Feature 2345/update pulse response object

server/src/main/java/com/objectcomputing/checkins/services/pulseresponse/PulseResponse.java

@@ -2,6 +2,7 @@
 
 import com.objectcomputing.checkins.converter.LocalDateConverter;
 import io.micronaut.core.annotation.Introspected;
+import io.micronaut.core.annotation.Nullable;
 import io.micronaut.data.annotation.AutoPopulated;
 import io.micronaut.data.annotation.TypeDef;
 import io.micronaut.data.annotation.sql.ColumnTransformer;
@@ -23,7 +24,6 @@
 @Entity
 @Getter
 @Setter
-@NoArgsConstructor
 @Introspected
 @Table(name = "pulse_response")
 public class PulseResponse {
@@ -35,18 +35,22 @@ public class PulseResponse {
     @Schema(description = "the id of the pulse_response")
     private UUID id;
 
+    @Column(name="internal_score")
+    @NotNull
+    @Schema(description = "integer for internalScore", required = true)
+    private Integer internalScore;
+
+    @Column(name="external_score")
+    @Nullable
+    @Schema(description = "integer for externalScore", required = true)
+    private Integer externalScore;
+
     @Column(name="submissiondate")
     @NotNull
     @Schema(description = "date for submissionDate")
     @TypeDef(type = DataType.DATE, converter = LocalDateConverter.class)
     private LocalDate submissionDate;
 
-    @Column(name="updateddate")
-    @NotNull
-    @Schema(description = "date for updatedDate")
-    @TypeDef(type = DataType.DATE, converter = LocalDateConverter.class)
-    private LocalDate updatedDate;
-
     @Column(name="teammemberid")
     @TypeDef(type=DataType.STRING)
     @NotNull
@@ -58,7 +62,7 @@ public class PulseResponse {
             read =  "pgp_sym_decrypt(internalFeelings::bytea,'${aes.key}')",
             write = "pgp_sym_encrypt(?,'${aes.key}') "
     )
-    @NotNull
+    @Nullable
     @Schema(description = "description of internalfeelings")
     private String internalFeelings;
 
@@ -67,21 +71,81 @@ public class PulseResponse {
             read =  "pgp_sym_decrypt(externalFeelings::bytea,'${aes.key}')",
             write = "pgp_sym_encrypt(?,'${aes.key}') "
     )
-    @NotNull
+    @Nullable
     @Schema(description = "description of externalfeelings")
     private String externalFeelings;
 
-    public PulseResponse(UUID id,LocalDate submissionDate,LocalDate updatedDate, UUID teamMemberId, String internalFeelings, String externalFeelings) {
+    protected PulseResponse() {
+    }
+
+    public PulseResponse(UUID id, Integer internalScore, Integer externalScore, LocalDate submissionDate, UUID teamMemberId, String internalFeelings, String externalFeelings) {
         this.id = id;
+        this.internalScore = internalScore;
+        this.externalScore = externalScore;
         this.submissionDate = submissionDate;
-        this.updatedDate = updatedDate;
         this.teamMemberId = teamMemberId;
         this.internalFeelings = internalFeelings;
         this.externalFeelings = externalFeelings;
     }
 
-    public PulseResponse(LocalDate submissionDate,LocalDate updatedDate, UUID teamMemberId, String internalFeelings, String externalFeelings) {
-        this(null,submissionDate, updatedDate, teamMemberId, internalFeelings, externalFeelings);
+    public PulseResponse(Integer internalScore, Integer externalScore, LocalDate submissionDate, UUID teamMemberId, String internalFeelings, String externalFeelings) {
+        this(null,internalScore, externalScore, submissionDate, teamMemberId, internalFeelings, externalFeelings);
+    }
+
+    public UUID getId() {
+        return this.id;
+    }
+
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
+    public Integer getInternalScore() {
+        return internalScore;
+    }
+
+    public void setInternalScore(Integer internalScore) {
+        this.internalScore = internalScore;
+    }
+
+    public Integer getExternalScore() {
+        return externalScore;
+    }
+
+    public void setExternalScore(Integer externalScore) {
+        this.externalScore = externalScore;
+    }
+
+    public LocalDate getSubmissionDate() {
+        return submissionDate;
+    }
+
+    public void setSubmissionDate(LocalDate submissionDate) {
+        this.submissionDate = submissionDate;
+    }
+
+    public UUID getTeamMemberId() {
+        return this.teamMemberId;
+    }
+
+    public void setTeamMemberId(UUID teamMemberId) {
+        this.teamMemberId = teamMemberId;
+    }
+
+    public String getInternalFeelings() {
+        return internalFeelings;
+    }
+
+    public void setInternalFeelings(String internalFeelings) {
+        this.internalFeelings = internalFeelings;
+    }
+
+    public String getExternalFeelings() {
+        return externalFeelings;
+    }
+
+    public void setExternalFeelings(String externalFeelings) {
+        this.externalFeelings = externalFeelings;
     }
 
     @Override
@@ -90,6 +154,8 @@ public boolean equals(Object o) {
         if (o == null || getClass() != o.getClass()) return false;
         PulseResponse that = (PulseResponse) o;
         return Objects.equals(id, that.id) &&
+                Objects.equals(internalScore, that.internalScore) &&
+                Objects.equals(externalScore, that.externalScore) &&
                 Objects.equals(submissionDate, that.submissionDate) &&
                 Objects.equals(teamMemberId, that.teamMemberId) &&
                 Objects.equals(internalFeelings, that.internalFeelings) &&
@@ -100,16 +166,17 @@ public boolean equals(Object o) {
     public String toString() {
         return "PulseResponse{" +
                 "id=" + id +
+                ", internalScore" + internalScore +
+                ", externalScore" + externalScore +
                 ", submissionDate=" + submissionDate +
-                ", updatedDate=" + updatedDate +
                 ", teamMemberId=" + teamMemberId +
                 ", internalFeelings=" + internalFeelings +
                 ", externalFeelings=" + externalFeelings +
                 '}';
     }
     @Override
     public int hashCode() {
-        return Objects.hash(id, submissionDate, updatedDate, teamMemberId, internalFeelings, externalFeelings);
+        return Objects.hash(id, internalScore, externalScore, submissionDate, teamMemberId, internalFeelings, externalFeelings);
     }
 }
 

server/src/main/java/com/objectcomputing/checkins/services/pulseresponse/PulseResponseController.java

@@ -61,12 +61,10 @@ public Mono<HttpResponse<Set<PulseResponse>>> findPulseResponses(@Nullable @Form
     @Post()
     public Mono<HttpResponse<PulseResponse>> createPulseResponse(@Body @Valid PulseResponseCreateDTO pulseResponse,
                                                                     HttpRequest<?> request) {
-        return Mono.fromCallable(() -> pulseResponseServices.save(new PulseResponse(pulseResponse.getSubmissionDate(),
-                        pulseResponse.getUpdatedDate(), pulseResponse.getTeamMemberId(), pulseResponse.getInternalFeelings(),
-                        pulseResponse.getExternalFeelings())))
+        return Mono.fromCallable(() -> pulseResponseServices.save(new PulseResponse(pulseResponse.getInternalScore(), pulseResponse.getExternalScore(), pulseResponse.getSubmissionDate(), pulseResponse.getTeamMemberId(), pulseResponse.getInternalFeelings(), pulseResponse.getExternalFeelings())))
                 .map(pulseresponse -> HttpResponse.created(pulseresponse)
-                    .headers(headers -> headers.location(URI.create(String.format("%s/%s", request.getPath(),
-                            pulseresponse.getId())))));
+                    .headers(headers -> headers.location(URI.create(String.format("%s/%s", request.getPath(), pulseresponse.getId()))))
+                );
     }
 
      /**

server/src/main/java/com/objectcomputing/checkins/services/pulseresponse/PulseResponseCreateDTO.java

@@ -1,6 +1,7 @@
 package com.objectcomputing.checkins.services.pulseresponse;
 
 import io.micronaut.core.annotation.Introspected;
+import io.micronaut.core.annotation.Nullable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
@@ -15,23 +16,74 @@
 public class PulseResponseCreateDTO {
 
     @NotNull
-    @Schema(description = "date for submissionDate")
-    private LocalDate submissionDate;
+    @Schema(required = true, description = "integer value of internal score")
+    private Integer internalScore;
+
+    @Nullable
+    @Schema(description = "integer value of external score")
+    private Integer externalScore;
 
     @NotNull
-    @Schema(description = "date for updatedDate")
-    private LocalDate updatedDate;
+    @Schema(description = "date for submissionDate")
+    private LocalDate submissionDate;
 
     @NotNull
     @Schema(description = "id of the associated member")
     private UUID teamMemberId;
 
-    @NotNull
+    @Nullable
     @Schema(description = "description of internal feelings")
     private String internalFeelings;
 
-    @NotNull
+    @Nullable
     @Schema(description = "description of external feelings")
     private String externalFeelings;
 
+    public Integer getInternalScore() {
+        return internalScore;
+    }
+
+    public void setInternalScore(Integer internalScore) {
+        this.internalScore = internalScore;
+    }
+
+    public Integer getExternalScore() {
+        return externalScore;
+    }
+
+    public void setExternalScore(Integer externalScore) {
+        this.externalScore = externalScore;
+    }
+
+    public LocalDate getSubmissionDate() {
+        return submissionDate;
+    }
+
+    public void setSubmissionDate(LocalDate submissionDate) {
+        this.submissionDate = submissionDate;
+    }
+
+    public UUID getTeamMemberId() {
+        return teamMemberId;
+    }
+
+    public void setTeamMemberId(UUID teamMemberId) {
+        this.teamMemberId = teamMemberId;
+    }
+
+    public String getInternalFeelings() {
+        return internalFeelings;
+    }
+
+    public void setInternalFeelings(String internalFeelings) {
+        this.internalFeelings = internalFeelings;
+    }
+
+    public String getExternalFeelings() {
+        return externalFeelings;
+    }
+
+    public void setExternalFeelings(String externalFeelings) {
+        this.externalFeelings = externalFeelings;
+    }
 }

server/src/main/java/com/objectcomputing/checkins/services/pulseresponse/PulseResponseServicesImpl.java

@@ -28,15 +28,12 @@ public PulseResponse save(PulseResponse pulseResponse) {
         if(pulseResponse!=null){
             final UUID memberId = pulseResponse.getTeamMemberId();
             LocalDate pulseSubDate = pulseResponse.getSubmissionDate();
-            LocalDate pulseUpDate = pulseResponse.getUpdatedDate();
             if(pulseResponse.getId()!=null){
             throw new BadArgException(String.format("Found unexpected id for pulseresponse %s", pulseResponse.getId()));
         } else if(!memberRepo.findById(memberId).isPresent()){
             throw new BadArgException(String.format("Member %s doesn't exists", memberId));
         } else if(pulseSubDate.isBefore(LocalDate.EPOCH) || pulseSubDate.isAfter(LocalDate.MAX)) {
             throw new BadArgException(String.format("Invalid date for pulseresponse submission date %s",memberId));
-        } else if(pulseUpDate.isBefore(LocalDate.EPOCH) || pulseUpDate.isAfter(LocalDate.MAX)) {
-            throw new BadArgException(String.format("Invalid date for pulseresponse updated date %s",memberId));
         }
         pulseResponseRet = pulseResponseRepo.save(pulseResponse);
         }
@@ -56,7 +53,6 @@ public PulseResponse update(PulseResponse pulseResponse) {
         final UUID id = pulseResponse.getId();
         final UUID memberId = pulseResponse.getTeamMemberId();
         LocalDate pulseSubDate = pulseResponse.getSubmissionDate();
-        LocalDate pulseUpDate = pulseResponse.getUpdatedDate();
         if(id==null||!pulseResponseRepo.findById(id).isPresent()){
             throw new BadArgException(String.format("Unable to find pulseresponse record with id %s", pulseResponse.getId()));
         }else if(!memberRepo.findById(memberId).isPresent()){
@@ -65,8 +61,6 @@ public PulseResponse update(PulseResponse pulseResponse) {
             throw new BadArgException(String.format("Invalid pulseresponse %s", pulseResponse));
         } else if(pulseSubDate.isBefore(LocalDate.EPOCH) || pulseSubDate.isAfter(LocalDate.MAX)) {
             throw new BadArgException(String.format("Invalid date for pulseresponse submission date %s",memberId));
-        } else if(pulseUpDate.isBefore(LocalDate.EPOCH) || pulseUpDate.isAfter(LocalDate.MAX)) {
-            throw new BadArgException(String.format("Invalid date for pulseresponse %s",memberId));
         }
 
         pulseResponseRet = pulseResponseRepo.update(pulseResponse);

server/src/main/resources/db/common/V102__alter_pulse_responses_table.sql

@@ -0,0 +1,4 @@
+ALTER TABLE pulse_response DROP COLUMN updatedDate;
+
+ALTER TABLE pulse_response ADD COLUMN internal_score Integer;
+ALTER TABLE pulse_response ADD COLUMN external_score Integer;

server/src/test/java/com/objectcomputing/checkins/services/fixture/PulseResponseFixture.java

@@ -7,7 +7,7 @@
 
 public interface PulseResponseFixture extends RepositoryFixture {
     default PulseResponse createADefaultPulseResponse(MemberProfile memberprofile) {
-        return getPulseResponseRepository().save(new PulseResponse(LocalDate.now(), LocalDate.now(),
+        return getPulseResponseRepository().save(new PulseResponse(0, 0, LocalDate.now(),
                 memberprofile.getId(), "internalfeelings", "externalfeelings"));
     }
 }