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

Refactor Rapidpro implementation on v2 #482

Open
wants to merge 150 commits into
base: v2
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
150 commits
Select commit Hold shift + click to select a range
13a446b
Refactor RapidProService
ellykits Jun 24, 2021
e2fa55f
Query rapidpro contacts with date modified
ellykits Jul 6, 2021
93aed3e
Merge branch 'v2' into rapidpro-refactor
ellykits Jul 6, 2021
b95b4f2
Lock processing of RapidPro contacts
ellykits Jul 7, 2021
255d8df
Implement RapidPro data converters
ellykits Jul 9, 2021
0a6a4ba
Refactor RapidProService
ellykits Jul 9, 2021
c205f12
Implement callback when RapidPro task is completed
ellykits Jul 12, 2021
3b4a670
Implement get provider location id
ellykits Jul 12, 2021
89e20f0
Process event and clients for RapidPro contacts
ellykits Jul 13, 2021
b91f093
Use current date as last processing date for rapidpro
ellykits Jul 13, 2021
4574870
Reformat code
ellykits Jul 13, 2021
b451073
Document RapidProService classes
ellykits Jul 13, 2021
f528ddf
Mark identifier as used
ellykits Jul 13, 2021
1388789
Convert RapidProContact to Client
ellykits Jul 13, 2021
02e5abb
Validate phone number
ellykits Jul 13, 2021
a19c10a
Add missing residential_address attribute to child client
ellykits Jul 13, 2021
3baa87c
Convert RapidProContact to mother client
ellykits Jul 13, 2021
3a17267
Convert RapidPro contact to Birth Registration event
ellykits Jul 13, 2021
dce1483
Implement find organization by location id
ellykits Jul 13, 2021
4b7a8f4
Include team details in Birth Registration Event
ellykits Jul 13, 2021
992c93d
Format code
ellykits Jul 13, 2021
eb93e45
Convert RapidProContact to Mother Registration Event
ellykits Jul 13, 2021
7dfc848
Add new vaccine IPV to RapidProFields
ellykits Jul 13, 2021
dd13a75
Create Vaccination Events from RapidProContact
ellykits Jul 14, 2021
a546098
Process RapidProContact vaccines
ellykits Jul 14, 2021
5d6e590
Introduce new facility code
ellykits Jul 14, 2021
15978f8
Convert RapidProContact to Growth Monitoring Event
ellykits Jul 14, 2021
9fcc873
Fix failing test in RapidProServiceTest
ellykits Jul 14, 2021
ea26cbc
Handle exceptions thrown when running tests
ellykits Jul 14, 2021
a797528
Fix date parsing issues on the RapidProContact converters
ellykits Jul 14, 2021
dc63141
Ignore undefined RapidPro contact JSON properties
ellykits Jul 15, 2021
b2ee329
Fix fetch supervisor URL
ellykits Jul 15, 2021
b1204eb
Fix checking if tag exists
ellykits Jul 15, 2021
320e585
Fix null pointer exception
ellykits Jul 15, 2021
258946a
Fix null fields on rapidpro converter classes
ellykits Jul 15, 2021
c561393
Test that events and clients are created from rapidpro contacts
ellykits Jul 15, 2021
dea6e8e
Rename helper method
ellykits Jul 15, 2021
9e48a2c
Default child's home facility to CBV's
ellykits Jul 15, 2021
886a6eb
Provide method for syncing OpenSRP events to RapidPro
ellykits Jul 15, 2021
d969d2e
Fix phone number format
ellykits Jul 16, 2021
281e2d2
Refactor method for fetching locations
ellykits Jul 16, 2021
db39583
Implement RapidPro to Client converter for child
ellykits Jul 16, 2021
2202ebc
Configure rapidpro project
ellykits Jul 16, 2021
ca518d5
Generate DAO classes for rapidpro_state table with mybatis
ellykits Jul 16, 2021
f0cb373
Implement RapidProStateService
ellykits Jul 16, 2021
ffe1bd1
Save RapidProState after processing data
ellykits Jul 16, 2021
fb7e318
Search supervisor contact from results if record exists
ellykits Jul 16, 2021
4c84212
Update RapidProContact fields with data from OpenSRP
ellykits Jul 16, 2021
edb832b
Fix saving RapidProState
ellykits Jul 17, 2021
1cc08b1
Save sync RapidProState sync status
ellykits Jul 17, 2021
2f362a7
Fix issue with fetching supervisor location
ellykits Jul 17, 2021
f6a6a69
Remove redundant condition check
ellykits Jul 17, 2021
1f2dd7c
Resolve saving supervisor state with null key
ellykits Jul 17, 2021
68e70f2
Resolve error with rapidprostate not being saved
ellykits Jul 17, 2021
de39a8b
Fix query for fetching rapidpro state
ellykits Jul 17, 2021
5558b4e
Fix query for fetching unsynced rapidpro states
ellykits Jul 17, 2021
ee321ff
Fix fetch unsynced state query
ellykits Jul 17, 2021
7e643ea
Correct RapidPro contact update URL
ellykits Jul 17, 2021
0b57927
Process opensrp event in RapidPro context
ellykits Jul 17, 2021
f9639b5
Process OpenSRP Vaccination and Birth Registration data
ellykits Jul 18, 2021
398fe6d
Process Growth Monitoring Event
ellykits Jul 18, 2021
627f366
Post OpenSRP child to RapidPro
ellykits Jul 18, 2021
64ca45e
Post OpenSPR child's mother to RapidPro
ellykits Jul 18, 2021
f283192
Set Growth Monitoring event dates on contact
ellykits Jul 18, 2021
ceed78c
Post existing user data to RapidPro
ellykits Jul 18, 2021
f138a3e
Restructure and format code
ellykits Jul 18, 2021
35a346c
Ignore processing events generated by RapidPro
ellykits Jul 18, 2021
fc367e8
Update existing client contact uuid
ellykits Jul 18, 2021
7f21b27
Handle paginated RapidPro contact response
ellykits Jul 18, 2021
d0076bf
Fix setting mother uuid
ellykits Jul 18, 2021
02ea6b8
Fix RapidProEventListener event handler condition
ellykits Jul 19, 2021
0dbbf81
Fix condition for filtering events
ellykits Jul 19, 2021
a639062
Fix NullPointerException when processing client
ellykits Jul 19, 2021
8234c41
Fix query
ellykits Jul 19, 2021
c2948e5
Refactor code
ellykits Jul 19, 2021
cc0e76b
Update logic for filtering MVACC registered clients
ellykits Jul 19, 2021
670c2c5
Fix IndexOutOfBoundException when getting mother relational id
ellykits Jul 19, 2021
4a23e04
Fix condition logic for checking mother registration on MVACC
ellykits Jul 19, 2021
b577ae0
Update RapidProFields
ellykits Jul 19, 2021
6ed0892
Assign contact to a group
ellykits Jul 21, 2021
26da331
Use a delimiter on MVACC identifier
ellykits Jul 22, 2021
a11c9ef
Replace ReetrantLock in RapidProService with synchronized
ellykits Jul 23, 2021
3ada0f5
Update configs
ellykits Jul 23, 2021
e944a7f
Tag MVACC created events with system of registration
ellykits Aug 19, 2021
e49ee22
Merge branch 'v2' into rapidpro-refactor
ellykits Aug 20, 2021
09f7bba
Resolve PR review comments
ellykits Aug 20, 2021
f60ecb3
Synchronize method for adding RapidPro contact to a group
ellykits Aug 20, 2021
6e94d55
Add 2.5 minutes timeout for RapidPro post request
ellykits Aug 20, 2021
bbb402b
Close http client connections
ellykits Aug 23, 2021
8ed117c
Log RapidPro tasks
ellykits Aug 23, 2021
bc0b811
Save earliest contact last_modified date as rapidpro state token
ellykits Aug 23, 2021
6b9f592
Remove trailing forward slash on base URL
ellykits Aug 23, 2021
313cb35
Update system of registration for updated contacts
ellykits Aug 23, 2021
a568ea6
Process limited number of RapidPro contacts
ellykits Aug 23, 2021
6c7704c
Limit the data posted to RapidPro
ellykits Aug 23, 2021
7f6be33
Update RapidPro group for child contact
ellykits Aug 23, 2021
536faa8
Remove limit on number of fetched contacts to be processed
ellykits Aug 23, 2021
ef57522
Update the logic for setting the rapidpro state token
ellykits Aug 23, 2021
3434d5d
Fix stream closed exception on http response
ellykits Aug 23, 2021
ddcfc90
Check for existing mother before creating contact
ellykits Aug 26, 2021
96193a3
Fix NullPointerException using eventDate
ellykits Aug 26, 2021
5421e20
Fix adding mother contact to Caretakers group
ellykits Aug 26, 2021
4803f0a
Set voided for blocked rapidpro contacts
ellykits Aug 26, 2021
1c96aeb
Fix fetching existing mother contact
ellykits Aug 27, 2021
6cf1314
Fix typo
ellykits Aug 27, 2021
dcbd18f
Register ZEIR clients who opted for SMS Reminder to RapidPro
ellykits Aug 27, 2021
ac3865c
Fix setting mother contact group
ellykits Aug 27, 2021
edd5a4c
Enable sync to start for contacts registered 6 months ago
ellykits Aug 27, 2021
1e1d83b
Fix logs
ellykits Aug 27, 2021
c41e747
Fix syncing updated ZEIR clients
ellykits Aug 27, 2021
e4e7f57
Fix syncing data for existing children
ellykits Aug 27, 2021
b2161c1
Udpate UUID for existing child after posting data
ellykits Aug 27, 2021
ff4b9db
Change log format
ellykits Aug 27, 2021
6dc7318
Add null check when searching mother contact
ellykits Sep 10, 2021
34caef2
Update condition for handling opensrp and rapidpro generated events
ellykits Sep 10, 2021
ac2ce77
Fix NullPointerException using eventDate
ellykits Sep 18, 2021
37ec0d9
Log when supervisor phone or location is missing
ellykits Oct 6, 2021
f93e7d0
Set event date on RapidPro generated events
ellykits Oct 6, 2021
e361d3e
Log information that is posted from OpenSRP to RapidPro
ellykits Oct 7, 2021
44d279b
Fix syncing late OpenSRP generated events to RapidPro
ellykits Oct 7, 2021
5ea2e2d
Merge branch 'v2' into rapidpro-refactor
ellykits Oct 7, 2021
7e20687
Fix condition for logging
ellykits Oct 7, 2021
77f79e1
Process vaccination/growth monitory events after registration
ellykits Oct 7, 2021
5aaf499
Filter rapidpro generated events
ellykits Oct 13, 2021
3e96162
:bug: Fix the child unsynced data load. Add getting data using the id…
dubdabasoduba Oct 19, 2021
3e76604
:arrow_up: Update the version
dubdabasoduba Oct 19, 2021
49219c3
:sparkles: Update the ZEIR to RapidPro sync
dubdabasoduba Nov 10, 2021
90466a0
:arrow_up: Merge branch 'v2' of github.com:opensrp/opensrp-server-cor…
dubdabasoduba Nov 10, 2021
53a7937
:bug: Fix the update from ZEIR creates a new RapidPro contact
dubdabasoduba Nov 10, 2021
5482714
:bug: Update the post exising child method to avoid duplicates on rap…
dubdabasoduba Nov 16, 2021
5e4f723
Resolve codacy comments
ellykits Nov 16, 2021
b37d106
Resolve review comments
ellykits Nov 16, 2021
68bef04
Resolve codacy comments
ellykits Dec 7, 2021
535de98
Merge branch 'v2' into rapidpro-refactor
ellykits Dec 7, 2021
332f654
Fix mutable function parameter
ellykits Dec 7, 2021
d2c3ca7
Merge branch 'v2' into rapidpro-refactor
ellykits Dec 16, 2021
acbc9c8
spring security upgrade
hilpitome May 4, 2022
6e4951d
Fix RapidPro integration fetching mother contact for child
ekigamba May 30, 2022
a9fea86
Update core version to 2.13.5-SNAPSHOT-ALPHA-ZEIR
ekigamba May 30, 2022
a995dfc
Update core version to 2.13.5-ZEIR-ALPHA-SNAPSHOT
ekigamba May 30, 2022
a63f34f
Fix loop in ZeirRapidProStateService
ekigamba Jun 10, 2022
73bdb32
Update core version to 2.13.6-ZEIR-ALPHA-SNAPSHOT
ekigamba Jun 10, 2022
b66a493
Merge branch 'v2' into rapidpro-refactor
ellykits Jan 19, 2023
8a004a9
Merge branch 'rapidpro-refactor' of github.com:opensrp/opensrp-server…
ellykits Jan 19, 2023
75bb02a
Update configs
ellykits Jan 19, 2023
61a63ed
Revert updateContactFields implementation
ellykits Jan 19, 2023
98dac7c
Merge branch 'v2' into rapidpro-refactor
ndegwamartin Feb 9, 2023
e8c642e
Fix Failing Test ✅
ndegwamartin Mar 9, 2023
1db9f70
Merge branch 'v2' into rapidpro-refactor
ndegwamartin Mar 23, 2023
f431903
Upgrade dependencies ⬆️
ndegwamartin Mar 23, 2023
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
36 changes: 18 additions & 18 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,30 @@

<artifactId>opensrp-server-core</artifactId>
<packaging>jar</packaging>
<version>2.14.7-SNAPSHOT</version>
<version>2.14.8-SNAPSHOT</version>
<name>opensrp-server-core</name>
<description>OpenSRP Server Core module</description>
<url>https://github.com/OpenSRP/opensrp-server-core</url>

<properties>
<main.basedir>${project.basedir}</main.basedir>
<spring.version>5.2.22.RELEASE</spring.version>
<spring.version>5.2.23.RELEASE</spring.version>
<spring.data.version>2.2.13.RELEASE</spring.data.version>
<mybatis.version>3.5.7</mybatis.version>
<mybatis.spring.version>2.0.6</mybatis.spring.version>
<hibernate.version>5.4.24.Final</hibernate.version>
<mybatis.version>3.5.13</mybatis.version>
<mybatis.spring.version>2.0.7</mybatis.spring.version>
<hibernate.version>5.4.33.Final</hibernate.version>
<opensrp.updatePolicy>always</opensrp.updatePolicy>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<nexus-staging-maven-plugin.version>1.5.1</nexus-staging-maven-plugin.version>
<nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>

<opensrp.api.version>1.1.3-SNAPSHOT</opensrp.api.version>
<opensrp.interface.version>2.0.1-SNAPSHOT</opensrp.interface.version>
<opensrp.plan.evaluator.version>1.6.7-SNAPSHOT</opensrp.plan.evaluator.version>
<jackson.version>2.14.0</jackson.version>
<powermock.version>2.0.5</powermock.version>
<lombok.version>1.18.12</lombok.version>
<spring.ampqp.version>2.2.22.RELEASE</spring.ampqp.version>
<log4j.version>2.17.1</log4j.version>
<opensrp.interface.version>2.0.2-SNAPSHOT</opensrp.interface.version>
<opensrp.plan.evaluator.version>1.6.8-SNAPSHOT</opensrp.plan.evaluator.version>
<jackson.version>2.14.2</jackson.version>
<powermock.version>2.0.9</powermock.version>
<lombok.version>1.18.26</lombok.version>
<spring.ampqp.version>2.4.11</spring.ampqp.version>
<log4j.version>2.20.0</log4j.version>

</properties>

Expand Down Expand Up @@ -92,12 +92,12 @@
<dependency>
<groupId>com.aliyun.oss</groupId>
<artifactId>aliyun-sdk-oss</artifactId>
<version>3.16.0</version>
<version>3.16.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
<version>1.5.3</version>
<version>1.5.4</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand All @@ -116,7 +116,7 @@
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk</artifactId>
<version>1.12.322</version>
<version>1.12.429</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Expand Down Expand Up @@ -201,7 +201,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.13</version>
<version>4.5.14</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand All @@ -217,7 +217,7 @@
<dependency>
<groupId>nl.jqno.equalsverifier</groupId>
<artifactId>equalsverifier</artifactId>
<version>3.9</version>
<version>3.14.1</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
232 changes: 0 additions & 232 deletions src/main/java/org/opensrp/domain/RapidProContact.java

This file was deleted.

Loading