Skip to content

PII issues fixes with backward compatibility for booking service [MOSIP-44379] #1091

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
GOKULRAJ136 wants to merge 10 commits into
base: develop
Choose a base branch
from
Draft

PII issues fixes with backward compatibility for booking service [MOSIP-44379] #1091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1f8204d
PII Issue Fixes
GOKULRAJ136 Feb 20, 2026
4d44180
Updated user validation
GOKULRAJ136 Feb 23, 2026
173d77e
Revert "Updated user validation"
GOKULRAJ136 Feb 24, 2026
6c53d24
Backward Compatibility Changes
GOKULRAJ136 Feb 25, 2026
c14374f
Changing kernel versions
GOKULRAJ136 Feb 26, 2026
5bbaa39
Dual backward compatibility fixes
GOKULRAJ136 Mar 2, 2026
a22d9b7
Logger value masking
GOKULRAJ136 Mar 2, 2026
52bf984
Update BookingController.java
GOKULRAJ136 Mar 2, 2026
5d118e5
Fixed empty return value issues
GOKULRAJ136 Mar 3, 2026
14a3e5b
Core changes
GOKULRAJ136 Mar 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pre-registration-booking-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<io.micrometer.prometheus.version>1.4.2</io.micrometer.prometheus.version>
<pre.registration.core.version>1.2.1-SNAPSHOT</pre.registration.core.version>
<kernel.core.version>1.2.1-SNAPSHOT</kernel.core.version>
<kernel.bom.version>1.2.1-SNAPSHOT</kernel.bom.version>
<kernel.core.version>1.3.0</kernel.core.version>
<kernel.bom.version>1.3.0</kernel.bom.version>
<java.version>21</java.version>
<!-- Core -->
<spring.boot.version>3.2.3</spring.boot.version>
Expand Down
47 changes: 46 additions & 1 deletion ...rvice/src/main/java/io/mosip/preregistration/booking/service/util/BookingServiceUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.util.List;
import java.util.Map;
import java.util.TimeZone;
import java.util.UUID;

import jakarta.annotation.PostConstruct;

Expand Down Expand Up @@ -69,6 +70,7 @@
import io.mosip.preregistration.booking.exception.BookingPreIdNotFoundException;
import io.mosip.preregistration.booking.exception.BookingRegistrationCenterIdNotFoundException;
import io.mosip.preregistration.booking.exception.BookingTimeSlotNotSeletectedException;
import io.mosip.preregistration.booking.exception.AppointmentBookingFailedException;
import io.mosip.preregistration.booking.exception.DemographicGetStatusException;
import io.mosip.preregistration.booking.exception.InvalidDateTimeFormatException;
import io.mosip.preregistration.booking.exception.RecordNotFoundException;
Expand All @@ -81,12 +83,14 @@
import io.mosip.preregistration.core.common.dto.RequestWrapper;
import io.mosip.preregistration.core.common.dto.ResponseWrapper;
import io.mosip.preregistration.core.common.entity.RegistrationBookingEntity;
import io.mosip.preregistration.core.common.entity.UserDetails;
import io.mosip.preregistration.core.config.LoggerConfiguration;
import io.mosip.preregistration.core.exception.MasterDataNotAvailableException;
import io.mosip.preregistration.core.exception.NotificationException;
import io.mosip.preregistration.core.exception.RestCallException;
import io.mosip.preregistration.core.util.UUIDGeneratorUtil;
import io.mosip.preregistration.core.util.ValidationUtil;
import io.mosip.preregistration.core.common.service.UserDetailsService;

/**
* This class provides the utility methods for Booking application.
Expand All @@ -107,6 +111,9 @@ public class BookingServiceUtil {
@Autowired
private RestTemplate restTemplate;

@Autowired
private UserDetailsService userDetailsService;

/**
* Reference for ${regCenter.url} from property file
*/
Expand Down Expand Up @@ -140,6 +147,9 @@ public class BookingServiceUtil {
@Value("${mosip.notification.timezone}")
private String specificZoneId;

@Value("${mosip.prereg.pii.backward.compatibility}")
private boolean piiBackwardCompatibility;

/**
* ObjectMapper global object creation
*/
Expand Down Expand Up @@ -535,7 +545,8 @@ public RegistrationBookingEntity bookingEntitySetter(String preRegistrationId,
entity.setRegistrationCenterId(bookingRequestDTO.getRegistrationCenterId());
entity.setId(UUIDGeneratorUtil.generateId());
entity.setLangCode("12L");
entity.setCrBy(authUserDetails().getUserId());
String userId = authUserDetails().getUserId();
entity.setCrBy(resolveEffectiveCrBy(userId));
entity.setCrDate(DateUtils.parseDateToLocalDateTime(new Date()));
entity.setRegDate(LocalDate.parse(bookingRequestDTO.getRegDate()));
entity.setSlotFromTime(LocalTime.parse(bookingRequestDTO.getSlotFromTime()));
Expand All @@ -544,6 +555,39 @@ public RegistrationBookingEntity bookingEntitySetter(String preRegistrationId,
return entity;
}

private String resolveEffectiveCrBy(String userId) {
String maskedUserId = userDetailsService.maskIdentifier(userId);
try {
String effectiveCrBy = piiBackwardCompatibility
? userDetailsService.resolveCanonicalUserIdOrIdentifier(userId)
: userDetailsService.resolveCanonicalUserId(userId).orElseThrow(() ->
new AppointmentBookingFailedException(ErrorCodes.PRG_BOOK_RCI_005.getCode(),
ErrorMessages.APPOINTMENT_BOOKING_FAILED.getMessage()));

boolean canonicalApplied = effectiveCrBy != null && !effectiveCrBy.isBlank()
&& !effectiveCrBy.trim().equals(userId == null ? "" : userId.trim());

log.info("sessionId", "idType", "id",
"Resolved effective user id for booking write. maskedUserId=" + maskedUserId
+ ", canonicalApplied=" + canonicalApplied);
return effectiveCrBy;
} catch (AppointmentBookingFailedException ex) {
log.warn("sessionId", "idType", "id",
"Strict canonical resolution failed for booking user " + maskedUserId);
throw ex;
} catch (Exception ex) {
log.warn("sessionId", "idType", "id",
"Failed to resolve effective booking user id for " + maskedUserId);
if (piiBackwardCompatibility) {
log.warn("sessionId", "idType", "id",
"Falling back to raw identifier for booking due to backward-compatibility mode");
return userId;
}
throw new AppointmentBookingFailedException(ErrorCodes.PRG_BOOK_RCI_005.getCode(),
ErrorMessages.APPOINTMENT_BOOKING_FAILED.getMessage());
}
}

/**
*
* @param notificationDTO
Expand Down Expand Up @@ -734,3 +778,4 @@ public MainResponseDTO<String> getApplicationStatus(String applicationId) {
// }

}

1 change: 1 addition & 0 deletions pre-registration-booking-service/src/main/resources/bootstrap.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ server.port=9095
health.config.enabled=false
mosip.preregistration.booking.id.book=mosip.pre-registration.booking.book
mosip.id.preregistration.booking.book=mosip.pre-registration.booking.book
mosip.prereg.pii.backward.compatibility=false

#disabling health check so that client doesnt try to load properties from sprint config server every
# 5 minutes (should not be done in production)
Expand Down
66 changes: 57 additions & 9 deletions .../test/java/io/mosip/preregistration/booking/test/service/util/BookingServiceUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;

import io.mosip.preregistration.booking.exception.*;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
Expand All @@ -32,6 +34,7 @@
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContext;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.test.util.ReflectionTestUtils;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
Expand All @@ -51,15 +54,6 @@
import io.mosip.preregistration.booking.dto.RegistrationCenterResponseDto;
import io.mosip.preregistration.booking.dto.SlotDto;
import io.mosip.preregistration.booking.entity.AvailibityEntity;
import io.mosip.preregistration.booking.exception.AppointmentReBookingFailedException;
import io.mosip.preregistration.booking.exception.AvailablityNotFoundException;
import io.mosip.preregistration.booking.exception.BookingDateNotSeletectedException;
import io.mosip.preregistration.booking.exception.BookingPreIdNotFoundException;
import io.mosip.preregistration.booking.exception.BookingRegistrationCenterIdNotFoundException;
import io.mosip.preregistration.booking.exception.BookingTimeSlotNotSeletectedException;
import io.mosip.preregistration.booking.exception.InvalidDateTimeFormatException;
import io.mosip.preregistration.booking.exception.RecordNotFoundException;
import io.mosip.preregistration.booking.exception.TimeSpanException;
import io.mosip.preregistration.booking.repository.BookingAvailabilityRepository;
import io.mosip.preregistration.booking.repository.RegistrationBookingRepository;
import io.mosip.preregistration.booking.repository.impl.BookingDAO;
Expand All @@ -68,6 +62,8 @@
import io.mosip.preregistration.core.common.dto.MainRequestDTO;
import io.mosip.preregistration.core.common.dto.NotificationDTO;
import io.mosip.preregistration.core.common.dto.ResponseWrapper;
import io.mosip.preregistration.core.common.entity.RegistrationBookingEntity;
import io.mosip.preregistration.core.common.service.UserDetailsService;
import io.mosip.preregistration.core.exception.MasterDataNotAvailableException;
import io.mosip.preregistration.core.exception.RestCallException;
import io.mosip.preregistration.core.util.RequestValidator;
Expand Down Expand Up @@ -97,6 +93,9 @@ public class BookingServiceUtilTest {
@MockBean
private BookingDAO bookingDAO;

@MockBean
private UserDetailsService userDetailsService;

@Mock
private AuthUserDetails authUserDetails;

Expand Down Expand Up @@ -139,6 +138,13 @@ public void setup() throws Exception {
Mockito.when(securityContext.getAuthentication()).thenReturn(authentication);
SecurityContextHolder.setContext(securityContext);
Mockito.when(SecurityContextHolder.getContext().getAuthentication().getPrincipal()).thenReturn(applicationUser);
Mockito.when(applicationUser.getUserId()).thenReturn("test-user");
Mockito.when(userDetailsService.resolveCanonicalUserId("test-user"))
.thenReturn(Optional.of("00000000-0000-0000-0000-000000000001"));
Mockito.when(userDetailsService.resolveCanonicalUserIdOrIdentifier("test-user"))
.thenReturn("00000000-0000-0000-0000-000000000001");
Mockito.when(userDetailsService.maskIdentifier(Mockito.anyString()))
.thenAnswer(invocation -> invocation.getArgument(0));
centerDto.setId("10001");
centerDto.setLangCode("eng");
centerDto.setCenterStartTime(startTime);
Expand Down Expand Up @@ -568,6 +574,46 @@ public void emailNotificationTest() throws JsonProcessingException {

@Test
public void bookingEntitySetterTest() {
ReflectionTestUtils.setField(serviceUtil, "piiBackwardCompatibility", false);
BookingRequestDTO bookingRequestDTO = new BookingRequestDTO();
bookingRequestDTO.setRegistrationCenterId("1");
bookingRequestDTO.setSlotFromTime("09:00");
bookingRequestDTO.setSlotToTime("09:13");
bookingRequestDTO.setRegDate("2018-12-06");
serviceUtil.bookingEntitySetter("1234568687844744", bookingRequestDTO);
}

@Test
public void bookingEntitySetterLegacyCrByTest() {
ReflectionTestUtils.setField(serviceUtil, "piiBackwardCompatibility", false);
BookingRequestDTO bookingRequestDTO = new BookingRequestDTO();
bookingRequestDTO.setRegistrationCenterId("1");
bookingRequestDTO.setSlotFromTime("09:00");
bookingRequestDTO.setSlotToTime("09:13");
bookingRequestDTO.setRegDate("2018-12-06");
RegistrationBookingEntity entity = serviceUtil.bookingEntitySetter("1234568687844744", bookingRequestDTO);
assertEquals("00000000-0000-0000-0000-000000000001", entity.getCrBy());
}

@Test
public void bookingEntitySetterCanonicalFallbackToRawTest() {
ReflectionTestUtils.setField(serviceUtil, "piiBackwardCompatibility", true);
Mockito.when(userDetailsService.resolveCanonicalUserIdOrIdentifier("test-user"))
.thenReturn("test-user");
BookingRequestDTO bookingRequestDTO = new BookingRequestDTO();
bookingRequestDTO.setRegistrationCenterId("1");
bookingRequestDTO.setSlotFromTime("09:00");
bookingRequestDTO.setSlotToTime("09:13");
bookingRequestDTO.setRegDate("2018-12-06");
RegistrationBookingEntity entity = serviceUtil.bookingEntitySetter("1234568687844744", bookingRequestDTO);
assertEquals("test-user", entity.getCrBy());
}

@Test(expected = AppointmentBookingFailedException.class)
public void bookingEntitySetterStrictModeNoRawFallbackTest() {
ReflectionTestUtils.setField(serviceUtil, "piiBackwardCompatibility", false);
Mockito.when(userDetailsService.resolveCanonicalUserId("test-user"))
.thenReturn(Optional.empty());
BookingRequestDTO bookingRequestDTO = new BookingRequestDTO();
bookingRequestDTO.setRegistrationCenterId("1");
bookingRequestDTO.setSlotFromTime("09:00");
Expand Down Expand Up @@ -646,3 +692,5 @@ public void timeSpanCheckForRebook1() {
}

}


1 change: 1 addition & 0 deletions pre-registration-booking-service/src/test/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ preregistration.rebook.timespan = 24
preregistration.cancel.timespan = 24
preregistration.timespan.cancel=24
preregistration.timespan.rebook=24
mosip.prereg.pii.backward.compatibility=false

service.version=v1.0
master.service.env=masterdata
Expand Down
Loading