finalized test

Author: Maria Farooq

restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/entities/ProfileAssociation.java

@@ -70,6 +70,13 @@ public Date getDateUpdated() {
         return dateUpdated;
     }
 
+    /**
+     * @param newProfileSid
+     * @return
+     */
+    public ProfileAssociation setProfileSid(final Sid newProfileSid){
+    	return new ProfileAssociation(newProfileSid, targetSid, dateCreated, Calendar.getInstance().getTime());
+    }
     @NotThreadSafe
     public static final class Builder {
         private Sid profileSid;
@@ -91,8 +98,8 @@ public void setProfileDocument(final Sid targetSid) {
             this.targetSid = targetSid;
         }
 
-        public void setSid(final Sid sid) {
-            this.profileSid = sid;
+        public void setSid(final Sid profileSid) {
+            this.profileSid = profileSid;
         }
 
         public void setDateCreated(final Date dateCreated) {

restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/mybatis/MybatisProfileAssociationsDao.java

@@ -111,8 +111,8 @@ public void updateAssociatedProfileOfAllSuchProfileSid(String oldProfileSid, Str
         final SqlSession session = sessions.openSession();
         try {
         	Map<String, Object> map = new HashMap<String, Object>();
-        	map.put("profile_sid", oldProfileSid);
-        	map.put("old_profile_sid", newProfileSid);
+        	map.put("profile_sid", newProfileSid);
+        	map.put("old_profile_sid", oldProfileSid);
             session.update(namespace + "updateAssociatedProfileOfAllSuchProfileSid", map);
             session.commit();
             map = null;

restcomm/restcomm.dao/src/test/java/org/restcomm/connect/dao/mybatis/ProfileAssociationsDaoTest.java

@@ -45,7 +45,7 @@ public void after() throws Exception {
     }
 
     @Test
-    public void addAndReadTest() throws IllegalArgumentException, URISyntaxException {
+    public void profileAssociationsCRUDTest() throws IllegalArgumentException, URISyntaxException {
         ProfileAssociationsDao dao = manager.getProfileAssociationsDao();
         //TODO: update profile sid type below after merge from master
         Sid profileSid = Sid.generate(Sid.Type.ORGANIZATION);
@@ -64,17 +64,39 @@ public void addAndReadTest() throws IllegalArgumentException, URISyntaxException
         Assert.assertNotNull(resultantProfileAssociations);
         Assert.assertEquals(1, resultantProfileAssociations.size());
         Assert.assertEquals(profileAssociation.toString(), resultantProfileAssociations.get(0).toString());
-        
+
         // Add another ProfileAssociation with same profile
         Sid targetSid2 = Sid.generate(Sid.Type.ACCOUNT);
         ProfileAssociation profileAssociation2 = new ProfileAssociation(profileSid, targetSid2, Calendar.getInstance().getTime(), Calendar.getInstance().getTime());
         dao.addProfileAssociation(profileAssociation2);
         resultantProfileAssociations = dao.getProfileAssociationsByProfileSid(profileSid.toString());
         Assert.assertNotNull(resultantProfileAssociations);
         Assert.assertEquals(2, resultantProfileAssociations.size());
+
+        //Update Associated Profile Of All Such ProfileSid
+        //TODO: update profile sid type below after merge from master
+        Sid newProfileSid = Sid.generate(Sid.Type.ORGANIZATION);
+        dao.updateAssociatedProfileOfAllSuchProfileSid(profileSid.toString(), newProfileSid.toString());
+        Assert.assertEquals(0, dao.getProfileAssociationsByProfileSid(profileSid.toString()).size());
+        Assert.assertEquals(2, dao.getProfileAssociationsByProfileSid(newProfileSid.toString()).size());
+
+        //Update ProfileAssociation of target
+        //TODO: update profile sid type below after merge from master
+        Sid newProfileSid2 = Sid.generate(Sid.Type.ORGANIZATION);
+        profileAssociation = dao.getProfileAssociationsByProfileSid(newProfileSid.toString()).get(0);
+        ProfileAssociation updatedProfileAssociation = profileAssociation.setProfileSid(newProfileSid2);
+        dao.updateProfileAssociationOfTargetSid(updatedProfileAssociation);
+        ProfileAssociation resultantProfileAssociationdao = dao.getProfileAssociationByTargetSid(updatedProfileAssociation.getTargetSid().toString());
+        Assert.assertNotNull(resultantProfileAssociationdao);
+        Assert.assertEquals(updatedProfileAssociation.getProfileSid().toString(), resultantProfileAssociationdao.getProfileSid().toString());
+
+        //Delete ByProfileSid
+        dao.deleteProfileAssociationByProfileSid(newProfileSid2.toString());
+        Assert.assertEquals(0,dao.getProfileAssociationsByProfileSid(newProfileSid2.toString()).size());
 
-        //Update ProfileAssociation
-        
+        //Delete ByTargetSid
+        dao.deleteProfileAssociationByTargetSid(resultantProfileAssociationdao.getProfileSid().toString());
+        Assert.assertNull(dao.getProfileAssociationByTargetSid(resultantProfileAssociationdao.getProfileSid().toString()));
     }
 
 }

restcomm/restcomm.dao/src/test/resources/organizationsDao/profileassociation.xml

@@ -16,13 +16,13 @@
   </select>
 
   <update id="updateProfileAssociationOfTargetSid" parameterType="map">
-    UPDATE "restcomm_profile_associations" SET "date_updated"=#{date_updated},
+    UPDATE "restcomm_profile_associations" SET "date_updated"=NOW(),
     "profile_sid"=#{profile_sid}
     WHERE "target_sid"=#{target_sid};
   </update>
 
   <update id="updateAssociatedProfileOfAllSuchProfileSid" parameterType="map">
-    UPDATE "restcomm_profile_associations" SET "date_updated"=#{date_updated},
+    UPDATE "restcomm_profile_associations" SET "date_updated"=NOW(),
     "profile_sid"=#{profile_sid}
     WHERE "profile_sid"=#{old_profile_sid};
   </update>