Refactored tests

masoudarvishian · May 10, 2024 · 7887d9d · 7887d9d
1 parent 88715d9
commit 7887d9d
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 0 deletions.
diff --git a/src/main/java/com/zenjob/challenge/application/interfaces/JobService.java b/src/main/java/com/zenjob/challenge/application/interfaces/JobService.java
@@ -11,4 +11,5 @@ public interface JobService {
     Job createJob(UUID companyId, LocalDate startDate, LocalDate endDate);
     void cancelJob(UUID companyId, UUID jobId) throws NotFoundException;
     Optional<Job> getJob(UUID id);
+    void clearAllJobs();
 }
diff --git a/src/main/java/com/zenjob/challenge/application/interfaces/ShiftService.java b/src/main/java/com/zenjob/challenge/application/interfaces/ShiftService.java
@@ -13,4 +13,5 @@ public interface ShiftService {
     void cancelShift(UUID companyId, UUID shiftId) throws NotFoundException;
     Optional<Shift> getShift(UUID id);
     void cancelShiftForTalent(UUID companyId, UUID talentId);
+    void clearAllShifts();
 }
diff --git a/src/main/java/com/zenjob/challenge/application/services/JobServiceImpl.java b/src/main/java/com/zenjob/challenge/application/services/JobServiceImpl.java
@@ -52,6 +52,11 @@ public Optional<Job> getJob(UUID id) {
         return jobRepository.findById(id);
     }
 
+    @Override
+    public void clearAllJobs() {
+        jobRepository.deleteAll();
+    }
+
     private static Job buildJob(UUID companyId, LocalDate startDate, LocalDate endDate) {
         return Job.builder()
                 .id(UUID.randomUUID())

diff --git a/src/main/java/com/zenjob/challenge/application/services/ShiftServiceImpl.java b/src/main/java/com/zenjob/challenge/application/services/ShiftServiceImpl.java
@@ -60,6 +60,11 @@ public void cancelShiftForTalent(UUID companyId, UUID talentId) {
         });
     }
 
+    @Override
+    public void clearAllShifts() {
+        shiftRepository.deleteAll();
+    }
+
     private List<Shift> getShiftsByTalentIdAndCompanyId(UUID talentId, UUID companyId) {
         List<Shift> shifts = shiftRepository.findAllByTalentId(talentId);
         return shifts.stream()

diff --git a/src/test/java/com/zenjob/challenge/application/services/JobServiceTests.java b/src/test/java/com/zenjob/challenge/application/services/JobServiceTests.java
@@ -8,9 +8,11 @@
 import com.zenjob.challenge.domain.entity.Shift;
 import com.zenjob.challenge.application.interfaces.JobService;
 import javassist.NotFoundException;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
 import org.springframework.boot.test.context.SpringBootTest;
 
 import java.time.Duration;
@@ -28,6 +30,12 @@ public class JobServiceTests {
     @Autowired
     private ShiftService shiftService;
 
+    @AfterEach
+    public void cleanUpDatabase() {
+        shiftService.clearAllShifts();
+        jobService.clearAllJobs();
+    }
+
     @Test
     public void job_should_have_at_least_one_shift() {
         // given

diff --git a/src/test/java/com/zenjob/challenge/application/services/ShiftServiceTests.java b/src/test/java/com/zenjob/challenge/application/services/ShiftServiceTests.java
@@ -6,9 +6,11 @@
 import com.zenjob.challenge.domain.entity.Shift;
 import com.zenjob.challenge.domain.exceptions.InvalidActionException;
 import javassist.NotFoundException;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
 import org.springframework.boot.test.context.SpringBootTest;
 
 import java.time.LocalDate;
@@ -24,6 +26,12 @@ public class ShiftServiceTests {
     @Autowired
     private ShiftService shiftService;
 
+    @AfterEach
+    public void cleanUpDatabase() {
+        shiftService.clearAllShifts();
+        jobService.clearAllJobs();
+    }
+
     @Test
     public void cancel_a_single_shift_by_company() throws NotFoundException {
         // given