Skip to content

Null checks for RegistrationCenter in update machine API [MOSIP-29696] #1177

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

Merged
merged 1 commit into from
Feb 10, 2025
Merged

Null checks for RegistrationCenter in update machine API [MOSIP-29696] #1177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion ...masterdata-service/src/main/java/io/mosip/kernel/masterdata/constant/DeviceErrorCode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ public enum DeviceErrorCode {
INVALID_DEVICE_ZONE("KER-MSD-439", "Admin not authorized to access this Device for this Zone"),
DECOMMISSIONED("KER-MSD-DDD", "Device has been already decommissioned or Device not found"),
INVALID_CENTER_ZONE("KER-MSD-219", "The zone of the registration center in the request does not match the zone of the device"),
INVALID_CENTER("KER-MSD-222", "The registration center in the request is not present in db");
INVALID_CENTER("KER-MSD-222", "The registration center in the request is not present in db"),
NO_REG_CENTER_FOUND("KER-MSD-444", "Registration Center cannot be empty or null");

private final String errorCode;
private final String errorMessage;
Expand Down
69 changes: 41 additions & 28 deletions ...ata-service/src/main/java/io/mosip/kernel/masterdata/service/impl/MachineServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,5 @@
package io.mosip.kernel.masterdata.service.impl;

import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors;

import io.mosip.kernel.masterdata.dto.response.*;
import io.mosip.kernel.masterdata.utils.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.dao.DataAccessException;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Sort;
import org.springframework.data.domain.Sort.Direction;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import io.mosip.kernel.core.dataaccess.exception.DataAccessLayerException;
import io.mosip.kernel.core.util.CryptoUtil;
import io.mosip.kernel.core.util.StringUtils;
Expand All @@ -46,6 +24,11 @@
import io.mosip.kernel.masterdata.dto.request.SearchDto;
import io.mosip.kernel.masterdata.dto.request.SearchFilter;
import io.mosip.kernel.masterdata.dto.request.SearchSort;
import io.mosip.kernel.masterdata.dto.response.MachineSearchDto;
import io.mosip.kernel.masterdata.dto.response.PageResponseDto;
import io.mosip.kernel.masterdata.dto.response.FilterResponseCodeDto;
import io.mosip.kernel.masterdata.dto.response.ColumnCodeValue;
import io.mosip.kernel.masterdata.dto.response.FilterResult;
import io.mosip.kernel.masterdata.entity.Machine;
import io.mosip.kernel.masterdata.entity.MachineHistory;
import io.mosip.kernel.masterdata.entity.MachineSpecification;
Expand All @@ -62,9 +45,41 @@
import io.mosip.kernel.masterdata.repository.RegistrationCenterRepository;
import io.mosip.kernel.masterdata.service.MachineHistoryService;
import io.mosip.kernel.masterdata.service.MachineService;
import io.mosip.kernel.masterdata.utils.AuditUtil;
import io.mosip.kernel.masterdata.utils.ZoneUtils;
import io.mosip.kernel.masterdata.utils.PageUtils;
import io.mosip.kernel.masterdata.utils.MachineUtil;
import io.mosip.kernel.masterdata.utils.LanguageUtils;
import io.mosip.kernel.masterdata.utils.ExceptionUtils;
import io.mosip.kernel.masterdata.utils.MapperUtils;
import io.mosip.kernel.masterdata.utils.MetaDataUtils;
import io.mosip.kernel.masterdata.utils.OptionalFilter;
import io.mosip.kernel.masterdata.utils.MasterdataSearchHelper;
import io.mosip.kernel.masterdata.utils.MasterDataFilterHelper;
import io.mosip.kernel.masterdata.utils.MasterdataCreationUtil;
import io.mosip.kernel.masterdata.utils.RegistrationCenterValidator;
import io.mosip.kernel.masterdata.utils.RegistrationCenterServiceHelper;
import io.mosip.kernel.masterdata.validator.FilterColumnValidator;
import io.mosip.kernel.masterdata.validator.FilterTypeEnum;
import io.mosip.kernel.masterdata.validator.FilterTypeValidator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Sort;
import org.springframework.data.domain.Sort.Direction;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.Arrays;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.Objects;
import java.util.stream.Collectors;

/**
* This class have methods to fetch a Machine Details
Expand Down Expand Up @@ -784,8 +799,8 @@ private void validateZone(String machineZone,String langCode) {

private void validateRegistrationCenter(String regCenterId) {
if(regCenterId == null || regCenterId.isEmpty())
throw new RequestException(DeviceErrorCode.INVALID_CENTER.getErrorCode(),
DeviceErrorCode.INVALID_CENTER.getErrorMessage());
throw new RequestException(DeviceErrorCode.NO_REG_CENTER_FOUND.getErrorCode(),
DeviceErrorCode.NO_REG_CENTER_FOUND.getErrorMessage());

List<RegistrationCenter> centers=regCenterRepository.findByIdAndIsDeletedFalseOrNull(regCenterId);
if(centers==null ||centers.isEmpty()) {
Expand Down Expand Up @@ -814,11 +829,9 @@ public MachineExtnDto updateMachine(MachinePutReqDto machinePutReqDto) {
// call method to check the machineZone will come under Accessed user zone or
// not
validateZone(machineZone, null);
validateRegistrationCenter(machinePutReqDto.getRegCenterId());
regCenterServiceHelper.validateRegistrationCenterZone(machineZone,machinePutReqDto.getRegCenterId());
try {
if(machinePutReqDto.getRegCenterId() != null && !machinePutReqDto.getRegCenterId().isEmpty()) {
validateRegistrationCenter(machinePutReqDto.getRegCenterId());
regCenterServiceHelper.validateRegistrationCenterZone(machineZone,machinePutReqDto.getRegCenterId());
}
// find requested machine is there or not in Machine Table
List<Machine> renMachine = machineRepository.findMachineById(machinePutReqDto.getId());
if(renMachine == null) {
Expand Down