dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 12893
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-11-07 12:44:33 +0700
message:
  Add not null constraint for orgunit column in paient hibernate mapping file.
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientIdentifier.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientIdentifierService.java
  dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/Patient.hbm.xml
  dhis-2/dhis-services/dhis-service-patient/src/test/java/org/hisp/dhis/patient/PatientServiceTest.java
  dhis-2/dhis-services/dhis-service-patient/src/test/java/org/hisp/dhis/patient/PatientStoreTest.java
  dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientIdentifier.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientIdentifier.java	2013-09-27 17:04:23 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientIdentifier.java	2013-11-07 05:44:33 +0000
@@ -33,6 +33,7 @@
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+
 import org.hisp.dhis.common.BaseIdentifiableObject;
 import org.hisp.dhis.common.DxfNamespaces;
 import org.hisp.dhis.common.view.DetailedView;
@@ -62,6 +63,14 @@
         setAutoFields();
     }
 
+    public PatientIdentifier( PatientIdentifierType identifierType, Patient patient, String identifier )
+    {
+        setAutoFields();
+        this.identifierType = identifierType;
+        this.patient = patient;
+        this.identifier = identifier;
+    }
+
     // -------------------------------------------------------------------------
     // Getters and setters
     // -------------------------------------------------------------------------
@@ -96,7 +105,7 @@
     @JsonProperty( "personIdentifier" )
     @JsonSerialize( as = BaseIdentifiableObject.class )
     @JsonView( { DetailedView.class } )
-    @JacksonXmlProperty( localName ="personIdentifier", namespace = DxfNamespaces.DXF_2_0 )
+    @JacksonXmlProperty( localName = "personIdentifier", namespace = DxfNamespaces.DXF_2_0 )
     public PatientIdentifierType getIdentifierType()
     {
         return identifierType;

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientIdentifierService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientIdentifierService.java	2013-11-04 03:13:27 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientIdentifierService.java	2013-11-07 05:44:33 +0000
@@ -197,5 +197,4 @@
      */
     Collection<PatientIdentifier> getPatientIdentifiers( Collection<PatientIdentifierType> identifierTypes,
         Patient patient );
-
 }

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/Patient.hbm.xml'
--- dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/Patient.hbm.xml	2013-10-14 12:41:35 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/Patient.hbm.xml	2013-11-07 05:44:33 +0000
@@ -44,7 +44,7 @@
       foreign-key="fk_representativeid" />
 
     <many-to-one name="organisationUnit" class="org.hisp.dhis.organisationunit.OrganisationUnit" column="organisationunitid"
-      foreign-key="fk_patient_organisationunitid" />
+      foreign-key="fk_patient_organisationunitid" not-null="true" />
 
     <many-to-one name="healthWorker" column="healthworkerid" class="org.hisp.dhis.user.User" foreign-key="fk_user_patientid" />
 

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/test/java/org/hisp/dhis/patient/PatientServiceTest.java'
--- dhis-2/dhis-services/dhis-service-patient/src/test/java/org/hisp/dhis/patient/PatientServiceTest.java	2013-11-05 08:07:19 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/test/java/org/hisp/dhis/patient/PatientServiceTest.java	2013-11-07 05:44:33 +0000
@@ -120,6 +120,9 @@
     {
         organisationUnit = createOrganisationUnit( 'A' );
         organisationUnitService.addOrganisationUnit( organisationUnit );
+        
+        OrganisationUnit organisationUnitB = createOrganisationUnit( 'B' );
+        organisationUnitService.addOrganisationUnit( organisationUnitB );
 
         PatientIdentifierType patientIdentifierType = createPatientIdentifierType( 'A' );
         identifierTypeId = identifierTypeService.savePatientIdentifierType( patientIdentifierType );
@@ -128,7 +131,7 @@
         attributeId = patientAttributeService.savePatientAttribute( patientAttribute );
 
         patientA1 = createPatient( 'A', "F", organisationUnit );
-        patientA2 = createPatient( 'A', "F", null );
+        patientA2 = createPatient( 'A', "F", organisationUnitB );
         patientA3 = createPatient( 'A', organisationUnit, patientIdentifierType );
         patientB1 = createPatient( 'B', "M", organisationUnit );
         patientB2 = createPatient( 'B', organisationUnit );
@@ -617,7 +620,6 @@
     public void testGetRegistrationOrgunitIds()
     {
         patientService.savePatient( patientA1 );
-        patientService.savePatient( patientA2 );
         patientService.savePatient( patientB1 );
         patientService.savePatient( patientB2 );
 

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/test/java/org/hisp/dhis/patient/PatientStoreTest.java'
--- dhis-2/dhis-services/dhis-service-patient/src/test/java/org/hisp/dhis/patient/PatientStoreTest.java	2013-11-05 08:07:19 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/test/java/org/hisp/dhis/patient/PatientStoreTest.java	2013-11-07 05:44:33 +0000
@@ -112,6 +112,9 @@
         organisationUnit = createOrganisationUnit( 'A' );
         organisationUnitService.addOrganisationUnit( organisationUnit );
 
+        OrganisationUnit organisationUnitB = createOrganisationUnit( 'B' );
+        organisationUnitService.addOrganisationUnit( organisationUnitB );
+        
         PatientIdentifierType patientIdentifierType = createPatientIdentifierType( 'A' );
         identifierTypeService.savePatientIdentifierType( patientIdentifierType );
 
@@ -119,7 +122,7 @@
         attributeId = patientAttributeService.savePatientAttribute( patientAttribute );
 
         patientA1 = createPatient( 'A', "F", organisationUnit );
-        patientA2 = createPatient( 'A', "F", null );
+        patientA2 = createPatient( 'A', "F", organisationUnitB );
         patientA3 = createPatient( 'A', organisationUnit, patientIdentifierType );
         patientB1 = createPatient( 'B', "M", organisationUnit );
         patientB2 = createPatient( 'B', organisationUnit );

=== modified file 'dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java'
--- dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java	2013-11-06 01:47:02 +0000
+++ dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java	2013-11-07 05:44:33 +0000
@@ -1123,7 +1123,7 @@
 
     /**
      * @param uniqueCharacter A unique character to identify the object.
-     * @return PatientAttribute
+     * @return PatientIdentifierType
      */
     public static PatientIdentifierType createPatientIdentifierType( char uniqueChar )
     {