Merge pull request #4952 from wikimedia/T372517

[ALT TEXT] Add additional action data when sending group assignment event

Author: mazevedofs

Wikipedia/Code/ArticleViewController+Editing.swift

@@ -296,7 +296,11 @@ extension ArticleViewController: EditorViewControllerDelegate {
 
         do {
             try dataController.assignArticleEditorExperiment(isLoggedIn: isLoggedIn, project: project)
-            EditInteractionFunnel.shared.logAltTextDidAssignArticleEditorGroup(project: WikimediaProject(wmfProject: project))
+            
+            if let user = dataStore.authenticationManager.getLoggedInUserCache(for: articleURL) {
+                EditInteractionFunnel.shared.logAltTextDidAssignArticleEditorGroup(username:user.name, userEditCount: user.editCount, articleTitle: articleTitle, image: filename, registrationDate: user.registrationDateString, project: WikimediaProject(wmfProject: project))
+            }
+            
         } catch let error {
             DDLogWarn("Error assigning alt text article editor experiment: \(error)")
         }

Wikipedia/Code/EditInteractionFunnel.swift

@@ -277,13 +277,20 @@ final class EditInteractionFunnel {
 
     // MARK: Alt-Text-Experiment
 
-    func logAltTextDidAssignImageRecsGroup(project: WikimediaProject) {
-        
+    func logAltTextDidAssignImageRecsGroup(username: String, userEditCount: UInt64, articleTitle: String, image: String, registrationDate: String?, project: WikimediaProject) {
         guard let group = WMFAltTextDataController.shared?.assignedAltTextImageRecommendationsGroupForLogging() else {
             return
         }
 
-        var actionData: [String: String] = [:]
+        var actionData = ["article_title": articleTitle,
+                          "image": image,
+                          "username": username,
+                          "event_user_revision_count": String(userEditCount)]
+        
+        if let registrationDate {
+            actionData["user_create_date"] = registrationDate
+        }
+        
         switch group {
         case "A":
             actionData["exp_b_group"] = "a"
@@ -296,13 +303,21 @@ final class EditInteractionFunnel {
         logEvent(activeInterface: .altTextEditingOnboarding, action: .groupAssignment, actionData: actionData, project: project)
     }
 
-    func logAltTextDidAssignArticleEditorGroup(project: WikimediaProject) {
+    func logAltTextDidAssignArticleEditorGroup(username: String, userEditCount: UInt64, articleTitle: String, image: String, registrationDate: String?, project: WikimediaProject) {
 
         guard let group = WMFAltTextDataController.shared?.assignedAltTextArticleEditorGroupForLogging() else {
             return
         }
 
-        var actionData: [String: String] = [:]
+        var actionData = ["article_title": articleTitle,
+                          "image": image,
+                          "username": username,
+                          "event_user_revision_count": String(userEditCount)]
+        
+        if let registrationDate {
+            actionData["user_create_date"] = registrationDate
+        }
+        
         switch group {
         case "C":
             actionData["exp_c_group"] = "c"

Wikipedia/Code/ExploreViewController.swift

@@ -1536,13 +1536,16 @@ extension ExploreViewController: WMFImageRecommendationsLoggingDelegate {
 
     func logAltTextExperimentDidAssignGroup() {
 
-        guard let imageRecommendationsViewModel else {
+        guard let imageRecommendationsViewModel,
+              let lastRecommendation = imageRecommendationsViewModel.lastRecommendation,
+           let siteURL = dataStore.languageLinkController.appLanguage?.siteURL,
+           let user = dataStore.authenticationManager.getLoggedInUserCache(for: siteURL) else {
             return
         }
 
         let project = WikimediaProject(wmfProject: imageRecommendationsViewModel.project)
 
-        EditInteractionFunnel.shared.logAltTextDidAssignImageRecsGroup(project: project)
+        EditInteractionFunnel.shared.logAltTextDidAssignImageRecsGroup(username:user.name, userEditCount: user.editCount, articleTitle: lastRecommendation.title, image: lastRecommendation.imageData.filename, registrationDate: user.registrationDateString, project: WikimediaProject(wmfProject: imageRecommendationsViewModel.project))
     }
 
     func logOnboardingDidTapPrimaryButton() {