Skip to content

Commit 07d4ead

Browse files
committed
Committing changes related to visa update api review comment changes
1 parent 409b799 commit 07d4ead

File tree

4 files changed

+3
-29
lines changed

4 files changed

+3
-29
lines changed

src/main/java/bio/overture/ego/controller/VisaController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public VisaController(
8787
@ApiIgnore @RequestHeader(value = "Authorization", required = true)
8888
final String authorization,
8989
@PathVariable(value = "id", required = true) UUID id,
90-
@RequestBody(required = true) VisaUpdateRequest visaRequest) {
90+
@RequestBody(required = true) VisaRequest visaRequest) {
9191
return visaService.partialUpdate(id, visaRequest);
9292
}
9393

src/main/java/bio/overture/ego/model/dto/VisaRequest.java

-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package bio.overture.ego.model.dto;
22

3-
import java.util.UUID;
43
import javax.validation.constraints.NotNull;
54
import lombok.AllArgsConstructor;
65
import lombok.Builder;
@@ -13,8 +12,6 @@
1312
@NoArgsConstructor
1413
public class VisaRequest {
1514

16-
private UUID id;
17-
1815
@NotNull private String type;
1916

2017
@NotNull private String source;

src/main/java/bio/overture/ego/model/dto/VisaUpdateRequest.java

-22
This file was deleted.

src/main/java/bio/overture/ego/service/VisaService.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
import bio.overture.ego.event.token.ApiKeyEventsPublisher;
88
import bio.overture.ego.model.dto.VisaRequest;
9-
import bio.overture.ego.model.dto.VisaUpdateRequest;
109
import bio.overture.ego.model.entity.Visa;
1110
import bio.overture.ego.repository.VisaRepository;
1211
import java.util.Optional;
@@ -75,7 +74,7 @@ public Page<Visa> listVisa(@NonNull Pageable pageable) {
7574
return visaRepository.findAll(pageable);
7675
}
7776

78-
public Visa partialUpdate(@NotNull UUID id, @NonNull VisaUpdateRequest updateRequest) {
77+
public Visa partialUpdate(@NotNull UUID id, @NonNull VisaRequest updateRequest) {
7978
val visa = getById(id);
8079
VISA_CONVERTER.updateVisa(updateRequest, visa);
8180
return getRepository().save(visa);
@@ -87,6 +86,6 @@ public Visa partialUpdate(@NotNull UUID id, @NonNull VisaUpdateRequest updateReq
8786
public abstract static class VisaConverter {
8887
public abstract Visa convertToVisa(VisaRequest request);
8988

90-
public abstract void updateVisa(VisaUpdateRequest request, @MappingTarget Visa visaToUpdate);
89+
public abstract void updateVisa(VisaRequest request, @MappingTarget Visa visaToUpdate);
9190
}
9291
}

0 commit comments

Comments
 (0)