Refactor Rapidpro implementation on v2 #482

ellykits · 2021-06-29T12:03:29Z

No description provided.

Implement project based service with callbacks

- Used Province, district and facility to obtain the actual location id of the provider

Today's date is persisted in the app state token table for future use. When the listener will query contact it will use this date to get all the contacts that were modified after the previous date. In case an error occurs while saving the rapidpro contacts, the earliest date modified will be used instead of today's date

- Use the facility location id to obtain the team information

The code will be used to uniquely identify the facility

bennsimon · 2021-11-16T07:15:05Z

src/main/java/org/opensrp/domain/rapidpro/converter/BaseRapidProClientConverter.java

+		client.addAttribute(RapidProConstants.IS_REGISTRATION_COMPLETE, false);
+		client.addAttribute(RapidProConstants.SYSTEM_OF_REGISTRATION, RapidProConstants.MVACC);
+		client.setDateCreated(DateTime.now());
+		if (StringUtils.isNoneBlank(rapidProContact.getName())) {


Suggested change

if (StringUtils.isNoneBlank(rapidProContact.getName())) {

if (StringUtils.isNotBlank(rapidProContact.getName())) {

StringUtils.isNoneBlank is used also to exclude any white blank spaces

…ro contacts

bennsimon · 2021-11-16T07:18:06Z

src/main/java/org/opensrp/domain/rapidpro/converter/BaseRapidProClientConverter.java

+		if (identifierSources != null && !identifierSources.isEmpty()) {
+			IdentifierSource identifierSource = identifierSources.get(0);
+			List<String> uniqueIds = uniqueIdentifierService
+					.generateIdentifiers(identifierSource, 1, rapidProContact.getFields().getSupervisorPhone());


Check for null on rapidProContact.

bennsimon · 2021-11-16T07:19:19Z

src/main/java/org/opensrp/domain/rapidpro/converter/BaseRapidProEventConverter.java

+		DateTime now = DateTime.now();
+		event.setEventDate(now);
+		event.setDateCreated(now);
+		event.setBaseEntityId(rapidProContact.getUuid());


Check for null rapidProContact and event ... or use @nonnull

bennsimon · 2021-11-16T07:21:07Z

src/main/java/org/opensrp/domain/rapidpro/converter/BaseRapidProEventConverter.java

+	}
+
+	protected String getVaccineSequence(ZeirVaccine vaccine) {
+		String[] splitVaccine = vaccine.name().split("_");


Check for null vaccine ... or use @nonnull

ZeirVaccine is an enum so can never be null. But I have added extra check (@NonNull) annotation

bennsimon · 2021-11-16T07:21:43Z

src/main/java/org/opensrp/domain/rapidpro/converter/BaseRapidProEventConverter.java

+	}
+
+	public String readObsValue(Event event, String formSubmissionField) {
+		Optional<Obs> optionalObs = event.getObs().stream()


Check for null event ... or use @nonnull

bennsimon · 2021-11-16T07:23:41Z

src/main/java/org/opensrp/domain/rapidpro/converter/BaseRapidProClientConverter.java

+	}
+
+	protected void addCommonClientProperties(Client client, RapidProContact rapidProContact) {
+		RapidProFields fields = rapidProContact.getFields();


Check for null rapidProContact and event ... or use @nonnull

bennsimon · 2021-11-16T07:53:21Z

src/main/java/org/opensrp/service/rapidpro/ZeirRapidProStateService.java

+					}
+				}
+			}
+			logger.warn("Synced all {} record(s) of type {} from OpenSRP to RapidPro", unSyncedStates.size(), entity.name());


Is this needed?

Yes it's needed.

bennsimon · 2021-11-16T07:53:49Z

src/main/java/org/opensrp/service/rapidpro/ZeirRapidProStateService.java

+		String group = entity == CHILD ? RapidProConstants.CHILDREN : RapidProConstants.CARETAKERS;
+		payload.put(RapidProConstants.GROUP, group);
+		try (CloseableHttpResponse httpResponse = postToRapidPro(payload.toString(),
+				RapidProUtils.getBaseUrl(rapidProUrl) + "/contact_actions.json")) {


Move the string literal to constants.

bennsimon · 2021-11-16T07:54:06Z

src/main/java/org/opensrp/service/rapidpro/ZeirRapidProStateService.java

+			}
+		}
+		catch (IOException exception) {
+			logger.error(exception.getMessage(), exception.fillInStackTrace().toString());


Suggested change

logger.error(exception.getMessage(), exception.fillInStackTrace().toString());

logger.error(exception);

bennsimon · 2021-11-16T08:01:01Z

src/main/java/org/opensrp/util/RapidProUtils.java

+			}
+		}
+		catch (JSONException | IOException exception) {
+			logger.error(exception.getMessage(), exception.fillInStackTrace().toString());


Suggested change

logger.error(exception.getMessage(), exception.fillInStackTrace().toString());

logger.error(exception);

bennsimon · 2021-11-16T08:01:57Z

src/main/java/org/opensrp/util/RapidProUtils.java

+	}
+
+	public static HttpGet contactByPhoneRequest(String phone, String rapidProUrl, String rapidProToken) {
+		return (HttpGet) setupRapidproRequest(getBaseUrl(rapidProUrl) + "/contacts.json?urn=tel:" + phone,


Move to string literal to constants.

Signed-off-by: Elly Kitoto <[email protected]>

- Log RapidPro contacts with issues - Refactor code and loop through records for results which are limited to 25 records

ekigamba · 2022-11-08T12:24:58Z

src/main/java/org/opensrp/service/rapidpro/ZeirRapidProStateService.java

@@ -401,7 +400,7 @@ private void updateContactFields(ZeirRapidProEntity entity, ZeirRapidProEntityPr
 				.limit(RapidProUtils.RAPIDPRO_DATA_LIMIT).collect(Collectors.toList());
 		ZeirChildClientConverter childConverter = new ZeirChildClientConverter(this);
 		ZeirMotherClientConverter motherConverter = new ZeirMotherClientConverter();
-		if (!unSyncedStates.isEmpty()) {
+		while (!unSyncedStates.isEmpty()) {


Revert this to an if to remove a possible l

Signed-off-by: Elly Kitoto <[email protected]>

…-core into rapidpro-refactor Signed-off-by: Elly Kitoto <[email protected]>

Signed-off-by: Elly Kitoto <[email protected]>

src/main/java/org/opensrp/domain/postgres/RapidproStateExample.java

+            }
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {


src/main/java/org/opensrp/domain/postgres/RapidproStateExample.java

+            }
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {


src/main/java/org/opensrp/domain/rapidpro/converter/RapidProContactEventConverter.java

+
+	List<Event> convertContactToEvents(RapidProContact rapidProContact);
+
+	RapidProContact convertEventToContact(Event event);


src/main/java/org/opensrp/domain/rapidpro/converter/BaseRapidProEventConverter.java

+		} else {
+			String lastItem = splitVaccine[splitVaccine.length - 1];
+			if (StringUtils.isNumeric(lastItem)) {
+				return String.valueOf(Integer.parseInt(lastItem) + 1);


ndegwamartin · 2023-03-08T09:01:34Z

This fix might need to await a patch from Spring given there's LTS support for Spring 5.3 till late in 2024 https://endoflife.date/spring-framework.

ndegwamartin · 2023-03-09T08:43:45Z

This fix might need to await a patch from Spring given there's LTS support for Spring 5.3 till late in 2024 https://endoflife.date/spring-framework.

Tracked here #619

Refactor RapidProService

13a446b

ellykits changed the title ~~Rapidpro service code refactor~~ v2: Rapidpro service code refactor Jun 29, 2021

ellykits added 28 commits July 6, 2021 17:31

Query rapidpro contacts with date modified

e2fa55f

Merge branch 'v2' into rapidpro-refactor

93aed3e

Lock processing of RapidPro contacts

b95b4f2

Implement RapidPro data converters

255d8df

Refactor RapidProService

0a6a4ba

Implement project based service with callbacks

Implement callback when RapidPro task is completed

c205f12

Implement get provider location id

3b4a670

- Used Province, district and facility to obtain the actual location id of the provider

Process event and clients for RapidPro contacts

89e20f0

Reformat code

4574870

Document RapidProService classes

b451073

Mark identifier as used

f528ddf

Convert RapidProContact to Client

1388789

Validate phone number

02e5abb

Add missing residential_address attribute to child client

a19c10a

Convert RapidProContact to mother client

3baa87c

Convert RapidPro contact to Birth Registration event

3a17267

Implement find organization by location id

dce1483

Include team details in Birth Registration Event

4b7a8f4

- Use the facility location id to obtain the team information

Format code

992c93d

Convert RapidProContact to Mother Registration Event

eb93e45

Add new vaccine IPV to RapidProFields

7dfc848

Create Vaccination Events from RapidProContact

dd13a75

Process RapidProContact vaccines

a546098

Introduce new facility code

5d6e590

The code will be used to uniquely identify the facility

Convert RapidProContact to Growth Monitoring Event

15978f8

Fix failing test in RapidProServiceTest

9fcc873

Handle exceptions thrown when running tests

ea26cbc

🐛 Fix the update from ZEIR creates a new RapidPro contact

53a7937

bennsimon reviewed Nov 16, 2021

View reviewed changes

🐛 Update the post exising child method to avoid duplicates on rapid p…

5482714

…ro contacts

bennsimon requested changes Nov 16, 2021

View reviewed changes

ellykits and others added 12 commits November 16, 2021 11:29

Resolve codacy comments

5e4f723

Signed-off-by: Elly Kitoto <[email protected]>

Resolve review comments

b37d106

Signed-off-by: Elly Kitoto <[email protected]>

Resolve codacy comments

68bef04

Signed-off-by: Elly Kitoto <[email protected]>

Merge branch 'v2' into rapidpro-refactor

535de98

Signed-off-by: Elly Kitoto <[email protected]>

Fix mutable function parameter

332f654

Signed-off-by: Elly Kitoto <[email protected]>

Merge branch 'v2' into rapidpro-refactor

d2c3ca7

Signed-off-by: Elly Kitoto <[email protected]>

spring security upgrade

acbc9c8

Fix RapidPro integration fetching mother contact for child

6e4951d

- Log RapidPro contacts with issues - Refactor code and loop through records for results which are limited to 25 records

Update core version to 2.13.5-SNAPSHOT-ALPHA-ZEIR

a9fea86

Update core version to 2.13.5-ZEIR-ALPHA-SNAPSHOT

a995dfc

Fix loop in ZeirRapidProStateService

a63f34f

Update core version to 2.13.6-ZEIR-ALPHA-SNAPSHOT

73bdb32

ekigamba suggested changes Nov 8, 2022

View reviewed changes

ellykits added 4 commits January 19, 2023 11:15

Merge branch 'v2' into rapidpro-refactor

b66a493

Signed-off-by: Elly Kitoto <[email protected]>

Merge branch 'rapidpro-refactor' of github.com:opensrp/opensrp-server…

8a004a9

…-core into rapidpro-refactor Signed-off-by: Elly Kitoto <[email protected]>

Update configs

75bb02a

Signed-off-by: Elly Kitoto <[email protected]>

Revert updateContactFields implementation

61a63ed

Signed-off-by: Elly Kitoto <[email protected]>

ellykits changed the title ~~v2: Rapidpro service code refactor~~ Refactor Rapidpro implementation on v2 Jan 19, 2023

Merge branch 'v2' into rapidpro-refactor

98dac7c

github-advanced-security bot found potential problems Feb 9, 2023

View reviewed changes

ndegwamartin and others added 3 commits March 9, 2023 11:50

Fix Failing Test ✅

e8c642e

Merge branch 'v2' into rapidpro-refactor

1db9f70

Upgrade dependencies ⬆️

f431903

ndegwamartin force-pushed the rapidpro-refactor branch from 87bf2a9 to f431903 Compare March 23, 2023 09:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactor Rapidpro implementation on v2 #482

Refactor Rapidpro implementation on v2 #482

ellykits commented Jun 29, 2021

bennsimon Nov 16, 2021

ellykits Nov 16, 2021

bennsimon Nov 16, 2021

bennsimon Nov 16, 2021

bennsimon Nov 16, 2021

ellykits Nov 16, 2021

bennsimon Nov 16, 2021

ellykits Nov 16, 2021

bennsimon Nov 16, 2021

bennsimon Nov 16, 2021

ellykits Nov 16, 2021

bennsimon Nov 16, 2021

bennsimon Nov 16, 2021

bennsimon Nov 16, 2021

bennsimon Nov 16, 2021

ekigamba Nov 8, 2022

ndegwamartin commented Mar 8, 2023

ndegwamartin commented Mar 9, 2023 •

edited

Loading

	if (StringUtils.isNoneBlank(rapidProContact.getName())) {
	if (StringUtils.isNotBlank(rapidProContact.getName())) {

	logger.error(exception.getMessage(), exception.fillInStackTrace().toString());
	logger.error(exception);


		List<Event> convertContactToEvents(RapidProContact rapidProContact);

		RapidProContact convertEventToContact(Event event);

Refactor Rapidpro implementation on v2 #482

Are you sure you want to change the base?

Refactor Rapidpro implementation on v2 #482

Conversation

ellykits commented Jun 29, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ndegwamartin commented Mar 8, 2023

ndegwamartin commented Mar 9, 2023 • edited Loading

ndegwamartin commented Mar 9, 2023 •

edited

Loading