From 2741735404d11a116e3b9420471b65fb884ba8c5 Mon Sep 17 00:00:00 2001
From: Yanick Minder <minder@puzzle.ch>
Date: Tue, 11 Feb 2025 15:15:00 +0100
Subject: [PATCH] add columns to h2 db

---
 .run/OkrApplication-E2E.run.xml                 |  2 +-
 .../java/ch/puzzle/okr/models/Deletable.java    |  1 -
 .../java/ch/puzzle/okr/models/Objective.java    |  1 -
 .../puzzle/okr/repository/ActionRepository.java |  8 ++------
 .../puzzle/okr/repository/DeleteRepository.java |  7 +++----
 .../okr/repository/ObjectiveRepository.java     |  1 -
 .../puzzle/okr/repository/UnitRepository.java   |  1 -
 .../puzzle/okr/repository/UserRepository.java   |  1 -
 .../persistence/ActionPersistenceService.java   |  3 +--
 .../persistence/CheckInPersistenceService.java  |  3 +--
 .../service/persistence/PersistenceBase.java    | 17 ++++++++---------
 .../persistence/TeamPersistenceService.java     |  3 +--
 .../persistence/UnitPersistenceService.java     |  3 +--
 .../persistence/UserPersistenceService.java     |  3 +--
 .../persistence/customCrud/DeleteMethod.java    |  6 +++---
 .../persistence/customCrud/HardDelete.java      |  5 +----
 .../persistence/customCrud/SoftDelete.java      |  8 ++++----
 .../okr/service/validation/ValidationBase.java  |  1 -
 .../V1_0_0__current-db-schema-for-testing.sql   |  8 ++++++++
 19 files changed, 35 insertions(+), 47 deletions(-)

diff --git a/.run/OkrApplication-E2E.run.xml b/.run/OkrApplication-E2E.run.xml
index aa7706165a..d14babf764 100644
--- a/.run/OkrApplication-E2E.run.xml
+++ b/.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" />
diff --git a/backend/src/main/java/ch/puzzle/okr/models/Deletable.java b/backend/src/main/java/ch/puzzle/okr/models/Deletable.java
index 5216f8447d..bf343cf148 100644
--- a/backend/src/main/java/ch/puzzle/okr/models/Deletable.java
+++ b/backend/src/main/java/ch/puzzle/okr/models/Deletable.java
@@ -3,7 +3,6 @@
 import jakarta.persistence.*;
 import org.hibernate.annotations.ColumnDefault;
 
-
 @MappedSuperclass
 public abstract class Deletable {
     @Column(name = "is_deleted", nullable = false)
diff --git a/backend/src/main/java/ch/puzzle/okr/models/Objective.java b/backend/src/main/java/ch/puzzle/okr/models/Objective.java
index 3dbb6ac09d..81adb2e7b7 100644
--- a/backend/src/main/java/ch/puzzle/okr/models/Objective.java
+++ b/backend/src/main/java/ch/puzzle/okr/models/Objective.java
@@ -70,7 +70,6 @@ private Objective(Builder builder) {
         setModifiedBy(builder.modifiedBy);
     }
 
-
     public Long getId() {
         return id;
     }
diff --git a/backend/src/main/java/ch/puzzle/okr/repository/ActionRepository.java b/backend/src/main/java/ch/puzzle/okr/repository/ActionRepository.java
index 7332e718a8..f551022362 100644
--- a/backend/src/main/java/ch/puzzle/okr/repository/ActionRepository.java
+++ b/backend/src/main/java/ch/puzzle/okr/repository/ActionRepository.java
@@ -3,12 +3,8 @@
 import ch.puzzle.okr.models.Action;
 import java.util.List;
 
-import ch.puzzle.okr.models.Objective;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.CrudRepository;
-
 public interface ActionRepository extends DeleteRepository<Action, Long> {
-//    @Query("select Action from Action a where ")
-//    TODO rename this
+    // @Query("select Action from Action a where ")
+    // TODO rename this
     List<Action> getActionsByKeyResultIdAndIsDeletedFalseOrderByPriorityAsc(Long keyResultId);
 }
diff --git a/backend/src/main/java/ch/puzzle/okr/repository/DeleteRepository.java b/backend/src/main/java/ch/puzzle/okr/repository/DeleteRepository.java
index b9c2dbdd29..6b8ffac8bb 100644
--- a/backend/src/main/java/ch/puzzle/okr/repository/DeleteRepository.java
+++ b/backend/src/main/java/ch/puzzle/okr/repository/DeleteRepository.java
@@ -1,18 +1,17 @@
 package ch.puzzle.okr.repository;
 
 import ch.puzzle.okr.models.Deletable;
+import java.util.List;
 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;
 
-import java.util.List;
-
 @NoRepositoryBean
 public interface DeleteRepository<E extends Deletable, I> extends CrudRepository<E, I> {
-//    @Query("select #{#entityName} e set e.isDeleted = true where e.id = :id")
-//    List<E> isDeleted(boolean isDeleted);
+    // @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();
diff --git a/backend/src/main/java/ch/puzzle/okr/repository/ObjectiveRepository.java b/backend/src/main/java/ch/puzzle/okr/repository/ObjectiveRepository.java
index ad0681ad41..247bdcd3cb 100644
--- a/backend/src/main/java/ch/puzzle/okr/repository/ObjectiveRepository.java
+++ b/backend/src/main/java/ch/puzzle/okr/repository/ObjectiveRepository.java
@@ -4,7 +4,6 @@
 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
diff --git a/backend/src/main/java/ch/puzzle/okr/repository/UnitRepository.java b/backend/src/main/java/ch/puzzle/okr/repository/UnitRepository.java
index ae2ce6ebee..838df2dcc9 100644
--- a/backend/src/main/java/ch/puzzle/okr/repository/UnitRepository.java
+++ b/backend/src/main/java/ch/puzzle/okr/repository/UnitRepository.java
@@ -3,7 +3,6 @@
 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
diff --git a/backend/src/main/java/ch/puzzle/okr/repository/UserRepository.java b/backend/src/main/java/ch/puzzle/okr/repository/UserRepository.java
index e394a49cc4..583ecd66a0 100644
--- a/backend/src/main/java/ch/puzzle/okr/repository/UserRepository.java
+++ b/backend/src/main/java/ch/puzzle/okr/repository/UserRepository.java
@@ -3,7 +3,6 @@
 import ch.puzzle.okr.models.User;
 import java.util.List;
 import java.util.Optional;
-import org.springframework.data.repository.CrudRepository;
 
 public interface UserRepository extends DeleteRepository<User, Long> {
     Optional<User> findByEmailAndIsDeletedFalse(String email);
diff --git a/backend/src/main/java/ch/puzzle/okr/service/persistence/ActionPersistenceService.java b/backend/src/main/java/ch/puzzle/okr/service/persistence/ActionPersistenceService.java
index 1bd78956d6..5460e4d3f9 100644
--- a/backend/src/main/java/ch/puzzle/okr/service/persistence/ActionPersistenceService.java
+++ b/backend/src/main/java/ch/puzzle/okr/service/persistence/ActionPersistenceService.java
@@ -4,9 +4,8 @@
 
 import ch.puzzle.okr.models.Action;
 import ch.puzzle.okr.repository.ActionRepository;
-import java.util.List;
-
 import ch.puzzle.okr.service.persistence.customCrud.SoftDelete;
+import java.util.List;
 import org.springframework.stereotype.Service;
 
 @Service
diff --git a/backend/src/main/java/ch/puzzle/okr/service/persistence/CheckInPersistenceService.java b/backend/src/main/java/ch/puzzle/okr/service/persistence/CheckInPersistenceService.java
index dfbbe47c46..c239c5b952 100644
--- a/backend/src/main/java/ch/puzzle/okr/service/persistence/CheckInPersistenceService.java
+++ b/backend/src/main/java/ch/puzzle/okr/service/persistence/CheckInPersistenceService.java
@@ -4,9 +4,8 @@
 
 import ch.puzzle.okr.models.checkin.CheckIn;
 import ch.puzzle.okr.repository.CheckInRepository;
-import java.util.List;
-
 import ch.puzzle.okr.service.persistence.customCrud.SoftDelete;
+import java.util.List;
 import org.springframework.stereotype.Service;
 
 @Service
diff --git a/backend/src/main/java/ch/puzzle/okr/service/persistence/PersistenceBase.java b/backend/src/main/java/ch/puzzle/okr/service/persistence/PersistenceBase.java
index 6cc3bcb410..b653fd0ce6 100644
--- a/backend/src/main/java/ch/puzzle/okr/service/persistence/PersistenceBase.java
+++ b/backend/src/main/java/ch/puzzle/okr/service/persistence/PersistenceBase.java
@@ -1,23 +1,22 @@
 package ch.puzzle.okr.service.persistence;
 
+import static org.springframework.http.HttpStatus.BAD_REQUEST;
+import static org.springframework.http.HttpStatus.NOT_FOUND;
+
 import ch.puzzle.okr.ErrorKey;
 import ch.puzzle.okr.exception.OkrResponseStatusException;
 import ch.puzzle.okr.service.persistence.customCrud.DeleteMethod;
 import ch.puzzle.okr.service.persistence.customCrud.HardDelete;
+import java.util.List;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.stream.StreamSupport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.dao.OptimisticLockingFailureException;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.http.HttpStatus;
 
-import java.util.List;
-import java.util.Spliterator;
-import java.util.Spliterators;
-import java.util.stream.StreamSupport;
-
-import static org.springframework.http.HttpStatus.BAD_REQUEST;
-import static org.springframework.http.HttpStatus.NOT_FOUND;
-
 /**
  * @param <T>
  *            the Type or entity of the repository
@@ -45,7 +44,7 @@ protected PersistenceBase(R repository) {
     }
 
     public R getRepository() {
-        return  repository;
+        return repository;
     }
 
     public T findById(I id) throws OkrResponseStatusException {
diff --git a/backend/src/main/java/ch/puzzle/okr/service/persistence/TeamPersistenceService.java b/backend/src/main/java/ch/puzzle/okr/service/persistence/TeamPersistenceService.java
index 6afe3cf46c..3b6d9b90df 100644
--- a/backend/src/main/java/ch/puzzle/okr/service/persistence/TeamPersistenceService.java
+++ b/backend/src/main/java/ch/puzzle/okr/service/persistence/TeamPersistenceService.java
@@ -4,9 +4,8 @@
 
 import ch.puzzle.okr.models.Team;
 import ch.puzzle.okr.repository.TeamRepository;
-import java.util.List;
-
 import ch.puzzle.okr.service.persistence.customCrud.SoftDelete;
+import java.util.List;
 import org.springframework.stereotype.Service;
 
 @Service
diff --git a/backend/src/main/java/ch/puzzle/okr/service/persistence/UnitPersistenceService.java b/backend/src/main/java/ch/puzzle/okr/service/persistence/UnitPersistenceService.java
index 3ce66ad30f..eeb3b9ce75 100644
--- a/backend/src/main/java/ch/puzzle/okr/service/persistence/UnitPersistenceService.java
+++ b/backend/src/main/java/ch/puzzle/okr/service/persistence/UnitPersistenceService.java
@@ -7,9 +7,8 @@
 import ch.puzzle.okr.exception.OkrResponseStatusException;
 import ch.puzzle.okr.models.Unit;
 import ch.puzzle.okr.repository.UnitRepository;
-import java.util.List;
-
 import ch.puzzle.okr.service.persistence.customCrud.SoftDelete;
+import java.util.List;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 
diff --git a/backend/src/main/java/ch/puzzle/okr/service/persistence/UserPersistenceService.java b/backend/src/main/java/ch/puzzle/okr/service/persistence/UserPersistenceService.java
index 7565209464..41d741691f 100644
--- a/backend/src/main/java/ch/puzzle/okr/service/persistence/UserPersistenceService.java
+++ b/backend/src/main/java/ch/puzzle/okr/service/persistence/UserPersistenceService.java
@@ -4,10 +4,9 @@
 
 import ch.puzzle.okr.models.User;
 import ch.puzzle.okr.repository.UserRepository;
+import ch.puzzle.okr.service.persistence.customCrud.SoftDelete;
 import java.util.List;
 import java.util.Optional;
-
-import ch.puzzle.okr.service.persistence.customCrud.SoftDelete;
 import org.springframework.stereotype.Service;
 
 @Service
diff --git a/backend/src/main/java/ch/puzzle/okr/service/persistence/customCrud/DeleteMethod.java b/backend/src/main/java/ch/puzzle/okr/service/persistence/customCrud/DeleteMethod.java
index 3c94c202f4..042b71212a 100644
--- a/backend/src/main/java/ch/puzzle/okr/service/persistence/customCrud/DeleteMethod.java
+++ b/backend/src/main/java/ch/puzzle/okr/service/persistence/customCrud/DeleteMethod.java
@@ -5,9 +5,9 @@
 public abstract class DeleteMethod<T, I, R extends CrudRepository<T, I>> {
     protected R repo;
     public abstract void deleteById(I id);
-    public abstract Iterable<T>  findAll();
+    public abstract Iterable<T> findAll();
 
-    public void setRepo(R repo){
-        this.repo  = repo;
+    public void setRepo(R repo) {
+        this.repo = repo;
     }
 }
diff --git a/backend/src/main/java/ch/puzzle/okr/service/persistence/customCrud/HardDelete.java b/backend/src/main/java/ch/puzzle/okr/service/persistence/customCrud/HardDelete.java
index 513ecc51f7..ab9b22c957 100644
--- a/backend/src/main/java/ch/puzzle/okr/service/persistence/customCrud/HardDelete.java
+++ b/backend/src/main/java/ch/puzzle/okr/service/persistence/customCrud/HardDelete.java
@@ -2,10 +2,7 @@
 
 import org.springframework.data.repository.CrudRepository;
 
-import java.util.List;
-
-
-public class HardDelete<T, I, R extends CrudRepository<T, I>> extends DeleteMethod<T, I, R>{
+public class HardDelete<T, I, R extends CrudRepository<T, I>> extends DeleteMethod<T, I, R> {
 
     @Override
     public void deleteById(I id) {
diff --git a/backend/src/main/java/ch/puzzle/okr/service/persistence/customCrud/SoftDelete.java b/backend/src/main/java/ch/puzzle/okr/service/persistence/customCrud/SoftDelete.java
index b7c8942e33..9180b21d5a 100644
--- a/backend/src/main/java/ch/puzzle/okr/service/persistence/customCrud/SoftDelete.java
+++ b/backend/src/main/java/ch/puzzle/okr/service/persistence/customCrud/SoftDelete.java
@@ -3,15 +3,15 @@
 import ch.puzzle.okr.models.Deletable;
 import ch.puzzle.okr.repository.DeleteRepository;
 
-
-public class SoftDelete <T extends Deletable, I, R extends DeleteRepository<T, I>> extends DeleteMethod<T, I, R> {
+public class SoftDelete<T extends Deletable, I, R extends DeleteRepository<T, I>> extends DeleteMethod<T, I, R> {
     @Override
     public void deleteById(I id) {
-        repo.markAsDeleted(id);
+        this.repo.deleteById(id);
+        // repo.markAsDeleted(id);
     }
 
     @Override
-    public Iterable<T>  findAll() {
+    public Iterable<T> findAll() {
         return this.repo.findAllVisible();
     }
 }
diff --git a/backend/src/main/java/ch/puzzle/okr/service/validation/ValidationBase.java b/backend/src/main/java/ch/puzzle/okr/service/validation/ValidationBase.java
index f886adc747..f4e1eb8184 100644
--- a/backend/src/main/java/ch/puzzle/okr/service/validation/ValidationBase.java
+++ b/backend/src/main/java/ch/puzzle/okr/service/validation/ValidationBase.java
@@ -15,7 +15,6 @@
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.http.HttpStatus;
 
diff --git a/backend/src/main/resources/db/h2-db/database-h2-schema/V1_0_0__current-db-schema-for-testing.sql b/backend/src/main/resources/db/h2-db/database-h2-schema/V1_0_0__current-db-schema-for-testing.sql
index 09ab19c645..319dbb3936 100644
--- a/backend/src/main/resources/db/h2-db/database-h2-schema/V1_0_0__current-db-schema-for-testing.sql
+++ b/backend/src/main/resources/db/h2-db/database-h2-schema/V1_0_0__current-db-schema-for-testing.sql
@@ -19,6 +19,8 @@ CREATE  TABLE unit
     unit_name      TEXT                  NOT NULL,
     created_by_id     BIGINT,
     is_default     boolean               NOT NULL,
+    is_deleted     boolean  default false NOT NULL,
+
     PRIMARY KEY (id)
 );
 
@@ -30,6 +32,7 @@ create table if not exists person
     first_name varchar(50)  not null,
     last_name  varchar(50)  not null,
     okr_champion BOOLEAN DEFAULT FALSE,
+    is_deleted     boolean  default false NOT NULL,
     primary key (id),
     constraint uk_person_email
         unique (email)
@@ -53,6 +56,7 @@ create table if not exists team
     id      bigint       not null,
     version int          not null,
     name    varchar(250) not null,
+    is_deleted     boolean  default false NOT NULL,
     primary key (id)
 );
 
@@ -71,6 +75,7 @@ create table if not exists objective
     state          text         not null,
     modified_by_id bigint,
     created_on     timestamp    not null,
+    is_deleted     boolean  default false NOT NULL,
     primary key (id),
     constraint fk_objective_created_by_person
         foreign key (created_by_id) references person,
@@ -107,6 +112,7 @@ create table if not exists key_result
     commit_zone     varchar(1024),
     target_zone     varchar(1024),
     stretch_zone    varchar(1024),
+    is_deleted     boolean  default false NOT NULL,
     primary key (id),
     constraint fk4ba6rgbr8mrkc8vvyqd5il4v9
         foreign key (created_by_id) references person,
@@ -139,6 +145,7 @@ create table if not exists check_in
     confidence    integer,
     check_in_type varchar(255),
     zone          text,
+    is_deleted     boolean  default false NOT NULL,
     primary key (id),
     constraint fk_check_in_key_result
         foreign key (key_result_id) references key_result
@@ -165,6 +172,7 @@ create table action
     action_point        varchar(4096) not null,
     priority      integer       not null,
     checked    boolean       not null,
+    is_deleted     boolean  default false NOT NULL,
     key_result_id bigint        not null
         constraint fk_completed_key_result
             references key_result