Hcm lts master flyway imageupdate (#1764)

* HLM 2.9lts updated flyway for health attendance * Update pom.xml * Updated CHANGELOG.md * Updated CHANGELOG.md, added flyway migration update changelog * HLM added first staff insert check to validate the attendee for hcm use case --------- Co-authored-by: kavi_elrey@1993 <[email protected]>
egovernments · Jul 9, 2024 · c20992b · c20992b
1 parent 30824c4
commit c20992b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/backend/attendance/CHANGELOG.md b/backend/attendance/CHANGELOG.md
@@ -5,7 +5,7 @@ All notable changes to this module will be documented in this file.
 
 - Added user Id list changes in Individual search
 - Upgraded PostgresSQL Driver version to 42.7.1
-- Upgraded Flyway base image version to 10.7.1 for DB Migration
+- Upgraded Flyway base image version to 10.7.1
 
 ## 1.0.1 - 2024-03-04
 

diff --git a/backend/attendance/src/main/java/org/egov/service/AttendeeService.java b/backend/attendance/src/main/java/org/egov/service/AttendeeService.java
@@ -58,10 +58,17 @@ public AttendeeCreateRequest createAttendee(AttendeeCreateRequest attendeeCreate
         log.info("validating create attendee request parameters");
         attendeeServiceValidator.validateAttendeeCreateRequestParameters(attendeeCreateRequest);
 
-        //validate whether attendees are project staff and whether attendees have the correct reporting staff
-        attendeeServiceValidator.validateAttendeeDetails(attendeeCreateRequest);
-        if(attendeeCreateRequest.getAttendees().isEmpty())
-            throw new CustomException("NO_VALID_ATTENDEES","No Valid attendees provided in this request.");
+        // Check if the configuration for "Register First Staff Insert" is disabled
+        if (!attendanceServiceConfiguration.getRegisterFirstStaffInsertEnabled()) {
+            // Validate whether the attendees are project staff and whether they have the correct reporting staff
+            attendeeServiceValidator.validateAttendeeDetails(attendeeCreateRequest);
+
+            // Check if the attendee list is empty after validation
+            if (attendeeCreateRequest.getAttendees().isEmpty()) {
+                // Throw a custom exception if no valid attendees are found in the request
+                throw new CustomException("NO_VALID_ATTENDEES", "No valid attendees provided in this request.");
+            }
+        }
 
         //extract registerIds and attendee IndividualIds from client request
         String tenantId = attendeeCreateRequest.getAttendees().get(0).getTenantId();