Merge pull request #413 from appirio-tech/dev

Promote to prod - effort hours and a few fixes

Author: ajefts

Diff for: components/project_management/src/java/main/com/topcoder/management/project/ProjectPropertyType.java

@@ -65,8 +65,15 @@
  *     <li>Added {@link #MM_TYPE_KEY}</li>
  * </ul>
  * </p>
+ *
+ * <p>
+ * Version 1.3.0 (Topcoder - Add effort hours field)
+ * <ul>
+ *     <li>Add {@link #EFFORT_HOURS_ESTIMATE}</li>
+ * </ul>
+ * </p>
  * @author tuenm, iamajia, flytoj2ee, tangzx, GreatKevin, TCSCODER
- * @version 1.2.9
+ * @version 1.3.0
  * @since 1.0
  */
 public class ProjectPropertyType implements Serializable {
@@ -424,6 +431,16 @@ public class ProjectPropertyType implements Serializable {
      */
     public static final String MM_TYPE_KEY = "Marathon Match Type";
 
+    /**
+     * Represent "Review Type" key
+     */
+    public static final String REVIEW_TYPE_KEY = "Review Type";
+
+    /*
+     * Represent "Effort Hours Estimate" key
+     */
+    public static final String EFFORT_HOURS_ESTIMATE = "Effort Hours Estimate";
+
     /**
      * Represents the id of this instance. Only values greater than zero is
      * allowed. This variable is initialized in the constructor and can be

Diff for: components/project_management/src/java/main/com/topcoder/management/project/persistence/AbstractInformixProjectPersistence.java

@@ -6188,6 +6188,9 @@ private void createProjectProperties(Long projectId, Project project, Map idValu
                 Long key = (Long) entry.getKey();
                 String value = (String) entry.getValue();
                 value = Encode.forHtml(value);
+
+                if ("".equals(value)) continue;
+
                 // insert the project property into database
                 Object[] queryArgs = new Object[] {projectId, key,
                         value, operator, operator };
@@ -6298,6 +6301,13 @@ private void updateProjectProperties(Project project, Map idValueMap,
 
                 Long propertyId = (Long) entry.getKey();
 
+
+                Long key = (Long) entry.getKey();
+                String value = (String) entry.getValue();
+                value = Encode.forHtml(value);
+
+                if ("".equals(value)) continue;
+
                 // check if the property in the project object already exists in
                 // the database
                 if (propertyMap.containsKey(propertyId)) {
@@ -6499,7 +6509,7 @@ private void deleteProjectProperties(Project project, Set<Long> propertyIdSet, C
 
             getLogger().log(Level.INFO, new LogMessage(projectId, null,
             		"delete records from project_info with projectId:" + projectId));
-            
+
             // delete the properties whose id is in the set
             Helper.doDMLQuery(conn, DELETE_PROJECT_PROPERTIES_SQL
                     + idListBuffer.toString(), new Object[] {projectId});

Diff for: services/client_project_entities_dao/src/java/main/com/topcoder/clients/dao/ejb3/ProjectDAOBean.java

@@ -82,13 +82,18 @@
  * </p>
  *
  * <p>
+ * Version 1.3 (TC - Add effort hours field)
+ * - Add enable effort hours field for client
+ * </p>
+ *
+ * <p>
  * <strong>THREAD SAFETY:</strong> This class is technically mutable since the inherited configuration properties (with
  * {@link PersistenceContext}) are set after construction, but the container will not initialize the properties more
  * than once for the session beans and the EJB3 container ensure the thread safety in this case.
  * </p>
  *
  * @author Mafy, snow01, flying2hk, TCSDEVELOPER
- * @version 1.2
+ * @version 1.3
  */
 @TransactionManagement(TransactionManagementType.CONTAINER)
 @TransactionAttribute(TransactionAttributeType.REQUIRED)
@@ -119,7 +124,7 @@ public class ProjectDAOBean extends GenericEJB3DAO<Project, Long> implements
     private static final String SELECT_PROJECT = "select p.project_id, p.name, p.po_box_number, p.description, "
               + " p.active, p.sales_tax, p.payment_terms_id, p.modification_user, p.modification_date, "
               + " p.creation_date, p.creation_user, p.is_deleted, "
-              + " cp.client_id, c.name as client_name, p.is_manual_prize_setting, c.code_name "
+              + " cp.client_id, c.name as client_name, p.is_manual_prize_setting, c.code_name, c.enable_effort_hours "
               + " from project as p left join client_project as cp on p.project_id = cp.project_id left join client c "
               + "            on c.client_id = cp.client_id and (c.is_deleted = 0 or c.is_deleted is null) "
               + " where p.active = 1 and p.start_date <= current and current <= p.end_date ";
@@ -130,7 +135,7 @@ public class ProjectDAOBean extends GenericEJB3DAO<Project, Long> implements
     private static final String SELECT_PROJECT_BY_CLIENT_ID = "select p.project_id, p.name, p.po_box_number, p.description, "
         + " p.active, p.sales_tax, p.payment_terms_id, p.modification_user, p.modification_date, "
         + " p.creation_date, p.creation_user, p.is_deleted, "
-        + " cp.client_id, c.name as client_name, p.is_manual_prize_setting, c.code_name "
+        + " cp.client_id, c.name as client_name, p.is_manual_prize_setting, c.code_name, c.enable_effort_hours "
         + " from project as p, client_project as cp, client as c "
         + " where p.start_date <= current and current <= p.end_date "
         + " and c.client_id = cp.client_id and (p.is_deleted = 0 or p.is_deleted is null) "
@@ -144,7 +149,7 @@ public class ProjectDAOBean extends GenericEJB3DAO<Project, Long> implements
     private static final String SELECT_PROJECT_PREFIX = "select p.project_id, p.name, p.po_box_number, p.description, "
             + " p.active, p.sales_tax, p.payment_terms_id, p.modification_user, p.modification_date, "
             + " p.creation_date, p.creation_user, p.is_deleted, "
-            + " cp.client_id, c.name as client_name, p.is_manual_prize_setting, c.code_name "
+            + " cp.client_id, c.name as client_name, p.is_manual_prize_setting, c.code_name, c.enable_effort_hours "
             + " from project as p, client_project as cp, client as c "
             + " where p.start_date <= current and current <= p.end_date "
             + " and c.client_id = cp.client_id and (p.is_deleted = 0 or p.is_deleted is null) "
@@ -493,6 +498,11 @@ private List<Project> convertQueryToListProjects(Query query) {
                            client.setCodeName(os[15].toString());
             }
 
+            if (os[16] != null) {
+                int enableEffortHours = Integer.parseInt(os[16].toString());
+                client.setEnableEffortHours(enableEffortHours == 1 ? true : false);
+            }
+
             result.add(c);
 
         }

Diff for: services/client_project_entities_dao/src/java/main/com/topcoder/clients/model/Client.java

@@ -93,6 +93,27 @@ public class Client extends AuditableEntity {
     @Column(name = "payment_term_id")
     private long paymentTermsId;
 
+    /**
+     * <p>
+     * This field represents the 'enableEffortHours' property of the Client.
+     * </p>
+     * <p>
+     * It is default to the default value of this data type when it is not
+     * assigned.
+     * </p>
+     * <p>
+     * Through corresponding getter/setter methods. It is retrieved from
+     * Client.enableEffortHours [Client.isEffortHoursEnabled()] and in table
+     * client.enable_effort_hours.
+     * </p>
+     * <p>
+     * There are no restrictions at this moment. It can take any value.
+     * OPTIONAL.
+     * </p>
+     */
+    @Column(name = "enable_effort_hours")
+    private boolean enableEffortHours;
+
     /**
      * <p>
      * This field represents the 'clientStatus' property of the Client.
@@ -354,4 +375,23 @@ public Date getStartDate() {
     public void setStartDate(Date startDate) {
         this.startDate = startDate;
     }
+
+    /**
+     * Gets whether this client enabled effort hours.
+     *
+     * @return whether this client enabled effort hours.
+     */
+    public boolean isEffortHoursEnabled() {
+        return this.enableEffortHours;
+    }
+
+    /**
+     * Sets whether this client enabled effort hours.
+     *
+     * @param enableEffortHours
+     *            whether this client enabled effort hours.
+     */
+    public void setEnableEffortHours(boolean enableEffortHours) {
+        this.enableEffortHours = enableEffortHours;
+    }
 }

Diff for: services/client_project_entities_dao/src/java/tests/com/topcoder/clients/dao/ejb3/TestBase.java

@@ -217,8 +217,8 @@ protected Client createClient(long id) {
                 .createNativeQuery("insert into client "
                         + "(client_id, client_status_id, is_deleted, payment_term_id,company_id"
                         + ",salestax,start_date,end_date,creation_date,creation_user,modification_date,"
-                        + "modification_user,code_name) "
-                        + "values (?,?,?,?,?,?,?,?,?,?,?,?,?)");
+                        + "modification_user,code_name,enable_effort_hours) "
+                        + "values (?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
         int idx = 1;
         query.setParameter(idx++, client.getId());
         query.setParameter(idx++, client.getClientStatus().getId());
@@ -232,7 +232,8 @@ protected Client createClient(long id) {
         query.setParameter(idx++, client.getCreateUsername());
         query.setParameter(idx++, client.getModifyDate());
         query.setParameter(idx++, client.getModifyUsername());
-        query.setParameter(idx, client.getCodeName());
+        query.setParameter(idx++, client.getCodeName());
+        query.setParameter(idx, 1);
         query.executeUpdate();
 
         return client;
@@ -265,8 +266,8 @@ protected Client createClient(String name, long id) {
                 .createNativeQuery("insert into client "
                         + "(client_id, client_status_id, is_deleted, payment_term_id,company_id"
                         + ",salestax,start_date,end_date,creation_date,creation_user,modification_date,"
-                        + "modification_user,code_name, name) "
-                        + "values (?,?,?,?,?,?,?,?,?,?,?,?,?, ?)");
+                        + "modification_user,code_name, name, enable_effort_hours) "
+                        + "values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
         int idx = 1;
         query.setParameter(idx++, client.getId());
         query.setParameter(idx++, client.getClientStatus().getId());
@@ -281,7 +282,8 @@ protected Client createClient(String name, long id) {
         query.setParameter(idx++, client.getModifyDate());
         query.setParameter(idx++, client.getModifyUsername());
         query.setParameter(idx++, client.getCodeName());
-        query.setParameter(idx, client.getName());
+        query.setParameter(idx++, client.getName());
+        query.setParameter(idx, 0);
         query.executeUpdate();
 
         return client;

Diff for: services/client_project_entities_dao/test_files/Schema.sql

@@ -46,7 +46,8 @@ creation_user VARCHAR(64),
 modification_date DATETIME YEAR TO FRACTION default CURRENT YEAR TO FRACTION,
 modification_user VARCHAR(64),
 code_name VARCHAR(64),
-is_deleted SMALLINT
+is_deleted SMALLINT,
+enable_effort_hours SMALLINT
 );
 
 

Diff for: services/client_project_entities_dao/test_files/clientproject-update.sql

@@ -82,9 +82,8 @@ ALTER TABLE company ADD is_deleted SMALLINT;
 -- client
 ALTER TABLE client ADD code_name VARCHAR(64);
 ALTER TABLE client ADD is_deleted SMALLINT;
-ALTER TABLE client ADD is_deleted SMALLINT;
 ALTER TABLE client ADD client_status_id INTEGER;
-
+ALTER TABLE client ADD enable_effort_hours SMALLINT;
 
 -- project
 ALTER TABLE project ADD project_status_id INTEGER;
@@ -142,4 +141,4 @@ alter table project add constraint foreign key
 
 alter table project add constraint foreign key 
 	(parent_project_id) references project (project_id)
-	constraint project_parent_project_fk;
+	constraint project_parent_project_fk;

Diff for: services/contest_service_facade/src/java/main/com/topcoder/service/facade/contest/ejb/ContestServiceFacadeBean.java

@@ -917,9 +917,14 @@
  *     <li>Add CONTEST_PRIZE_TYPE_ID</li>
  * </ul>
  *
+ * Version 3.13 (Topcoder - Add effort hours field):
+ * <ul>
+ *     <li>Add enable effort hours</li>
+ * </ul>
+ *
  * @author snow01, pulky, murphydog, waits, BeBetter, hohosky, isv, tangzx, GreatKevin, lmmortal, minhu, GreatKevin, tangzx
  * @author isv, GreatKevin, Veve, deedee, TCSCODER, TCSASSEMBLER
- * @version 3.12
+ * @version 3.13
  */
 @Stateless
 @TransactionManagement(TransactionManagementType.CONTAINER)
@@ -5149,8 +5154,7 @@ public SoftwareCompetition updateSoftwareContest(TCSubject tcSubject, SoftwareCo
     public Set<Long> updatePreRegister(TCSubject tcSubject, SoftwareCompetition contest,
                                           Set<Long> preRegisterMembers) throws ContestServiceException
     {
-
-        long forumId;
+         long forumId;
         String userRoleId = "";
         String moderatorRoleId = "";
         Forums forum = null;
@@ -5946,6 +5950,18 @@ public SoftwareCompetition getSoftwareContestByProjectId(TCSubject tcSubject, lo
             checkSoftwareContestPermission(tcSubject, projectId, true);
 
             FullProjectData fullProjectData = this.projectServices.getFullProjectData(projectId);
+
+            Boolean effortHoursEnabled = false;
+            try {
+                effortHoursEnabled = projectService.getClientByProject(fullProjectData.getProjectHeader().getTcDirectProjectId()).isEffortHoursEnabled();
+            } catch (PersistenceFault e) {
+                effortHoursEnabled = false;
+            }
+
+            if(!effortHoursEnabled) {
+                fullProjectData.getProjectHeader().getProperties().remove(ProjectPropertyType.EFFORT_HOURS_ESTIMATE);
+            }
+
             Long compVersionId = Long.parseLong(fullProjectData.getProjectHeader()
                                                                .getProperty(ProjectPropertyType.EXTERNAL_REFERENCE_ID_PROJECT_PROPERTY_KEY));
             contest.setAssetDTO(this.catalogService.getAssetByVersionId(

Diff for: services/project_services/src/java/main/com/topcoder/project/service/impl/ProjectServicesImpl.java

@@ -441,13 +441,20 @@
  * </ul>
  * </p>
  *
+ * <p>
+ * Version 2.6 (Topcoder - Add effort hours field)
+ * <ul>
+ *     <li>Add enable effort hours</li>
+ * </ul>
+ * </p>
+ *
  * <strong>Thread Safety:</strong> This class is immutable but operates on non thread safe objects,
  * thus making it potentially non thread safe.
  * </p>
  *
  * @author argolite, moonli, pulky
  * @author fabrizyo, znyyddf, murphydog, waits, hohosky, isv, lmmortal, GreatKevin, TCSCODER
- * @version 2.5
+ * @version 2.6
  * @since 1.0
  */
 public class ProjectServicesImpl implements ProjectServices {
@@ -793,6 +800,10 @@ public class ProjectServicesImpl implements ProjectServices {
      */
     private static final int BUG_HUNT_PROJECT_CATEGORY_ID = 9;
 
+    /**
+     * Represent internal review type of ProjectPropertyType
+     */
+    private static final String REVIEW_TYPE_INTERNAL = "INTERNAL";
 
     /**
      * <p>
@@ -834,7 +845,8 @@ public class ProjectServicesImpl implements ProjectServices {
             ProjectPropertyType.REVIEW_FEEDBACK_FLAG_PROJECT_PROPERTY_KEY, ProjectPropertyType.CONTEST_FEE_PERCENTAGE_PROJECT_PROPERTY_KEY,
             ProjectPropertyType.ALLOW_MULTIPLE_SUBMISSIONS_PROPERTY_KEY, ProjectPropertyType.COPILOT_COST_PROJECT_PROPERTY_KEY,
             ProjectPropertyType.MAXIMUM_SUBMISSIONS_KEY, ProjectPropertyType.VIEWABLE_SUBMISSIONS_FLAG_KEY_STRING,
-            ProjectPropertyType.ALLOW_STOCK_ART_KEY, ProjectPropertyType.FORUM_TYPE
+            ProjectPropertyType.ALLOW_STOCK_ART_KEY, ProjectPropertyType.FORUM_TYPE,
+            ProjectPropertyType.EFFORT_HOURS_ESTIMATE
     };
 
     /**
@@ -2105,7 +2117,8 @@ public FullProjectData updateProject(Project projectHeader, String projectHeader
                     }
 
                     if (projectHeader.getProjectCategory().getId() == ProjectCategory.CODE.getId() &&
-                            projectHeader.getAutoAssignReviewerId() > 0 && p.getPhaseType().getId() == PhaseType.REVIEW_PHASE.getId()) {
+                            REVIEW_TYPE_INTERNAL.equals(projectHeader.getProperty(ProjectPropertyType.REVIEW_TYPE_KEY)) &&
+                            p.getPhaseType().getId() == PhaseType.REVIEW_PHASE.getId()) {
                         // code with auto assigned review only requires one reviewer.
                         p.setAttribute("Reviewer Number", "1");
                     } else if (projectHeader.getProjectCategory().getId() == ProjectCategory.CODE.getId() &&
@@ -5176,7 +5189,7 @@ private void setNewPhasesProperties(Project projectHeader,
                         projectHeader.getProjectCategory().getId() == ProjectCategory.BUG_HUNT.getId() ||
                         projectHeader.getProjectCategory().getProjectType().getId() == ProjectType.STUDIO.getId() ||
                         (projectHeader.getProjectCategory().getId() == ProjectCategory.CODE.getId() &&
-                                projectHeader.getAutoAssignReviewerId() > 0)
+                                REVIEW_TYPE_INTERNAL.equals(projectHeader.getProperty(ProjectPropertyType.REVIEW_TYPE_KEY)))
                         ) {
                     // 1) copilot posting 2) studio 3) bug hunt 4) code with auto assigned review only requires one reviewer.
                     p.setAttribute("Reviewer Number", "1");

Diff for: services/specification_review_service/test_files/insert.sql

@@ -501,6 +501,9 @@ INSERT INTO id_sequences(name, next_block_start, block_size, exhausted)
 insert into project_info_type_lu(project_info_type_id, name, description, create_user, create_date, modify_user, modify_date)
   VALUES(44, 'Post-Mortem Required', 'Post-Mortem Required', 'System', CURRENT, 'System', CURRENT);
 
+insert into project_info_type_lu(project_info_type_id, name, description, create_user, create_date, modify_user, modify_date)
+  VALUES(88, 'Effort Hours Estimate', 'Effort Hours Estimate', 'System', CURRENT, 'System', CURRENT);
+
 INSERT INTO submission_type_lu(submission_type_id, name, description, create_user, create_date, modify_user, modify_date)
   VALUES(1, 'Contest Submission', 'The contest submission', 'System', CURRENT, 'System', CURRENT);
 INSERT INTO submission_type_lu(submission_type_id, name, description, create_user, create_date, modify_user, modify_date)