Skip to content

Commit 8849933

Browse files
ckm007ckm007
authored
Merge pull request #1177 from GOKULRAJ136/DSL-144
Null checks for RegistrationCenter in update machine API [MOSIP-29696]
2 parents cce22ba + f0c36ab commit 8849933

File tree

2 files changed

+43
-29
lines changed

2 files changed

+43
-29
lines changed

‎admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/constant/DeviceErrorCode.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ public enum DeviceErrorCode {
3333
INVALID_DEVICE_ZONE("KER-MSD-439", "Admin not authorized to access this Device for this Zone"),
3434
DECOMMISSIONED("KER-MSD-DDD", "Device has been already decommissioned or Device not found"),
3535
INVALID_CENTER_ZONE("KER-MSD-219", "The zone of the registration center in the request does not match the zone of the device"),
36-
INVALID_CENTER("KER-MSD-222", "The registration center in the request is not present in db");
36+
INVALID_CENTER("KER-MSD-222", "The registration center in the request is not present in db"),
37+
NO_REG_CENTER_FOUND("KER-MSD-444", "Registration Center cannot be empty or null");
3738

3839
private final String errorCode;
3940
private final String errorMessage;

‎admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/service/impl/MachineServiceImpl.java

Lines changed: 41 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,5 @@
11
package io.mosip.kernel.masterdata.service.impl;
22

3-
import java.time.LocalDateTime;
4-
import java.time.ZoneId;
5-
import java.util.ArrayList;
6-
import java.util.Arrays;
7-
import java.util.Collections;
8-
import java.util.List;
9-
import java.util.Objects;
10-
import java.util.Optional;
11-
import java.util.stream.Collectors;
12-
13-
import io.mosip.kernel.masterdata.dto.response.*;
14-
import io.mosip.kernel.masterdata.utils.*;
15-
import org.springframework.beans.factory.annotation.Autowired;
16-
import org.springframework.beans.factory.annotation.Value;
17-
import org.springframework.dao.DataAccessException;
18-
import org.springframework.data.domain.Page;
19-
import org.springframework.data.domain.PageRequest;
20-
import org.springframework.data.domain.Sort;
21-
import org.springframework.data.domain.Sort.Direction;
22-
import org.springframework.stereotype.Service;
23-
import org.springframework.transaction.annotation.Transactional;
24-
253
import io.mosip.kernel.core.dataaccess.exception.DataAccessLayerException;
264
import io.mosip.kernel.core.util.CryptoUtil;
275
import io.mosip.kernel.core.util.StringUtils;
@@ -46,6 +24,11 @@
4624
import io.mosip.kernel.masterdata.dto.request.SearchDto;
4725
import io.mosip.kernel.masterdata.dto.request.SearchFilter;
4826
import io.mosip.kernel.masterdata.dto.request.SearchSort;
27+
import io.mosip.kernel.masterdata.dto.response.MachineSearchDto;
28+
import io.mosip.kernel.masterdata.dto.response.PageResponseDto;
29+
import io.mosip.kernel.masterdata.dto.response.FilterResponseCodeDto;
30+
import io.mosip.kernel.masterdata.dto.response.ColumnCodeValue;
31+
import io.mosip.kernel.masterdata.dto.response.FilterResult;
4932
import io.mosip.kernel.masterdata.entity.Machine;
5033
import io.mosip.kernel.masterdata.entity.MachineHistory;
5134
import io.mosip.kernel.masterdata.entity.MachineSpecification;
@@ -62,9 +45,41 @@
6245
import io.mosip.kernel.masterdata.repository.RegistrationCenterRepository;
6346
import io.mosip.kernel.masterdata.service.MachineHistoryService;
6447
import io.mosip.kernel.masterdata.service.MachineService;
48+
import io.mosip.kernel.masterdata.utils.AuditUtil;
49+
import io.mosip.kernel.masterdata.utils.ZoneUtils;
50+
import io.mosip.kernel.masterdata.utils.PageUtils;
51+
import io.mosip.kernel.masterdata.utils.MachineUtil;
52+
import io.mosip.kernel.masterdata.utils.LanguageUtils;
53+
import io.mosip.kernel.masterdata.utils.ExceptionUtils;
54+
import io.mosip.kernel.masterdata.utils.MapperUtils;
55+
import io.mosip.kernel.masterdata.utils.MetaDataUtils;
56+
import io.mosip.kernel.masterdata.utils.OptionalFilter;
57+
import io.mosip.kernel.masterdata.utils.MasterdataSearchHelper;
58+
import io.mosip.kernel.masterdata.utils.MasterDataFilterHelper;
59+
import io.mosip.kernel.masterdata.utils.MasterdataCreationUtil;
60+
import io.mosip.kernel.masterdata.utils.RegistrationCenterValidator;
61+
import io.mosip.kernel.masterdata.utils.RegistrationCenterServiceHelper;
6562
import io.mosip.kernel.masterdata.validator.FilterColumnValidator;
6663
import io.mosip.kernel.masterdata.validator.FilterTypeEnum;
6764
import io.mosip.kernel.masterdata.validator.FilterTypeValidator;
65+
import org.springframework.beans.factory.annotation.Autowired;
66+
import org.springframework.dao.DataAccessException;
67+
import org.springframework.data.domain.Page;
68+
import org.springframework.data.domain.PageRequest;
69+
import org.springframework.data.domain.Sort;
70+
import org.springframework.data.domain.Sort.Direction;
71+
import org.springframework.stereotype.Service;
72+
import org.springframework.transaction.annotation.Transactional;
73+
74+
import java.time.LocalDateTime;
75+
import java.time.ZoneId;
76+
import java.util.Arrays;
77+
import java.util.ArrayList;
78+
import java.util.Collections;
79+
import java.util.List;
80+
import java.util.Optional;
81+
import java.util.Objects;
82+
import java.util.stream.Collectors;
6883

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

785800
private void validateRegistrationCenter(String regCenterId) {
786801
if(regCenterId == null || regCenterId.isEmpty())
787-
throw new RequestException(DeviceErrorCode.INVALID_CENTER.getErrorCode(),
788-
DeviceErrorCode.INVALID_CENTER.getErrorMessage());
802+
throw new RequestException(DeviceErrorCode.NO_REG_CENTER_FOUND.getErrorCode(),
803+
DeviceErrorCode.NO_REG_CENTER_FOUND.getErrorMessage());
789804

790805
List<RegistrationCenter> centers=regCenterRepository.findByIdAndIsDeletedFalseOrNull(regCenterId);
791806
if(centers==null ||centers.isEmpty()) {
@@ -814,11 +829,9 @@ public MachineExtnDto updateMachine(MachinePutReqDto machinePutReqDto) {
814829
// call method to check the machineZone will come under Accessed user zone or
815830
// not
816831
validateZone(machineZone, null);
832+
validateRegistrationCenter(machinePutReqDto.getRegCenterId());
833+
regCenterServiceHelper.validateRegistrationCenterZone(machineZone,machinePutReqDto.getRegCenterId());
817834
try {
818-
if(machinePutReqDto.getRegCenterId() != null && !machinePutReqDto.getRegCenterId().isEmpty()) {
819-
validateRegistrationCenter(machinePutReqDto.getRegCenterId());
820-
regCenterServiceHelper.validateRegistrationCenterZone(machineZone,machinePutReqDto.getRegCenterId());
821-
}
822835
// find requested machine is there or not in Machine Table
823836
List<Machine> renMachine = machineRepository.findMachineById(machinePutReqDto.getId());
824837
if(renMachine == null) {

0 commit comments

Comments
 (0)