Feature/refactor delete

.run/OkrApplication-E2E.run.xml

@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="OkrApplication-E2E" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
     <option name="ACTIVE_PROFILES" value="integration-test" />
-    <option name="ALTERNATIVE_JRE_PATH" value="$USER_HOME$/.sdkman/candidates/java/current" />
+    <option name="ALTERNATIVE_JRE_PATH" value="corretto-21" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <module name="backend" />
     <option name="SPRING_BOOT_MAIN_CLASS" value="ch.puzzle.okr.OkrApplication" />

backend/src/main/java/ch/puzzle/okr/models/Action.java

@@ -7,7 +7,7 @@
 import java.util.Objects;
 
 @Entity
-public class Action implements WriteableInterface {
+public class Action extends Deletable implements WriteableInterface {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "sequence_action")
     @SequenceGenerator(name = "sequence_action", allocationSize = 1)

backend/src/main/java/ch/puzzle/okr/models/Deletable.java

@@ -0,0 +1,19 @@
+package ch.puzzle.okr.models;
+
+import jakarta.persistence.*;
+import org.hibernate.annotations.ColumnDefault;
+
+@MappedSuperclass
+public abstract class Deletable {
+    @Column(name = "is_deleted", nullable = false)
+    @ColumnDefault("false")
+    private boolean isDeleted = false;
+
+    public boolean isDeleted() {
+        return isDeleted;
+    }
+
+    public void setDeleted(boolean deleted) {
+        isDeleted = deleted;
+    }
+}

backend/src/main/java/ch/puzzle/okr/models/Objective.java

@@ -9,7 +9,7 @@
 
 @Entity
 @Table(indexes = { @Index(name = "idx_objective_title", columnList = "title") })
-public class Objective implements WriteableInterface {
+public class Objective extends Deletable implements WriteableInterface {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "sequence_objective")
     @SequenceGenerator(name = "sequence_objective", allocationSize = 1)

backend/src/main/java/ch/puzzle/okr/models/Team.java

@@ -8,7 +8,7 @@
 import java.util.Objects;
 
 @Entity
-public class Team implements WriteableInterface {
+public class Team extends Deletable implements WriteableInterface {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "sequence_team")
     @SequenceGenerator(name = "sequence_team", allocationSize = 1)

backend/src/main/java/ch/puzzle/okr/models/Unit.java

@@ -9,7 +9,7 @@
 
 @Entity
 @EntityListeners(AuditingEntityListener.class)
-public class Unit {
+public class Unit extends Deletable {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "sequence_unit")
     @SequenceGenerator(name = "sequence_unit", allocationSize = 1)

backend/src/main/java/ch/puzzle/okr/models/User.java

@@ -12,7 +12,7 @@
 @Entity
 // table cannot be named "user" since it is a reserved keyword of Postgres
 @Table(name = "person")
-public class User {
+public class User extends Deletable {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "sequence_person")
     @SequenceGenerator(name = "sequence_person", allocationSize = 1)

backend/src/main/java/ch/puzzle/okr/models/checkin/CheckIn.java

@@ -1,5 +1,6 @@
 package ch.puzzle.okr.models.checkin;
 
+import ch.puzzle.okr.models.Deletable;
 import ch.puzzle.okr.models.MessageKey;
 import ch.puzzle.okr.models.User;
 import ch.puzzle.okr.models.WriteableInterface;
@@ -15,7 +16,7 @@
 @Entity
 @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 @DiscriminatorColumn(name = "check_in_type")
-public abstract class CheckIn implements WriteableInterface {
+public abstract class CheckIn extends Deletable implements WriteableInterface {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "sequence_check_in")
     @SequenceGenerator(name = "sequence_check_in", allocationSize = 1)

backend/src/main/java/ch/puzzle/okr/models/keyresult/KeyResult.java

@@ -11,7 +11,7 @@
 @Entity
 @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 @DiscriminatorColumn(name = "key_result_type")
-public abstract class KeyResult implements WriteableInterface {
+public abstract class KeyResult extends Deletable implements WriteableInterface {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "sequence_key_result")
     @SequenceGenerator(name = "sequence_key_result", allocationSize = 1)

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

@@ -2,8 +2,7 @@
 
 import ch.puzzle.okr.models.Action;
 import java.util.List;
-import org.springframework.data.repository.CrudRepository;
 
-public interface ActionRepository extends CrudRepository<Action, Long> {
-    List<Action> getActionsByKeyResultIdOrderByPriorityAsc(Long keyResultId);
+public interface ActionRepository extends DeleteRepository<Action, Long> {
+    List<Action> getActionsByKeyResultIdAndIsDeletedFalseOrderByPriorityAsc(Long keyResultId);
 }

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

@@ -2,10 +2,9 @@
 
 import ch.puzzle.okr.models.checkin.CheckIn;
 import java.util.List;
-import org.springframework.data.repository.CrudRepository;
 
-public interface CheckInRepository extends CrudRepository<CheckIn, Long> {
-    List<CheckIn> findCheckInsByKeyResultIdOrderByCreatedOnDesc(Long keyResultId);
+public interface CheckInRepository extends DeleteRepository<CheckIn, Long> {
+    List<CheckIn> findCheckInsByKeyResultIdAndIsDeletedFalseOrderByCreatedOnDesc(Long keyResultId);
 
-    CheckIn findFirstByKeyResultIdOrderByCreatedOnDesc(Long keyResultId);
+    CheckIn findFirstByKeyResultIdAndIsDeletedFalseOrderByCreatedOnDesc(Long keyResultId);
 }

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

@@ -0,0 +1,23 @@
+package ch.puzzle.okr.repository;
+
+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;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.NoRepositoryBean;
+import org.springframework.data.repository.query.Param;
+
+@NoRepositoryBean
+public interface DeleteRepository<E extends Deletable, I> extends CrudRepository<E, I>, JpaSpecificationExecutor<E> {
+    // @Query("select #{#entityName} e set e.isDeleted = true where e.id = :id")
+    // List<E> isDeleted(boolean isDeleted);
+
+    @Query("select e from #{#entityName} e where e.isDeleted = false ")
+    List<E> findAllVisible();
+
+    @Modifying
+    @Query("update #{#entityName} e set e.isDeleted = true where e.id = :id")
+    void markAsDeleted(@Param("id") I id);
+}

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

@@ -2,8 +2,7 @@
 
 import ch.puzzle.okr.models.keyresult.KeyResult;
 import java.util.List;
-import org.springframework.data.repository.CrudRepository;
 
-public interface KeyResultRepository extends CrudRepository<KeyResult, Long> {
-    List<KeyResult> findByObjectiveId(Long objectiveId);
+public interface KeyResultRepository extends DeleteRepository<KeyResult, Long> {
+    List<KeyResult> findByObjectiveIdAndIsDeletedFalse(Long objectiveId);
 }

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

@@ -4,13 +4,12 @@
 import ch.puzzle.okr.models.Quarter;
 import ch.puzzle.okr.models.Team;
 import java.util.List;
-import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface ObjectiveRepository extends CrudRepository<Objective, Long> {
+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

@@ -2,9 +2,8 @@
 
 import ch.puzzle.okr.models.Team;
 import java.util.List;
-import org.springframework.data.repository.CrudRepository;
 
-public interface TeamRepository extends CrudRepository<Team, Long> {
+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

@@ -3,17 +3,16 @@
 import ch.puzzle.okr.models.Unit;
 import java.util.List;
 import java.util.Optional;
-import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface UnitRepository extends CrudRepository<Unit, Long> {
+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

@@ -3,10 +3,9 @@
 import ch.puzzle.okr.models.User;
 import java.util.List;
 import java.util.Optional;
-import org.springframework.data.repository.CrudRepository;
 
-public interface UserRepository extends CrudRepository<User, Long> {
-    Optional<User> findByEmail(String email);
+public interface UserRepository extends DeleteRepository<User, Long> {
+    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

@@ -4,14 +4,15 @@
 
 import ch.puzzle.okr.models.Action;
 import ch.puzzle.okr.repository.ActionRepository;
+import ch.puzzle.okr.service.persistence.customCrud.SoftDelete;
 import java.util.List;
 import org.springframework.stereotype.Service;
 
 @Service
 public class ActionPersistenceService extends PersistenceBase<Action, Long, ActionRepository> {
 
     protected ActionPersistenceService(ActionRepository repository) {
-        super(repository);
+        super(repository, new SoftDelete<>());
     }
 
     @Override
@@ -20,6 +21,6 @@ public String getModelName() {
     }
 
     public List<Action> getActionsByKeyResultIdOrderByPriorityAsc(Long keyResultId) {
-        return getRepository().getActionsByKeyResultIdOrderByPriorityAsc(keyResultId);
+        return getRepository().getActionsByKeyResultIdAndIsDeletedFalseOrderByPriorityAsc(keyResultId);
     }
 }

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

@@ -4,14 +4,15 @@
 
 import ch.puzzle.okr.models.checkin.CheckIn;
 import ch.puzzle.okr.repository.CheckInRepository;
+import ch.puzzle.okr.service.persistence.customCrud.SoftDelete;
 import java.util.List;
 import org.springframework.stereotype.Service;
 
 @Service
 public class CheckInPersistenceService extends PersistenceBase<CheckIn, Long, CheckInRepository> {
 
     protected CheckInPersistenceService(CheckInRepository repository) {
-        super(repository);
+        super(repository, new SoftDelete<>());
     }
 
     @Override
@@ -20,10 +21,10 @@ public String getModelName() {
     }
 
     public List<CheckIn> getCheckInsByKeyResultIdOrderByCheckInDateDesc(Long keyResultId) {
-        return getRepository().findCheckInsByKeyResultIdOrderByCreatedOnDesc(keyResultId);
+        return getRepository().findCheckInsByKeyResultIdAndIsDeletedFalseOrderByCreatedOnDesc(keyResultId);
     }
 
     public CheckIn getLastCheckInOfKeyResult(Long keyResultId) {
-        return getRepository().findFirstByKeyResultIdOrderByCreatedOnDesc(keyResultId);
+        return getRepository().findFirstByKeyResultIdAndIsDeletedFalseOrderByCreatedOnDesc(keyResultId);
     }
 }

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

@@ -4,6 +4,7 @@
 
 import ch.puzzle.okr.models.keyresult.KeyResult;
 import ch.puzzle.okr.repository.KeyResultRepository;
+import ch.puzzle.okr.service.persistence.customCrud.SoftDelete;
 import jakarta.transaction.Transactional;
 import java.util.List;
 import org.springframework.stereotype.Service;
@@ -12,7 +13,7 @@
 public class KeyResultPersistenceService extends PersistenceBase<KeyResult, Long, KeyResultRepository> {
 
     protected KeyResultPersistenceService(KeyResultRepository repository) {
-        super(repository);
+        super(repository, new SoftDelete<>());
     }
 
     @Override
@@ -21,13 +22,14 @@ public String getModelName() {
     }
 
     public List<KeyResult> getKeyResultsByObjective(Long objectiveId) {
-        return getRepository().findByObjectiveId(objectiveId);
+        return getRepository().findByObjectiveIdAndIsDeletedFalse(objectiveId);
     }
 
     @Transactional
     public KeyResult recreateEntity(Long id, KeyResult keyResult) {
         // delete entity in order to prevent duplicates in case of changed keyResultType
         deleteById(id);
+        // deleteById(id, new HardDelete<>());
 
         // reset id of key result, so it gets saved as a new entity
         keyResult.resetId();

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

@@ -8,6 +8,7 @@
 import ch.puzzle.okr.models.Team;
 import ch.puzzle.okr.models.authorization.AuthorizationUser;
 import ch.puzzle.okr.repository.ObjectiveRepository;
+import ch.puzzle.okr.service.persistence.customCrud.SoftDelete;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.NoResultException;
 import jakarta.persistence.TypedQuery;
@@ -29,7 +30,7 @@ public class ObjectivePersistenceService extends PersistenceBase<Objective, Long
 
     protected ObjectivePersistenceService(ObjectiveRepository repository, EntityManager entityManager,
                                           AuthorizationCriteria<Objective> authorizationCriteria) {
-        super(repository);
+        super(repository, new SoftDelete<>());
         this.entityManager = entityManager;
         this.authorizationCriteria = authorizationCriteria;
     }
@@ -52,7 +53,7 @@ public String getModelName() {
      * @return number of Objectives of team in quarter
      */
     public Integer countByTeamAndQuarter(Team team, Quarter quarter) {
-        return getRepository().countByTeamAndQuarter(team, quarter);
+        return getRepository().countByTeamAndQuarterAndIsDeletedFalse(team, quarter);
     }
 
     public Objective findObjectiveById(Long objectiveId, AuthorizationUser authorizationUser,
@@ -61,7 +62,7 @@ public Objective findObjectiveById(Long objectiveId, AuthorizationUser authoriza
     }
 
     public List<Objective> findObjectiveByTeamId(Long teamId) {
-        return getRepository().findObjectivesByTeamId(teamId);
+        return getRepository().findObjectivesByTeamIdAndIsDeletedFalse(teamId);
     }
 
     public Objective findObjectiveByKeyResultId(Long keyResultId, AuthorizationUser authorizationUser,