Skip to content

Commit a87a3ed

Browse files
vedfordevvedfordev
committed
#86 | filter out data from table result
1 parent e261b02 commit a87a3ed

11 files changed

+477
-70
lines changed

‎Makefile

+5-1
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,9 @@ open-test-results-goonj:
127127
open-test-results-amrit:
128128
open amrit/build/reports/tests/test/index.html
129129

130+
open-test-results-lahi:
131+
open lahi/build/reports/tests/test/index.html
132+
130133
open-test-results-migrator:
131134
open metadata-migrator/build/reports/tests/test/index.html
132135

@@ -165,5 +168,6 @@ deploy-to-vagrant: build-server deploy-to-vagrant-only
165168
setup: setup-log-dir
166169
touch goonj/src/test/resources/goonj-secret.properties
167170
touch goonj/src/test/resources/avni-secret.properties
168-
touch goonj/src/test/resources/bahmni-secret.properties
171+
touch bahmni/src/test/resources/bahmni-secret.properties
169172
touch amrit/src/test/resources/amrit-secret.properties
173+
touch lahi/src/test/resources/lahi-secret.properties

‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ Module order
33
2. Goonj
44
3. Amrit
55
4. Power
6+
5. Lahi

‎lahi/src/main/java/org/avni_integration_service/lahi/domain/GlificStudent.java

+120
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
package org.avni_integration_service.lahi.domain;
2+
3+
public class GlificStudent {
4+
private String name;
5+
private String id;
6+
private String status;
7+
private String completed_at;
8+
private String contact_id;
9+
private String contact_phone;
10+
private String flow_id;
11+
private String results;
12+
private String updated_at;
13+
private String inserted_at;
14+
private GlificStudentResult glificStudentResult;
15+
16+
public String getName() {
17+
return name;
18+
}
19+
20+
public void setName(String name) {
21+
this.name = name;
22+
}
23+
24+
public String getId() {
25+
return id;
26+
}
27+
28+
public void setId(String id) {
29+
this.id = id;
30+
}
31+
32+
public String getStatus() {
33+
return status;
34+
}
35+
36+
public void setStatus(String status) {
37+
this.status = status;
38+
}
39+
40+
public String getCompleted_at() {
41+
return completed_at;
42+
}
43+
44+
public void setCompleted_at(String completed_at) {
45+
this.completed_at = completed_at;
46+
}
47+
48+
public String getContact_id() {
49+
return contact_id;
50+
}
51+
52+
public void setContact_id(String contact_id) {
53+
this.contact_id = contact_id;
54+
}
55+
56+
public String getContact_phone() {
57+
return contact_phone;
58+
}
59+
60+
public void setContact_phone(String contact_phone) {
61+
this.contact_phone = contact_phone;
62+
}
63+
64+
public String getFlow_id() {
65+
return flow_id;
66+
}
67+
68+
public void setFlow_id(String flow_id) {
69+
this.flow_id = flow_id;
70+
}
71+
72+
public String getResults() {
73+
return results;
74+
}
75+
76+
public void setResults(String results) {
77+
this.results = results;
78+
}
79+
80+
public String getUpdated_at() {
81+
return updated_at;
82+
}
83+
84+
public void setUpdated_at(String updated_at) {
85+
this.updated_at = updated_at;
86+
}
87+
88+
public String getInserted_at() {
89+
return inserted_at;
90+
}
91+
92+
public void setInserted_at(String inserted_at) {
93+
this.inserted_at = inserted_at;
94+
}
95+
96+
public GlificStudentResult getGlificStudentResult() {
97+
return glificStudentResult;
98+
}
99+
100+
public void setGlificStudentResult(GlificStudentResult glificStudentResult) {
101+
this.glificStudentResult = glificStudentResult;
102+
}
103+
104+
@Override
105+
public String toString() {
106+
return "GlificStudent{" +
107+
"name='" + name + '\'' +
108+
", id='" + id + '\'' +
109+
", status='" + status + '\'' +
110+
", completed_at='" + completed_at + '\'' +
111+
", contact_id='" + contact_id + '\'' +
112+
", contact_phone='" + contact_phone + '\'' +
113+
", flow_id='" + flow_id + '\'' +
114+
", results='" + results + '\'' +
115+
", updated_at='" + updated_at + '\'' +
116+
", inserted_at='" + inserted_at + '\'' +
117+
", glificStudentResult=" + glificStudentResult +
118+
'}';
119+
}
120+
}

‎lahi/src/main/java/org/avni_integration_service/lahi/domain/GlificStudentResult.java

+162
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,162 @@
1+
package org.avni_integration_service.lahi.domain;
2+
3+
public class GlificStudentResult {
4+
5+
private String avni_first_name;
6+
private String avni_last_name;
7+
private String avni_date_of_birth;
8+
private String avni_gender;
9+
private String avni_state;
10+
private String avni_district_name;
11+
private String avni_school_name;
12+
private String avni_alternate_contact;
13+
private String avni_email;
14+
private String avni_highest_qualification;
15+
private String avni_other_qualification;
16+
private String avni_qualification_status;
17+
private String avni_academic_year;
18+
private String avni_vocational;
19+
private String avni_trade;
20+
21+
public String getAvni_first_name() {
22+
return avni_first_name;
23+
}
24+
25+
public void setAvni_first_name(String avni_first_name) {
26+
this.avni_first_name = avni_first_name;
27+
}
28+
29+
public String getAvni_last_name() {
30+
return avni_last_name;
31+
}
32+
33+
public void setAvni_last_name(String avni_last_name) {
34+
this.avni_last_name = avni_last_name;
35+
}
36+
37+
public String getAvni_date_of_birth() {
38+
return avni_date_of_birth;
39+
}
40+
41+
public void setAvni_date_of_birth(String avni_date_of_birth) {
42+
this.avni_date_of_birth = avni_date_of_birth;
43+
}
44+
45+
46+
public String getAvni_gender() {
47+
return avni_gender;
48+
}
49+
50+
public void setAvni_gender(String avni_gender) {
51+
this.avni_gender = avni_gender;
52+
}
53+
54+
public String getAvni_state() {
55+
return avni_state;
56+
}
57+
58+
public void setAvni_state(String avni_state) {
59+
this.avni_state = avni_state;
60+
}
61+
62+
public String getAvni_district_name() {
63+
return avni_district_name;
64+
}
65+
66+
public void setAvni_district_name(String avni_district_name) {
67+
this.avni_district_name = avni_district_name;
68+
}
69+
70+
public String getAvni_school_name() {
71+
return avni_school_name;
72+
}
73+
74+
public void setAvni_school_name(String avni_school_name) {
75+
this.avni_school_name = avni_school_name;
76+
}
77+
78+
public String getAvni_alternate_contact() {
79+
return avni_alternate_contact;
80+
}
81+
82+
public void setAvni_alternate_contact(String avni_alternate_contact) {
83+
this.avni_alternate_contact = avni_alternate_contact;
84+
}
85+
86+
public String getAvni_email() {
87+
return avni_email;
88+
}
89+
90+
public void setAvni_email(String avni_email) {
91+
this.avni_email = avni_email;
92+
}
93+
94+
public String getAvni_highest_qualification() {
95+
return avni_highest_qualification;
96+
}
97+
98+
public void setAvni_highest_qualification(String avni_highest_qualification) {
99+
this.avni_highest_qualification = avni_highest_qualification;
100+
}
101+
102+
public String getAvni_other_qualification() {
103+
return avni_other_qualification;
104+
}
105+
106+
public void setAvni_other_qualification(String avni_other_qualification) {
107+
this.avni_other_qualification = avni_other_qualification;
108+
}
109+
110+
public String getAvni_qualification_status() {
111+
return avni_qualification_status;
112+
}
113+
114+
public void setAvni_qualification_status(String avni_qualification_status) {
115+
this.avni_qualification_status = avni_qualification_status;
116+
}
117+
118+
public String getAvni_academic_year() {
119+
return avni_academic_year;
120+
}
121+
122+
public void setAvni_academic_year(String avni_academic_year) {
123+
this.avni_academic_year = avni_academic_year;
124+
}
125+
126+
public String getAvni_vocational() {
127+
return avni_vocational;
128+
}
129+
130+
public void setAvni_vocational(String avni_vocational) {
131+
this.avni_vocational = avni_vocational;
132+
}
133+
134+
public String getAvni_trade() {
135+
return avni_trade;
136+
}
137+
138+
public void setAvni_trade(String avni_trade) {
139+
this.avni_trade = avni_trade;
140+
}
141+
142+
@Override
143+
public String toString() {
144+
return "GlificStudent{" +
145+
"avni_first_name='" + avni_first_name + '\'' +
146+
", avni_last_name='" + avni_last_name + '\'' +
147+
", avni_date_of_birth='" + avni_date_of_birth + '\'' +
148+
", avni_gender='" + avni_gender + '\'' +
149+
", avni_state='" + avni_state + '\'' +
150+
", avni_district_name='" + avni_district_name + '\'' +
151+
", avni_school_name='" + avni_school_name + '\'' +
152+
", avni_alternate_contact='" + avni_alternate_contact + '\'' +
153+
", avni_email='" + avni_email + '\'' +
154+
", avni_highest_qualification='" + avni_highest_qualification + '\'' +
155+
", avni_other_qualification='" + avni_other_qualification + '\'' +
156+
", avni_qualification_status='" + avni_qualification_status + '\'' +
157+
", avni_academic_year='" + avni_academic_year + '\'' +
158+
", avni_vocational='" + avni_vocational + '\'' +
159+
", avni_trade='" + avni_trade + '\'' +
160+
'}';
161+
}
162+
}

‎lahi/src/main/java/org/avni_integration_service/lahi/domain/Student.java

+3-41
Original file line numberDiff line numberDiff line change
@@ -2,59 +2,21 @@
22

33
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
44
import org.avni_integration_service.avni.domain.Subject;
5-
import org.avni_integration_service.util.MapUtil;
65

76
import java.util.Arrays;
8-
import java.util.Date;
97
import java.util.List;
108
import java.util.Map;
119
import java.util.stream.Collectors;
1210

1311
@JsonIgnoreProperties(ignoreUnknown = true)
14-
public class Student implements LahiEntity {
15-
16-
private static final String FIRST_NAME = "avni_first_name";
17-
private static final String LAST_NAME = "avni_last_name";
18-
private static final String DATE_OF_BIRTH = "avni_date_of_birth";
19-
private static final String DATE_OF_REGISTRATION = "updated_at";
20-
private static final String GENDER = "avni_gender";
21-
private static final String STATE = "avni_state";
22-
private static final String DISTRICT = "avni_district_name";
23-
private static final String BLOCK = "";
24-
private static final String SCHOOL = "avni_school_name";
25-
private static final String UDISE = "";
26-
private static final String OTHER_SCHOOL_NAME = "";
27-
private static final String STUDENT_CONTACT_NUMBER = "phone";
28-
private static final String ALTERNATE_NUMBER = "avni_alternate_contact";
29-
private static final String EMAIL = "avni_email";
30-
private static final String HIGHEST_QUALIFICATION = "avni_highest_qualification";
31-
private static final String OTHER_QUALIFICATION = "avni_other_qualification";
32-
private static final String QUALIFICATION_STATUS = "avni_qualification_status";
33-
private static final String ACADEMIC_YEAR = "avni_academic_year";
34-
private static final String VOCATIONAL = "avni_vocational";
35-
private static final String TRADE = "avni_trade";
36-
private static final String STUDENT_PERMISSION = "";
37-
private static final String STUDENT_ADDRESS = "Other, Other, Other, Other";
38-
39-
//TODO remove demand field start
40-
41-
private static final String DemandDistrictField = "District";
42-
private static final String DemandStateField = "State";
43-
private static final String DemandNameField = "DemandName";
44-
private static final String DemandTargetCommunity = "TargetCommunity";
45-
private static final String DemandIdField = "DemandId";
46-
private static final String DemandIsVoidedField = "IsVoided";
47-
private static final String DemandStatusField = "DemandStatus";
48-
private static final String DispatchStatusField = "DispatchStatus";
49-
50-
//TODO remove demand field end
12+
public class Student implements LahiEntity, StudentConstants {
5113
private Map<String, Object> response;
5214

5315
private static final List<String> Core_Fields = Arrays.asList(FIRST_NAME,LAST_NAME,DATE_OF_BIRTH,
5416
DATE_OF_REGISTRATION,GENDER);
5517
//TODO add address fields to above and also anyother fields
5618

57-
public static Student from(Map<String, Object> studentResponse) {
19+
public static StudentConstants from(Map<String, Object> studentResponse) {
5820
Student student = new Student();
5921
student.response = studentResponse;
6022
return student;
@@ -71,7 +33,7 @@ public Subject subjectWithoutObservations() {
7133
// subject.setFirstName(MapUtil.getString(DemandNameField, response));
7234
// subject.setVoided(MapUtil.getBoolean(DemandIsVoidedField, response));
7335
// String[] arrayOfTCs = MapUtil.getString(DemandTargetCommunity, response) != null ? MapUtil.getString(DemandTargetCommunity, response).split(";") : null;
74-
// subject.addObservation("Target Community", arrayOfTCs);
36+
// subject.("Target Community", arrayOfTCs);
7537
// subject.addObservation("Type of Disaster", demandDto.getTypeOfDisaster());
7638
// subject.addObservation("Number of people", this.getNumberOfPeople());
7739
// subject.addObservation("Account Name", this.getAccountName());

0 commit comments

Comments
 (0)