Skip to content

Commit

Permalink
fixed naming issue (#1130)
Browse files Browse the repository at this point in the history 
Signed-off-by: Ritik Jain <[email protected]>
Co-authored-by: Ritik Jain <[email protected]>
  • Loading branch information
@RitikJain4108
RitikJain4108 and Ritik Jain authored Nov 2, 2023
1 parent cf5306d commit c53e842
Show file tree
Hide file tree
Showing 7 changed files with 65 additions and 136 deletions.
4 changes: 2 additions & 2 deletions resident/resident-service/src/main/java/io/mosip/resident/constant/ResidentErrorCode.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ public enum ResidentErrorCode {
AUTH_TYPE_CALLBACK_NOT_AVAILABLE("RES-SER-443", "Callback url is not available for auth type: %s"),
RESIDENT_WEBSUB_UPDATE_AUTH_TYPE_FAILED("RES-SER-444", "Failed to update auth type status for resident"),
RESIDENT_AUTH_TXN_DETAILS_FAILURE("RES-SER-445", "Failed to retrieve auth transaction details"),
INVALID_PAGE_START_VALUE("RES-SER-446", "Invalid page start value"),
INVALID_PAGE_FETCH_VALUE("RES-SER-447", "Invalid page fetch value"),
INVALID_PAGE_INDEX_VALUE("RES-SER-446", "Invalid page index value"),
INVALID_PAGE_SIZE_VALUE("RES-SER-447", "Invalid page size value"),
PERPETUAL_VID_NOT_AVALIABLE("RES-SER-448", "Perpatual VID not available"),
AID_STATUS_IS_NOT_READY("RES-SER-449", "AID is not ready"),
BIOMETRIC_MISSING("RES-SER-450", "Biometric data is not available in database"),
Expand Down
12 changes: 6 additions & 6 deletions resident/resident-service/src/main/java/io/mosip/resident/controller/ResidentController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -372,8 +372,8 @@ public ResponseWrapper<EventStatusResponseDTO> checkEventIdStatus(@PathVariable(
@ApiResponse(responseCode = "403", description = "Forbidden", content = @Content(schema = @Schema(hidden = true))),
@ApiResponse(responseCode = "404", description = "Not Found", content = @Content(schema = @Schema(hidden = true))) })
public ResponseWrapper<PageDto<ServiceHistoryResponseDto>> getServiceHistory(@PathVariable("langCode") String langCode,
@RequestParam(name = "pageStart", required = false) Integer pageStart,
@RequestParam(name = "pageFetch", required = false) Integer pageFetch,
@RequestParam(name = "pageIndex", required = false) Integer pageIndex,
@RequestParam(name = "pageSize", required = false) Integer pageSize,
@RequestParam(name = "fromDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate fromDate,
@RequestParam(name = "toDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate toDate,
@RequestParam(name = "sortType", required = false) String sortType,
Expand All @@ -388,7 +388,7 @@ public ResponseWrapper<PageDto<ServiceHistoryResponseDto>> getServiceHistory(@Pa
ResponseWrapper<PageDto<ServiceHistoryResponseDto>> responseWrapper = new ResponseWrapper<>();
try {
validator.validateServiceHistoryRequest(fromDate, toDate, sortType, serviceType, statusFilter, langCode, searchText);
responseWrapper = residentService.getServiceHistory(pageStart, pageFetch, fromDate, toDate, serviceType,
responseWrapper = residentService.getServiceHistory(pageIndex, pageSize, fromDate, toDate, serviceType,
sortType, statusFilter, searchText, langCode, timeZoneOffset, locale,
RESIDENT_VIEW_HISTORY_DEFAULT_PAGE_SIZE, null);
} catch (InvalidInputException | ResidentServiceCheckedException e) {
Expand Down Expand Up @@ -669,8 +669,8 @@ public int bellupdateClickdttimes() throws ResidentServiceCheckedException, Apis
@ApiResponse(responseCode = "403", description = "Forbidden", content = @Content(schema = @Schema(hidden = true))),
@ApiResponse(responseCode = "404", description = "Not Found", content = @Content(schema = @Schema(hidden = true))) })
public ResponseWrapper<?> getNotificationsList(@PathVariable("langCode") String langCode,
@RequestParam(name = "pageStart", required = false) Integer pageStart,
@RequestParam(name = "pageFetch", required = false) Integer pageFetch,
@RequestParam(name = "pageIndex", required = false) Integer pageIndex,
@RequestParam(name = "pageSize", required = false) Integer pageSize,
@RequestHeader(name = "time-zone-offset", required = false, defaultValue = "0") int timeZoneOffset,
@RequestHeader(name = "locale", required = false) String locale)
throws ResidentServiceCheckedException, ApisResourceAccessException {
Expand All @@ -680,7 +680,7 @@ public ResponseWrapper<?> getNotificationsList(@PathVariable("langCode") String
try {
validator.validateLanguageCode(langCode);
id = identityServiceImpl.getResidentIdaToken();
notificationDtoList = residentService.getNotificationList(pageStart, pageFetch, id, langCode,
notificationDtoList = residentService.getNotificationList(pageIndex, pageSize, id, langCode,
timeZoneOffset, locale);
} catch (ResidentServiceCheckedException | ApisResourceAccessException | InvalidInputException e) {
audit.setAuditRequestDto(EventEnum.GET_NOTIFICATION_FAILURE);
Expand Down
18 changes: 9 additions & 9 deletions resident/resident-service/src/main/java/io/mosip/resident/dto/PageDto.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
*/

public class PageDto<T> {
private int pageNo;
private int pageIndex;
private int pageSize;
private long totalItems;
private int totalPages;
private List<T> data;

public int getPageNo() {
return this.pageNo;
public int getPageIndex() {
return this.pageIndex;
}

public int getPageSize() {
Expand All @@ -37,8 +37,8 @@ public List<T> getData() {
return this.data;
}

public void setPageNo(int pageNo) {
this.pageNo = pageNo;
public void setPageIndex(int pageIndex) {
this.pageIndex = pageIndex;
}

public void setPageSize(int pageSize) {
Expand All @@ -64,12 +64,12 @@ protected boolean canEqual(Object other) {
}

public String toString() {
int var10000 = this.getPageNo();
return "PageDto(pageNo=" + var10000 + ", pageSize=" + this.getPageSize() + ", " + ", totalItems=" + this.getTotalItems() + ", totalPages=" + this.getTotalPages() + ", data=" + this.getData() + ")";
int var10000 = this.getPageIndex();
return "PageDto(pageIndex=" + var10000 + ", pageSize=" + this.getPageSize() + ", " + ", totalItems=" + this.getTotalItems() + ", totalPages=" + this.getTotalPages() + ", data=" + this.getData() + ")";
}

public PageDto(int pageNo, int pageSize, long totalItems, int totalPages, List<T> data) {
this.pageNo = pageNo;
public PageDto(int pageIndex, int pageSize, long totalItems, int totalPages, List<T> data) {
this.pageIndex = pageIndex;
this.pageSize = pageSize;
this.totalItems = totalItems;
this.totalPages = totalPages;
Expand Down
4 changes: 2 additions & 2 deletions resident/resident-service/src/main/java/io/mosip/resident/service/ResidentService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public Tuple2<ResponseDTO, String> reqAauthTypeStatusUpdateV2(AuthLockOrUnLockRe

RegStatusCheckResponseDTO getRidStatus(String rid);

ResponseWrapper<PageDto<ServiceHistoryResponseDto>> getServiceHistory(Integer pageStart, Integer pageFetch,
ResponseWrapper<PageDto<ServiceHistoryResponseDto>> getServiceHistory(Integer pageIndex, Integer pageSize,
LocalDate fromDateTime, LocalDate toDateTime, String serviceType, String sortType,
String statusFilter, String searchText, String langCode, int timeZoneOffset, String locale) throws ResidentServiceCheckedException, ApisResourceAccessException;

Expand All @@ -77,7 +77,7 @@ ResponseWrapper<EventStatusResponseDTO> getEventStatus(String id, String eventId

int updatebellClickdttimes(String idaToken) throws ApisResourceAccessException, ResidentServiceCheckedException;

ResponseWrapper<PageDto<ServiceHistoryResponseDto>> getNotificationList(Integer pageStart, Integer pageFetch, String Id, String languageCode, int timeZoneOffset, String locale) throws ResidentServiceCheckedException, ApisResourceAccessException;
ResponseWrapper<PageDto<ServiceHistoryResponseDto>> getNotificationList(Integer pageIndex, Integer pageSize, String Id, String languageCode, int timeZoneOffset, String locale) throws ResidentServiceCheckedException, ApisResourceAccessException;

byte[] downLoadServiceHistory(ResponseWrapper<PageDto<ServiceHistoryResponseDto>> responseWrapper,
String languageCode, LocalDateTime eventReqDateTime, LocalDate fromDateTime, LocalDate toDateTime,
Expand Down
Loading

0 comments on commit c53e842

Please sign in to comment.