Skip to content

Commit 768e446

Browse files
allan-onallan-on
committed
Merge branch 'master' of github.com:opensrp/opensrp-plan-evaluator into 521-add-practitioner-server-vn-and-date-created
2 parents d8fb990 + 5cd3a92 commit 768e446

9 files changed

Lines changed: 27 additions & 12 deletions

File tree

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
<dependency>
121121
<groupId>org.apache.commons</groupId>
122122
<artifactId>commons-lang3</artifactId>
123-
<version>3.10</version>
123+
<version>3.12.0</version>
124124
</dependency>
125125
<dependency>
126126
<groupId>org.jacoco</groupId>

‎src/main/java/org/smartregister/domain/Address.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import java.util.Map;
66
import java.util.Map.Entry;
77

8+
import com.google.gson.GsonBuilder;
89
import org.apache.commons.lang3.builder.EqualsBuilder;
910
import org.apache.commons.lang3.builder.HashCodeBuilder;
1011
import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -464,6 +465,6 @@ public final int hashCode() {
464465

465466
@Override
466467
public String toString() {
467-
return ToStringBuilder.reflectionToString(this);
468+
return new GsonBuilder().setPrettyPrinting().create().toJson(this);
468469
}
469470
}

‎src/main/java/org/smartregister/domain/Client.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import java.util.Map;
77
import java.util.Map.Entry;
88

9+
import com.google.gson.GsonBuilder;
910
import org.apache.commons.lang3.StringUtils;
1011
import org.apache.commons.lang3.builder.EqualsBuilder;
1112
import org.apache.commons.lang3.builder.HashCodeBuilder;
@@ -358,7 +359,7 @@ public final int hashCode() {
358359

359360
@Override
360361
public String toString() {
361-
return ToStringBuilder.reflectionToString(this);
362+
return new GsonBuilder().setPrettyPrinting().create().toJson(this);
362363
}
363364

364365
}

‎src/main/java/org/smartregister/domain/Event.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import java.util.Map;
77
import java.util.Map.Entry;
88

9+
import com.google.gson.GsonBuilder;
910
import org.apache.commons.lang3.StringUtils;
1011
import org.apache.commons.lang3.builder.EqualsBuilder;
1112
import org.apache.commons.lang3.builder.HashCodeBuilder;
@@ -454,7 +455,7 @@ public final int hashCode() {
454455

455456
@Override
456457
public String toString() {
457-
return ToStringBuilder.reflectionToString(this);
458+
return new GsonBuilder().setPrettyPrinting().create().toJson(this);
458459
}
459460

460461
}

‎src/main/java/org/smartregister/domain/Obs.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import java.util.Map;
99
import java.util.Set;
1010

11+
import com.google.gson.GsonBuilder;
1112
import org.apache.commons.lang3.builder.EqualsBuilder;
1213
import org.apache.commons.lang3.builder.HashCodeBuilder;
1314
import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -322,7 +323,7 @@ public final int hashCode() {
322323

323324
@Override
324325
public String toString() {
325-
return ToStringBuilder.reflectionToString(this);
326+
return new GsonBuilder().setPrettyPrinting().create().toJson(this);
326327
}
327328

328329

‎src/main/java/org/smartregister/domain/Stock.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.smartregister.domain;
22

3+
import com.google.gson.GsonBuilder;
34
import com.google.gson.annotations.SerializedName;
45
import org.apache.commons.lang3.builder.EqualsBuilder;
56
import org.apache.commons.lang3.builder.HashCodeBuilder;
@@ -242,7 +243,7 @@ public final int hashCode() {
242243

243244
@Override
244245
public String toString() {
245-
return ToStringBuilder.reflectionToString(this);
246+
return new GsonBuilder().setPrettyPrinting().create().toJson(this);
246247
}
247248

248249
}

‎src/main/java/org/smartregister/domain/User.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.util.ArrayList;
44
import java.util.List;
55

6+
import com.google.gson.GsonBuilder;
67
import org.apache.commons.lang3.builder.EqualsBuilder;
78
import org.apache.commons.lang3.builder.HashCodeBuilder;
89
import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -252,7 +253,7 @@ public final int hashCode() {
252253

253254
@Override
254255
public String toString() {
255-
return ToStringBuilder.reflectionToString(this);
256+
return new GsonBuilder().setPrettyPrinting().create().toJson(this);
256257
}
257258

258259
}

‎src/test/java/org/smartregister/converters/ClientConverterTest.java‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import com.ibm.fhir.model.type.Identifier;
88
import com.ibm.fhir.path.FHIRPathElementNode;
99
import org.joda.time.DateTime;
10+
import org.joda.time.DateTimeZone;
1011
import org.junit.Test;
1112
import org.smartregister.domain.Client;
1213
import org.smartregister.pathevaluator.PathEvaluatorLibrary;
@@ -27,8 +28,10 @@ public class ClientConverterTest {
2728
@Test
2829
public void testConvertToPatientResource() {
2930
Client client = gson.fromJson(CLIENT_JSON, Client.class);
30-
client.setBirthdate(new DateTime(0l));
31-
client.setDeathdate(new DateTime(0l));
31+
DateTimeZone zoneUTC = DateTimeZone.UTC;
32+
DateTime epochDateTime = new DateTime(0l, zoneUTC);
33+
client.setBirthdate(epochDateTime);
34+
client.setDeathdate(epochDateTime);
3235
client.setFirstName("John");
3336
client.setMiddleName("Lewis");
3437
client.setLastName("Johny");
@@ -67,8 +70,10 @@ public void testConvertToPatientResource() {
6770
@Test
6871
public void testConvertToPatientResourceV2() {
6972
Client client = gson.fromJson(CLIENT_JSON_2, Client.class);
70-
client.setBirthdate(new DateTime(0l));
71-
client.setDeathdate(new DateTime(0l));
73+
DateTimeZone zoneUTC = DateTimeZone.UTC;
74+
DateTime epochDateTime = new DateTime(0l, zoneUTC);
75+
client.setBirthdate(epochDateTime);
76+
client.setDeathdate(epochDateTime);
7277
client.setFirstName("John");
7378
client.setMiddleName("Lewis");
7479
client.setLastName("Johny");

‎src/test/java/org/smartregister/converters/TaskConverterTest.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.ibm.fhir.model.resource.Task;
66
import org.apache.commons.lang3.StringUtils;
77
import org.joda.time.DateTime;
8+
import org.joda.time.DateTimeZone;
89
import org.junit.Test;
910
import org.smartregister.domain.Period;
1011
import org.smartregister.domain.Task.Restriction;
@@ -16,7 +17,6 @@
1617
public class TaskConverterTest {
1718

1819
private String taskJson = "{\"identifier\":\"tsk11231jh22\",\"planIdentifier\":\"IRS_2018_S1\",\"groupIdentifier\":\"2018_IRS-3734{\",\"status\":\"Ready\",\"businessStatus\":\"Not Visited\",\"priority\":\"routine\",\"code\":\"IRS\",\"description\":\"Spray House\",\"focus\":\"IRS Visit\",\"for\":\"location.properties.uid:41587456-b7c8-4c4e-b433-23a786f742fc\",\"executionPeriod\": {\"start\":\"2018-11-10T2200\",\"end\":\"2019-11-10T2100\"},\"authoredOn\":\"2018-10-31T0700\",\"lastModified\":\"2018-10-31T0700\",\"owner\":\"demouser\",\"note\":[{\"authorString\":\"demouser\",\"time\":\"2018-01-01T0800\",\"text\":\"This should be assigned to patrick.\"}],\"serverVersion\":0,\"reasonReference\":\"reasonrefuuid\",\"location\":\"catchment1\",\"requester\":\"chw1\"}";
19-
2020
private String dateFormat = "yyyy-MM-dd'T'HH:mm'Z'";
2121

2222
private static Gson gson = new GsonBuilder().registerTypeAdapter(DateTime.class, new TaskDateTimeTypeConverter())
@@ -25,6 +25,10 @@ public class TaskConverterTest {
2525
@Test
2626
public void testConvertToFhirTask() {
2727
org.smartregister.domain.Task task = gson.fromJson(taskJson, org.smartregister.domain.Task.class);
28+
DateTime testNotetime = task.getNotes().get(0).getTime();
29+
DateTimeZone zoneUTC = DateTimeZone.UTC;
30+
DateTime utcTime = testNotetime.withZone(zoneUTC);
31+
task.getNotes().get(0).setTime(utcTime);
2832
Task fihrTask = TaskConverter.convertTasktoFihrResource(task);
2933
assertNotNull(fihrTask);
3034
assertEquals(fihrTask.getStatus().getValueAsEnumConstant().value(),

0 commit comments

Comments
 (0)