Voting state

meeting/src/main/java/com/exam_microservices/meeting/client/voting/PutMeetingStatusDTO.java

@@ -0,0 +1,11 @@
+package com.exam_microservices.meeting.client.voting;
+
+import com.exam_microservices.meeting.meeting.MeetingStatus;
+import lombok.Builder;
+import lombok.Data;
+
+@Builder @Data
+public class PutMeetingStatusDTO {
+    private Long meetingId;
+    private MeetingStatus meetingStatus;
+}

meeting/src/main/java/com/exam_microservices/meeting/client/voting/VotingClient.java

@@ -1,5 +1,6 @@
 package com.exam_microservices.meeting.client.voting;
 
+import com.exam_microservices.meeting.meeting.MeetingStatus;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.http.*;
@@ -12,15 +13,15 @@
 public class VotingClient {
 
     private final RestTemplate restTemplate;
-    private final String microServiceInternalSecret;
-    private final String postVotingUrl;
+    @Value("${rest.internal.secret}")
+    private String microServiceInternalSecret;
+    @Value("${rest.votingClient.postVoting}")
+    private String postVotingUrl;
+    @Value("${rest.votingClient.putMeetingStatusToVoting}")
+    private String putMeetingStatusInVotingUrl;
 
-    public VotingClient(RestTemplateBuilder builder,
-                        @Value("${rest.internal.secret}") String microServiceInternalSecret,
-                        @Value("${rest.votingClient.postVoting}") String postVotingUrl) {
+    public VotingClient(RestTemplateBuilder builder) {
         this.restTemplate = builder.build();
-        this.microServiceInternalSecret = microServiceInternalSecret;
-        this.postVotingUrl = postVotingUrl;
     }
 
     public void startVotingRound(Long meetingId, String question, List<Long> participantsIds){
@@ -41,4 +42,22 @@ public void startVotingRound(Long meetingId, String question, List<Long> partici
                 request,
                 String.class);
     }
+
+    public void sendMeetingStatusToVoting(Long meetingId, MeetingStatus meetingStatus){
+        // Creating Request Body and Getting Url From application file
+        PutMeetingStatusDTO putMeetingStatus = PutMeetingStatusDTO.builder()
+                .meetingId(meetingId)
+                .meetingStatus(meetingStatus)
+                .build();
+        HttpHeaders headers = new HttpHeaders();
+        headers.set(HttpHeaders.AUTHORIZATION, microServiceInternalSecret);
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        // making a request to voting service :)
+        HttpEntity<PutMeetingStatusDTO> request = new HttpEntity<>(putMeetingStatus,headers);
+        ResponseEntity<String> response = restTemplate.exchange(
+                putMeetingStatusInVotingUrl, // the url can be found in application-prod.yml file
+                HttpMethod.PUT,
+                request,
+                String.class);
+    }
 }

meeting/src/main/java/com/exam_microservices/meeting/meeting/external/MeetingExternalService.java

@@ -71,6 +71,7 @@ public Meeting startMeeting(Long housingId, Long meetingId) {
 
         meeting.setMeetingStatus(MeetingStatus.ONGOING_WAITING_ON_QUESTIONS);
         meeting.setStartTime(LocalDateTime.now());
+        votingClient.sendMeetingStatusToVoting(meeting.getId(), meeting.getMeetingStatus());
         return meetingRepo.save(meeting);
     }
 
@@ -84,7 +85,7 @@ public Meeting endMeeting(Long housingId,Long meetingId) {
         participants.forEach(participant -> {
             meetingPublisher.publishMeetingEnded(meeting, participant);
         });
-
+        votingClient.sendMeetingStatusToVoting(meeting.getId(), meeting.getMeetingStatus());
         return meetingRepo.save(meeting);
     }
 

meeting/src/main/resources/application-dev.yml

@@ -46,6 +46,7 @@ rest:
     secret: ${INTERNAL_SECRET}
   votingClient:
     postVoting: ${GATEWAY_URL}/service/voting
+    putMeetingStatusToVoting: ${GATEWAY_URL}/service/voting/meetingStatus
   housingClient:
     postHousingInvitation: ${GATEWAY_URL}/service/housing/invitation
 

meeting/src/main/resources/application-prod.yml

@@ -39,6 +39,7 @@ rest:
     secret: ${INTERNAL_SECRET}
   votingClient:
     postVoting: ${GATEWAY_URL}/service/voting
+    putMeetingStatusToVoting: ${GATEWAY_URL}/service/voting/meetingStatus
   housingClient:
     postHousingInvitation: ${GATEWAY_URL}/service/housing/invitation
 

voting/src/main/java/com/exam_microservices/voting/ParticipantCode/MeetingStatus.java

@@ -0,0 +1,18 @@
+package com.exam_microservices.voting.ParticipantCode;
+
+public enum MeetingStatus {
+    NOT_STARTED,
+    ONGOING_WAITING_ON_QUESTIONS,
+    ONGOING_VOTING,
+    DONE;
+    public String getPublicMeetingStatusMessage(){
+        return switch (this){
+            case ONGOING_VOTING, ONGOING_WAITING_ON_QUESTIONS ->
+                    "This meeting is already ongoing";
+            case DONE ->
+                    "This meeting is done";
+            case NOT_STARTED ->
+                    "This meeting has not stated yet";
+        };
+    }
+}

voting/src/main/java/com/exam_microservices/voting/ParticipantCode/ParticipantsCode.java

@@ -1,9 +1,6 @@
 package com.exam_microservices.voting.ParticipantCode;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -20,4 +17,12 @@ public class ParticipantsCode {
     private Long meetingId;
     private Long residentId;
     private Long participantId;
+    private MeetingStatus meetingStatus;
+
+    @PrePersist
+    void prePersist() {
+        if (meetingStatus == null) {
+            meetingStatus = MeetingStatus.NOT_STARTED;
+        }
+    }
 }

voting/src/main/java/com/exam_microservices/voting/ParticipantCode/ParticipantsCodeRepo.java

@@ -1,8 +1,10 @@
 package com.exam_microservices.voting.ParticipantCode;
 
 import org.springframework.data.jpa.repository.JpaRepository;
-import java.util.Optional;
+
+import java.util.List;
 
 public interface ParticipantsCodeRepo extends JpaRepository<ParticipantsCode, String> {
-    Optional<ParticipantsCode> findByCodeAndMeetingIdAndResidentId(String code, Long meetingId, Long residentId);
+
+    List<ParticipantsCode> findAllByMeetingId(Long meetingId);
 }

voting/src/main/java/com/exam_microservices/voting/ParticipantCode/ParticipantsCodeService.java

@@ -10,6 +10,7 @@
 
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
+import java.util.List;
 import java.util.UUID;
 
 @Service
@@ -34,6 +35,7 @@ private ParticipantsCode generateCode(Long meetingId, Long residentId, Long part
                 .meetingId(meetingId)
                 .residentId(residentId)
                 .participantId(participantId)
+                .meetingStatus(MeetingStatus.NOT_STARTED)
                 .build();
 
         return repository.save(participantCode);
@@ -57,4 +59,10 @@ public void addParticipantToVoting(Long meetingId, Long residentId, Long partici
     public ParticipantsCode getParticipantCode(String code) {
         return  repository.findById(code).orElseThrow(()-> new ParticipantCodeNotFound("participant not found, code="+code));
     }
+
+   public void changeParticipantCodeMeetingStatus(Long meetingId, MeetingStatus meetingStatus){
+        List<ParticipantsCode> participantsCodes =  repository.findAllByMeetingId(meetingId);
+        participantsCodes.forEach(participantsCode -> participantsCode.setMeetingStatus(meetingStatus));
+        repository.saveAll(participantsCodes);
+   }
 }

voting/src/main/java/com/exam_microservices/voting/voting/DtoInternal/PutMeetingStatusDTO.java

@@ -0,0 +1,11 @@
+package com.exam_microservices.voting.voting.DtoInternal;
+
+import com.exam_microservices.voting.ParticipantCode.MeetingStatus;
+import lombok.Builder;
+import lombok.Data;
+
+@Builder @Data
+public class PutMeetingStatusDTO {
+    private Long meetingId;
+    private MeetingStatus meetingStatus;
+}

voting/src/main/java/com/exam_microservices/voting/voting/VotingInternalController.java

@@ -2,9 +2,9 @@
 
 import com.exam_microservices.voting.voting.DTO.*;
 import com.exam_microservices.voting.voting.DTO.GetVotingDTO;
-import com.exam_microservices.voting.voting.DTO.GetVotingStateDTO;
 import com.exam_microservices.voting.voting.DTO.PostVotingDTO;
 import com.exam_microservices.voting.voting.DtoInternal.GetVotingReportDTO;
+import com.exam_microservices.voting.voting.DtoInternal.PutMeetingStatusDTO;
 import com.exam_microservices.voting.voting.interfaces.VotingService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,5 +52,11 @@ public ResponseEntity<List<GetVotingReportDTO>> getParticipantInfoVoting(
         @PathVariable Long participantId) {
         List<GetVotingReportDTO> getVotingReportDTOs = votingService.createVotingReportDTO(meetingId, participantId);
        return  ResponseEntity.ok(getVotingReportDTOs);
-        }
+    }
+
+   @PutMapping("/meetingStatus")
+   public ResponseEntity<?> putMeetingStatusToParticipantCode(@RequestBody PutMeetingStatusDTO putMeetingStatusDTO){
+        votingService.updateMeetingStatusInParticipantCodes(putMeetingStatusDTO.getMeetingId(), putMeetingStatusDTO.getMeetingStatus());
+        return ResponseEntity.noContent().build();
+   }
 }

voting/src/main/java/com/exam_microservices/voting/voting/VotingServiceImpl.java

@@ -1,5 +1,6 @@
 package com.exam_microservices.voting.voting;
 
+import com.exam_microservices.voting.ParticipantCode.MeetingStatus;
 import com.exam_microservices.voting.ParticipantCode.ParticipantsCode;
 import com.exam_microservices.voting.ParticipantCode.ParticipantsCodeService;
 import com.exam_microservices.voting.exception.*;
@@ -148,8 +149,9 @@ public Voting getVotingQuestion(String code) {
     @Override
     public VotingState getVotingStateForParticipant(String code) {
         ParticipantsCode participantsCode = participantsCodeService.getParticipantCode(code);
-        //not sure yet maybe add a check that meeting ended here.
-        // but then will need to fix som endpoints between meeting and voting
+        if (participantsCode.getMeetingStatus() == MeetingStatus.NOT_STARTED) return VotingState.MEETING_NOT_STARTED;
+        if (participantsCode.getMeetingStatus() == MeetingStatus.DONE) return VotingState.MEETING_ENDED;
+
         Optional<Voting> votingOptional = votingRepo.findFirstByMeetingIdAndVotingStatus(participantsCode.getMeetingId(), VotingStatus.OPEN);
         if (votingOptional.isEmpty())
             return VotingState.NOT_ONGOING;
@@ -188,4 +190,9 @@ public List<GetVotingReportDTO> createVotingReportDTO(Long meetingId, Long parti
                             .build();})
                 .toList();
     }
+
+    @Override
+    public void updateMeetingStatusInParticipantCodes(Long meetingId, MeetingStatus meetingStatus) {
+        participantsCodeService.changeParticipantCodeMeetingStatus(meetingId, meetingStatus);
+    }
 }

voting/src/main/java/com/exam_microservices/voting/voting/VotingState.java

@@ -5,7 +5,9 @@
  * Used to indicate whether the voting is ongoing, finished, or if the participant has voted.
  */
 public enum VotingState {
+    MEETING_NOT_STARTED,
     NOT_ONGOING,
     ONGOING_BUT_YOU_HAVE_VOTED,
-    ONGOING_BUT_YOU_HAVE_NOT_VOTED
+    ONGOING_BUT_YOU_HAVE_NOT_VOTED,
+    MEETING_ENDED
 }

voting/src/main/java/com/exam_microservices/voting/voting/interfaces/VotingService.java

@@ -1,5 +1,6 @@
 package com.exam_microservices.voting.voting.interfaces;
 
+import com.exam_microservices.voting.ParticipantCode.MeetingStatus;
 import com.exam_microservices.voting.voting.DTO.*;
 import com.exam_microservices.voting.voting.DtoInternal.GetVotingReportDTO;
 import com.exam_microservices.voting.voting.Voting;
@@ -14,4 +15,5 @@ public interface VotingService {
     Voting getVotingQuestion(String Code);
     VotingState getVotingStateForParticipant(String code);
     List<GetVotingReportDTO> createVotingReportDTO(Long meetingId, Long participantId);
+    void updateMeetingStatusInParticipantCodes(Long meetingId, MeetingStatus meetingStatus);
 }