From d6fc020c78a511a985e6f51ca371ea84e2d3fa32 Mon Sep 17 00:00:00 2001
From: Nivetha-M <34033831+Nivetha-M@users.noreply.github.com>
Date: Tue, 14 Jun 2022 16:19:17 +0530
Subject: [PATCH] Org bulk upload- subtype fix (#1083)
Co-authored-by: nivetha <nivetha.mariappan@tarento.com>
---
.../actor/bulkupload/OrgBulkUploadBackgroundJobActor.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/service/src/main/java/org/sunbird/actor/bulkupload/OrgBulkUploadBackgroundJobActor.java b/service/src/main/java/org/sunbird/actor/bulkupload/OrgBulkUploadBackgroundJobActor.java
index 0848a0b92..77ca400a0 100644
--- a/service/src/main/java/org/sunbird/actor/bulkupload/OrgBulkUploadBackgroundJobActor.java
+++ b/service/src/main/java/org/sunbird/actor/bulkupload/OrgBulkUploadBackgroundJobActor.java
@@ -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);
--
GitLab