Changeset 1b20b22 for iknow-api/Models

Timestamp:

09/15/26 21:15:53 (8 days ago)

Author:

Stefan-Saveski <stefansaveski19@…>

Branches:

master

Children:

002cf5f, 20df1a3, b8093a0, bcacc91

Parents:

93c368a

Message:

• ready for presentation

Location:

iknow-api/Models

Files:

• EnrolledSemesters.cs (modified) (1 diff)
• EnrollmentInfo.cs (deleted)
• HighSchool.cs (modified) (3 diffs)
• MajorSubjects.cs (modified) (1 diff)
• Payment.cs (modified) (1 diff)
• Quota.cs (added)
• SemesterSubjects.cs (modified) (1 diff)
• User.cs (modified) (2 diffs)

iknow-api/Models/EnrolledSemesters.cs

@@ -14 +14 @@
         public string? Note { get; set; }
         public DateTime CratedAt { get; set; }
-        public DateTime LastChange { get; set; }
-        public DateTime Verified { get; set; }
+        public DateTime? LastChange { get; set; }
+        public DateTime? Verified { get; set; }
         public int SemesterId { get; set; }
         public ActiveSemesters? Semester { get; set; }

iknow-api/Models/HighSchool.cs

@@ -1 @@
-using System.ComponentModel.DataAnnotations.Schema;
-
 namespace iknow_api.Models
 {
@@ -7 +5 @@
         Strucen, Gimnazija
     }
+
     public class HighSchool
     {
@@ -14 +13 @@
         public int UserId { get; set; }
         public User? User { get; set; }
-        public string? StudyLanguage { get; set; }
     }
 }

iknow-api/Models/MajorSubjects.cs

@@ -6 +6 @@
         public int SubjectId { get; set; }
         public int MandatorySemester { get; set; }
-        public int Accreditation { get; set; }
         public Major? Majors { get; set; }
         public Subject? Subjects { get; set; }

iknow-api/Models/Payment.cs

@@ -10 +10 @@
         public User? User { get; set; }
         public int EnrollmentInfoId { get; set; }
+        public int Amount { get; set; }
         public EnrolledSemesters? EnrolledSemesters { get; set; }
 

iknow-api/Models/SemesterSubjects.cs

@@ -1 +1 @@
 namespace iknow_api.Models
 {
+    // The student is reached through EnrolledSemester.UserId; the ER model
+    // links SemestersSubjects to Users only through the professor.
     public class SemesterSubject
     {
-        public int Id { get; set; } 
-        
-        public int UserId { get; set; }                 
+        public int Id { get; set; }
+
         public int EnrolledSemesterId { get; set; }
         public int SubjectId { get; set; }
         public int ProfessorId { get; set; }
         public bool Signature { get; set; }
-        public User? User { get; set; }                 
+
         public EnrolledSemesters? EnrolledSemester { get; set; }
         public Subject? Subject { get; set; }
-        public User? Professor { get; set; }           
+        public User? Professor { get; set; }
         public PassedSubject? PassedSubject { get; set; }
     }

iknow-api/Models/User.cs

@@ -1 @@
-
-
 namespace iknow_api.Models
 {
@@ -10 +8 @@
     }
 
+    // Attributes follow the Users entity in the ER model exactly.
     public class User
     {
-        internal object Payments;
-
         public int Id { get; set; }
         public string? Name { get; set; }
-        public string? EMBG {get; set; }
+        public string? EMBG { get; set; }
         public string? Surname { get; set; }
         public string? Index { get; set; }
         public string? Email { get; set; }
         public string? PasswordHash { get; set; }
-        public string? MiddleName { get; set; }
-        public string? Gender { get; set; }
-        public string? Nationality { get; set; }
-        public string? Citizenship { get; set; }
-        public DateTime Bday { get; set; }
+        public DateTime? Bday { get; set; }
         public DateTime CreatedAt { get; set; }
         public UserRole Role { get; set; }
+        public Quota? Quota { get; set; }
+        public int? EnrollmentYear { get; set; }
+
         public HighSchool? HighSchool { get; set; }
         public ContactInfo? ContactInfo { get; set; }
-        public EnrollmentInfo? EnrollmentInfo { get; set; }
         public ICollection<UserDocuments>? Documents { get; set; }
-        public ICollection<Payment>? EnrolledSemesters { get; set; }
-        public ICollection<SemesterSubject>? EnrolledSemesterUserSubjects { 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; }
+
+        // Users 1 --teaches-- N SemestersSubjects
         public ICollection<SemesterSubject>? TeachingSubjects { get; set; }
-
     }
 }