Skip to content

Commit

Permalink
Merge pull request #614 from Nikhil1Reddy/mydevelop4
Browse files Browse the repository at this point in the history
MOSIP-28140 save datashare token in toolkit db
  • Loading branch information
mayuradesh committed Jul 6, 2023
2 parents 69606b6 + 8435a1d commit 795b8c3
Show file tree
Hide file tree
Showing 5 changed files with 88 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,7 @@ public ResponseWrapper<String> saveDataShareToken(
@RequestBody RequestWrapper<DataShareSaveTokenRequest> requestWrapper, Errors errors) {
log.info("sessionId", "idType", "id", "In saveDataShareToken method of ABISDataShareController.");
log.info("Recvd request {}", requestWrapper);
ResponseWrapper<String> responseWrapper = new ResponseWrapper<>();
responseWrapper.setResponse("OK");
return responseWrapper;
return abisDataShareService.saveDataShareToken(requestWrapper);
}

@PostMapping(value = "/invalidateDataShareToken")
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package io.mosip.compliance.toolkit.entity;

import lombok.*;
import org.springframework.stereotype.Component;

import javax.persistence.*;

@Component
@Entity
@Table(name = "datashare_tokens", schema = "toolkit")
@Getter
@Setter
@NoArgsConstructor
@ToString
@IdClass(AbisDataShareTokenPK.class)
public class AbisDataShareTokenEntity {
@Id
@Column(name = "partner_id")
private String partnerId;
@Id
@Column(name = "testcase_id")
private String testCaseId;
@Id
@Column(name = "testrun_id")
private String testRunId;
@Column(name = "token")
private String token;
@Column(name = "result")
private String result = "";

public AbisDataShareTokenEntity(String partnerId, String ctkTestCaseId, String ctkTestRunId, String token) {
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package io.mosip.compliance.toolkit.entity;

import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.io.Serializable;

@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class AbisDataShareTokenPK implements Serializable {
private String partnerId;
private String testCaseId;
private String testRunId;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package io.mosip.compliance.toolkit.repository;

import io.mosip.compliance.toolkit.entity.AbisDataShareTokenEntity;
import io.mosip.kernel.core.dataaccess.spi.repository.BaseRepository;
import org.springframework.stereotype.Repository;

@Repository("AbisDataShareTokenRepository")
public interface AbisDataShareTokenRepository extends BaseRepository<AbisDataShareTokenEntity, String> {
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,14 @@
import java.io.InputStream;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Objects;

import io.mosip.compliance.toolkit.dto.abis.*;
import io.mosip.compliance.toolkit.entity.AbisDataShareTokenEntity;
import io.mosip.compliance.toolkit.repository.AbisDataShareTokenRepository;
import io.mosip.kernel.core.http.RequestWrapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.core.context.SecurityContextHolder;
Expand All @@ -18,10 +23,6 @@
import io.mosip.compliance.toolkit.constants.AppConstants;
import io.mosip.compliance.toolkit.constants.ProjectTypes;
import io.mosip.compliance.toolkit.constants.ToolkitErrorCodes;
import io.mosip.compliance.toolkit.dto.abis.DataShareExpireRequest;
import io.mosip.compliance.toolkit.dto.abis.DataShareRequestDto;
import io.mosip.compliance.toolkit.dto.abis.DataShareResponseDto;
import io.mosip.compliance.toolkit.dto.abis.DataShareResponseWrapperDto;
import io.mosip.compliance.toolkit.repository.BiometricTestDataRepository;
import io.mosip.compliance.toolkit.util.KeyManagerHelper;
import io.mosip.compliance.toolkit.util.ObjectMapperConfig;
Expand Down Expand Up @@ -54,6 +55,9 @@ public class ABISDataShareService {
@Autowired
BiometricTestDataRepository biometricTestDataRepository;

@Autowired
AbisDataShareTokenRepository abisDataShareTokenRepository;

@Autowired
TestCasesService testCasesService;

Expand Down Expand Up @@ -237,4 +241,23 @@ public ResponseWrapper<Boolean> expireDataShareUrl(DataShareExpireRequest reques
return responseWrapper;
}

public ResponseWrapper<String> saveDataShareToken(RequestWrapper<DataShareSaveTokenRequest> requestWrapper) {
ResponseWrapper<String> responseWrapper = new ResponseWrapper<>();
AbisDataShareTokenEntity abisDataShareTokenEntity = new AbisDataShareTokenEntity();
abisDataShareTokenEntity.setPartnerId(requestWrapper.getRequest().getPartnerId());
abisDataShareTokenEntity.setTestCaseId(requestWrapper.getRequest().getCtkTestCaseId());
abisDataShareTokenEntity.setTestRunId(requestWrapper.getRequest().getCtkTestRunId());
abisDataShareTokenEntity.setToken(requestWrapper.getRequest().getToken());
try {
AbisDataShareTokenEntity savedEntity = abisDataShareTokenRepository.save(abisDataShareTokenEntity);
} catch (Exception ex) {
responseWrapper.setResponse(AppConstants.FAILURE);
ServiceError serviceError = new ServiceError();
serviceError.setMessage(ex.getLocalizedMessage());
responseWrapper.setErrors(Collections.singletonList(serviceError));
}
responseWrapper.setResponse(AppConstants.SUCCESS);
return responseWrapper;
}

}

0 comments on commit 795b8c3

Please sign in to comment.