Changeset 4708118 for iknow-api/DTOs/UserDTO.cs

Timestamp:

10/28/25 10:51:44 (11 months ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

f8af32b

Parents:

c2e73b6 (diff), ff202cf (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.

git-author:

Boris Gjorgjievski <69085722+imbrsk@…> (10/28/25 10:51:44)

git-committer:

GitHub <noreply@…> (10/28/25 10:51:44)

Message:

Merge pull request #6 from stefansaveski/feature/getUser

Feature/get user

File:

• iknow-api/DTOs/UserDTO.cs (modified) (3 diffs)

iknow-api/DTOs/UserDTO.cs

@@ -7 +7 @@
         public string Password { get; set; } = string.Empty;
         public bool GenerateRefreshToken { get; set; }
+    }
+    public class GetUserDataDto
+    {
+        public string JWT { get; set; }
     }
 
@@ -19 +23 @@
         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; }
+
     }
 
@@ -41 +56 @@
         Student
     }
+    public enum type
+    {
+        strucen, gimnazija
+    }
+    public enum quota
+    {
+        drzavna, privatna, stipendija
+    }
+    public enum major
+    {
+        SIIS, PIT, KN, KI, IMB, IE, SSP, SEIS
+    }
 }