add SurveyStatus enum, fix tests, fix typos, add filters and mappings to dashboards

Author: wilczeqqqq

src/main/java/com/pwr/students/domain/Survey.java

@@ -1,6 +1,7 @@
 package com.pwr.students.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.pwr.students.repository.SurveyStatus;
 import jakarta.persistence.*;
 import jakarta.validation.constraints.*;
 import java.io.Serializable;
@@ -40,7 +41,8 @@ public class Survey implements Serializable {
     private LocalDate deadline;
 
     @Column(name = "status")
-    private String status;
+    @Enumerated(EnumType.STRING)
+    private SurveyStatus status;
 
     @OneToMany(fetch = FetchType.EAGER, mappedBy = "survey")
     @Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
@@ -106,16 +108,16 @@ public void setDeadline(LocalDate deadline) {
         this.deadline = deadline;
     }
 
-    public String getStatus() {
+    public SurveyStatus getStatus() {
         return this.status;
     }
 
-    public Survey status(String status) {
+    public Survey status(SurveyStatus status) {
         this.setStatus(status);
         return this;
     }
 
-    public void setStatus(String status) {
+    public void setStatus(SurveyStatus status) {
         this.status = status;
     }
 

src/main/java/com/pwr/students/repository/SurveyStatus.java

@@ -0,0 +1,7 @@
+package com.pwr.students.repository;
+
+public enum SurveyStatus {
+    DRAFT,
+    ACTIVE,
+    EXPIRED,
+}

src/main/java/com/pwr/students/web/rest/SurveyAssigmentResource.java

@@ -39,27 +39,27 @@ public SurveyAssigmentResource(SurveyAssigmentRepository surveyAssigmentReposito
     }
 
     /**
-     * {@code POST  /survey-assigments} : Create a new surveyAssigment.
+     * {@code POST  /survey-assignments} : Create a new surveyAssigment.
      *
      * @param surveyAssigment the surveyAssigment to create.
      * @return the {@link ResponseEntity} with status {@code 201 (Created)} and with body the new surveyAssigment, or with status {@code 400 (Bad Request)} if the surveyAssigment has already an ID.
      * @throws URISyntaxException if the Location URI syntax is incorrect.
      */
-    @PostMapping("/survey-assigments")
+    @PostMapping("/survey-assignments")
     public ResponseEntity<SurveyAssigment> createSurveyAssigment(@RequestBody SurveyAssigment surveyAssigment) throws URISyntaxException {
         log.debug("REST request to save SurveyAssigment : {}", surveyAssigment);
         if (surveyAssigment.getId() != null) {
             throw new BadRequestAlertException("A new surveyAssigment cannot already have an ID", ENTITY_NAME, "idexists");
         }
         SurveyAssigment result = surveyAssigmentRepository.save(surveyAssigment);
         return ResponseEntity
-            .created(new URI("/api/survey-assigments/" + result.getId()))
+            .created(new URI("/api/survey-assignments/" + result.getId()))
             .headers(HeaderUtil.createEntityCreationAlert(applicationName, false, ENTITY_NAME, result.getId().toString()))
             .body(result);
     }
 
     /**
-     * {@code PUT  /survey-assigments/:id} : Updates an existing surveyAssigment.
+     * {@code PUT  /survey-assignments/:id} : Updates an existing surveyAssigment.
      *
      * @param id the id of the surveyAssigment to save.
      * @param surveyAssigment the surveyAssigment to update.
@@ -68,7 +68,7 @@ public ResponseEntity<SurveyAssigment> createSurveyAssigment(@RequestBody Survey
      * or with status {@code 500 (Internal Server Error)} if the surveyAssigment couldn't be updated.
      * @throws URISyntaxException if the Location URI syntax is incorrect.
      */
-    @PutMapping("/survey-assigments/{id}")
+    @PutMapping("/survey-assignments/{id}")
     public ResponseEntity<SurveyAssigment> updateSurveyAssigment(
         @PathVariable(value = "id", required = false) final Long id,
         @RequestBody SurveyAssigment surveyAssigment
@@ -93,7 +93,7 @@ public ResponseEntity<SurveyAssigment> updateSurveyAssigment(
     }
 
     /**
-     * {@code PATCH  /survey-assigments/:id} : Partial updates given fields of an existing surveyAssigment, field will ignore if it is null
+     * {@code PATCH  /survey-assignments/:id} : Partial updates given fields of an existing surveyAssigment, field will ignore if it is null
      *
      * @param id the id of the surveyAssigment to save.
      * @param surveyAssigment the surveyAssigment to update.
@@ -103,7 +103,7 @@ public ResponseEntity<SurveyAssigment> updateSurveyAssigment(
      * or with status {@code 500 (Internal Server Error)} if the surveyAssigment couldn't be updated.
      * @throws URISyntaxException if the Location URI syntax is incorrect.
      */
-    @PatchMapping(value = "/survey-assigments/{id}", consumes = { "application/json", "application/merge-patch+json" })
+    @PatchMapping(value = "/survey-assignments/{id}", consumes = { "application/json", "application/merge-patch+json" })
     public ResponseEntity<SurveyAssigment> partialUpdateSurveyAssigment(
         @PathVariable(value = "id", required = false) final Long id,
         @RequestBody SurveyAssigment surveyAssigment
@@ -138,12 +138,12 @@ public ResponseEntity<SurveyAssigment> partialUpdateSurveyAssigment(
     }
 
     /**
-     * {@code GET  /survey-assigments} : get all the surveyAssigments.
+     * {@code GET  /survey-assignments} : get all the surveyAssigments.
      *
      * @param eagerload flag to eager load entities from relationships (This is applicable for many-to-many).
      * @return the {@link ResponseEntity} with status {@code 200 (OK)} and the list of surveyAssigments in body.
      */
-    @GetMapping("/survey-assigments")
+    @GetMapping("/survey-assignments")
     public List<SurveyAssigment> getAllSurveyAssigments(@RequestParam(required = false, defaultValue = "false") boolean eagerload) {
         log.debug("REST request to get all SurveyAssigments");
         if (eagerload) {
@@ -154,25 +154,25 @@ public List<SurveyAssigment> getAllSurveyAssigments(@RequestParam(required = fal
     }
 
     /**
-     * {@code GET  /survey-assigments/:id} : get the "id" surveyAssigment.
+     * {@code GET  /survey-assignments/:id} : get the "id" surveyAssigment.
      *
      * @param id the id of the surveyAssigment to retrieve.
      * @return the {@link ResponseEntity} with status {@code 200 (OK)} and with body the surveyAssigment, or with status {@code 404 (Not Found)}.
      */
-    @GetMapping("/survey-assigments/{id}")
+    @GetMapping("/survey-assignments/{id}")
     public ResponseEntity<SurveyAssigment> getSurveyAssigment(@PathVariable Long id) {
         log.debug("REST request to get SurveyAssigment : {}", id);
         Optional<SurveyAssigment> surveyAssigment = surveyAssigmentRepository.findOneWithEagerRelationships(id);
         return ResponseUtil.wrapOrNotFound(surveyAssigment);
     }
 
     /**
-     * {@code DELETE  /survey-assigments/:id} : delete the "id" surveyAssigment.
+     * {@code DELETE  /survey-assignments/:id} : delete the "id" surveyAssigment.
      *
      * @param id the id of the surveyAssigment to delete.
      * @return the {@link ResponseEntity} with status {@code 204 (NO_CONTENT)}.
      */
-    @DeleteMapping("/survey-assigments/{id}")
+    @DeleteMapping("/survey-assignments/{id}")
     public ResponseEntity<Void> deleteSurveyAssigment(@PathVariable Long id) {
         log.debug("REST request to delete SurveyAssigment : {}", id);
         surveyAssigmentRepository.deleteById(id);

src/main/webapp/app/entities/survey-assigment/survey-assigment.reducer.ts

@@ -14,7 +14,7 @@ const initialState: EntityState<ISurveyAssigment> = {
   updateSuccess: false,
 };
 
-const apiUrl = 'api/survey-assigments';
+const apiUrl = 'api/survey-assignments';
 
 // Actions
 

src/main/webapp/app/modules/managerSurveysDashboard/managerSurveysDashboard.tsx

@@ -5,7 +5,7 @@ import './managerSurveysDashboard.css';
 import { BsThreeDots, BsGear } from 'react-icons/bs';
 import { FiSend, FiTrash2 } from 'react-icons/fi';
 import { GrStatusInfo } from 'react-icons/gr';
-import { Link, useNavigate } from 'react-router-dom';
+import { Link } from 'react-router-dom';
 import { deleteEntity } from 'app/entities/survey/survey.reducer';
 import { useAppDispatch } from 'app/config/store';
 
@@ -32,8 +32,7 @@ const ManagerSurveysDashboard = () => {
   }, [refreshSurveys]);
 
   function ActiveSurveysSection() {
-    // const activeSurveys = surveys.filter((survey) => survey.status === 'active'); // TODO uncomment it after column status is added to survey table
-    const activeSurveys = surveys.filter(survey => survey.id !== 0); // TODO remove it after column status is added to survey table
+    const activeSurveys = surveys.filter(survey => survey.status === 'ACTIVE');
 
     return (
       <div>
@@ -49,28 +48,32 @@ const ManagerSurveysDashboard = () => {
 
   // Component for the expired surveys section
   function NotPublishedSurveysSection() {
-    const notPublishedSurveys = surveys.filter(survey => survey.status === 'inactive');
+    const notPublishedSurveys = surveys.filter(survey => survey.status === 'DRAFT');
 
     return (
       <div>
         <h2>Not published</h2>
-        {notPublishedSurveys.map(survey => (
-          <SurveyBox key={survey.id} survey={survey} />
-        ))}
+        <div className={'survey-container'}>
+          {notPublishedSurveys.map(survey => (
+            <SurveyBox key={survey.id} survey={survey} />
+          ))}
+        </div>
       </div>
     );
   }
 
   // Component for the expired surveys section
   function ExpiredSurveysSection() {
-    const expiredSurveys = surveys.filter(survey => survey.status === 'expired');
+    const expiredSurveys = surveys.filter(survey => survey.status === 'EXPIRED');
 
     return (
       <div>
         <h2>Expired</h2>
-        {expiredSurveys.map(survey => (
-          <SurveyBox key={survey.id} survey={survey} />
-        ))}
+        <div className={'survey-container'}>
+          {expiredSurveys.map(survey => (
+            <SurveyBox key={survey.id} survey={survey} />
+          ))}
+        </div>
       </div>
     );
   }

src/main/webapp/app/modules/userSurveysDashboard/userSurveysDashboard.tsx

@@ -1,11 +1,12 @@
 import React, { useEffect, useState } from 'react';
 import axios from 'axios';
 import './userSurveysDashboard.css';
-import { useNavigate } from 'react-router-dom';
+import { Link, useNavigate } from 'react-router-dom';
 import { Button, Modal } from 'react-bootstrap';
 
 const UserSurveysDashboard = () => {
   const [surveys, setSurveys] = useState([]);
+  const [surveyAssignments, setSurveyAssignments] = useState([]);
 
   // TODO this code will look different bacause we will have to fetch the surveys assigned for this user (for now it fetches everything, waiting for backend to be ready)
   useEffect(() => {
@@ -19,18 +20,54 @@ const UserSurveysDashboard = () => {
       .catch(error => {
         console.error('Error fetching survey data:', error);
       });
+    axios
+      .get('/api/survey-assignments') // Replace '/api/survey-assignments' with the appropriate endpoint URL
+      .then(response => {
+        // Update the surveyAssignments state with the fetched data
+        setSurveyAssignments(response.data);
+      })
+      .catch(error => {
+        console.error('Error fetching survey assignment data:', error);
+      });
   }, []);
 
   function ActiveSurveysSection() {
-    // const activeSurveys = surveys.filter((survey) => survey.status === 'active'); // TODO uncomment it after column status is added to survey table
-    const activeSurveys = surveys.filter(survey => survey.id !== 0); // TODO remove it after column status is added to survey table
+    const activeSurveys = surveyAssignments
+      .filter(assignment => assignment.is_finished === false)
+      .map(assignment => {
+        const survey = surveys.find(survey => survey.id === assignment.survey.id && survey.status === 'ACTIVE');
+        return survey || null;
+      })
+      .filter(survey => survey !== null);
 
     return (
       <div>
         <h2>Active</h2>
         <div className={'survey-container'}>
           {activeSurveys.map(survey => (
-            <SurveyBox key={survey.id} survey={survey} />
+            <SurveyBox key={survey.id} survey={survey} openLinkTo={null} isSurveyActive={true} />
+          ))}
+        </div>
+      </div>
+    );
+  }
+
+  function CompletedSurveysSection() {
+    const completedSurveys = surveyAssignments
+      .filter(assignment => assignment.is_finished === true)
+      .map(assignment => {
+        const survey = surveys.find(survey => survey.id === assignment.survey.id && survey.status === 'ACTIVE');
+        return survey || null;
+      })
+      .filter(survey => survey !== null);
+
+    return (
+      <div>
+        <h2>Completed</h2>
+        <div className={'survey-container'}>
+          {completedSurveys.map(survey => (
+            <SurveyBox key={survey.id} survey={survey} openLinkTo="history-test" isSurveyActive={false} />
+            // TODO openLinkTo="history-test" is a placeholder for the link to the survey history page
           ))}
         </div>
       </div>
@@ -39,20 +76,22 @@ const UserSurveysDashboard = () => {
 
   // Component for the expired surveys section
   function ExpiredSurveysSection() {
-    const expiredSurveys = surveys.filter(survey => survey.status === 'expired');
+    const expiredSurveys = surveys.filter(survey => survey.status === 'EXPIRED');
 
     return (
       <div>
         <h2>Expired</h2>
-        {expiredSurveys.map(survey => (
-          <SurveyBox key={survey.id} survey={survey} />
-        ))}
+        <div className={'survey-container'}>
+          {expiredSurveys.map(survey => (
+            <SurveyBox key={survey.id} survey={survey} openLinkTo={null} isSurveyActive={false} />
+          ))}
+        </div>
       </div>
     );
   }
 
   // Component for a survey box
-  function SurveyBox({ survey }) {
+  function SurveyBox({ survey, openLinkTo, isSurveyActive }) {
     const [modalOpen, setModalOpen] = useState(false);
 
     const navigate = useNavigate();
@@ -72,9 +111,19 @@ const UserSurveysDashboard = () => {
     return (
       <div className={'survey'}>
         <div className={'survey-inside'}></div>
-        <div className={'name-row'} onClick={openModal}>
-          <p className={'wrap-text'}>{survey.name}</p>
-        </div>
+        {isSurveyActive ? (
+          <Link to={null} onClick={openModal}>
+            <div className={'name-row'}>
+              <p className={'wrap-text'}>{survey.name}</p>
+            </div>
+          </Link>
+        ) : (
+          <Link to={openLinkTo}>
+            <div className={'name-row'}>
+              <p className={'wrap-text'}>{survey.name}</p>
+            </div>
+          </Link>
+        )}
 
         <Modal show={modalOpen} onHide={closeModal} dialogClassName="rounded-modal">
           <Modal.Header closeButton>
@@ -85,8 +134,9 @@ const UserSurveysDashboard = () => {
             <p>Number of questions: {survey.questions.length}</p>
             {/*TODO add approximate completion time column to survey table or find another way to calculate it*/}
             <p>Completion time: placeholder</p>
-            {/*TODO add author column to survey table*/}
-            <p>Author: placeholder</p>
+            <p>
+              Author: {survey.users[0].firstName} {survey.users[0].lastName}
+            </p>
           </Modal.Body>
           <Modal.Footer>
             <Button variant="secondary" onClick={closeModal}>
@@ -103,8 +153,9 @@ const UserSurveysDashboard = () => {
 
   return (
     <div>
-      <h1>Survey Dashboard</h1>
+      <h1>Assigned Surveys Dashboard</h1>
       <ActiveSurveysSection />
+      <CompletedSurveysSection />
       <ExpiredSurveysSection />
     </div>
   );

src/test/java/com/pwr/students/web/rest/SurveyAssigmentResourceIT.java

@@ -42,7 +42,7 @@ class SurveyAssigmentResourceIT {
     private static final Boolean DEFAULT_IS_FINISHED = false;
     private static final Boolean UPDATED_IS_FINISHED = true;
 
-    private static final String ENTITY_API_URL = "/api/survey-assigments";
+    private static final String ENTITY_API_URL = "/api/survey-assignments";
     private static final String ENTITY_API_URL_ID = ENTITY_API_URL + "/{id}";
 
     private static Random random = new Random();

src/test/java/com/pwr/students/web/rest/SurveyResourceIT.java

@@ -10,6 +10,7 @@
 import com.pwr.students.IntegrationTest;
 import com.pwr.students.domain.Survey;
 import com.pwr.students.repository.SurveyRepository;
+import com.pwr.students.repository.SurveyStatus;
 import jakarta.persistence.EntityManager;
 import java.time.LocalDate;
 import java.time.ZoneId;
@@ -50,8 +51,8 @@ class SurveyResourceIT {
     private static final LocalDate DEFAULT_DEADLINE = LocalDate.ofEpochDay(0L);
     private static final LocalDate UPDATED_DEADLINE = LocalDate.now(ZoneId.systemDefault());
 
-    private static final String DEFAULT_STATUS = "AAAAAAAAAA";
-    private static final String UPDATED_STATUS = "BBBBBBBBBB";
+    private static final SurveyStatus DEFAULT_STATUS = SurveyStatus.ACTIVE;
+    private static final SurveyStatus UPDATED_STATUS = SurveyStatus.EXPIRED;
 
     private static final String ENTITY_API_URL = "/api/surveys";
     private static final String ENTITY_API_URL_ID = ENTITY_API_URL + "/{id}";