Skip to content
This repository has been archived by the owner on Jan 21, 2021. It is now read-only.

Commit

Permalink
code indentation
Browse files Browse the repository at this point in the history
  • Loading branch information
Proshanto committed Jul 18, 2017
1 parent 41f8843 commit e0adcb3
Show file tree
Hide file tree
Showing 22 changed files with 80 additions and 82 deletions.
6 changes: 3 additions & 3 deletions opensrp-register/src/main/java/org/opensrp/register/service/handler/ANCScheduleHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ public class ANCScheduleHandler extends BaseScheduleHandler {
@Autowired
public ANCScheduleHandler(AnteNatalCareSchedulesService ancScheduleService) {
this.ancScheduleService = ancScheduleService;
}
}
@Override
public void handle(Event event, JSONObject scheduleConfigEvent,String scheduleName) {
public void handle(Event event, JSONObject scheduleConfigEvent,String scheduleName) {
try {
if(scheduleName==null){
scheduleName="Ante Natal Care Reminder Visit";
Expand All @@ -32,7 +32,7 @@ public void handle(Event event, JSONObject scheduleConfigEvent,String scheduleNa
} else if (action.equalsIgnoreCase(ActionType.fulfill.toString())) {
ancScheduleService.fullfillMilestone(event.getBaseEntityId(), event.getProviderId(), scheduleName, LocalDate.parse(getReferenceDateForSchedule(event, scheduleConfigEvent, action)), event.getId());
}
}
}
}
catch (JSONException e) {
logger.error("", e);
Expand Down
8 changes: 4 additions & 4 deletions opensrp-register/src/main/java/org/opensrp/register/service/handler/BaseScheduleHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,17 +139,17 @@ protected Map<String, Object> getReferenceDateFields(JSONObject scheduleConfigEv
protected String getReferenceDateForSchedule(Event event, JSONObject scheduleConfigEvent, String action)
throws JSONException {
Map<String, Object> refDateFields = new HashMap<String, Object>();
if (action.equalsIgnoreCase(ActionType.enroll.toString())) {
if (action.equalsIgnoreCase(ActionType.enroll.toString())) {
refDateFields = getReferenceDateFields(scheduleConfigEvent);
} else if (action.equalsIgnoreCase(ActionType.fulfill.toString())) {
refDateFields = getFulfillmentDateFields(scheduleConfigEvent);
}
JSONObject eventJson = objectToJson(event);
Map<String, Object> obs = getEventObs(eventJson);
Map<String, Object> obsByFormSubmissionField = getEventObsByFormSubmissionField(eventJson);
String dateStr = "";
String dateStr = "";
for (Map.Entry<String, Object> entry : refDateFields.entrySet()) {
String key = entry.getKey();//"concept"
String key = entry.getKey();//"concept"
String value = entry.getValue().toString();//"concept value or fieldname"
if (key.equalsIgnoreCase(JSON_KEY_CONCEPT) && !refDateFields.containsKey(JSON_KEY_EVENT)) {
//date is a concept and in the current event being processed search it in the event's obs
Expand All @@ -171,7 +171,7 @@ protected String getReferenceDateForSchedule(Event event, JSONObject scheduleCon
if(obsByFormSubmissionField.containsKey(value) && !obsByFormSubmissionField.get(value).toString().isEmpty()){
dateStr = getDateValue(obsByFormSubmissionField.get(value));
}
} else if(key.equalsIgnoreCase(JSON_KEY_TYPE) && value.equalsIgnoreCase("Client")){
} else if(key.equalsIgnoreCase(JSON_KEY_TYPE) && value.equalsIgnoreCase("Client")){
Client client = getClient(event);

String fieldValue = refDateFields.get(JSON_KEY_FIELD) != null? refDateFields.get(JSON_KEY_FIELD).toString() : null;
Expand Down
7 changes: 3 additions & 4 deletions ...srp-register/src/main/java/org/opensrp/register/service/handler/ChildScheduleHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,11 @@
import org.springframework.stereotype.Component;

@Component
public class ChildScheduleHandler extends BaseScheduleHandler {

public class ChildScheduleHandler extends BaseScheduleHandler {
private ENCCSchedulesService enccSchedulesService;
private ClientService clientService;
@Autowired
public ChildScheduleHandler(ENCCSchedulesService enccSchedulesService,ClientService clientService){
public ChildScheduleHandler(ENCCSchedulesService enccSchedulesService,ClientService clientService) {
this.enccSchedulesService = enccSchedulesService;
this.clientService = clientService;
}
Expand All @@ -44,7 +43,7 @@ public void handle(Event event, JSONObject scheduleConfigEvent,String scheduleNa
}
}
}
else if (action.equalsIgnoreCase(ActionType.fulfill.toString())) {
else if (action.equalsIgnoreCase(ActionType.fulfill.toString())) {
enccSchedulesService.fullfillMilestone(event.getBaseEntityId(), event.getProviderId(), scheduleName, LocalDate.parse(getReferenceDateForSchedule(event, scheduleConfigEvent, action)), event.getId());
}

Expand Down
2 changes: 1 addition & 1 deletion opensrp-register/src/main/java/org/opensrp/register/service/handler/ElcoScheduleHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class ElcoScheduleHandler extends BaseScheduleHandler {
public static final String ELCO_SCHEDULE_PSRF = "ELCO PSRF";
public static final String MIS_ELCO = "mis_elco";
@Autowired
public ElcoScheduleHandler(ELCOScheduleService elcoScheduleService){
public ElcoScheduleHandler(ELCOScheduleService elcoScheduleService) {
this.elcoScheduleService = elcoScheduleService;
}
@Override
Expand Down
7 changes: 3 additions & 4 deletions opensrp-register/src/main/java/org/opensrp/register/service/handler/HHScheduleHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,20 @@ public class HHScheduleHandler extends BaseScheduleHandler {

private HHSchedulesService hhSchedulesService;
@Autowired
public HHScheduleHandler(HHSchedulesService hhSchedulesService){
this.hhSchedulesService = hhSchedulesService;
public HHScheduleHandler(HHSchedulesService hhSchedulesService) {
this.hhSchedulesService = hhSchedulesService;
}
@Override
public void handle(Event event, JSONObject scheduleConfigEvent,String scheduleName) {
try {

if(scheduleName==null){
scheduleName="FW CENSUS";
}

if (evaluateEvent(event, scheduleConfigEvent)) {
String milestone = getMilestone(scheduleConfigEvent);
String action = getAction(scheduleConfigEvent);
if (action.equalsIgnoreCase(ActionType.enroll.toString())) {
if (action.equalsIgnoreCase(ActionType.enroll.toString())) {
hhSchedulesService.enrollIntoMilestoneOfCensus(event.getBaseEntityId(),
getReferenceDateForSchedule(event, scheduleConfigEvent, action), event.getProviderId(), milestone,
event.getId());
Expand Down
2 changes: 1 addition & 1 deletion opensrp-register/src/main/java/org/opensrp/register/service/handler/PNCScheduleHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public class PNCScheduleHandler extends BaseScheduleHandler {

private PNCSchedulesService pncSchedulesService;
@Autowired
public PNCScheduleHandler(PNCSchedulesService pncSchedulesService){
public PNCScheduleHandler(PNCSchedulesService pncSchedulesService) {
this.pncSchedulesService = pncSchedulesService;
}
@Override
Expand Down
6 changes: 3 additions & 3 deletions ...-register/src/main/java/org/opensrp/register/service/handler/VaccinesScheduleHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@

@Component
public class VaccinesScheduleHandler extends BaseScheduleHandler {
private HealthSchedulerService scheduler;
private HealthSchedulerService scheduler;
private AllEvents allEvents;
@Autowired
public VaccinesScheduleHandler(HealthSchedulerService scheduler,AllEvents allEvents){
public VaccinesScheduleHandler(HealthSchedulerService scheduler,AllEvents allEvents) {
this.scheduler = scheduler;
this.allEvents = allEvents;
this.allEvents = allEvents;
}
@Override
public void handle(Event event, JSONObject scheduleConfigEvent, String scheduleName) {
Expand Down
10 changes: 5 additions & 5 deletions ...p-register/src/test/java/org/opensrp/register/service/handler/ANCScheduleHandlerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public void setUp() throws Exception {
}

@Test
public void shouldTestANCScheduleHandler() throws Exception{
public void shouldTestANCScheduleHandler() throws Exception {
Event event = geteventOfVaccination();
JSONArray schedulesJsonObject = new JSONArray("[" + getFile() + "]");
String scheduleName =null;
Expand All @@ -74,17 +74,17 @@ public void shouldTestANCScheduleHandler() throws Exception{
String action = aNCScheduleHandler.getAction(scheduleConfigEvent);
String milestone=aNCScheduleHandler.getMilestone(scheduleConfigEvent);
LocalDate date = LocalDate.parse("2016-07-10");
if(milestone.equalsIgnoreCase("opv2") && action.equalsIgnoreCase(ActionType.enroll.toString())){
if (milestone.equalsIgnoreCase("opv2") && action.equalsIgnoreCase(ActionType.enroll.toString())) {
aNCScheduleHandler.handle(event,scheduleConfigEvent, scheduleName);
InOrder inOrder = inOrder(anteNatalCareSchedulesService);
inOrder.verify(anteNatalCareSchedulesService).enrollMother(event.getBaseEntityId(),"Ante Natal Care Reminder Visit", LocalDate.parse("2016-07-10"),
event.getId());
event.getId());
}
else if(milestone.equalsIgnoreCase("opv2") && action.equalsIgnoreCase(ActionType.fulfill.toString())){
else if (milestone.equalsIgnoreCase("opv2") && action.equalsIgnoreCase(ActionType.fulfill.toString())) {
aNCScheduleHandler.handle(event,scheduleConfigEvent, scheduleName);
InOrder inOrder = inOrder(anteNatalCareSchedulesService);
inOrder.verify(anteNatalCareSchedulesService).fullfillMilestone(event.getBaseEntityId(), event.getProviderId(), "Ante Natal Care Reminder Visit", date, event.getId());
}else{
} else {

}
}
Expand Down
10 changes: 5 additions & 5 deletions ...p-register/src/test/java/org/opensrp/register/service/handler/BNFScheduleHandlerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ public void setUp() throws Exception {
}

@Test
public void shouldTestBNFScheduleHandler() throws Exception{
public void shouldTestBNFScheduleHandler() throws Exception {
Event event = geteventOfVaccination();
JSONArray schedulesJsonObject = new JSONArray("[" + getFile() + "]");
String scheduleName =null;
String scheduleName = null;
for (int i = 0; i < schedulesJsonObject.length(); i++) {
JSONObject scheduleJsonObject = schedulesJsonObject.getJSONObject(i);
JSONArray eventsJsonArray = scheduleJsonObject.getJSONArray(JSON_KEY_EVENTS);
Expand All @@ -71,13 +71,13 @@ public void shouldTestBNFScheduleHandler() throws Exception{
List<String> eventsList = jsonArrayToList(eventTypesJsonArray);
if (eventsList.contains(event.getEventType())) {
String action = bnfScheduleHandler.getAction(scheduleConfigEvent);
String milestone=bnfScheduleHandler.getMilestone(scheduleConfigEvent);
String milestone = bnfScheduleHandler.getMilestone(scheduleConfigEvent);
LocalDate date = LocalDate.parse("2016-07-10");
if(milestone.equalsIgnoreCase("opv2") && action.equalsIgnoreCase(ActionType.enroll.toString())){
if (milestone.equalsIgnoreCase("opv2") && action.equalsIgnoreCase(ActionType.enroll.toString())) {
bnfScheduleHandler.handle(event,scheduleConfigEvent, scheduleName);
InOrder inOrder = inOrder(bnfSchedulesService);
inOrder.verify(bnfSchedulesService).enrollBNF(event.getBaseEntityId(), "BirthNotificationPregnancyStatusFollowUp", LocalDate.parse("2016-07-10"), event.getId());
} else{
} else {
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions ...-register/src/test/java/org/opensrp/register/service/handler/BaseScheduleHandlerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public void setUp() throws Exception {
}

@Test
public void shouldTestgetReferenceDateForSchedule() throws Exception{
public void shouldTestgetReferenceDateForSchedule() throws Exception {
Event event = geteventOfBirthRegistration();
List<Event> events = getEvents("2016-02-03");
when(allEvents, method(AllEvents.class, "findByBaseEntityIdAndConceptParentCode", String.class, String.class,String.class))
Expand All @@ -85,9 +85,9 @@ public void shouldTestgetReferenceDateForSchedule() throws Exception{
JSONArray eventTypesJsonArray = scheduleConfigEvent.getJSONArray(JSON_KEY_TYPES);
List<String> eventsList = jsonArrayToList(eventTypesJsonArray);
if (eventsList.contains(event.getEventType())) {
scheduleName = scheduleJsonObject.getString(JSON_KEY_SCHEDULE_NAME);;
scheduleName = scheduleJsonObject.getString(JSON_KEY_SCHEDULE_NAME);;
String action = vaccinesScheduleHandler.getAction(scheduleConfigEvent);
String milestone=vaccinesScheduleHandler.getMilestone(scheduleConfigEvent);
String milestone = vaccinesScheduleHandler.getMilestone(scheduleConfigEvent);
LocalDate date = LocalDate.parse("2016-07-10");
vaccinesScheduleHandler.handle(event,scheduleConfigEvent, scheduleName);
vaccinesScheduleHandler.getReferenceDateForSchedule(event, scheduleConfigEvent, action);
Expand Down
10 changes: 5 additions & 5 deletions ...register/src/test/java/org/opensrp/register/service/handler/ChildScheduleHandlerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public void setUp() throws Exception {
}

@Test
public void shouldTestChilsScheduleHandler() throws Exception{
public void shouldTestChilsScheduleHandler() throws Exception {
Event event = geteventOfVaccination();
JSONArray schedulesJsonObject = new JSONArray("[" + getFile() + "]");
String scheduleName =null;
Expand All @@ -70,12 +70,12 @@ public void shouldTestChilsScheduleHandler() throws Exception{
List<String> eventsList = jsonArrayToList(eventTypesJsonArray);
if (eventsList.contains(event.getEventType())) {
String action = childScheduleHandler.getAction(scheduleConfigEvent);
String milestone=childScheduleHandler.getMilestone(scheduleConfigEvent);
if (milestone.equalsIgnoreCase("opv2") && action.equalsIgnoreCase(ActionType.enroll.toString())){
childScheduleHandler.handle(event,scheduleConfigEvent, scheduleName);
String milestone = childScheduleHandler.getMilestone(scheduleConfigEvent);
if (milestone.equalsIgnoreCase("opv2") && action.equalsIgnoreCase(ActionType.enroll.toString())) {
childScheduleHandler.handle(event,scheduleConfigEvent, scheduleName);
InOrder inOrder = inOrder(enccSchedulesService);
inOrder.verify(enccSchedulesService).enrollIntoCorrectMilestoneOfENCCCare("ooo-yyy-yyy", "BirthNotificationPregnancyStatusFollowUp", LocalDate.parse("2016-07-10"), event.getId());
} else if(milestone.equalsIgnoreCase("opv2") && action.equalsIgnoreCase(ActionType.fulfill.toString())){
} else if (milestone.equalsIgnoreCase("opv2") && action.equalsIgnoreCase(ActionType.fulfill.toString())) {
childScheduleHandler.handle(event,scheduleConfigEvent, scheduleName);
InOrder inOrder = inOrder(enccSchedulesService);
inOrder.verify(enccSchedulesService).fullfillMilestone(event.getBaseEntityId(), event.getProviderId(), "BirthNotificationPregnancyStatusFollowUp", LocalDate.parse("2016-07-10"), event.getId());
Expand Down
10 changes: 5 additions & 5 deletions ...-register/src/test/java/org/opensrp/register/service/handler/ElcoScheduleHandlerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public void setUp() throws Exception {
}

@Test
public void shouldTestChilsScheduleHandler() throws Exception{
public void shouldTestElcoScheduleHandler() throws Exception {
Event event = geteventOfVaccination();
JSONArray schedulesJsonObject = new JSONArray("[" + getFile() + "]");
String scheduleName =null;
Expand All @@ -61,13 +61,13 @@ public void shouldTestChilsScheduleHandler() throws Exception{
if (eventsList.contains(event.getEventType())) {
String action = elcoScheduleHandler.getAction(scheduleConfigEvent);
String milestone=elcoScheduleHandler.getMilestone(scheduleConfigEvent);
if (milestone.equalsIgnoreCase("opv2") && action.equalsIgnoreCase(ActionType.enroll.toString())){
if (milestone.equalsIgnoreCase("opv2") && action.equalsIgnoreCase(ActionType.enroll.toString())) {
elcoScheduleHandler.handle(event,scheduleConfigEvent, scheduleName);
InOrder inOrder = inOrder(elcoScheduleService);
inOrder.verify(elcoScheduleService).imediateEnrollIntoMilestoneOfPSRF(event.getBaseEntityId(),
"2016-07-10", event.getProviderId(),
ELCO_SCHEDULE_PSRF, event.getId());
} else if(milestone.equalsIgnoreCase("opv2") && action.equalsIgnoreCase(ActionType.fulfill.toString())){
"2016-07-10", event.getProviderId(),
ELCO_SCHEDULE_PSRF, event.getId());
} else if(milestone.equalsIgnoreCase("opv2") && action.equalsIgnoreCase(ActionType.fulfill.toString())) {
elcoScheduleHandler.handle(event,scheduleConfigEvent, scheduleName);
InOrder inOrder = inOrder(elcoScheduleService);
inOrder.verify(elcoScheduleService).fullfillMilestone(event.getBaseEntityId(), event.getProviderId(), ELCO_SCHEDULE_PSRF, LocalDate.parse("2016-07-10"), event.getId());
Expand Down
6 changes: 3 additions & 3 deletions ...rp-register/src/test/java/org/opensrp/register/service/handler/HHScheduleHandlerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public void setUp() throws Exception {
}

@Test
public void shouldTestChilsScheduleHandler() throws Exception{
public void shouldTestChilsScheduleHandler() throws Exception {
Event event = geteventOfVaccination();
JSONArray schedulesJsonObject = new JSONArray("[" + getFile() + "]");
String scheduleName =null;
Expand All @@ -58,12 +58,12 @@ public void shouldTestChilsScheduleHandler() throws Exception{
if (eventsList.contains(event.getEventType())) {
String action = hhScheduleHandler.getAction(scheduleConfigEvent);
String milestone=hhScheduleHandler.getMilestone(scheduleConfigEvent);
if (milestone.equalsIgnoreCase("opv2") && action.equalsIgnoreCase(ActionType.enroll.toString())){
if (milestone.equalsIgnoreCase("opv2") && action.equalsIgnoreCase(ActionType.enroll.toString())) {
hhScheduleHandler.handle(event,scheduleConfigEvent, scheduleName);
InOrder inOrder = inOrder(hhSchedulesService);
inOrder.verify(hhSchedulesService).enrollIntoMilestoneOfCensus(event.getBaseEntityId(),
"2016-07-10", event.getProviderId(), "opv2",event.getId());
} else if(milestone.equalsIgnoreCase("opv2") && action.equalsIgnoreCase(ActionType.fulfill.toString())){
} else if(milestone.equalsIgnoreCase("opv2") && action.equalsIgnoreCase(ActionType.fulfill.toString())) {
hhScheduleHandler.handle(event,scheduleConfigEvent, scheduleName);
InOrder inOrder = inOrder(hhSchedulesService);
inOrder.verify(hhSchedulesService).fullfillMilestone(event.getBaseEntityId(), event.getProviderId(), "FW CENSUS", LocalDate.parse("2016-07-10"), event.getId());
Expand Down
Loading

0 comments on commit e0adcb3

Please sign in to comment.