Generate Kafka event for Peer review #98383861382799

Author: Rakesh Recharla

service/src/main/java/com/appirio/service/review/dao/ProjectResultDAO.java

@@ -1,15 +1,13 @@
 package com.appirio.service.review.dao;
 
-import java.util.List;
-
-import org.skife.jdbi.v2.sqlobject.BindBean;
-
 import com.appirio.service.review.api.ProjectResult;
 import com.appirio.supply.dataaccess.DatasourceName;
 import com.appirio.supply.dataaccess.SqlBatchFile;
 import com.appirio.supply.dataaccess.api.audit.Audit;
-import com.appirio.supply.dataaccess.api.audit.AuditActionPerformer;
 import com.appirio.supply.dataaccess.api.validation.Validate;
+import org.skife.jdbi.v2.sqlobject.BindBean;
+
+import java.util.List;
 
 /**
  * DAO to interact with project result data
@@ -22,9 +20,8 @@ public interface ProjectResultDAO {
     /**
      * Batch inserts new project result records
      * @param results results to insert
-     * @param userId  user id used for auditing purposes
      */
     @SqlBatchFile("sql/project-result/project-result-update.sql")
-    void updateProjectResults(@BindBean @Audit @Validate List<ProjectResult> results, @AuditActionPerformer Long userId);
+    void updateProjectResults(@BindBean @Audit @Validate List<ProjectResult> results);
 
 }

service/src/main/java/com/appirio/service/review/manager/ScoreManager.java

@@ -276,17 +276,19 @@ public void calculateAggregateScores(long challengeId) throws Exception {
     private void populateProjectResults(Long challengeId) {
         List<ReviewResult> results = calculateChallengeResults(challengeId);
         List<ProjectResult> projectResults = new ArrayList<ProjectResult>();
+        ObjectMapper mapper = new ObjectMapper();
 
         for (ReviewResult result : results) {
-            projectResults.add(new ProjectResult("handle", result.getUserId(), challengeId, result.getFinalScore(),
-                    result.getPlacement(), Boolean.valueOf(true).equals(result.getPassed()) ? 1l : 0l));
+            ProjectResult projectResult = new ProjectResult("handle", result.getUserId(), challengeId, result.getFinalScore(),
+                    result.getPlacement(), Boolean.valueOf(true).equals(result.getPassed()) ? 1l : 0l);
+            projectResults.add(projectResult);
+
+            // sdfsdfsd
+            // fire event on to the kafka bus to award SYS badge
+            publishKafkaEvent(mapper.valueToTree(projectResult), "event.member.sys.badges");
         }
 
-        // TODO use a real user id
-        projectResultDAO.updateProjectResults(projectResults, 22655028l);
-        // fire event on to the kafka bus to award SYS badge
-        ObjectMapper mapper = new ObjectMapper();
-        publishKafkaEvent(mapper.valueToTree(projectResults), "event.member.sys.badges");
+        projectResultDAO.updateProjectResults(projectResults);
     }
 
     /**

service/src/test/java/com/appirio/service/test/dao/ProjectResultDAOTest.java

@@ -1,13 +1,8 @@
 package com.appirio.service.test.dao;
 
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
+import com.appirio.service.review.api.ProjectResult;
+import com.appirio.service.review.dao.ProjectResultDAO;
+import com.appirio.supply.SupplyException;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -16,11 +11,13 @@
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.skife.jdbi.v2.Query;
 
-import com.appirio.service.review.api.ProjectResult;
-import com.appirio.service.review.api.ReviewItem;
-import com.appirio.service.review.dao.ProjectResultDAO;
-import com.appirio.service.review.dao.ReviewItemDAO;
-import com.appirio.supply.SupplyException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
 
 /**
  * Test ProjectResultDAO
@@ -66,12 +63,12 @@ public void testUpdateReviewItems() throws Exception {
         long beforeTime = System.currentTimeMillis();
 
         // Invoke method
-        dao.updateProjectResults(projectResults, 9l);
+        dao.updateProjectResults(projectResults);
 
         // For each review item
         for(ProjectResult projectResult : projectResults) {
             // Verify auditing and validation
-            verifyAuditing(projectResult, "9", beforeTime);
+            //verifyAuditing(projectResult, "9", beforeTime);
             verifyValidation(projectResult);
         }