Changeset c4c43f3

Timestamp:

04/20/26 19:04:21 (3 months ago)

Author:

Andrej <asumanovski@…>

Branches:

master

Children:

37307aa

Parents:

6fa5831

Message:

Normalization of the database

Files:

• backend/HELP.md (modified) (1 diff)
• backend/docs/Normalization.txt (added)
• backend/src/main/java/com/trekr/backend/entity/discipline/CustomTrackingCategory.java (modified) (2 diffs)
• backend/src/main/java/com/trekr/backend/entity/discipline/DisciplineUser.java (modified) (2 diffs)
• backend/src/main/java/com/trekr/backend/entity/training/TrainingSession.java (modified) (3 diffs)
• db-scripts/ddl.sql (modified) (3 diffs)
• db-scripts/dml.sql (modified) (2 diffs)

backend/HELP.md

@@ -1 +1 @@
 # Getting Started
+
+### Project Documentation
+
+* [Normalization (Phase P5)](docs/Normalization.txt)
 
 ### Reference Documentation

backend/src/main/java/com/trekr/backend/entity/discipline/CustomTrackingCategory.java

@@ -28 +28 @@
     private String name;
 
-    @Column(name = "num_tasks")
-    private Integer numTasks;
-
-    @Column(name = "tasks")
-    private String tasks;
-
     public CustomTrackingCategory() {
     }
@@ -60 +54 @@
         this.name = name;
     }
-
-    public Integer getNumTasks() {
-        return numTasks;
-    }
-
-    public void setNumTasks(Integer numTasks) {
-        this.numTasks = numTasks;
-    }
-
-    public String getTasks() {
-        return tasks;
-    }
-
-    public void setTasks(String tasks) {
-        this.tasks = tasks;
-    }
 }

backend/src/main/java/com/trekr/backend/entity/discipline/DisciplineUser.java

@@ -24 +24 @@
     private User user;
 
-    @Column(name = "num_tasks")
-    private Integer numTasks;
-
-    @Column(name = "tasks")
-    private String tasks;
-
     public DisciplineUser() {
     }
@@ -48 +42 @@
         this.user = user;
     }
-
-    public Integer getNumTasks() {
-        return numTasks;
-    }
-
-    public void setNumTasks(Integer numTasks) {
-        this.numTasks = numTasks;
-    }
-
-    public String getTasks() {
-        return tasks;
-    }
-
-    public void setTasks(String tasks) {
-        this.tasks = tasks;
-    }
 }

backend/src/main/java/com/trekr/backend/entity/training/TrainingSession.java

@@ -1 +1 @@
 package com.trekr.backend.entity.training;
 
-import com.trekr.backend.entity.weight.WeightUser;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -27 +26 @@
     @JoinColumn(name = "training_user_id")
     private TrainingUser trainingUser;
-
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "weight_user_id")
-    private WeightUser weightUser;
 
     @Column(name = "duration")
@@ -63 +58 @@
     }
 
-    public WeightUser getWeightUser() {
-        return weightUser;
-    }
-
-    public void setWeightUser(WeightUser weightUser) {
-        this.weightUser = weightUser;
-    }
 
     public BigDecimal getDuration() {

db-scripts/ddl.sql

@@ -73 +73 @@
     training_user_id BIGINT
         REFERENCES TRAINING_USERS(user_id) ON DELETE CASCADE,
-    weight_user_id BIGINT
-        REFERENCES WEIGHT_USERS(user_id) ON DELETE CASCADE,
     duration NUMERIC,
     calories NUMERIC,
@@ -83 +81 @@
 CREATE TABLE DISCIPLINE_USERS (
     user_id BIGINT PRIMARY KEY
-        REFERENCES USERS(user_id) ON DELETE CASCADE,
-    num_tasks INTEGER,
-    tasks TEXT
+        REFERENCES USERS(user_id) ON DELETE CASCADE
 );
 
@@ -92 +88 @@
     user_id BIGINT
         REFERENCES USERS(user_id) ON DELETE CASCADE,
-    name TEXT NOT NULL,
-    num_tasks INTEGER,
-    tasks TEXT
+    name TEXT NOT NULL
 );
 

db-scripts/dml.sql

@@ -192 +192 @@
 );
 
-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'),
-(2, 2, 2, 45, 400, '2026-02-01', 'Cycling'),
-(3, 3, 3, 30, 300, '2026-02-01', 'Swimming'),
-(4, 4, 4, 50, 420, '2026-02-02', 'HIIT'),
-(5, 5, 5, 40, 350, '2026-02-02', 'Strength'),
-(6, 6, 6, 35, 280, '2026-02-02', 'Yoga'),
-(7, 7, 7, 55, 520, '2026-02-03', 'Running'),
-(8, 8, 8, 45, 390, '2026-02-03', 'Cycling'),
-(9, 9, 9, 30, 260, '2026-02-03', 'Rowing'),
-(10, 10, 10, 60, 480, '2026-02-04', 'Swimming'),
-(11, 11, 11, 50, 430, '2026-02-05', 'Strength'),
-(12, 12, 12, 40, 310, '2026-02-05', 'Yoga'),
-(13, 13, 13, 60, 540, '2026-02-06', 'Running'),
-(14, 14, 14, 35, 260, '2026-02-06', 'Pilates'),
-(15, 15, 15, 45, 390, '2026-02-07', 'Cycling'),
-(16, 16, 16, 55, 460, '2026-02-07', 'HIIT'),
-(17, 17, 17, 30, 240, '2026-02-08', 'Rowing'),
-(18, 18, 18, 65, 520, '2026-02-08', 'Swimming'),
-(19, 19, 19, 50, 440, '2026-02-09', 'Running'),
-(20, 20, 20, 45, 370, '2026-02-09', 'Strength'),
-(21, 11, 11, 35, 300, '2026-02-12', 'Cycling'),
-(22, 13, 13, 30, 260, '2026-02-12', 'Core'),
-(23, 15, 15, 70, 600, '2026-02-13', 'Long Run'),
-(24, 17, 17, 40, 320, '2026-02-13', 'Strength');
+INSERT INTO TRAINING_SESSIONS (training_id, training_user_id, duration, calories, date, type) VALUES
+(1, 1, 60, 500, '2026-02-01', 'Running'),
+(2, 2, 45, 400, '2026-02-01', 'Cycling'),
+(3, 3, 30, 300, '2026-02-01', 'Swimming'),
+(4, 4, 50, 420, '2026-02-02', 'HIIT'),
+(5, 5, 40, 350, '2026-02-02', 'Strength'),
+(6, 6, 35, 280, '2026-02-02', 'Yoga'),
+(7, 7, 55, 520, '2026-02-03', 'Running'),
+(8, 8, 45, 390, '2026-02-03', 'Cycling'),
+(9, 9, 30, 260, '2026-02-03', 'Rowing'),
+(10, 10, 60, 480, '2026-02-04', 'Swimming'),
+(11, 11, 50, 430, '2026-02-05', 'Strength'),
+(12, 12, 40, 310, '2026-02-05', 'Yoga'),
+(13, 13, 60, 540, '2026-02-06', 'Running'),
+(14, 14, 35, 260, '2026-02-06', 'Pilates'),
+(15, 15, 45, 390, '2026-02-07', 'Cycling'),
+(16, 16, 55, 460, '2026-02-07', 'HIIT'),
+(17, 17, 30, 240, '2026-02-08', 'Rowing'),
+(18, 18, 65, 520, '2026-02-08', 'Swimming'),
+(19, 19, 50, 440, '2026-02-09', 'Running'),
+(20, 20, 45, 370, '2026-02-09', 'Strength'),
+(21, 11, 35, 300, '2026-02-12', 'Cycling'),
+(22, 13, 30, 260, '2026-02-12', 'Core'),
+(23, 15, 70, 600, '2026-02-13', 'Long Run'),
+(24, 17, 40, 320, '2026-02-13', 'Strength');
 
 SELECT setval(
@@ -223 +223 @@
 );
 
-INSERT INTO DISCIPLINE_USERS (user_id, num_tasks, tasks) VALUES
-(1, 2, '["Morning Run","Read Book"]'),
-(2, 1, '["Meditation"]'),
-(3, 3, '["Plan Day","No Sugar","Stretch"]'),
-(4, 2, '["Drink Water","Walk 8k Steps"]'),
-(5, 2, '["Journal","Gym"]'),
-(6, 1, '["Study 1h"]'),
-(7, 2, '["Stretch 10m","No Soda"]'),
-(8, 2, '["Walk 30m","Sleep 7h"]'),
-(9, 3, '["Read 20p","Meditate","No Sugar"]'),
-(10, 1, '["Drink Water"]'),
-(11, 3, '["Morning Run","Plan Day","Study 1h"]'),
-(12, 2, '["Yoga","Cook Healthy"]'),
-(13, 2, '["Gym","Protein Target"]'),
-(14, 2, '["Journal","Early Bed"]'),
-(15, 3, '["Duolingo","No Alcohol","Walk 8k Steps"]');
-
-INSERT INTO CUSTOM_TRACKING_CATEGORIES (custom_tracking_id, user_id, name, num_tasks, tasks) VALUES
-(1, 1, 'Project Trekr', 2, '["Code Review","Push Updates"]'),
-(2, 2, 'Language Learning', 2, '["Duolingo","Watch Lesson"]'),
-(3, 3, 'Side Hustle', 3, '["Client Outreach","Build Feature","Invoice"]'),
-(4, 5, 'Fitness Plan', 2, '["Protein Target","Sleep 8h"]'),
-(5, 6, 'Exam Prep', 2, '["Practice Problems","Review Notes"]'),
-(6, 11, 'University', 3, '["Attend Lecture","Solve Tasks","Review"]'),
-(7, 12, 'Health', 2, '["Steps","Water"]'),
-(8, 13, 'Startup', 3, '["Pitch","Build","Ship"]'),
-(9, 14, 'Cooking', 2, '["Meal Prep","Groceries"]'),
-(10, 15, 'Reading List', 2, '["Read Fiction","Read Nonfiction"]'),
-(11, 16, 'Work Sprint', 3, '["Standup","Tickets","PR Review"]'),
-(12, 17, 'Finance Goals', 2, '["Track Expenses","Invest"]'),
-(13, 18, 'Language', 2, '["Duolingo","Podcast"]'),
-(14, 19, 'Gym Program', 3, '["Squat","Bench","Deadlift"]'),
-(15, 20, 'Exam Prep', 3, '["Practice","Mock","Review"]');
+INSERT INTO DISCIPLINE_USERS (user_id) VALUES
+(1),
+(2),
+(3),
+(4),
+(5),
+(6),
+(7),
+(8),
+(9),
+(10),
+(11),
+(12),
+(13),
+(14),
+(15);
+
+INSERT INTO CUSTOM_TRACKING_CATEGORIES (custom_tracking_id, user_id, name) VALUES
+(1, 1, 'Project Trekr'),
+(2, 2, 'Language Learning'),
+(3, 3, 'Side Hustle'),
+(4, 5, 'Fitness Plan'),
+(5, 6, 'Exam Prep'),
+(6, 11, 'University'),
+(7, 12, 'Health'),
+(8, 13, 'Startup'),
+(9, 14, 'Cooking'),
+(10, 15, 'Reading List'),
+(11, 16, 'Work Sprint'),
+(12, 17, 'Finance Goals'),
+(13, 18, 'Language'),
+(14, 19, 'Gym Program'),
+(15, 20, 'Exam Prep');
 
 SELECT setval(