Changeset 2d64b2e for iknow-api/Models

Timestamp:

12/09/25 14:54:20 (10 months ago)

Author:

imbrsk <boris696boris@…>

Branches:

master

Children:

33c69d6, 691f152

Parents:

22439d3

Message:

Refactor model properties for consistency and clarity

• Updated property names in ContactInfo, Documents, EnrollmentInfo, HighSchool, MajorSubjects, RefreshToken, and User models to follow PascalCase naming convention.
• Added new properties MiddleName, Gender, Nationality, and Citizenship to User model.
• Introduced StudyType and StudyStatus properties in EnrollmentInfo model.
• Changed Akreditacija to Accreditation in MajorSubjects model.
• Updated references in AuthService to match new property names.
• Created initial migration for database schema reflecting these changes.

Location:

iknow-api/Models

Files:

• ContactInfo.cs (modified) (1 diff)
• Documents.cs (modified) (1 diff)
• EnrollmentInfo.cs (modified) (3 diffs)
• HighSchool.cs (modified) (2 diffs)
• MajorSubjects.cs (modified) (1 diff)
• RefreshToken.cs (modified) (1 diff)
• User.cs (modified) (1 diff)

iknow-api/Models/ContactInfo.cs

@@ -6 +6 @@
     {
         public int Id { get; set; }
-        public string? city { get; set; }
-        public string? address { get; set; }
-        public string? municipality { get; set; }
-        public string? phoneNumber { get; set; }
-        public string? microsoftEmail { get; set; }
+        public string? City { get; set; }
+        public string? Address { get; set; }
+        public string? Municipality { get; set; }
+        public string? PhoneNumber { get; set; }
+        public string? MicrosoftEmail { get; set; }
         
         public int UserId { get; set; }

iknow-api/Models/Documents.cs

@@ -4 +4 @@
     {
         public int Id { get; set; }
-        public string? name { get; set; }
-        public string? body { get; set; }
-        public int cost { get; set; }
+        public string? Name { get; set; }
+        public string? Body { get; set; }
+        public int Cost { get; set; }
         public ICollection<UserDocuments>? User { get; set; }
     }

iknow-api/Models/EnrollmentInfo.cs

@@ -1 +1 @@
 using System.ComponentModel.DataAnnotations.Schema;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.Net.Http.Headers;
 
 namespace iknow_api.Models
@@ -11 +13 @@
         public int Id { get; set; }
         public int enrollmentYear { get; set; }
-        // CS1597 fix: no semicolon after accessor block
         public Quota quota { get; set; }
         public int MajorId { get; set; }
@@ -17 +18 @@
         public int UserId { get; set; }
         public User? User { get; set; }
+        public string? StudyType { get; set; }
+        public string? StudyStatus { get; set; }
 
     }

iknow-api/Models/HighSchool.cs

@@ -3 +3 @@
 namespace iknow_api.Models
 {
-    public enum type
+    public enum HighSchoolType
     {
-        strucen, gimnazija
+        Strucen, Gimnazija
     }
     public class HighSchool
@@ -11 +11 @@
         public int Id { get; set; }
         public float GPA { get; set; }
-        public type tip { get; set; }
-
+        public HighSchoolType HighSchoolType { get; set; }
         public int UserId { get; set; }
-        public User User { 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 Akreditacija { get; set; }
+        public int Accreditation { get; set; }
         public Major? Majors { get; set; }
         public Subject? Subjects { get; set; }

iknow-api/Models/RefreshToken.cs

@@ -7 +7 @@
         public int Id { get; set; }
         public int UserId { get; set; }
-        public User User { get; set; } 
+        public User? User { get; set; } 
         public string? Token { get; set; }
         public DateTime ExpiresAt { get; set; }

iknow-api/Models/User.cs

@@ -19 +19 @@
         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 CreatedAt { get; set; }