BAH 2962 | SMS functionality of appointment booking and reminder moved to backend #117

atish160384 · 2023-07-07T12:45:56Z

SMS functionality of appointment booking and reminder moved to backend

# Conflicts: # api/src/main/java/org/openmrs/module/appointments/service/impl/SMSService.java

# Conflicts: # api/src/main/java/org/openmrs/module/appointments/service/impl/AppointmentsServiceImpl.java # api/src/main/java/org/openmrs/module/appointments/service/impl/SMSService.java # api/src/main/resources/messages.properties # api/src/test/java/org/openmrs/module/appointments/service/impl/AppointmentVisitLocationTest.java

api/src/main/java/org/openmrs/module/appointments/service/AppointmentsService.java

api/src/main/java/org/openmrs/module/appointments/service/impl/SMSService.java

api/src/test/java/org/openmrs/module/appointments/service/impl/SMSServiceTest.java

omod/src/main/java/org/openmrs/module/appointments/web/controller/AppointmentController.java

…nc operation

…of events.

CLAassistant · 2023-09-13T10:43:37Z

All committers have signed the CLA.

# Conflicts: # api/pom.xml # omod/pom.xml

# Conflicts: # api/src/main/java/org/openmrs/module/appointments/scheduler/tasks/ReminderForAppointment.java

api/src/main/java/org/openmrs/module/appointments/constants/PrivilegeConstants.java

api/src/main/java/org/openmrs/module/appointments/events/AppointmentBookingEvent.java

api/src/main/java/org/openmrs/module/appointments/events/AppointmentEvent.java

angshu · 2023-10-05T12:21:16Z

api/src/main/java/org/openmrs/module/appointments/events/AppointmentEventType.java

+    BAHMNI_RECURRING_APPOINTMENT_UPDATED("bahmni-recurring-appointment");
+
+    private final String topic;
+    AppointmentEventType(String topic) {


we shouldn't be mixing event with the topic here.
if any mapping needs to be done regarding which topic it must be sent to, then the listener to the spring application event (e.g. bahmni events module) - should use some mapping to identify the topic.

api/src/main/java/org/openmrs/module/appointments/events/RecurringAppointmentEvent.java

api/src/main/java/org/openmrs/module/appointments/scheduler/tasks/ReminderForAppointment.java

angshu · 2023-10-05T12:29:37Z

...c/main/java/org/openmrs/module/appointments/service/impl/AppointmentArgumentsMapperImpl.java

+import org.springframework.util.StringUtils;
+
+
+import java.util.*;


replace with single line imports .. no util.* import

this is not replaced .. please replace util.* with single line imports

api/src/main/resources/appointment.properties

api/src/main/java/org/openmrs/module/appointments/service/impl/AppointmentVisitLocation.java

...n/java/org/openmrs/module/appointments/events/eventListener/AppointmentSMSEventListener.java

# Conflicts: # pom.xml

angshu · 2023-10-17T14:06:43Z

...n/java/org/openmrs/module/appointments/events/eventListener/AppointmentSMSEventListener.java

+        String message = messageBuilderService.getAppointmentBookingMessage(appointmentArgumentsMapper.createArgumentsMapForRecurringAppointmentBooking(appointment), providersName);
+        communicationService.sendSMS(phoneNumber, message);
+    }
+    private boolean checkGlobalCondition() {


may a method name "shouldSendEmailForBookingAppointment()" is more appropriate than "checkGlobalCondition"?

angshu · 2023-10-17T14:11:15Z

...c/main/java/org/openmrs/module/appointments/service/impl/AppointmentArgumentsMapperImpl.java

+import org.springframework.util.StringUtils;
+
+
+import java.util.*;


this is not replaced .. please replace util.* with single line imports

angshu · 2023-10-17T14:13:48Z

omod/src/main/resources/config.xml

+		<defaultValue>false</defaultValue>
+	</globalProperty>
+
+	<globalProperty>


We should not be setting property like this. This attribute should be associated with location. Also where is this used? if not used, please remove.

angshu · 2023-10-17T14:14:22Z

omod/src/main/resources/config.xml

+	</globalProperty>
+
+	<globalProperty>
+		<property>bahmni.sms.timezone</property>


why is this prefixed with bahmni.sms, where other properties are sms.*?

angshu · 2023-10-17T14:14:32Z

omod/src/main/resources/config.xml

+	</globalProperty>
+
+	<globalProperty>
+		<property>bahmni.sms.dateformat</property>


same question as above?

angshu · 2023-10-17T14:16:27Z

pom.xml

@@ -50,6 +50,7 @@
 		<javaxMail.version>1.6.2</javaxMail.version>
 		<servletApi.version>3.0.1</servletApi.version>
 		<webServices.version>2.29.0</webServices.version>
+		<communications.version>1.2.0-SNAPSHOT</communications.version>


NOTE: remember to merge changes onto communication omod and ensure that latest snapshot is released before you merge this.

atishbeehyv123 and others added 21 commits June 1, 2023 14:10

BAH-2181 | added sms reminder for appointments

5640079

[Rahul] | Fix. teleconsultation-api Version Upgrade

8407919

BAH-2181 | ConnectionDetails refratored with null check

c76b466

BAH-2181 | refractored patientid and clinicName

bfaf187

BAH-2181 | Refractored the process of fetching Clinic name

12a517d

BAH-2181 | Moving appointment booking sms to backend

0c641e9

refractored user and template key

29857ba

sms uri to be fetched from global properties now

63d0d6f

refractored the code acc to comments

a31cef2

teleconsultation-api version changed because build failed

4395f39

refractored clinic to facility and used sms-user

d8900aa

refractored code

aee3b64

refractored code

1246c0a

added tests because of build failure with less coverage

4c379be

added tests because of build failure with less coverage

d88975b

decreased minimum required branch coverage ratio

09bc9f7

Merge remote-tracking branch 'origin/master' into BAH-2181

6718e62

# Conflicts: # api/src/main/java/org/openmrs/module/appointments/service/impl/SMSService.java

Refractored test for SMSServiceTest

bd89818

Refractored test for SMSServiceTest

a8e6d06

Merge remote-tracking branch 'origin/BAH-2962' into BAH-2962

ade2221

atish160384 requested review from angshu, gsluthra and rahu1ramesh July 7, 2023 12:52

atish160384 force-pushed the BAH-2962 branch from 026084b to ade2221 Compare July 9, 2023 10:37

angshu reviewed Jul 12, 2023

View reviewed changes

atishbeehyv123 added 4 commits July 27, 2023 19:24

BAH-2962 | refractored sms api to be different api altogether for asy…

0f6a3c6

…nc operation

BAH-2962 | used single line imports

2b8f041

Added required privileges condition check for appointments sms

d06a6e3

Added required privileges condition check for appointments sms.

43ee6c8

Removed usage of appointments module to send sms now working as part …

b19d36e

…of events.

anubhavBeehyv requested a review from angshu September 14, 2023 07:16

anubhavBeehyv added 7 commits September 14, 2023 12:50

Merge remote-tracking branch 'origin/master' into BAH-2962

52d572f

# Conflicts: # api/pom.xml # omod/pom.xml

Merge remote-tracking branch 'origin/master' into BAH-2962

9cbf697

# Conflicts: # api/src/main/java/org/openmrs/module/appointments/scheduler/tasks/ReminderForAppointment.java

Event Publisher moved to specific modules.

efc4a7e

Event Publisher moved to specific modules.

cd829d4

Event publisher now added in appointments module itself.

fcc423b

Removed bahmni-commons dependency

ac2b2f3

Added communications-module dependency as aware_of.

ede9471

angshu requested changes Oct 5, 2023

View reviewed changes

angshu reviewed Oct 5, 2023

View reviewed changes

api/src/main/java/org/openmrs/module/appointments/scheduler/tasks/ReminderForAppointment.java Show resolved Hide resolved

angshu reviewed Oct 5, 2023

View reviewed changes

angshu requested changes Oct 5, 2023

View reviewed changes

anubhavBeehyv and others added 4 commits October 5, 2023 18:37

Update PrivilegeConstants.java

86bfd69

Changes to resolve git comments

d6f376b

Merge remote-tracking branch 'origin/BAH-2962' into BAH-2962

551a8f0

Changes to resolve git comments

ae5683c

anubhavBeehyv requested a review from angshu October 9, 2023 10:01

anubhavBeehyv and others added 3 commits October 12, 2023 13:53

Merge remote-tracking branch 'origin/master' into BAH-2962

ce8c9a0

# Conflicts: # pom.xml

Update AppointmentArgumentsMapperImpl.java

5edc04c

Update AppointmentArgumentsMapperImpl.java

d608863

angshu reviewed Oct 17, 2023

View reviewed changes

anubhavBeehyv added 3 commits October 17, 2023 20:03

Changes to reslove comments

94114bf

Merge remote-tracking branch 'origin/BAH-2962' into BAH-2962

d68b46c

Removed global property clinic timings.

58f3d69

atish160384 requested a review from angshu October 19, 2023 06:51

angshu approved these changes Oct 20, 2023

View reviewed changes

anubhavBeehyv merged commit 7e76a28 into master Oct 20, 2023
1 check passed

ibacher mentioned this pull request Nov 21, 2023

BAH-3854 | AppointmentEventsAdvice should not throw when older validateAndSave is called #141

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

BAH 2962 | SMS functionality of appointment booking and reminder moved to backend #117

BAH 2962 | SMS functionality of appointment booking and reminder moved to backend #117

atish160384 commented Jul 7, 2023

CLAassistant commented Sep 13, 2023 •

edited

Loading

angshu Oct 5, 2023

angshu Oct 5, 2023

angshu Oct 5, 2023

angshu Oct 17, 2023

angshu Oct 17, 2023

angshu Oct 17, 2023

angshu Oct 17, 2023

angshu Oct 17, 2023

angshu Oct 17, 2023

angshu Oct 17, 2023

anubhavBeehyv Oct 17, 2023

		import org.springframework.util.StringUtils;


		import java.util.*;

BAH 2962 | SMS functionality of appointment booking and reminder moved to backend #117

BAH 2962 | SMS functionality of appointment booking and reminder moved to backend #117

Conversation

atish160384 commented Jul 7, 2023

CLAassistant commented Sep 13, 2023 • edited Loading

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

CLAassistant commented Sep 13, 2023 •

edited

Loading