Changeset 1a9c843

Timestamp:

09/23/26 13:29:06 (2 hours ago)

Author:

Stefan-Saveski <stefansaveski19@…>

Branches:

master

Children:

e7bafc0

Parents:

a12988e (diff), f7c8acf (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'origin/phase5-normalization'

Files:

• iknow-api/Data/AppDbContext.cs (modified) (1 diff)
• iknow-api/Models/Payment.cs (modified) (1 diff)
• iknow-api/Models/User.cs (modified) (1 diff)
• sql/advanced.sql (added)
• sql/data_load.sql (modified) (1 diff)
• sql/iknow.dbml (modified) (2 diffs)
• sql/schema.md (modified) (3 diffs)
• sql/schema_creation.sql (modified) (1 diff)

iknow-api/Data/AppDbContext.cs

@@ -290 +290 @@
                 e.HasKey(p => p.Id);
                 e.Property(p => p.Id).HasColumnName("id");
-                e.Property(p => p.UserId).HasColumnName("user_id");
                 e.Property(p => p.EnrollmentInfoId).HasColumnName("enrollment_id");
                 e.Property(p => p.Amount).HasColumnName("amount");
 
-                e.HasOne(p => p.User)
-                 .WithMany(u => u.Payments)
-                 .HasForeignKey(p => p.UserId)
-                 .OnDelete(DeleteBehavior.Cascade);
-
+                // No user_id: the student comes from the enrolment. Removing it
+                // was the BCNF fix from Phase 5 (enrolled_id -> user_id).
                 e.HasOne(p => p.EnrolledSemesters)
                  .WithMany(es => es.Users)

iknow-api/Models/Payment.cs

@@ -1 @@
-using System.ComponentModel.DataAnnotations.Schema;
-
 namespace iknow_api.Models
 {
+    /// <summary>
+    /// The student is reached through the enrolment: enrolled_id -> user_id.
+    /// A user_id here would be redundant and could contradict the enrolment,
+    /// which is the BCNF violation found during normalization (Phase 5).
+    /// </summary>
     public class Payment
     {
         public int Id { get; set; }
 
-        public int UserId { get; set; }
-        public User? User { get; set; }
         public int EnrollmentInfoId { get; set; }
         public int Amount { get; set; }
         public EnrolledSemesters? EnrolledSemesters { get; set; }
-
     }
 }

iknow-api/Models/User.cs

@@ -28 +28 @@
         public ICollection<UserDocuments>? Documents { get; set; }
 
-        // Named for the relationship it carries: Users 1 --pays-- N Payment.
-        public ICollection<Payment>? Payments { get; set; }
-
         // Users 1 --submits-- N EnrolledSemesters
         public ICollection<EnrolledSemesters>? Enrolments { get; set; }

sql/data_load.sql

@@ -115 +115 @@
 (3, 1, 'tok_old789_stefan', '2026-01-01 00:00:00', FALSE);
 
-INSERT INTO payment (id, user_id, enrollment_id, amount) VALUES
-(1, 1, 1, 200),
-(2, 1, 2, 200),
-(3, 2, 3, 400),
-(4, 3, 4, 200);
+INSERT INTO payment (id, enrollment_id, amount) VALUES
+(1, 1, 200),
+(2, 2, 200),
+(3, 3, 400),
+(4, 4, 200);
 
 INSERT INTO major_subjects (major_id, subject_id, mandatory_semester) VALUES

sql/iknow.dbml

@@ -150 +150 @@
 Table project.payment {
   id integer [pk, increment]
-  user_id integer [not null]
   enrollment_id integer [not null]
   amount integer [not null]
@@ -188 +187 @@
 Ref: project.contact.user_id - project.users.id                      // has_contact (1:1)
 Ref: project.token.user_id > project.users.id                        // has_token
-Ref: project.payment.user_id > project.users.id                      // pays
 Ref: project.payment.enrollment_id > project.enrolled_semesters.id   // for_enrollment
 Ref: project.enrolled_semesters.user_id > project.users.id           // submits

sql/schema.md

@@ -111 +111 @@
     payment {
         integer id PK
-        integer user_id FK
         integer enrollment_id FK
         integer amount
@@ -136 +135 @@
     users               ||--o| contact            : has_contact
     users               ||--o{ token              : has_token
-    users               ||--o{ payment            : pays
     users               ||--o{ enrolled_semesters : submits
     users               ||--o{ user_documents     : owns
@@ -184 +182 @@
   they differ.
 - `professour_subjects` keeps the spelling used by the table in `schema_creation.sql`.
+- `payment` has no `user_id`: the student is reached through `enrollment_id`.
+  Storing it twice violated BCNF (`enrolled_id -> user_id`) and allowed a
+  payment to contradict the enrolment it refers to. Removed in Phase 5.

sql/schema_creation.sql

@@ -115 +115 @@
 CREATE TABLE payment (
     id             INTEGER PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
-    user_id        INTEGER NOT NULL REFERENCES users (id),
     enrollment_id  INTEGER NOT NULL REFERENCES enrolled_semesters (id),
     amount         INTEGER NOT NULL