#998: use QuarterData and remove Quarter implementation in backend

puzzle · Sep 23, 2024 · d59f128 · d59f128
1 parent 4af8695
commit d59f128
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 528 deletions.
diff --git a/...java/ch/puzzle/okr/utilX/QuarterData.java → .../java/ch/puzzle/okr/util/QuarterData.java b/...java/ch/puzzle/okr/utilX/QuarterData.java → .../java/ch/puzzle/okr/util/QuarterData.java
@@ -1,4 +1,4 @@
-package ch.puzzle.okr.utilX;
+package ch.puzzle.okr.util;
 
 import ch.puzzle.quarter.generate.h2.QuarterFunction;
 import org.slf4j.Logger;

diff --git a/backend/src/main/java/ch/puzzle/okr/util/quarter/generate/QuarterData.java b/backend/src/main/java/ch/puzzle/okr/util/quarter/generate/QuarterData.java
diff --git a/backend/src/main/java/ch/puzzle/okr/util/quarter/generate/QuarterLabel.java b/backend/src/main/java/ch/puzzle/okr/util/quarter/generate/QuarterLabel.java
diff --git a/backend/src/main/java/ch/puzzle/okr/util/quarter/generate/Quarters.java b/backend/src/main/java/ch/puzzle/okr/util/quarter/generate/Quarters.java
diff --git a/backend/src/main/java/ch/puzzle/okr/util/quarter/generate/h2/QuarterFunction.java b/backend/src/main/java/ch/puzzle/okr/util/quarter/generate/h2/QuarterFunction.java
diff --git a/backend/src/main/resources/db/h2-db/data-test-h2/V100_0_0__TestData.sql b/backend/src/main/resources/db/h2-db/data-test-h2/V100_0_0__TestData.sql
@@ -31,13 +31,13 @@ values (1, 1, '[email protected]', 'Paco', 'Eggimann', 'peggimann'),
        (41, 1, '[email protected]', 'Paco', 'Egiman', 'paco'),
        (51, 1, '[email protected]', 'Robin', 'Papierer', 'robin');
 
-CREATE ALIAS INIT_QUARTER_DATA FOR 'ch.puzzle.okr.util.quarter.generate.h2.QuarterFunction.initQuarterData';
-CREATE ALIAS CURRENT_QUARTER_LABEL FOR 'ch.puzzle.okr.util.quarter.generate.h2.QuarterFunction.currentQuarterLabel';
-CREATE ALIAS CURRENT_QUARTER_START_DATE FOR 'ch.puzzle.okr.util.quarter.generate.h2.QuarterFunction.currentQuarterStartDate';
-CREATE ALIAS CURRENT_QUARTER_END_DATE FOR 'ch.puzzle.okr.util.quarter.generate.h2.QuarterFunction.currentQuarterEndDate';
-CREATE ALIAS NEXT_QUARTER_LABEL FOR 'ch.puzzle.okr.util.quarter.generate.h2.QuarterFunction.nextQuarterLabel';
-CREATE ALIAS NEXT_QUARTER_START_DATE FOR 'ch.puzzle.okr.util.quarter.generate.h2.QuarterFunction.nextQuarterStartDate';
-CREATE ALIAS NEXT_QUARTER_END_DATE FOR 'ch.puzzle.okr.util.quarter.generate.h2.QuarterFunction.nextQuarterEndDate';
+CREATE ALIAS INIT_QUARTER_DATA FOR 'ch.puzzle.okr.util.QuarterData.initQuarterData';
+CREATE ALIAS CURRENT_QUARTER_LABEL FOR 'ch.puzzle.okr.util.QuarterData.currentQuarterLabel';
+CREATE ALIAS CURRENT_QUARTER_START_DATE FOR 'ch.puzzle.okr.util.QuarterData.currentQuarterStartDate';
+CREATE ALIAS CURRENT_QUARTER_END_DATE FOR 'ch.puzzle.okr.util.QuarterData.currentQuarterEndDate';
+CREATE ALIAS NEXT_QUARTER_LABEL FOR 'ch.puzzle.okr.util.QuarterData.nextQuarterLabel';
+CREATE ALIAS NEXT_QUARTER_START_DATE FOR 'ch.puzzle.okr.util.QuarterData.nextQuarterStartDate';
+CREATE ALIAS NEXT_QUARTER_END_DATE FOR 'ch.puzzle.okr.util.QuarterData.nextQuarterEndDate';
 
 call INIT_QUARTER_DATA();
 

diff --git a/backend/src/test/java/ch/puzzle/okr/util/quarter/generate/QuarterLabelTest.java b/backend/src/test/java/ch/puzzle/okr/util/quarter/generate/QuarterLabelTest.java