Skip to content

Commit

Permalink
4.8.19 dev (sunbird-cb#177)
Browse files Browse the repository at this point in the history 
* 4.8.19 fix org designation (sunbird-cb#173)

* Cbrelease 4.8.18 (sunbird-cb#171)

* 4.8.18 dev v5 (sunbird-cb#146)

* commiting for file uploading and downloading cios logs (sunbird-cb#142)

* commiting for file uploading and downloading cios logs

* commiting for deleting temp file directly in download api.

* "Resolved Security Hotspots by adding proper logging" (sunbird-cb#145)

* "Resolved Security Hotspots by adding proper logging"

* "Resolved bugs raised by SonarQube"

* "Resolved bugs raised by SonarQube"

---------

Co-authored-by: pathiktarento1089 <123535830+pathiktarento1089@users.noreply.github.com>
Co-authored-by: vikrantbipin <118338417+vikrantbipin@users.noreply.github.com>

* 4.8.18 merged (sunbird-cb#148)

* 4.8.17 dev v5 (sunbird-cb#44)

* KB-6678 - if assessment is submitted without selecting any option then same questions are repeating in each attempt (in question weightage)

1. Getting NaN if both correct and incorrect are 0 , So added a check.

* added api for to show V6 competencies (sunbird-cb#40)

* added api for to show V6 competencies

* worked on code review comments

* worked on code review comments

* Update application.properties removed spaces between the values

---------

Co-authored-by: anilkumar <anilkumar.kammlapalli@tarento.com>

---------

Co-authored-by: SaipradeepR <53404427+SaipradeepR@users.noreply.github.com>
Co-authored-by: tarentomaheshvakkund <139739142+tarentomaheshvakkund@users.noreply.github.com>
Co-authored-by: anilkumarkammalapalli <121931293+anilkumarkammalapalli@users.noreply.github.com>
Co-authored-by: anilkumar <anilkumar.kammlapalli@tarento.com>

* public link generation and calling email sending api

* public link generation and calling email sending api (sunbird-cb#112)

* convertToPng code added

* png and email encryption method added (sunbird-cb#114)

* public link generation and calling email sending api

* convertToPng code added

* pull from upstream

* Cbrelease 4.8.17 (sunbird-cb#115)

* public link generation and calling email sending api

* convertToPng code added

* pull from upstream

* svg issue resolved

* svg issue resolved (sunbird-cb#118)

* public link generation and calling email sending api

* convertToPng code added

* pull from upstream

* svg issue resolved

* 4.8.17 report fix (sunbird-cb#107)

* Adding impl for report download (sunbird-cb#101)

* 4.8.17 mdo report fix (sunbird-cb#105)

* Adding impl for report download

* Adding impl for report download

* Adding impl for report download (sunbird-cb#106)

* upload issue resolved

* Cbrelease 4.8.17 (sunbird-cb#119)

* public link generation and calling email sending api

* convertToPng code added

* pull from upstream

* svg issue resolved

* upload issue resolved

* certificateId hardCode removed

* CertificateId hard code removed (sunbird-cb#120)

* public link generation and calling email sending api

* convertToPng code added

* pull from upstream

* svg issue resolved

* upload issue resolved

* certificateId hardCode removed

* producer code added

* producer code added

* MAde the impl changes for pdf generator (sunbird-cb#122)

* Remove unused impl and adding null check (sunbird-cb#123)

* Remove unused impl and update the check (sunbird-cb#124)

* Remove unused impl (sunbird-cb#125)

* Update the property (sunbird-cb#126)

* Adding the impl changes for pdf issue (sunbird-cb#127)

* Added the check for the kafka event process

* Integerating content progress update along with assessment submit API - KAR-788 (sunbird-cb#129) (sunbird-cb#133)

Co-authored-by: sreerag-tarento <sreerag.sajeesh@tarento.com>

* Integerating content progress API with all v4,v5 & v6 version of assessment submit API - KAR-788 (sunbird-cb#135) (sunbird-cb#139)

* Integerating content progress update along with assessment submit API - KAR-788

* Integerating content progress APi with all v4,v5 & v6 version of assessment submit API

Co-authored-by: sreerag-tarento <sreerag.sajeesh@tarento.com>

* Fixed build issues

* Creating v2 API to fetch l1, l2 child from postgres (sunbird-cb#147)

---------

Co-authored-by: Karthikeyan Rajendran <70887864+karthik-tarento@users.noreply.github.com>
Co-authored-by: SaipradeepR <53404427+SaipradeepR@users.noreply.github.com>
Co-authored-by: tarentomaheshvakkund <139739142+tarentomaheshvakkund@users.noreply.github.com>
Co-authored-by: anilkumarkammalapalli <121931293+anilkumarkammalapalli@users.noreply.github.com>
Co-authored-by: anilkumar <anilkumar.kammlapalli@tarento.com>
Co-authored-by: arpithasureshappa <arpitha.sureshappa@tarento.com>
Co-authored-by: Sharath Prasad <sharaths.kashyap@gmail.com>
Co-authored-by: sreerag-tarento <sreerag.sajeesh@tarento.com>
Co-authored-by: karthik-tarento <karthikeyan.rajendran@tarento.com>

* For ticket https://karmayogibharat.atlassian.net/browse/KAR-818 (sunbird-cb#149)

* 4.8.18 merged v1 (sunbird-cb#151)

* 4.8.17 dev v5 (sunbird-cb#44)

* KB-6678 - if assessment is submitted without selecting any option then same questions are repeating in each attempt (in question weightage)

1. Getting NaN if both correct and incorrect are 0 , So added a check.

* added api for to show V6 competencies (sunbird-cb#40)

* added api for to show V6 competencies

* worked on code review comments

* worked on code review comments

* Update application.properties removed spaces between the values

---------

Co-authored-by: anilkumar <anilkumar.kammlapalli@tarento.com>

---------

Co-authored-by: SaipradeepR <53404427+SaipradeepR@users.noreply.github.com>
Co-authored-by: tarentomaheshvakkund <139739142+tarentomaheshvakkund@users.noreply.github.com>
Co-authored-by: anilkumarkammalapalli <121931293+anilkumarkammalapalli@users.noreply.github.com>
Co-authored-by: anilkumar <anilkumar.kammlapalli@tarento.com>

* public link generation and calling email sending api

* public link generation and calling email sending api (sunbird-cb#112)

* convertToPng code added

* png and email encryption method added (sunbird-cb#114)

* public link generation and calling email sending api

* convertToPng code added

* pull from upstream

* Cbrelease 4.8.17 (sunbird-cb#115)

* public link generation and calling email sending api

* convertToPng code added

* pull from upstream

* svg issue resolved

* svg issue resolved (sunbird-cb#118)

* public link generation and calling email sending api

* convertToPng code added

* pull from upstream

* svg issue resolved

* 4.8.17 report fix (sunbird-cb#107)

* Adding impl for report download (sunbird-cb#101)

* 4.8.17 mdo report fix (sunbird-cb#105)

* Adding impl for report download

* Adding impl for report download

* Adding impl for report download (sunbird-cb#106)

* upload issue resolved

* Cbrelease 4.8.17 (sunbird-cb#119)

* public link generation and calling email sending api

* convertToPng code added

* pull from upstream

* svg issue resolved

* upload issue resolved

* certificateId hardCode removed

* CertificateId hard code removed (sunbird-cb#120)

* public link generation and calling email sending api

* convertToPng code added

* pull from upstream

* svg issue resolved

* upload issue resolved

* certificateId hardCode removed

* producer code added

* producer code added

* MAde the impl changes for pdf generator (sunbird-cb#122)

* Remove unused impl and adding null check (sunbird-cb#123)

* Remove unused impl and update the check (sunbird-cb#124)

* Remove unused impl (sunbird-cb#125)

* Update the property (sunbird-cb#126)

* Adding the impl changes for pdf issue (sunbird-cb#127)

* Added the check for the kafka event process

* Integerating content progress update along with assessment submit API - KAR-788 (sunbird-cb#129) (sunbird-cb#133)

Co-authored-by: sreerag-tarento <sreerag.sajeesh@tarento.com>

* Integerating content progress API with all v4,v5 & v6 version of assessment submit API - KAR-788 (sunbird-cb#135) (sunbird-cb#139)

* Integerating content progress update along with assessment submit API - KAR-788

* Integerating content progress APi with all v4,v5 & v6 version of assessment submit API

Co-authored-by: sreerag-tarento <sreerag.sajeesh@tarento.com>

* Fixed build issues

* Creating v2 API to fetch l1, l2 child from postgres (sunbird-cb#147)

* Adding the check for childrenId's (sunbird-cb#150)

---------

Co-authored-by: Karthikeyan Rajendran <70887864+karthik-tarento@users.noreply.github.com>
Co-authored-by: SaipradeepR <53404427+SaipradeepR@users.noreply.github.com>
Co-authored-by: tarentomaheshvakkund <139739142+tarentomaheshvakkund@users.noreply.github.com>
Co-authored-by: anilkumarkammalapalli <121931293+anilkumarkammalapalli@users.noreply.github.com>
Co-authored-by: anilkumar <anilkumar.kammlapalli@tarento.com>
Co-authored-by: arpithasureshappa <arpitha.sureshappa@tarento.com>
Co-authored-by: Sharath Prasad <sharaths.kashyap@gmail.com>
Co-authored-by: sreerag-tarento <sreerag.sajeesh@tarento.com>
Co-authored-by: karthik-tarento <karthikeyan.rajendran@tarento.com>

* 4.8.18 fix bulk upload (sunbird-cb#153)

* Doing the impl changes for User Bulk Upload csv Impl

* Doing the impl changes for User Bulk Upload csv Impl

* Update HallOfFameServiceImpl.java

Added "XS" to National Learning Week

* 4.8.18 dev (sunbird-cb#155)

* "Public User Event Bulk Onboard Feature" (sunbird-cb#152)

* "Public user event bulk onboard - Bug Fix" (sunbird-cb#154)

* "Public user event bulk onboard - Bug Fix"

* Review changes

---------

Co-authored-by: vikrantbipin <118338417+vikrantbipin@users.noreply.github.com>
Co-authored-by: sreerag-tarento <sreerag.sajeesh@tarento.com>

* Added default status,progress and comletion percentage for public event bulk onboard (sunbird-cb#156)

* "Public User Event Bulk Onboard Feature"

* "Public User Event Bulk Onboard Feature-bug fix"

* "Added default status,progress and comletion percentage for public event bulk onboard"

* "Added default status,progress and comletion percentage for public event bulk onboard"

* PublicUserEventBulkOnboard: Added claim event karma points, fixed bugs and enhanced code (sunbird-cb#157)

* "Public User Event Bulk Onboard Feature"

* "Public User Event Bulk Onboard Feature-bug fix"

* "Added default status,progress and comletion percentage for public event bulk onboard"

* "Added default status,progress and comletion percentage for public event bulk onboard"

* "PublicUserEventBulkOnboard:Added claim event karma points, fixed bugs and enhanced code"

* "Commented karma points event triggering because  Karma points are generated inside event-cert generator flink job"

* Claim karma point event and corrected ets time (sunbird-cb#158)

* "Public User Event Bulk Onboard Feature"

* "Public User Event Bulk Onboard Feature-bug fix"

* "Added default status,progress and comletion percentage for public event bulk onboard"

* "Added default status,progress and comletion percentage for public event bulk onboard"

* "PublicUserEventBulkOnboard:Added claim event karma points, fixed bugs and enhanced code"

* "Commented karma points event triggering because  Karma points are generated inside event-cert generator flink job"

* "Claim karma point event and corrected ets time"

* LearnerLeaderBoard API returning empty when no data instead of not-found (sunbird-cb#159)

* added lrc_progressdetails for offline event enrolment (sunbird-cb#160)

* "Public User Event Bulk Onboard Feature"

* "Public User Event Bulk Onboard Feature-bug fix"

* "Added default status,progress and comletion percentage for public event bulk onboard"

* "Added default status,progress and comletion percentage for public event bulk onboard"

* "PublicUserEventBulkOnboard:Added claim event karma points, fixed bugs and enhanced code"

* "Commented karma points event triggering because  Karma points are generated inside event-cert generator flink job"

* "Claim karma point event and corrected ets time"

* "added lrc_progressdetails"

* Fixed class cast exception for event duration (sunbird-cb#162)

* "Public User Event Bulk Onboard Feature"

* "Public User Event Bulk Onboard Feature-bug fix"

* "Added default status,progress and comletion percentage for public event bulk onboard"

* "Added default status,progress and comletion percentage for public event bulk onboard"

* "PublicUserEventBulkOnboard:Added claim event karma points, fixed bugs and enhanced code"

* "Commented karma points event triggering because  Karma points are generated inside event-cert generator flink job"

* "Claim karma point event and corrected ets time"

* "added lrc_progressdetails"

* "Fixed class cast exception for event duration"

* Corrected karma point event format (sunbird-cb#163)

* "Public User Event Bulk Onboard Feature"

* "Public User Event Bulk Onboard Feature-bug fix"

* "Added default status,progress and comletion percentage for public event bulk onboard"

* "Added default status,progress and comletion percentage for public event bulk onboard"

* "PublicUserEventBulkOnboard:Added claim event karma points, fixed bugs and enhanced code"

* "Commented karma points event triggering because  Karma points are generated inside event-cert generator flink job"

* "Claim karma point event and corrected ets time"

* "added lrc_progressdetails"

* "Fixed class cast exception for event duration"

* "Corrected karma point event format"

* Added validation for invalid event details (sunbird-cb#165)

* "Public User Event Bulk Onboard Feature"

* "Public User Event Bulk Onboard Feature-bug fix"

* "Added default status,progress and comletion percentage for public event bulk onboard"

* "Added default status,progress and comletion percentage for public event bulk onboard"

* "PublicUserEventBulkOnboard:Added claim event karma points, fixed bugs and enhanced code"

* "Commented karma points event triggering because  Karma points are generated inside event-cert generator flink job"

* "Claim karma point event and corrected ets time"

* "added lrc_progressdetails"

* "Fixed class cast exception for event duration"

* "Corrected karma point event format"

* "Added validation for invalid event details"

* Added condition to update the existing enrollment and trigger the kafka event (sunbird-cb#166)

* "Public User Event Bulk Onboard Feature"

* "Public User Event Bulk Onboard Feature-bug fix"

* "Added default status,progress and comletion percentage for public event bulk onboard"

* "Added default status,progress and comletion percentage for public event bulk onboard"

* "PublicUserEventBulkOnboard:Added claim event karma points, fixed bugs and enhanced code"

* "Commented karma points event triggering because  Karma points are generated inside event-cert generator flink job"

* "Claim karma point event and corrected ets time"

* "added lrc_progressdetails"

* "Fixed class cast exception for event duration"

* "Corrected karma point event format"

* "Added validation for invalid event details"

* "Added condition to update the enrollment and trigger the kafka event"

* 4.8.18 dev v8 (sunbird-cb#169)

* Events to be generated based on the data recieved in CSV File. (sunbird-cb#161)

* LearnerLeaderBoard API returning empty when no data instead of not-found

* Events to be generated based on the data recieved in CSV File.

1. If the user have consumed the event more than 180 seconds we need to generate the event  for karma points and certificate generation.
2. Input would be csv file.

---------

Co-authored-by: karthik-tarento <karthikeyan.rajendran@tarento.com>

* worked on user event consumption (sunbird-cb#164)

* worked on user event consumption

* worked on code review comments

---------

Co-authored-by: anilkumar <anilkumar.kammlapalli@tarento.com>

* removed date from csv (sunbird-cb#168)

Co-authored-by: anilkumar <anilkumar.kammlapalli@tarento.com>

---------

Co-authored-by: tarentomaheshvakkund <139739142+tarentomaheshvakkund@users.noreply.github.com>
Co-authored-by: anilkumarkammalapalli <121931293+anilkumarkammalapalli@users.noreply.github.com>
Co-authored-by: anilkumar <anilkumar.kammlapalli@tarento.com>

* Added comments for user event enrolment updates

* User event enrolment: fixed typo in event message

* Fix for updating completedOn column value

* Created new APIs to fetch status of offline event bulkonboard and download the processed csv file (sunbird-cb#170)

* "Public User Event Bulk Onboard Feature"

* "Public User Event Bulk Onboard Feature-bug fix"

* "Added default status,progress and comletion percentage for public event bulk onboard"

* "Added default status,progress and comletion percentage for public event bulk onboard"

* "PublicUserEventBulkOnboard:Added claim event karma points, fixed bugs and enhanced code"

* "Commented karma points event triggering because  Karma points are generated inside event-cert generator flink job"

* "Claim karma point event and corrected ets time"

* "added lrc_progressdetails"

* "Fixed class cast exception for event duration"

* "Corrected karma point event format"

* "Added validation for invalid event details"

* "Added condition to update the enrollment and trigger the kafka event"

* "Created new APIs to fetch status of offline event bulkonboard and download the processed csv file"

* Updated logic for event cert generation script

* Handling invalid records

* Reading event duration from event_batch table

* Added max_size while updating record

* Handling completed user event enrolment in script

* Added condition to skip status 0

* Added parsing for edge cases

* Added API to update event enrolment status value

* Updated code to check issueCertificates

* Updated code to check issueCertificates

* Updated code to check issueCertificates

---------

Co-authored-by: Karthikeyan Rajendran <70887864+karthik-tarento@users.noreply.github.com>
Co-authored-by: pathiktarento1089 <123535830+pathiktarento1089@users.noreply.github.com>
Co-authored-by: vikrantbipin <118338417+vikrantbipin@users.noreply.github.com>
Co-authored-by: SaipradeepR <53404427+SaipradeepR@users.noreply.github.com>
Co-authored-by: tarentomaheshvakkund <139739142+tarentomaheshvakkund@users.noreply.github.com>
Co-authored-by: anilkumarkammalapalli <121931293+anilkumarkammalapalli@users.noreply.github.com>
Co-authored-by: anilkumar <anilkumar.kammlapalli@tarento.com>
Co-authored-by: arpithasureshappa <arpitha.sureshappa@tarento.com>
Co-authored-by: Sharath Prasad <sharaths.kashyap@gmail.com>
Co-authored-by: sreerag-tarento <sreerag.sajeesh@tarento.com>
Co-authored-by: karthik-tarento <karthikeyan.rajendran@tarento.com>
Co-authored-by: sureshece16 <80331286+sureshece16@users.noreply.github.com>

* Update the orgDesignation Bug Fixes

---------

Co-authored-by: Karthikeyan Rajendran <70887864+karthik-tarento@users.noreply.github.com>
Co-authored-by: pathiktarento1089 <123535830+pathiktarento1089@users.noreply.github.com>
Co-authored-by: vikrantbipin <118338417+vikrantbipin@users.noreply.github.com>
Co-authored-by: SaipradeepR <53404427+SaipradeepR@users.noreply.github.com>
Co-authored-by: tarentomaheshvakkund <139739142+tarentomaheshvakkund@users.noreply.github.com>
Co-authored-by: anilkumarkammalapalli <121931293+anilkumarkammalapalli@users.noreply.github.com>
Co-authored-by: anilkumar <anilkumar.kammlapalli@tarento.com>
Co-authored-by: arpithasureshappa <arpitha.sureshappa@tarento.com>
Co-authored-by: Sharath Prasad <sharaths.kashyap@gmail.com>
Co-authored-by: sreerag-tarento <sreerag.sajeesh@tarento.com>
Co-authored-by: karthik-tarento <karthikeyan.rajendran@tarento.com>
Co-authored-by: sureshece16 <80331286+sureshece16@users.noreply.github.com>

* Revert "4.8.19 fix org designation (sunbird-cb#173)" (sunbird-cb#174)

This reverts commit 40f54b0.

* 4.8.19 dev fix1 (sunbird-cb#175)

* Update the orgDesignation Bug Fixes

* Update the orgDesignation Bug Fixes

* Update the orgDesignation Bug Fixes (sunbird-cb#176)

---------

Co-authored-by: Karthikeyan Rajendran <70887864+karthik-tarento@users.noreply.github.com>
Co-authored-by: pathiktarento1089 <123535830+pathiktarento1089@users.noreply.github.com>
Co-authored-by: vikrantbipin <118338417+vikrantbipin@users.noreply.github.com>
Co-authored-by: SaipradeepR <53404427+SaipradeepR@users.noreply.github.com>
Co-authored-by: tarentomaheshvakkund <139739142+tarentomaheshvakkund@users.noreply.github.com>
Co-authored-by: anilkumarkammalapalli <121931293+anilkumarkammalapalli@users.noreply.github.com>
Co-authored-by: anilkumar <anilkumar.kammlapalli@tarento.com>
Co-authored-by: arpithasureshappa <arpitha.sureshappa@tarento.com>
Co-authored-by: Sharath Prasad <sharaths.kashyap@gmail.com>
Co-authored-by: sreerag-tarento <sreerag.sajeesh@tarento.com>
Co-authored-by: karthik-tarento <karthikeyan.rajendran@tarento.com>
Co-authored-by: sureshece16 <80331286+sureshece16@users.noreply.github.com>
  • Loading branch information
@Sahil-tarento @karthik-tarento
@pathiktarento1089 @vikrantbipin @SaipradeepR @tarentomaheshvakkund @anilkumarkammalapalli @ArpithaSureshappa @sharathkashyap @sreerag-tarento @sureshece16
13 people authored Nov 5, 2024
1 parent fdf23ee commit 71bfed4
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 28 deletions.
21 changes: 12 additions & 9 deletions src/main/java/org/sunbird/org/service/OrgDesignationCompetencyMappingServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -316,15 +316,18 @@ private void populateOrgDesignationMaster(Sheet sheet, String frameworkId) throw
private List<String> getOrgAddedDesignation(List<Map<String, Object>> getAllDesignationForOrg) {
List<String> designation = new ArrayList<>();
if (CollectionUtils.isNotEmpty(getAllDesignationForOrg)) {
Map<String, Object> designationFrameworkObject = getAllDesignationForOrg.stream().filter(n -> ((String) (n.get("code")))
.equalsIgnoreCase(Constants.DESIGNATION)).findFirst().orElse(null);
if (MapUtils.isNotEmpty(designationFrameworkObject)) {
List<Map<String, Object>> designationFrameworkTerms = (List<Map<String, Object>>) designationFrameworkObject.get("terms");
if (CollectionUtils.isNotEmpty(designationFrameworkTerms)) {
designation = designationFrameworkTerms.stream()
.map(map -> (String) map.get(Constants.NAME))
.distinct() // Ensure unique values
.collect(Collectors.toList());
Map<String, Object> orgFrameworkObject = getAllDesignationForOrg.stream().filter(n -> ((String) (n.get("code")))
.equalsIgnoreCase(Constants.ORG)).findFirst().orElse(null);
if (MapUtils.isNotEmpty(orgFrameworkObject)) {
List<Map<String, Object>> orgFrameworkTerms = (List<Map<String, Object>>) orgFrameworkObject.get("terms");
if (CollectionUtils.isNotEmpty(orgFrameworkTerms)) {
List<Map<String, Object>> designationAssociation = (List<Map<String, Object>>) orgFrameworkTerms.get(0).get(Constants.ASSOCIATIONS);
if (CollectionUtils.isNotEmpty(designationAssociation)) {
designation = designationAssociation.stream()
.map(map -> (String) map.get(Constants.NAME))
.distinct() // Ensure unique values
.collect(Collectors.toList());
}
}
}
}
Expand Down
44 changes: 25 additions & 19 deletions src/main/java/org/sunbird/org/service/OrgDesignationMappingServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,14 @@ private void processBulkUpload(HashMap<String, String> inputDataMap) throws IOEx
if (CollectionUtils.isNotEmpty(orgDesignation) && orgDesignation.contains(designation)) {
if (CollectionUtils.isNotEmpty(orgFrameworkTerms)) {
List<Map<String, Object>> associations = (List<Map<String, Object>>) orgFrameworkTerms.get(0).get(Constants.ASSOCIATIONS);
if (CollectionUtils.isNotEmpty(associations)) {
if (CollectionUtils.isEmpty(associations)) { // For the first association Object addition
Map<String, Object> designationObject = getDesignationObject(getAllDesignationForOrg, designation);
if (MapUtils.isNotEmpty(designationObject)) {
associationIdentifier = (String) designationObject.get(Constants.IDENTIFIER);
} else {
invalidErrList.add("Issue while adding the designation for org");
}
} else {
boolean isDesignationAssociationsPresent = associations.stream().anyMatch(n -> ((String) n.get(Constants.NAME)).equalsIgnoreCase(designation));
if (isDesignationAssociationsPresent) {
invalidErrList.add("Already designation: " + designation + "is mapped for org");
Expand Down Expand Up @@ -700,7 +707,6 @@ private void processBulkUpload(HashMap<String, String> inputDataMap) throws IOEx
Map<String, Object> orgFrameworkTerm = orgFrameworkTerms.stream().filter(n -> ((String) n.get(Constants.STATUS)).equalsIgnoreCase(Constants.LIVE)).findFirst().map(HashMap::new).orElse(null);
if (MapUtils.isNotEmpty(orgFrameworkTerm)) {
designationMappingInfoMap.put(Constants.ORGANISATION, orgFrameworkTerm);

} else {
invalidErrList.add("The issue while fetching the framework term for the org which is active.");
}
Expand Down Expand Up @@ -812,25 +818,25 @@ private void addUpdateDesignationMapping(String frameworkId, Map<String, Object>
List<Map<String, Object>> associationsMap = (List<Map<String, Object>>) terms.get(Constants.ASSOCIATIONS);
if (CollectionUtils.isNotEmpty(associationsMap)) {
associations.addAll(associationsMap.stream().map(n -> (String) n.get(Constants.IDENTIFIER)).collect(Collectors.toList()));
associations.addAll(nodeId);
List<Map<String, Object>> createDesignationObject = new ArrayList<>();
for (String association : associations) {
Map<String, Object> nodeIdMap = new HashMap<>();
nodeIdMap.put(Constants.IDENTIFIER, association);
createDesignationObject.add(nodeIdMap);
}
logger.info("The associated size need to be updated: " + associations.size());
Map<String, Object> frameworkAssociationUpdateForOrg = updateFrameworkTerm(frameworkId, updateRequestObject(createDesignationObject), Constants.ORG, (String) terms.get(Constants.CODE));
if (MapUtils.isNotEmpty(frameworkAssociationUpdateForOrg)) {
Map<String, Object> result = publishFramework(frameworkId, new HashMap<>(), orgId);
if (MapUtils.isNotEmpty(result)) {
logger.info("Publish is Success for frameworkId: " + frameworkId);
} else {
invalidErrList.add("Issue while publish the framework.");
}
}
associations.addAll(nodeId);
List<Map<String, Object>> createDesignationObject = new ArrayList<>();
for (String association : associations) {
Map<String, Object> nodeIdMap = new HashMap<>();
nodeIdMap.put(Constants.IDENTIFIER, association);
createDesignationObject.add(nodeIdMap);
}
logger.info("The associated size need to be updated: " + associations.size());
Map<String, Object> frameworkAssociationUpdateForOrg = updateFrameworkTerm(frameworkId, updateRequestObject(createDesignationObject), Constants.ORG, (String) terms.get(Constants.CODE));
if (MapUtils.isNotEmpty(frameworkAssociationUpdateForOrg)) {
Map<String, Object> result = publishFramework(frameworkId, new HashMap<>(), orgId);
if (MapUtils.isNotEmpty(result)) {
logger.info("Publish is Success for frameworkId: " + frameworkId);
} else {
invalidErrList.add("Issue while adding the associations to the framework for theme.");
invalidErrList.add("Issue while publish the framework.");
}
} else {
invalidErrList.add("Issue while adding the associations to the framework for theme.");
}
}
}
Expand Down

0 comments on commit 71bfed4

Please sign in to comment.