fix tests by fixing view

Author: kcinay055679

backend/src/main/java/ch/puzzle/okr/OkrApplication.java

@@ -1,9 +1,7 @@
 package ch.puzzle.okr;
 
-import ch.puzzle.okr.models.Deletable;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.data.jpa.domain.Specification;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
@@ -15,9 +13,4 @@ public static void main(String[] args) {
                 .initializers(new OkrApplicationContextInitializer()) //
                 .run(args);
     }
-
-    public static <E> Specification<E> isNotMarkedAsDeleted() {
-        return (root, query, criteriaBuilder) ->
-                criteriaBuilder.isFalse(root.get("isDeleted"));
-    }
 }

backend/src/main/java/ch/puzzle/okr/repository/ActionRepository.java

@@ -4,7 +4,5 @@
 import java.util.List;
 
 public interface ActionRepository extends DeleteRepository<Action, Long> {
-    // @Query("select Action from Action a where ")
-    // TODO rename this
-    List<Action> getActionsByKeyResultIdOrderByPriorityAsc(Long keyResultId);
+    List<Action> getActionsByKeyResultIdAndIsDeletedFalseOrderByPriorityAsc(Long keyResultId);
 }

backend/src/main/java/ch/puzzle/okr/repository/CheckInRepository.java

@@ -1,11 +1,10 @@
 package ch.puzzle.okr.repository;
 
 import ch.puzzle.okr.models.checkin.CheckIn;
-
 import java.util.List;
 
 public interface CheckInRepository extends DeleteRepository<CheckIn, Long> {
-    List<CheckIn> findCheckInsByKeyResultIdOrderByCreatedOnDesc(Long keyResultId);
+    List<CheckIn> findCheckInsByKeyResultIdAndIsDeletedFalseOrderByCreatedOnDesc(Long keyResultId);
 
-    CheckIn findFirstByKeyResultIdOrderByCreatedOnDesc(Long keyResultId);
+    CheckIn findFirstByKeyResultIdAndIsDeletedFalseOrderByCreatedOnDesc(Long keyResultId);
 }

backend/src/main/java/ch/puzzle/okr/repository/DeleteRepository.java

@@ -2,7 +2,6 @@
 
 import ch.puzzle.okr.models.Deletable;
 import java.util.List;
-
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;

backend/src/main/java/ch/puzzle/okr/repository/KeyResultRepository.java

@@ -4,5 +4,5 @@
 import java.util.List;
 
 public interface KeyResultRepository extends DeleteRepository<KeyResult, Long> {
-    List<KeyResult> findByObjectiveId(Long objectiveId);
+    List<KeyResult> findByObjectiveIdAndIsDeletedFalse(Long objectiveId);
 }

backend/src/main/java/ch/puzzle/okr/repository/ObjectiveRepository.java

@@ -9,7 +9,7 @@
 @Repository
 public interface ObjectiveRepository extends DeleteRepository<Objective, Long> {
 
-    Integer countByTeamAndQuarter(Team team, Quarter quarter);
+    Integer countByTeamAndQuarterAndIsDeletedFalse(Team team, Quarter quarter);
 
-    List<Objective> findObjectivesByTeamId(Long id);
+    List<Objective> findObjectivesByTeamIdAndIsDeletedFalse(Long id);
 }

backend/src/main/java/ch/puzzle/okr/repository/TeamRepository.java

@@ -5,5 +5,5 @@
 
 public interface TeamRepository extends DeleteRepository<Team, Long> {
 
-    List<Team> findTeamsByName(String name);
+    List<Team> findTeamsByNameAndIsDeletedFalse(String name);
 }

backend/src/main/java/ch/puzzle/okr/repository/UnitRepository.java

@@ -8,11 +8,11 @@
 @Repository
 public interface UnitRepository extends DeleteRepository<Unit, Long> {
 
-    Optional<Unit> findUnitByUnitName(String name);
+    Optional<Unit> findUnitByUnitNameAndIsDeletedFalse(String name);
 
-    List<Unit> findAllByCreatedById(Long userId);
+    List<Unit> findAllByCreatedByIdAndIsDeletedFalse(Long userId);
 
-    boolean existsUnitByUnitName(String unitName);
+    boolean existsUnitByUnitNameAndIsDeletedFalse(String unitName);
 
-    boolean existsUnitByUnitNameAndIdNot(String unitName, Long id);
+    boolean existsUnitByUnitNameAndIsDeletedFalseAndIdNot(String unitName, Long id);
 }

backend/src/main/java/ch/puzzle/okr/repository/UserRepository.java

@@ -5,7 +5,7 @@
 import java.util.Optional;
 
 public interface UserRepository extends DeleteRepository<User, Long> {
-    Optional<User> findByEmail(String email);
+    Optional<User> findByEmailAndIsDeletedFalse(String email);
 
-    List<User> findByOkrChampion(boolean isOkrChampion);
+    List<User> findByOkrChampionAndIsDeletedFalse(boolean isOkrChampion);
 }

backend/src/main/java/ch/puzzle/okr/service/persistence/ActionPersistenceService.java

@@ -21,6 +21,6 @@ public String getModelName() {
     }
 
     public List<Action> getActionsByKeyResultIdOrderByPriorityAsc(Long keyResultId) {
-        return getRepository().getActionsByKeyResultIdOrderByPriorityAsc(keyResultId);
+        return getRepository().getActionsByKeyResultIdAndIsDeletedFalseOrderByPriorityAsc(keyResultId);
     }
 }