Merge pull request #127 from isvisv/dev

Submission author is determined by respective resource properties but…

Author: ajefts

conf/web/WEB-INF/applicationContext.xml

@@ -249,6 +249,24 @@
 
     <bean id="mimeTypeRetriever" class="com.topcoder.direct.services.view.action.contest.launch.MimeTypeRetriever"/>
 
+    <bean id="dbConnectionFactory" class="com.topcoder.db.connectionfactory.DBConnectionFactoryImpl">
+        <constructor-arg index="0" value="com.topcoder.db.connectionfactory.DBConnectionFactoryImpl"/>
+    </bean>
+
+    <bean id="resourcePersistence" class="com.topcoder.management.resource.persistence.sql.SqlResourcePersistence">
+        <constructor-arg index="0" ref="dbConnectionFactory"/>
+    </bean>
+
+    <bean id="searchBundleManager" class="com.topcoder.search.builder.SearchBundleManager">
+        <constructor-arg index="0" value="com.topcoder.searchbuilder.common"/>
+    </bean>
+
+    <bean id="persistenceResourceManager"
+          class="com.topcoder.management.resource.persistence.PersistenceResourceManager">
+        <constructor-arg index="0" ref="resourcePersistence"/>
+        <constructor-arg index="1" ref="searchBundleManager"/>
+    </bean>
+
     <!-- Actions -->
     <bean id="baseDirectStrutsAction"
           class="com.topcoder.direct.services.view.action.BaseDirectStrutsAction"
@@ -300,6 +318,7 @@
         <property name="studioSubmissionBase" value="@studio.submission.base@"/>
         <property name="softwareSubmissionBase" value="@file_storage_location@"/>
         <property name="mimeTypeRetriever" ref="mimeTypeRetriever"/>
+        <property name="resourceManager" ref="persistenceResourceManager"/>
     </bean>
 
     <bean id="getProjectVMInstancesAction"

src/java/main/com/topcoder/direct/services/view/action/project/ProjectWorkManagementAction.java

@@ -29,6 +29,9 @@
 import com.topcoder.direct.services.view.util.DirectUtils;
 import com.topcoder.management.deliverable.Submission;
 import com.topcoder.management.deliverable.Upload;
+import com.topcoder.management.resource.Resource;
+import com.topcoder.management.resource.ResourceManager;
+import com.topcoder.management.resource.persistence.ResourcePersistenceException;
 import com.topcoder.project.phases.Phase;
 import com.topcoder.shared.dataAccess.DataAccess;
 import com.topcoder.shared.dataAccess.Request;
@@ -50,8 +53,16 @@
 /**
  * Action supporting project work management page.
  *
- * @author TCSASSEMBLER
- * @version 1.0
+ *
+ * <p>
+ * Version 1.1 Change notes:
+ *   <ol>
+ *     <li>Added {@link #resourceManager} property.</li>
+ *     <li>Added {@link #resolveSubmitter(Submission)} method.</li>
+ *   </ol>
+ * </p>
+ * @author isv, TCSASSEMBLER
+ * @version 1.1
  */
 public class ProjectWorkManagementAction extends BaseDirectStrutsAction implements FormAction<ProjectIdForm> {
 
@@ -129,6 +140,13 @@ public class ProjectWorkManagementAction extends BaseDirectStrutsAction implemen
      */
     private MimeTypeRetriever mimeTypeRetriever;
 
+    /**
+     * <p>A <code>ResourceManager</code> providing the value for resourceManager property.</p>
+     *
+     * @since 1.1
+     */
+    private ResourceManager resourceManager;
+
     /**
      * Logger for this class.
      */
@@ -581,6 +599,7 @@ public String pushSubmissions() {
                         Map<Long, Map<Integer, Submission>> organizingMap = new HashMap<Long, Map<Integer, Submission>>();
 
                         for (Submission s : checkpointSubmissions) {
+                            resolveSubmitter(s);
 
                             Long submissionUserId = Long.parseLong(s.getCreationUser());
 
@@ -591,8 +610,6 @@ public String pushSubmissions() {
                                 Map<Integer, Submission> userSubmissionMap = new TreeMap<Integer, Submission>();
                                 userSubmissionMap.put(s.getUserRank(), s);
                                 organizingMap.put(submissionUserId, userSubmissionMap);
-                                userHandlesMap.put(submissionUserId,
-                                        this.getUserService().getUserHandle(submissionUserId));
                             }
                         }
 
@@ -615,6 +632,7 @@ public String pushSubmissions() {
                         Map<Long, Map<Integer, Submission>> organizingMap = new HashMap<Long, Map<Integer, Submission>>();
 
                         for (Submission s : finalRoundSubmissions) {
+                            resolveSubmitter(s);
 
                             Long submissionUserId = Long.parseLong(s.getCreationUser());
 
@@ -625,8 +643,6 @@ public String pushSubmissions() {
                                 Map<Integer, Submission> userSubmissionMap = new TreeMap<Integer, Submission>();
                                 userSubmissionMap.put(s.getUserRank(), s);
                                 organizingMap.put(submissionUserId, userSubmissionMap);
-                                userHandlesMap.put(submissionUserId,
-                                        this.getUserService().getUserHandle(submissionUserId));
                             }
                         }
 
@@ -647,17 +663,14 @@ public String pushSubmissions() {
 
                             // find out the latest final fix submission
                             Submission latestSubmission = finalFixesSubmissions.get(0);
+                            resolveSubmitter(latestSubmission);
                             for (int i = 1, n = finalFixesSubmissions.size(); i < n; ++i) {
                                 if (latestSubmission.getModificationTimestamp().compareTo(
                                         finalFixesSubmissions.get(i).getModificationTimestamp()) < 0) {
                                     latestSubmission = finalFixesSubmissions.get(i);
                                 }
                             }
 
-                            userHandlesMap.put(Long.parseLong(latestSubmission.getCreationUser()),
-                                    this.getUserService().getUserHandle(
-                                            Long.parseLong(latestSubmission.getCreationUser())));
-
                             List<com.appirio.client.asp.api.Submission> finalFixSubmissionsToPush = new ArrayList<com.appirio.client.asp.api.Submission>();
 
                             finalFixSubmissionsToPush.add(getStudioSubmissionDataForAPI(latestSubmission, true));
@@ -678,6 +691,7 @@ public String pushSubmissions() {
                         for (Submission sub : submissions) {
                             if (sub.getId() == firstPlaceWinner.getSubmissionId()) {
                                 // find the winner
+                                resolveSubmitter(sub);
                                 List<com.appirio.client.asp.api.Submission> winnerSubmissionToPush = new ArrayList<com.appirio.client.asp.api.Submission>();
 
                                 winnerSubmissionToPush.add(getSoftwareSubmissionDataForAPI(sub));
@@ -695,6 +709,7 @@ public String pushSubmissions() {
                         for (Upload upload : uploads) {
                             if (upload.getProjectPhase() != null && upload.getProjectPhase().longValue() == lastClosedFinalFixPhase.getId()) {
                                 Submission finalFixSubmission = new Submission();
+                                resolveSubmitter(finalFixSubmission);
                                 long finalFixSubmissionId = 0;
                                 long submitterId = 0;
                                 for (ContestFinalFixDTO ff : finalFixes) {
@@ -893,6 +908,25 @@ private String createAbsoluteStudioSubmissionBasePath(Submission submission) {
         return buf.toString();
     }
 
+    /**
+     * <p>Gets the details for actual submitter based on the submitter resource associated with the specified submission
+     * and updates {@link Submission#getCreationUser()} accordingly.</p>
+     *
+     * @param submission a <code>Submission</code> providing submission details.
+     * @throws ResourcePersistenceException if an unexpected error occurs.
+     * @since 1.1
+     */
+    private void resolveSubmitter(Submission submission) throws ResourcePersistenceException {
+        long submitterResourceId = submission.getUpload().getOwner();
+        Resource submitterResource = getResourceManager().getResource(submitterResourceId);
+        long submitterUserId = Long.parseLong(submitterResource.getProperty("External Reference ID"));
+        String submitterHandle = submitterResource.getProperty("Handle");
+
+        this.userHandlesMap.put(submitterUserId, submitterHandle);
+
+        submission.setCreationUser(String.valueOf(submitterUserId));
+    }
+
     /**
      * Gets the absolute path of the preview deliverable zip.
      *
@@ -1126,6 +1160,26 @@ public void setMimeTypeRetriever(MimeTypeRetriever mimeTypeRetriever) {
         this.mimeTypeRetriever = mimeTypeRetriever;
     }
 
+    /**
+     * <p>Gets the resourceManager property.</p>
+     *
+     * @return a <code>ResourceManager</code> providing the value for resourceManager property.
+     * @since 1.1
+     */
+    public ResourceManager getResourceManager() {
+        return this.resourceManager;
+    }
+
+    /**
+     * <p>Sets the resourceManager property.</p>
+     *
+     * @param resourceManager a <code>ResourceManager</code> providing the value for resourceManager property.
+     * @since 1.1
+     */
+    public void setResourceManager(ResourceManager resourceManager) {
+        this.resourceManager = resourceManager;
+    }
+
     public static class SubmissionPresentationFilter implements FilenameFilter {
 
         /**