Merge pull request #1065 from opensrp/issue-521-v2.2

Add server version, date created and date edited to Practitioner and Organization Resources

pom.xml

@@ -6,7 +6,7 @@
 
     <artifactId>opensrp-server-web</artifactId>
     <packaging>war</packaging>
-    <version>2.9.0-SNAPSHOT</version>
+    <version>2.9.1-SNAPSHOT</version>
     <name>opensrp-server-web</name>
     <description>OpenSRP Server Web Application</description>
     <url>https://github.com/OpenSRP/opensrp-server-web</url>
@@ -24,7 +24,7 @@
         <redis.jedis.version>3.8.0</redis.jedis.version>
         <opensrp.updatePolicy>always</opensrp.updatePolicy>
         <nexus-staging-maven-plugin.version>1.5.1</nexus-staging-maven-plugin.version>
-        <opensrp.core.version>2.13.0-SNAPSHOT</opensrp.core.version>
+        <opensrp.core.version>2.13.1-SNAPSHOT</opensrp.core.version>
         <opensrp.connector.version>2.4.0-SNAPSHOT</opensrp.connector.version>
         <opensrp.interface.version>2.0.1-SNAPSHOT</opensrp.interface.version>
         <powermock.version>2.0.5</powermock.version>

src/main/java/org/opensrp/web/Constants.java

@@ -20,16 +20,21 @@ public interface Constants {
     String DEFAULT_EXCEPTION_HANDLER_MESSAGE = "The server encountered an error processing the request." ;
 
     public static final String RETURN_COUNT= "return_count";
+
     public static final String TOTAL_RECORDS = "total_records";
 
     public static final String PAGE_NUMBER = "pageNumber";
 
     public static final String PAGE_SIZE = "pageSize";
 
+    public static final String SERVER_VERSION = "serverVersion";
+
     public static final String ORDER_BY_TYPE = "orderByType";
 
     public static final String ORDER_BY_FIELD_NAME = "orderByFieldName";
 
+	public static final String DATETIME_IN_UTC_FORMAT_STRING = "yyyy-MM-dd'T'HH:mm:ss.SSSZ";
+
     String LOCATIONS = "locations";
 
 	String NULL = "null";

src/main/java/org/opensrp/web/rest/OrganizationResource.java

@@ -44,11 +44,12 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import static org.opensrp.web.Constants.ORDER_BY_FIELD_NAME;
-import static org.opensrp.web.Constants.ORDER_BY_TYPE;
 import static org.opensrp.web.Constants.PAGE_NUMBER;
 import static org.opensrp.web.Constants.PAGE_SIZE;
+import static org.opensrp.web.Constants.ORDER_BY_TYPE;
 import static org.opensrp.web.Constants.TOTAL_RECORDS;
+import static org.opensrp.web.Constants.ORDER_BY_FIELD_NAME;
+import static org.opensrp.web.Constants.SERVER_VERSION;
 
 /**
  * @author Samuel Githengi created on 09/10/19
@@ -116,10 +117,17 @@ public List<Organization> getAllOrganizations(@RequestParam(value = "location_id
 			@RequestParam(value = PAGE_NUMBER, required = false) Integer pageNumber,
 			@RequestParam(value = PAGE_SIZE, required = false) Integer pageSize,
 			@RequestParam(value = ORDER_BY_TYPE, required = false) String orderByType,
-			@RequestParam(value = ORDER_BY_FIELD_NAME, required = false) String orderByFieldName
+			@RequestParam(value = ORDER_BY_FIELD_NAME, required = false) String orderByFieldName,
+			@RequestParam(value = SERVER_VERSION, required = false) String serverVersionParam
 	) {
+
+		Long serverVersion = null;
+		if (serverVersionParam != null) {
+			serverVersion = Long.parseLong(serverVersionParam);
+		}
+
 		OrganizationSearchBean organizationSearchBean = createOrganizationSearchBeanForPagination(pageNumber, pageSize,
-				orderByType, orderByFieldName);
+				orderByType, orderByFieldName, serverVersion);
 
 		if (StringUtils.isNotBlank(locationID)) {
 			return organizationService.selectOrganizationsEncompassLocations(locationID);
@@ -296,12 +304,14 @@ public ResponseEntity<List<Practitioner>> getOrgPractitioners(@PathVariable("ide
 
 	/**
 	 * This API queries list of team assignment from a practitioner identifer
+	 *
 	 * @param practitionerIdentifier
 	 * @return List of Organization
 	 */
 	@GetMapping(value = "/by-practitioner/{practitioner-identifier}", produces = { MediaType.APPLICATION_JSON_VALUE })
-	public List<Organization> getTeamsByPractitionerIdentifier(@PathVariable("practitioner-identifier") String practitionerIdentifier) {
-			return organizationService.getOrganizationsByPractitionerIdentifier(practitionerIdentifier);
+	public List<Organization> getTeamsByPractitionerIdentifier(
+			@PathVariable("practitioner-identifier") String practitionerIdentifier) {
+		return organizationService.getOrganizationsByPractitionerIdentifier(practitionerIdentifier);
 	}
 
 	@RequestMapping(value = "/assignedLocationsAndPlans", method = RequestMethod.GET, produces = {
@@ -341,7 +351,7 @@ public ResponseEntity<String> searchOrganization(OrganizationSearchBean organiza
 	}
 
 	private OrganizationSearchBean createOrganizationSearchBeanForPagination(Integer pageNumber, Integer pageSize,
-			String orderByType, String orderByFieldName) {
+			String orderByType, String orderByFieldName, Long serverVersion) {
 		OrganizationSearchBean organizationSearchBean = new OrganizationSearchBean();
 		OrganizationSearchBean.OrderByType orderByTypeEnum = orderByType != null ?
 				OrganizationSearchBean.OrderByType.valueOf(orderByType) :
@@ -353,6 +363,7 @@ private OrganizationSearchBean createOrganizationSearchBeanForPagination(Integer
 		organizationSearchBean.setPageSize(pageSize);
 		organizationSearchBean.setOrderByFieldName(fieldName);
 		organizationSearchBean.setOrderByType(orderByTypeEnum);
+		organizationSearchBean.setServerVersion(serverVersion);
 
 		return organizationSearchBean;
 	}