Change period to be a daterange in DB

Author: terolaakso

service/src/main/kotlin/fi/espoo/evaka/messaging/MessageQueries.kt

@@ -807,9 +807,9 @@ personal_accounts AS (
     JOIN message_account acc ON acc.employee_id = acl.employee_id
     JOIN message_account_view acc_name ON acc_name.id = acc.id
     LEFT JOIN LATERAL (
-        SELECT daterange(ooo.start_date, ooo.end_date, '[]') AS period
+        SELECT ooo.period
         FROM out_of_office ooo
-        WHERE ooo.employee_id = acc.employee_id AND ${bind(today)} BETWEEN ooo.start_date AND ooo.end_date
+        WHERE ooo.employee_id = acc.employee_id AND period && DATERANGE(${bind(today)}, NULL)
         LIMIT 1
     ) ooo ON TRUE
     WHERE active IS TRUE

service/src/main/kotlin/fi/espoo/evaka/outofoffice/OutOfOffice.kt

@@ -22,10 +22,10 @@ fun Database.Read.getOutOfOfficePeriods(
         createQuery {
                 sql(
                     """
-SELECT id, daterange(start_date, end_date, '[]') AS period
+SELECT id, period
 FROM out_of_office
 WHERE employee_id = ${bind(employeeId)}
-AND end_date >= ${bind(today)}
+AND period && DATERANGE(${bind(today)}, NULL)
 """
                 )
             }
@@ -41,8 +41,8 @@ fun Database.Transaction.upsertOutOfOfficePeriod(
         createUpdate {
                 sql(
                     """
-INSERT INTO out_of_office (employee_id, start_date, end_date)
-VALUES (${bind(employeeId)}, ${bind(period.period.start)}, ${bind(period.period.end)})
+INSERT INTO out_of_office (employee_id, period)
+VALUES (${bind(employeeId)}, DATERANGE(${bind(period.period.start)}, ${bind(period.period.end)}, '[]'))
 """
                 )
             }
@@ -52,7 +52,7 @@ VALUES (${bind(employeeId)}, ${bind(period.period.start)}, ${bind(period.period.
                 sql(
                     """
 UPDATE out_of_office
-SET start_date = ${bind(period.period.start)}, end_date = ${bind(period.period.end)}
+SET period = DATERANGE(${bind(period.period.start)}, ${bind(period.period.end)}, '[]')
 WHERE id = ${bind(period.id)}
 """
                 )

service/src/main/resources/db/migration/V483__out_of_office.sql

@@ -1,14 +1,13 @@
 CREATE TABLE out_of_office
 (
     id          UUID PRIMARY KEY DEFAULT ext.uuid_generate_v1mc(),
-    employee_id UUID NOT NULL,
-    start_date  DATE NOT NULL,
-    end_date    DATE NOT NULL
+    employee_id UUID      NOT NULL,
+    period      DATERANGE NOT NULL
 );
 
-CREATE INDEX idx_out_of_office_employee_id_end_date
-    ON out_of_office (employee_id, end_date);
+CREATE INDEX idx_out_of_office_employee_id_period
+    ON out_of_office USING gist (employee_id, period);
 
 ALTER TABLE out_of_office
     ADD CONSTRAINT fk_out_of_office_employee_id FOREIGN KEY (employee_id) REFERENCES employee (id),
-    ADD CONSTRAINT start_before_end CHECK ((start_date <= end_date));
+    ADD CONSTRAINT period_not_null CHECK ((NOT (lower_inf(period) OR upper_inf(period))));