Changeset 8615885

Timestamp:

02/09/26 22:17:45 (5 months ago)

Author:

Andrej <asumanovski@…>

Branches:

master

Children:

5c20c64

Parents:

3ebe47c

Message:

Made all models

Files:

• backend/src/main/java/com/trekr/backend/entity/discipline/CustomTrackingCategory.java (added)
• backend/src/main/java/com/trekr/backend/entity/discipline/DailyCompletion.java (added)
• backend/src/main/java/com/trekr/backend/entity/discipline/DisciplineUser.java (added)
• backend/src/main/java/com/trekr/backend/entity/discipline/Task.java (added)
• backend/src/main/java/com/trekr/backend/entity/discipline/TaskDailyCompletion.java (added)
• backend/src/main/java/com/trekr/backend/entity/discipline/TaskDailyCompletionId.java (added)
• backend/src/main/java/com/trekr/backend/entity/finance/FinanceUser.java (added)
• backend/src/main/java/com/trekr/backend/entity/finance/Income.java (added)
• backend/src/main/java/com/trekr/backend/entity/invest/Asset.java (added)
• backend/src/main/java/com/trekr/backend/entity/invest/InvestorUser.java (added)
• backend/src/main/java/com/trekr/backend/entity/training/TrainingSession.java (added)
• backend/src/main/java/com/trekr/backend/entity/training/TrainingUser.java (added)
• backend/src/main/java/com/trekr/backend/entity/weight/DailyIntake.java (added)
• backend/src/main/java/com/trekr/backend/entity/weight/WeightUser.java (added)
• db-scripts/ddl.sql (modified) (7 diffs)
• db-scripts/dml.sql (modified) (7 diffs)

db-scripts/ddl.sql

@@ -37 +37 @@
 
 CREATE TABLE INCOMES (
-    income_id BIGINT PRIMARY KEY,
+    income_id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
     user_id BIGINT
         REFERENCES FINANCE_USERS(user_id) ON DELETE CASCADE,
@@ -62 +62 @@
 
 CREATE TABLE DAILY_INTAKES (
-    daily_intake_id BIGINT PRIMARY KEY,
+    daily_intake_id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
     user_id BIGINT
         REFERENCES WEIGHT_USERS(user_id) ON DELETE CASCADE,
@@ -70 +70 @@
 
 CREATE TABLE TRAINING_SESSIONS (
-    training_id BIGINT PRIMARY KEY,
+    training_id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
     training_user_id BIGINT
         REFERENCES TRAINING_USERS(user_id) ON DELETE CASCADE,
@@ -89 +89 @@
 
 CREATE TABLE CUSTOM_TRACKING_CATEGORIES (
-    custom_tracking_id BIGINT PRIMARY KEY,
+    custom_tracking_id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
     user_id BIGINT
         REFERENCES USERS(user_id) ON DELETE CASCADE,
@@ -98 +98 @@
 
 CREATE TABLE TASKS (
-    task_id BIGINT PRIMARY KEY,
+    task_id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
     name TEXT NOT NULL,
     is_finished BOOLEAN NOT NULL DEFAULT FALSE,
@@ -118 +118 @@
 
 CREATE TABLE DAILY_COMPLETION (
-    daily_completion_id BIGINT PRIMARY KEY,
+    daily_completion_id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
     user_id BIGINT
         REFERENCES USERS(user_id) ON DELETE CASCADE,
@@ -141 +141 @@
 
 CREATE TABLE ASSETS (
-    asset_id BIGINT PRIMARY KEY,
+    asset_id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
     user_id BIGINT
         REFERENCES INVESTOR_USERS(user_id) ON DELETE CASCADE,

db-scripts/dml.sql

@@ -109 +109 @@
 (39, 25, '2026-03-28', 6050);
 
+-- If INCOMES.income_id is an IDENTITY column, advance its sequence past dummy ids.
+SELECT setval(
+        pg_get_serial_sequence('trekr.incomes', 'income_id'),
+        (SELECT COALESCE(MAX(income_id), 0) FROM trekr.incomes)
+);
+
 INSERT INTO TRAINING_USERS (user_id, gender, age, weight) VALUES
 (1, 'Male', 21, 73),
@@ -185 +191 @@
 (30, 20, 2300, '2026-02-10');
 
+-- If DAILY_INTAKES.daily_intake_id is an IDENTITY column, advance its sequence past dummy ids.
+SELECT setval(
+        pg_get_serial_sequence('trekr.daily_intakes', 'daily_intake_id'),
+        (SELECT COALESCE(MAX(daily_intake_id), 0) FROM trekr.daily_intakes)
+);
+
 INSERT INTO TRAINING_SESSIONS (training_id, training_user_id, weight_user_id, duration, calories, date, type) VALUES
 (1, 1, 1, 60, 500, '2026-02-01', 'Running'),
@@ -211 +223 @@
 (24, 17, 17, 40, 320, '2026-02-13', 'Strength');
 
+-- If TRAINING_SESSIONS.training_id is an IDENTITY column, advance its sequence past dummy ids.
+SELECT setval(
+        pg_get_serial_sequence('trekr.training_sessions', 'training_id'),
+        (SELECT COALESCE(MAX(training_id), 0) FROM trekr.training_sessions)
+);
+
 INSERT INTO DISCIPLINE_USERS (user_id, num_tasks, tasks) VALUES
 (1, 2, '["Morning Run","Read Book"]'),
@@ -244 +262 @@
 (14, 19, 'Gym Program', 3, '["Squat","Bench","Deadlift"]'),
 (15, 20, 'Exam Prep', 3, '["Practice","Mock","Review"]');
+
+-- If CUSTOM_TRACKING_CATEGORIES.custom_tracking_id is an IDENTITY column, advance its sequence past dummy ids.
+SELECT setval(
+        pg_get_serial_sequence('trekr.custom_tracking_categories', 'custom_tracking_id'),
+        (SELECT COALESCE(MAX(custom_tracking_id), 0) FROM trekr.custom_tracking_categories)
+);
 
 INSERT INTO TASKS (task_id, name, is_finished, discipline_user_id, custom_tracking_id) VALUES
@@ -307 +331 @@
 (60, 'Review Exam', FALSE, NULL, 15);
 
+-- If TASKS.task_id is an IDENTITY column, advance its sequence past dummy ids.
+SELECT setval(
+        pg_get_serial_sequence('trekr.tasks', 'task_id'),
+        (SELECT COALESCE(MAX(task_id), 0) FROM trekr.tasks)
+);
+
 INSERT INTO DAILY_COMPLETION (daily_completion_id, user_id, date, procent) VALUES
 (1, 1, '2026-02-01', 100),
@@ -338 +368 @@
 (29, 20, '2026-02-09', 33),
 (30, 20, '2026-02-10', 66);
+
+-- If DAILY_COMPLETION.daily_completion_id is an IDENTITY column, advance its sequence past dummy ids.
+SELECT setval(
+        pg_get_serial_sequence('trekr.daily_completion', 'daily_completion_id'),
+        (SELECT COALESCE(MAX(daily_completion_id), 0) FROM trekr.daily_completion)
+);
 
 INSERT INTO TASK_DAILY_COMPLETION (task_id, daily_completion_id) VALUES
@@ -393 +429 @@
 (16, 14, 'SPY', 485, '2026-02-09', 1.5),
 (17, 15, 'NVDA', 640, '2026-02-10', 0.9);
+
+-- If ASSETS.asset_id is an IDENTITY column, advance its sequence past dummy ids.
+SELECT setval(
+        pg_get_serial_sequence('trekr.assets', 'asset_id'),
+        (SELECT COALESCE(MAX(asset_id), 0) FROM trekr.assets)
+);