commiting changes related to visa implementation

Author: Azher2Ali

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

@@ -86,9 +86,8 @@ public VisaController(
   public @ResponseBody Visa updateVisa(
       @ApiIgnore @RequestHeader(value = "Authorization", required = true)
           final String authorization,
-      @PathVariable(value = "id") UUID id,
-      @RequestBody(required = true) VisaRequest visaRequest) {
-    return visaService.partialUpdate(id, visaRequest);
+      @RequestBody(required = true) VisaUpdateRequest visaRequest) {
+    return visaService.partialUpdate(visaRequest);
   }
 
   @AdminScoped

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

@@ -1,5 +1,6 @@
 package bio.overture.ego.model.dto;
 
+import java.util.UUID;
 import javax.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -12,7 +13,7 @@
 @NoArgsConstructor
 public class VisaRequest {
 
-  @NotNull private String id;
+  private UUID id;
 
   @NotNull private String type;
 

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

@@ -0,0 +1,25 @@
+package bio.overture.ego.model.dto;
+
+import java.util.UUID;
+import javax.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class VisaUpdateRequest {
+
+  @NotNull private UUID id;
+
+  @NotNull private String type;
+
+  @NotNull private String source;
+
+  @NotNull private String value;
+
+  @NotNull private String by;
+}

src/main/java/bio/overture/ego/model/entity/Visa.java

@@ -31,12 +31,6 @@
 @AllArgsConstructor
 @FieldNameConstants
 @EqualsAndHashCode(of = {"id"})
-@NamedEntityGraph(
-    name = "policy-entity-with-relationships",
-    attributeNodes = {
-      @NamedAttributeNode(value = JavaFields.USERPERMISSIONS),
-      @NamedAttributeNode(value = JavaFields.GROUPPERMISSIONS),
-    })
 public class Visa implements Identifiable<UUID> {
 
   @Id

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

@@ -5,9 +5,8 @@
 import static org.mapstruct.factory.Mappers.getMapper;
 
 import bio.overture.ego.event.token.ApiKeyEventsPublisher;
-import bio.overture.ego.model.dto.PolicyRequest;
 import bio.overture.ego.model.dto.VisaRequest;
-import bio.overture.ego.model.entity.Policy;
+import bio.overture.ego.model.dto.VisaUpdateRequest;
 import bio.overture.ego.model.entity.Visa;
 import bio.overture.ego.repository.VisaRepository;
 import java.util.Optional;
@@ -31,12 +30,11 @@
 public class VisaService extends AbstractNamedService<Visa, UUID> {
 
   /** Constants */
-  private static final VisaService.VisaConverter VISA_CONVERTER = getMapper(VisaService.VisaConverter.class);
+  private static final VisaService.VisaConverter VISA_CONVERTER =
+      getMapper(VisaService.VisaConverter.class);
 
   /** Dependencies */
-  @Autowired
-
-  private VisaRepository visaRepository;
+  @Autowired private VisaRepository visaRepository;
 
   private final ApiKeyEventsPublisher apiKeyEventsPublisher;
 
@@ -76,16 +74,18 @@ public Page<Visa> listVisa(@NonNull Pageable pageable) {
     return visaRepository.findAll(pageable);
   }
 
-  public Visa partialUpdate(@NonNull UUID id, @NonNull VisaRequest updateRequest) {
-    val visa = getById(id);
+  public Visa partialUpdate(@NonNull VisaUpdateRequest updateRequest) {
+    val visa = getById(updateRequest.getId());
     VISA_CONVERTER.updateVisa(updateRequest, visa);
     return getRepository().save(visa);
   }
+
   @Mapper(
-          nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS,
-          unmappedTargetPolicy = ReportingPolicy.WARN)
+      nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS,
+      unmappedTargetPolicy = ReportingPolicy.WARN)
   public abstract static class VisaConverter {
-  public abstract Visa convertToVisa(VisaRequest request);
-    public abstract void updateVisa(VisaRequest request, @MappingTarget Visa visaToUpdate);
+    public abstract Visa convertToVisa(VisaRequest request);
 
-  }}
+    public abstract void updateVisa(VisaUpdateRequest request, @MappingTarget Visa visaToUpdate);
+  }
+}

src/main/resources/flyway/sql/V1_22__add_visa.sql

@@ -0,0 +1,8 @@
+CREATE TABLE GA4GHVISA (
+  id                      UUID PRIMARY KEY,
+  type                    varchar(255) NOT NULL,
+  source                  varchar(255) NOT NULL,
+  value                   varchar(255) NOT NULL,
+  by                      varchar(255) NOT NULL
+);
+