Fetch achievements data from beta cluster for beta variant of the app (commons-app#2986)

Author: maskaravivek

app/src/main/java/fr/free/nrw/commons/di/NetworkingModule.java

@@ -70,7 +70,7 @@ public MediaWikiApi provideMediaWikiApi(Context context,
     @Provides
     @Singleton
     public OkHttpJsonApiClient provideOkHttpJsonApiClient(OkHttpClient okHttpClient,
-                                                          @Named("tools_force") HttpUrl toolsForgeUrl,
+                                                          @Named("tools_forge") HttpUrl toolsForgeUrl,
                                                           @Named("default_preferences") JsonKvStore defaultKvStore,
                                                           Gson gson) {
         return new OkHttpJsonApiClient(okHttpClient,
@@ -91,7 +91,7 @@ public String provideMwApiUrl() {
     }
 
     @Provides
-    @Named("tools_force")
+    @Named("tools_forge")
     @NonNull
     @SuppressWarnings("ConstantConditions")
     public HttpUrl provideToolsForgeUrl() {

app/src/main/java/fr/free/nrw/commons/mwapi/OkHttpJsonApiClient.java

@@ -3,6 +3,7 @@
 import android.text.TextUtils;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 
@@ -11,6 +12,7 @@
 import org.wikipedia.dataclient.mwapi.MwQueryResponse;
 import org.wikipedia.dataclient.mwapi.RecentChange;
 import org.wikipedia.util.DateUtil;
+
 import java.io.IOException;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -34,6 +36,7 @@
 import fr.free.nrw.commons.nearby.model.NearbyResultItem;
 import fr.free.nrw.commons.upload.FileUtils;
 import fr.free.nrw.commons.utils.CommonsDateUtil;
+import fr.free.nrw.commons.utils.ConfigUtils;
 import fr.free.nrw.commons.wikidata.model.GetWikidataEditCountResponse;
 import io.reactivex.Observable;
 import io.reactivex.Single;
@@ -85,6 +88,11 @@ public Single<Integer> getUploadCount(String userName) {
         urlBuilder
                 .addPathSegments("/uploadsbyuser.py")
                 .addQueryParameter("user", userName);
+
+        if (ConfigUtils.isBetaFlavour()) {
+            urlBuilder.addQueryParameter("labs", "commonswiki");
+        }
+
         Request request = new Request.Builder()
                 .url(urlBuilder.build())
                 .build();
@@ -106,6 +114,11 @@ public Single<Integer> getWikidataEdits(String userName) {
         urlBuilder
                 .addPathSegments("/wikidataedits.py")
                 .addQueryParameter("user", userName);
+
+        if (ConfigUtils.isBetaFlavour()) {
+            urlBuilder.addQueryParameter("labs", "commonswiki");
+        }
+
         Request request = new Request.Builder()
                 .url(urlBuilder.build())
                 .build();
@@ -134,7 +147,7 @@ public Single<Integer> getWikidataEdits(String userName) {
      */
     public Single<FeedbackResponse> getAchievements(String userName) {
         final String fetchAchievementUrlTemplate =
-                wikiMediaToolforgeUrl + "/feedback.py";
+                wikiMediaToolforgeUrl + (ConfigUtils.isBetaFlavour() ? "/feedback.py?labs=commonswiki" : "/feedback.py");
         return Single.fromCallable(() -> {
             String url = String.format(
                     Locale.ENGLISH,