diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000000000000000000000000000000000000..b6be142eca1df3e42e1381c80349b2c040bf8a16 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,22 @@ +cache: + paths: + - .m2/ + +stages: + - build + - test + +maven-build: + image: maven:3.8.5-openjdk-17 + stage: build + script: "mvn clean package -DskipTests" + artifacts: + paths: + - target/ + +maven-test: + image: maven:3.8.5-openjdk-17 + stage: test + script: "mvn test" + dependencies: + - maven-build diff --git a/src/main/java/hdm/mi/growbros/models/GardenEntry.java b/src/main/java/hdm/mi/growbros/models/GardenEntry.java index dde6744331a505fc97f7e39be576a67f2ae7e558..5678e0d3923e66dd3640aff4ad016a1f9f74228f 100644 --- a/src/main/java/hdm/mi/growbros/models/GardenEntry.java +++ b/src/main/java/hdm/mi/growbros/models/GardenEntry.java @@ -4,9 +4,9 @@ import hdm.mi.growbros.models.plant.Plant; import hdm.mi.growbros.models.user.User; import jakarta.persistence.*; import lombok.AllArgsConstructor; -import lombok.Getter; +import lombok.Builder; +import lombok.Data; import lombok.NoArgsConstructor; -import lombok.Setter; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; @@ -16,8 +16,8 @@ import java.util.Objects; @Entity @EntityListeners(AuditingEntityListener.class) -@Getter -@Setter +@Data +@Builder @AllArgsConstructor @NoArgsConstructor public class GardenEntry { diff --git a/src/test/java/hdm/mi/growbros/repositories/GardenRepositoryTest.java b/src/test/java/hdm/mi/growbros/repositories/GardenRepositoryTest.java index 6aa97c9ff6e3a85017ae3880d45f037e5bd7a8ae..7873ad501cf4e1af2bcf684a6d563eff7d698a6a 100644 --- a/src/test/java/hdm/mi/growbros/repositories/GardenRepositoryTest.java +++ b/src/test/java/hdm/mi/growbros/repositories/GardenRepositoryTest.java @@ -70,10 +70,10 @@ class GardenRepositoryTest { .harvestWeekEnd(30) .build(); entityManager.persist(p3); - ge1 = new GardenEntry(0L, p1, user1, null); - ge2 = new GardenEntry(0L, p2, user1, null); - ge3 = new GardenEntry(0L, p3, user1, null); - ge4 = new GardenEntry(0L, p3, user2, null); + ge1 = GardenEntry.builder().id(0L).plant(p1).user(user1).build(); + ge2 = GardenEntry.builder().id(0L).plant(p2).user(user1).build(); + ge3 = GardenEntry.builder().id(0L).plant(p3).user(user1).build(); + ge4 = GardenEntry.builder().id(0L).plant(p3).user(user2).build(); underTest.saveAll(List.of(ge1, ge2, ge3, ge4)); } diff --git a/src/test/java/hdm/mi/growbros/service/GardenServiceTest.java b/src/test/java/hdm/mi/growbros/service/GardenServiceTest.java index b672464d13dfd5083c5f9ad318c46f44f17a476d..b61a4b092a847327a26f1db4831ae2cefc61c5f6 100644 --- a/src/test/java/hdm/mi/growbros/service/GardenServiceTest.java +++ b/src/test/java/hdm/mi/growbros/service/GardenServiceTest.java @@ -48,7 +48,7 @@ class GardenServiceTest { when(plantRepository.findById(1L)).thenReturn(Optional.of(plant)); when(gardenRepository.save( any(GardenEntry.class)) - ).thenReturn(new GardenEntry(0L, plant, null, null)); + ).thenReturn(GardenEntry.builder().plant(plant).build()); //assert var result = gardenService.addPlantToGarden(1L, UserTestData.getUser1()); @@ -68,23 +68,23 @@ class GardenServiceTest { User user = UserTestData.getUser1(); - when(gardenRepository.findByUser(user, Sort.by("createdDate"))).thenReturn(mapPlantsToGardenEntries(orderedByCreatedMock, user)); + when(gardenRepository.findByUser(user, Sort.by("createdAt").descending())).thenReturn(mapPlantsToGardenEntries(orderedByCreatedMock, user)); when(gardenRepository.findByUser(user, Sort.by("plant.name"))).thenReturn(mapPlantsToGardenEntries(orderedByNameMock, user)); when(gardenRepository.findAllByNearestHarvestWeek(eq(user), any(int.class))).thenReturn(mapPlantsToGardenEntries(orderedByHarvestMock, user)); when(gardenRepository.findAllByNearestPlantingWeek(eq(user), any(int.class))).thenReturn(mapPlantsToGardenEntries(orderedByPlantDateMock, user)); assertAll( - () -> assertEquals(gardenService.getUserPlants(user, null), orderedByNameMock), - () -> assertEquals(gardenService.getUserPlants(user, "random stuff"), orderedByNameMock), - () -> assertEquals(gardenService.getUserPlants(user, "createdAt"), orderedByCreatedMock), - () -> assertEquals(gardenService.getUserPlants(user, "plantDate"), orderedByPlantDateMock), - () -> assertEquals(gardenService.getUserPlants(user, "harvestDate"), orderedByHarvestMock) + () -> assertEquals(orderedByNameMock, gardenService.getUserPlants(user, null)), + () -> assertEquals(orderedByNameMock, gardenService.getUserPlants(user, "random stuff")), + () -> assertEquals(orderedByCreatedMock, gardenService.getUserPlants(user, "createdAt")), + () -> assertEquals(orderedByPlantDateMock, gardenService.getUserPlants(user, "plantDate")), + () -> assertEquals(orderedByHarvestMock, gardenService.getUserPlants(user, "harvestDate")) ); } private List<GardenEntry> mapPlantsToGardenEntries(List<Plant> plants, User user) { return plants.stream() - .map(plant -> new GardenEntry(0L, plant, user, null)) + .map(plant -> GardenEntry.builder().plant(plant).id(0L).user(user).build()) .toList(); } } diff --git a/src/test/java/hdm/mi/growbros/service/PlantsServiceIntegrationTest.java b/src/test/java/hdm/mi/growbros/service/PlantsServiceIntegrationTest.java index b67724a08b4a083c7c2eb8a9ee40ea874741a88d..8538b5828a894e0104f25afa35b79f1907a2a2d6 100644 --- a/src/test/java/hdm/mi/growbros/service/PlantsServiceIntegrationTest.java +++ b/src/test/java/hdm/mi/growbros/service/PlantsServiceIntegrationTest.java @@ -7,8 +7,14 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.test.context.ActiveProfiles; +import java.util.List; + import static org.junit.jupiter.api.Assertions.assertEquals; @SpringBootTest @@ -29,6 +35,9 @@ class PlantsServiceIntegrationTest { @Test void canUpdatePlant() { + Authentication authentication = new UsernamePasswordAuthenticationToken("admin", "password", List.of(new SimpleGrantedAuthority("ADMIN"))); + SecurityContextHolder.getContext().setAuthentication(authentication); + System.out.println("set mock security context"); String newName = "new name!"; plantsService.updatePlant(plant.getId(), PlantUpdateRequest.builder().name(newName).build()); assertEquals(newName, plantRepository.findById(plant.getId()).get().getName());