Skip to content
GitLab
Unverified Commit d6fc020c authored by Nivetha-M's avatar Nivetha-M Committed by GitHub
Browse files

Org bulk upload- subtype fix (#1083) 


Co-authored-by: default avatarnivetha <nivetha.mariappan@tarento.com>
parent 5fee30b8
release-4.9.0 release-4.9.0_RC3 release-4.9.0_RC2
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 6 additions and 2 deletions
+6 -2
service/src/main/java/org/sunbird/actor/bulkupload/OrgBulkUploadBackgroundJobActor.java
+ 6
− 2
View file @ d6fc020c
......@@ -202,7 +202,9 @@ public class OrgBulkUploadBackgroundJobActor extends BaseBulkUploadBackgroundJob
row.put(JsonKey.LOCATION_CODE, locationCodes);
String orgId;
row.put(JsonKey.ORG_TYPE, OrgTypeValidator.getInstance().getTypeByValue(org.getOrganisationType()));
row.put(JsonKey.ORG_SUB_TYPE, OrgTypeValidator.getInstance().getTypeByValue(org.getOrganisationSubType()));
if (org.getOrganisationSubType() != null) {
row.put(JsonKey.ORG_SUB_TYPE, OrgTypeValidator.getInstance().getTypeByValue(org.getOrganisationSubType()));
}
try {
orgId =
upsertOrg(
......@@ -242,7 +244,9 @@ public class OrgBulkUploadBackgroundJobActor extends BaseBulkUploadBackgroundJob
Map<String, Object> row = mapper.convertValue(org, Map.class);
row.put(JsonKey.LOCATION_CODE, locationCodes);
row.put(JsonKey.ORG_TYPE, OrgTypeValidator.getInstance().getTypeByValue(org.getOrganisationType()));
row.put(JsonKey.ORG_SUB_TYPE, OrgTypeValidator.getInstance().getTypeByValue(org.getOrganisationSubType()));
if (org.getOrganisationSubType() != null) {
row.put(JsonKey.ORG_SUB_TYPE, OrgTypeValidator.getInstance().getTypeByValue(org.getOrganisationSubType()));
}
try {
row.put(JsonKey.ORGANISATION_ID, org.getId());
upsertOrg(organisationManagementActor, row, ActorOperations.UPDATE_ORG.getValue(), context);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment