Changeset c0256f3

Timestamp:

10/27/25 21:50:02 (11 months ago)

Author:

stefansaveski <stefansaveski19@…>

Branches:

master

Children:

e423ff3

Parents:

4f5d8fd

Message:

Add user-related entities and enforce one-to-one mappings

Enhanced the User model with new entities: ContactInfo,
EnrollmentInfo, and HighSchool, establishing one-to-one
relationships. Updated UserDTO with additional fields and
introduced enums for type, quota, and major. Modified
UserRepository and AuthService to handle new entities.

Updated database schema with unique constraints on UserId
for related tables and added EF Core migration
20251027191028_dbRelations. Adjusted JSON serialization
to prevent circular references.

Location:

iknow-api

Files:

• Controllers/UserController.cs (modified) (1 diff)
• DTOs/UserDTO.cs (modified) (2 diffs)
• Migrations/20251027191028_dbRelations.Designer.cs (added)
• Migrations/20251027191028_dbRelations.cs (added)
• Migrations/AppDbContextModelSnapshot.cs (modified) (7 diffs)
• Models/User.cs (modified) (1 diff)
• Program.cs (modified) (2 diffs)
• Repository/Implementations/UserRepository.cs (modified) (2 diffs)
• Repository/Interface/IUserRepository.cs (modified) (1 diff)
• Services/Implementations/AuthService.cs (modified) (1 diff)

iknow-api/Controllers/UserController.cs

@@ -26 +26 @@
                 var userData = await _userService.GetUserData(token);
                 if (userData == null) return Ok(new { info = "can't get info" });
-                return Ok(new { Token = userData });
+                return Ok(new { User = userData });
             }
             return null;

iknow-api/DTOs/UserDTO.cs

@@ -22 +22 @@
         public DateTime Bday { get; set; }
         public UserRole Role { get; set; }
+        public float gpa { get; set; }
+        public type tip { get; set; }
+        public string city { get; set; } = string.Empty;
+        public string address { get; set; } = string.Empty;
+        public string municipality { get; set; } = string.Empty;
+        public string phoneNumber { get; set; } = string.Empty;
+        public string microsoftEmail { get; set; } = string.Empty;
+        public int enrollmentYear { get; set; }
+        public quota quotaType { get; set; }
+        public major majorType { get; set; }
+
     }
 
@@ -44 +55 @@
         Student
     }
+    public enum type
+    {
+        strucen, gimnazija
+    }
+    public enum quota
+    {
+        drzavna, privatna, stipendija
+    }
+    public enum major
+    {
+        SIIS, PIT, KN, KI, IMB, IE, SSP, SEIS
+    }
 }

iknow-api/Migrations/AppDbContextModelSnapshot.cs

@@ -51 +51 @@
                     b.HasKey("Id");
 
-                    b.HasIndex("UserId");
+                    b.HasIndex("UserId")
+                        .IsUnique();
 
                     b.ToTable("ContactInfo");
@@ -75 +76 @@
                     b.HasKey("Id");
 
-                    b.HasIndex("UserId");
+                    b.HasIndex("UserId")
+                        .IsUnique();
 
                     b.ToTable("EnrollmentInfo");
@@ -99 +101 @@
                     b.HasKey("Id");
 
-                    b.HasIndex("UserId");
+                    b.HasIndex("UserId")
+                        .IsUnique();
 
                     b.ToTable("HighSchool");
@@ -144 +147 @@
                 {
                     b.HasOne("iknow_api.Models.User", "User")
-                        .WithMany()
-                        .HasForeignKey("UserId")
+                        .WithOne("ContactInfo")
+                        .HasForeignKey("iknow_api.Models.ContactInfo", "UserId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
@@ -155 +158 @@
                 {
                     b.HasOne("iknow_api.Models.User", "User")
-                        .WithMany()
-                        .HasForeignKey("UserId")
+                        .WithOne("EnrollmentInfo")
+                        .HasForeignKey("iknow_api.Models.EnrollmentInfo", "UserId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
@@ -166 +169 @@
                 {
                     b.HasOne("iknow_api.Models.User", "User")
-                        .WithMany()
-                        .HasForeignKey("UserId")
+                        .WithOne("HighSchool")
+                        .HasForeignKey("iknow_api.Models.HighSchool", "UserId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
@@ -173 +176 @@
                     b.Navigation("User");
                 });
+
+            modelBuilder.Entity("iknow_api.Models.User", b =>
+                {
+                    b.Navigation("ContactInfo");
+
+                    b.Navigation("EnrollmentInfo");
+
+                    b.Navigation("HighSchool");
+                });
 #pragma warning restore 612, 618
         }

iknow-api/Models/User.cs

@@ -21 +21 @@
         public DateTime CreatedAt { get; set; }
         public UserRole Role { get; set; }
+        public HighSchool? HighSchool { get; set; }
+        public ContactInfo? ContactInfo { get; set; }
+        public EnrollmentInfo? EnrollmentInfo { get; set; }
+
     }
 }

iknow-api/Program.cs

@@ -1 +1 @@
 using System.Text;
+using System.Text.Json.Serialization;
 using iknow_api.Data;
 using iknow_api.Repositories;
@@ -33 +34 @@
 });
 // Add services to the container.
-builder.Services.AddControllers();
+builder.Services.AddControllers()
+    .AddJsonOptions(options =>
+    {
+        options.JsonSerializerOptions.ReferenceHandler = ReferenceHandler.IgnoreCycles;
+    });
 builder.Services.AddOpenApi();
 

iknow-api/Repository/Implementations/UserRepository.cs

@@ -25 +25 @@
         }
         
-        public async Task<User> GetUserByIdAsync(int id)
+        public async Task<User?> GetUserByIdAsync(int id)
         {
-            return await _context.User.FirstOrDefaultAsync(u => u.Id == id);
+            return await _context.User
+                .Include(u => u.ContactInfo)
+                .Include(u => u.EnrollmentInfo)
+                .Include(u => u.HighSchool)
+                .FirstOrDefaultAsync(u => u.Id == id);
         }
 
@@ -36 +40 @@
             await _context.SaveChangesAsync();
         }
+        public async Task AddContactAsync(ContactInfo contactInfo)
+        {
+            _context.ContactInfo.Add(contactInfo);
+            await _context.SaveChangesAsync();
+        }
+        public async Task AddEnrollmentAsync(EnrollmentInfo enrollment)
+        {
+            _context.EnrollmentInfo.Add(enrollment);
+            await _context.SaveChangesAsync();
+        }   
+        public async Task AddHighSchoolAsync(HighSchool highSchool)
+        {
+            _context.HighSchool.Add(highSchool);
+            await _context.SaveChangesAsync();
+        }       
 
         public async Task<int> GetUsersCountAsync()

iknow-api/Repository/Interface/IUserRepository.cs

@@ -7 +7 @@
         Task<User?> GetUserByUsernameAsync(string username);
         Task AddUserAsync(User user);
+        Task AddContactAsync(ContactInfo contactInfo);
+        Task AddEnrollmentAsync(EnrollmentInfo enrollment);
+        Task AddHighSchoolAsync(HighSchool highSchool);
         Task<int> GetUsersCountAsync();
         Task<User> GetUserByIdAsync(int id);

iknow-api/Services/Implementations/AuthService.cs

@@ -40 +40 @@
 
             await _userRepository.AddUserAsync(user);
+            int userId = user.Id;
+            var contactInfo = new ContactInfo
+            {
+                UserId = userId,
+                city = registerDto.city,
+                address = registerDto.address,
+                municipality = registerDto.municipality,
+                phoneNumber = registerDto.phoneNumber,
+                microsoftEmail = registerDto.microsoftEmail
+            };
+            await _userRepository.AddContactAsync(contactInfo);
+            var enrollmentInfo = new EnrollmentInfo
+            {
+                UserId = userId,
+                enrollmentYear = registerDto.enrollmentYear,
+                quota = (Models.quota)registerDto.quotaType,
+                major = (Models.major)registerDto.majorType
+            };
+            await _userRepository.AddEnrollmentAsync(enrollmentInfo);
+            await _userRepository.AddHighSchoolAsync(new HighSchool
+            {
+                UserId = userId,
+                GPA = registerDto.gpa,
+                tip = (Models.type)registerDto.tip
+            });
             return true;
         }