[jboss-svn-commits] JBL Code SVN: r18501 - in labs/jbosslabs/labs-3.0-build: services/project-service/src/main/java/org/jboss/labs/core/service/impl and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: wrzep
Date: 2008-02-19 05:28:54 -0500 (Tue, 19 Feb 2008)
New Revision: 18501

Modified:
   labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/Project.java
   labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/Username.java
   labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/core/service/impl/ProjectServiceBean.java
Log:
JBLAB-909
create/add project lead
batch update bug fixed


Modified: labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/Project.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/Project.java	2008-02-19 09:35:46 UTC (rev 18500)
+++ labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/Project.java	2008-02-19 10:28:54 UTC (rev 18501)
@@ -25,6 +25,7 @@
 
 import javax.persistence.*;
 import java.io.Serializable;
+import java.util.Arrays;
 import java.util.List;
 
 @Entity
@@ -36,7 +37,7 @@
     @Version
     private Integer version;
     
-    private String projectId;
+    @Column(unique = true) private String projectId;
     private String name;
     private String description;
     private String downloadsURL;
@@ -66,8 +67,10 @@
     @OneToOne(cascade = CascadeType.PERSIST)
     private Blog mainBlog;
     @ManyToMany(cascade = {CascadeType.PERSIST, CascadeType.MERGE})
+    @JoinTable(name = "Project_Contributor")
     private List<Username> contributors;
     @ManyToMany(cascade = {CascadeType.PERSIST, CascadeType.MERGE})
+    @JoinTable(name = "Project_ProjectLead")
     private List<Username> projectLeads;
 
     public Project() {
@@ -182,7 +185,6 @@
         return ohlohId;
     }
 
-
     public List<Blog> getBlogList() {
         return blogList;
     }
@@ -259,4 +261,14 @@
     public String getOhlohURL() {
         return null; //TODO
     }
+
+    /* Helper methods */
+
+    public void addProjectLead(Username leadUsername) {
+        if (projectLeads == null) {
+            setProjectLeads(Arrays.asList(leadUsername));
+        } else {
+            projectLeads.add(leadUsername);
+        }
+    }
 }

Modified: labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/Username.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/Username.java	2008-02-19 09:35:46 UTC (rev 18500)
+++ labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/Username.java	2008-02-19 10:28:54 UTC (rev 18501)
@@ -25,6 +25,7 @@
 
 import javax.persistence.*;
 import java.io.Serializable;
+import java.util.Arrays;
 import java.util.List;
 
 
@@ -103,4 +104,12 @@
     public void setLeadProjects(List<Project> leadProjects) {
         this.leadProjects = leadProjects;
     }
+
+    public void addLeadProject(Project project) {
+        if (leadProjects == null) {
+            setLeadProjects(Arrays.asList(project));
+        } else {
+            leadProjects.add(project);
+        }
+    }
 }

Modified: labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/core/service/impl/ProjectServiceBean.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/core/service/impl/ProjectServiceBean.java	2008-02-19 09:35:46 UTC (rev 18500)
+++ labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/core/service/impl/ProjectServiceBean.java	2008-02-19 10:28:54 UTC (rev 18501)
@@ -44,17 +44,19 @@
                                                 .setParameter("username", lu)
                                                 .getSingleResult();
 
-            System.out.println("leadUsername: " + leadUsername);
+            System.out.println("leadUsername: " + (leadUsername == null ? "" : leadUsername.getUsername()));
         } catch (NoResultException e) {
             // do nothing
         }
 
-       /* if (leadUsername == null) {
+        if (leadUsername == null) {
+
             leadUsername = new Username(projectRequest.getLeadUsername());
             em.persist(leadUsername);
         }
 
-        p.setProjectLeads(Arrays.asList(leadUsername));*/
+        leadUsername.addLeadProject(p);
+        p.addProjectLead(leadUsername);
 
        /* if (repository) {
             Repository r = new Repository(RepositoryType.SVN);