Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add server version, date created and date edited to Practitioner & Organization entities #550

Merged
merged 22 commits into from
Feb 24, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
e22b7fd
:construction: Update Practitioner,Organization Models,Mappers
allan-on Dec 6, 2021
14030e4
:construction: Undo merge overwrite in OrganizationMapper.xml
allan-on Feb 23, 2022
ec623e6
:construction: Apply OpenSRP Java code style formatter
allan-on Dec 8, 2021
2b4c1cd
:construction: Format code
allan-on Feb 23, 2022
1a9ec3d
:arrow_up: Update plan-evaluator version
allan-on Dec 15, 2021
6662d40
:construction: Add select & update by key & generate server vn
allan-on Dec 15, 2021
57d625b
:construction: Add Organisation DateTime & Server vn attributes
allan-on Dec 15, 2021
a3c095c
:construction: Refactor add, update & get a Practitioner
allan-on Dec 16, 2021
b6afaa5
:white_check_mark: Update PractitionerRepository Tests
allan-on Dec 17, 2021
ba0f550
:construction: Fix set practitioner server version NPE
allan-on Dec 17, 2021
2ba3c00
:arrow_up: Upgrade plan evaluator version
allan-on Feb 23, 2022
8388a0d
:construction: Refactor add/update Organization functionality
allan-on Dec 17, 2021
659307f
:white_check_mark: Update OrganizationRepository tests
allan-on Dec 17, 2021
8cd2f32
:construction: Add filter/search by server version
allan-on Dec 23, 2021
36f0eb5
:green_heart: Remove unused import
allan-on Dec 22, 2021
34482f7
:white_check_mark: Update Org & Practitioner Repository tests
allan-on Dec 23, 2021
a5ce62f
:recycle: Remove empty PractitionerSearchBean constructor
allan-on Jan 3, 2022
ba6069e
:construction: Set server version to null in getAllPractitionersByIde…
allan-on Jan 10, 2022
50e50a9
:white_check_mark: Update PractitionerRepositoryTest
allan-on Feb 7, 2022
5aba402
:wrench: Exclude MyBatis generated files from test report
allan-on Feb 7, 2022
5d62bb3
:white_check_mark: Fix Practitioner Repository Test
allan-on Feb 7, 2022
951d021
:camera_flash: Update snapshot version
allan-on Feb 23, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<artifactId>opensrp-server-core</artifactId>
<packaging>jar</packaging>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.1-SNAPSHOT</version>
<name>opensrp-server-core</name>
<description>OpenSRP Server Core module</description>
<url>https://github.com/OpenSRP/opensrp-server-core</url>
Expand All @@ -23,7 +23,7 @@

<opensrp.api.version>1.1.1-SNAPSHOT</opensrp.api.version>
<opensrp.interface.version>2.0.1-SNAPSHOT</opensrp.interface.version>
<opensrp.plan.evaluator.version>1.6.5-SNAPSHOT</opensrp.plan.evaluator.version>
<opensrp.plan.evaluator.version>1.6.7-SNAPSHOT</opensrp.plan.evaluator.version>
<jackson.version>2.12.6</jackson.version>
<powermock.version>2.0.5</powermock.version>
<lombok.version>1.18.12</lombok.version>
Expand Down Expand Up @@ -521,6 +521,10 @@
<configuration>
<destFile>${basedir}/target/coverage-reports/jacoco-unit.exec</destFile>
<dataFile>${basedir}/target/coverage-reports/jacoco-unit.exec</dataFile>
<excludes>
<exclude>org/opensrp/domain/postgres/*</exclude>
<exclude>org/opensrp/repository/postgres/mapper/*</exclude>
</excludes>
</configuration>
<executions>
<execution>
Expand Down
38 changes: 35 additions & 3 deletions src/main/java/org/opensrp/domain/Organization.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
/**
*
*
*/
package org.opensrp.domain;

import org.joda.time.DateTime;

import java.io.Serializable;
import java.util.Set;

Expand All @@ -26,8 +28,15 @@ public class Organization implements Serializable {
public CodeSystem type;

private Set<AssignedLocations> assignedLocations;


private DateTime dateCreated;

private DateTime dateEdited;

private long serverVersion;

private Integer memberCount;

public Long getId() {
return id;
}
Expand Down Expand Up @@ -87,9 +96,32 @@ public void setAssignedLocations(Set<AssignedLocations> assignedLocations) {
public Integer getMemberCount() {
return memberCount;
}

public void setMemberCount(Integer memberCount) {
this.memberCount = memberCount;
}

public DateTime getDateCreated() {
return dateCreated;
}

public void setDateCreated(DateTime dateCreated) {
this.dateCreated = dateCreated;
}

public DateTime getDateEdited() {
return dateEdited;
}

public void setDateEdited(DateTime dateEdited) {
this.dateEdited = dateEdited;
}

public long getServerVersion() {
return serverVersion;
}

public void setServerVersion(long serverVersion) {
this.serverVersion = serverVersion;
}
}
Loading