Changeset 1269 for his/tags/1.6.0

Timestamp:

04/04/09 16:49:14 (3 years ago)

Author:

olger

Message:

Hibernate changes to the Team, Member and Role structure to prevent returning teammembers x roles. (enforce a distinct)

Files:

• his/tags/1.6.0/data/src/main/java/org/joiningtracks/his/data/model/Team.java (modified) (3 diffs)
• his/tags/1.6.0/data/src/test/java/org/joiningtracks/his/data/dao/Database.java (modified) (3 diffs)
• his/tags/1.6.0/data/src/test/java/org/joiningtracks/his/data/dao/jpa/JpaPatientGroupDaoTest.java (modified) (2 diffs)
• his/tags/1.6.0/data/src/test/java/org/joiningtracks/his/data/dao/jpa/JpaTeamDaoTest.java (modified) (1 diff)

his/tags/1.6.0/data/src/main/java/org/joiningtracks/his/data/model/Team.java

@@ -22 +22 @@
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Set;
+import java.util.HashSet;
-
-@SuppressWarnings({"JpaDataSourceORMInspection", "JpaModelErrorInspection"})
@@ -35 +37 @@
-    @JoinColumn(name = "team_id", referencedColumnName = "id", nullable = false)
-    @Cascade(value=org.hibernate.annotations.CascadeType.DELETE_ORPHAN)
-List<TeamMember> teamMembers = new ArrayLis
+Set<TeamMember> teamMembers = new HashSe
-
-    public Team() {
@@ -81 +83 @@
-    }
-
-Lis
+Se
-        return teamMembers;
-    }
-
-Lis
+Se
-        this.teamMembers = teamMembers;
-    }

his/tags/1.6.0/data/src/test/java/org/joiningtracks/his/data/dao/Database.java

@@ -867 +867 @@
-            long id,
-            String groupName,
-
+
+
-
-        JdbcInsertStatement stmt = new JdbcInsertStatementBuilder("patientgroup")
@@ -873 +874 @@
-                .addParameter("group_name", groupName)
-                .addParameter("group_type", groupType)
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    public void insertPatientGroupPathwayParticipation(
-            long id,
@@ -1000 +1024 @@
-    }
-
+    public void insertTeamMemberRole(
+            long id,
+            String description) {
+
+        JdbcInsertStatement stmt = new JdbcInsertStatementBuilder("team_member_roles")
+                .addParameter("id", id)
+                .addParameter("role_description", description)
+                .addParameter("version", 0)
+                .build();
+
+        jdbcTemplate.update(stmt.getSql(), stmt.getParameters());
+    }
+
+    public void insertTeam(
+            long id,
+            String name) {
+
+        JdbcInsertStatement stmt = new JdbcInsertStatementBuilder("team")
+                .addParameter("id", id)
+                .addParameter("team_name", name)
+                .addParameter("version", 0)
+                .build();
+
+        jdbcTemplate.update(stmt.getSql(), stmt.getParameters());
+    }
+
+    public void insertTeamMember(
+            long id,
+            String ldapId,
+            long teamMemberRoleId,
+            long teamId) {
+
+
+        JdbcInsertStatement stmt = new JdbcInsertStatementBuilder("team_members")
+                .addParameter("id", id)
+                .addParameter("version", 0)
+                .addParameter("team_id", teamId)
+                .addParameter("ldap_id", ldapId)
+                .addParameter("role_id", teamMemberRoleId)
+                .build();
+
+        jdbcTemplate.update(stmt.getSql(), stmt.getParameters());
+    }
-    //========================================== Getters/Setters =======================================================
-

his/tags/1.6.0/data/src/test/java/org/joiningtracks/his/data/dao/jpa/JpaPatientGroupDaoTest.java

@@ -13 +13 @@
-import org.joiningtracks.his.data.model.Patient;
-import org.joiningtracks.his.data.model.PatientGroup;
+import org.joiningtracks.his.data.model.Team;
-
-import java.util.Collection;
@@ -362 +363 @@
-    }
-
+    public void testPatientGroupWithTeam() {
+        db.insertTeamMemberRole(1L, "rol 1");
+        db.insertTeamMemberRole(2L, "rol 2");
+        db.insertTeam(1L, "team  1");
+        db.insertTeamMember(1L, "LDAPID 1", 1L, 1L);
+        db.insertTeamMember(2L, "LDAPID 2", 2L, 1L);
+
+        OccurredAppointment occurredAppointment = new OccurredAppointment("identifier", "description", new DateTime(), new DateTime());
+        db.insertAppointment(1L, occurredAppointment.getIdentifier(), occurredAppointment.getDescription(), occurredAppointment.getStartDate(), occurredAppointment.getEndDate());
+
+        db.insertPatientGroup(1L, "groupname", "grouptype 1", 1L);
+        db.insertPatientGroupAppointment(1L, 1L, "identifier");
+
+        db.insertProcessDefinition(1L, "", "");
+        db.insertProcessInstance(1L, new Date(), 1L);
+        db.insertProcessInstance(2L, new Date(), 1L);
+        db.insertGeneralPractitioner(1L, "", "", "", "", "", "", "", "", 1L);
+        db.insertPatient(1L, 1L, "firstname", "lastname", "initials", new Date(), Patient.Gender.MALE, "+31211111111", "+31612345678", "email@host.com", "Teststreet", "80", "1234 XP", "Amsterdam", COUNTRY_ID_NETHERLANDS, null);
+        db.insertPatient(2L, 1L, "firstname", "lastname", "initials", new Date(), Patient.Gender.MALE, "+31211111111", "+31612345678", "email@host.com", "Teststreet", "80", "1234 XP", "Amsterdam", COUNTRY_ID_NETHERLANDS, null);
+        db.insertPathwayParticipation(1L, 1L, 1L, 1L);
+        db.insertPathwayParticipation(2L, 2L, 2L, 1L);
+
+        db.insertPatientGroupPathwayParticipation(1L, 1L, 1L);
+        db.insertPatientGroupPathwayParticipation(2L, 1L, 2L);
+
+        PatientGroup patientGroup = dao.getById(1L);
+        assertNotNull(patientGroup);
+        Team team = patientGroup.getTeam();
+        assertNotNull(team);
+        assertEquals("Teammembers should be 2", 2, team.getTeamMembers().size());
+
+    }
-}

his/tags/1.6.0/data/src/test/java/org/joiningtracks/his/data/dao/jpa/JpaTeamDaoTest.java

@@ -39 +39 @@
-        assertNull(dao.getById(id));
-    }
+
+    public void testFetchTeamMembersAndRoles() throws Exception {
+
+        db.insertTeamMemberRole(1L, "rol 1");
+        db.insertTeamMemberRole(2L, "rol 2");
+        db.insertTeam(1L, "team  1");
+        db.insertTeamMember(1L, "LDAPID 1", 1L, 1L);
+        db.insertTeamMember(2L, "LDAPID 2", 2L, 1L);
+
+        Team team = dao.getById(1L);
+        assertNotNull(team);
+        assertEquals("Expected 2 teammembers", 2, team.getTeamMembers().size());
+
+        team = dao.getById(1L);
+        assertNotNull(team);
+        assertEquals("Expected 2 teammembers", 2, team.getTeamMembers().size());
+
+    }
+
-}