Changing filepaths

exercise.wwwapi/DTOs/GetObjects/PostsSuccessDTO.cs

@@ -1,5 +1,4 @@
 using exercise.wwwapi.Models;
-using exercise.wwwapi.Models.UserInfo;
 using System.Text.Json.Serialization;
 
 namespace exercise.wwwapi.DTOs.GetObjects

exercise.wwwapi/DTOs/GetObjects/UsersSuccessDTO.cs

@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using exercise.wwwapi.Models.UserInfo;
 
 namespace exercise.wwwapi.DTOs.GetUsers;
 

exercise.wwwapi/DTOs/Notes/NoteDTO.cs

@@ -1,5 +1,4 @@
-using exercise.wwwapi.Models.UserInfo;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text.Json.Serialization;
 

exercise.wwwapi/DTOs/Posts/GetPosts/AuthorDTO.cs

@@ -1,5 +1,4 @@
 using exercise.wwwapi.Models;
-using exercise.wwwapi.Models.UserInfo;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text.Json.Serialization;
@@ -9,8 +8,6 @@ namespace exercise.wwwapi.DTOs.Posts.GetPosts
     public class AuthorDTO
     {
         public int Id { get; set; }
-
-        //public ProfileDTO Profile { get; set; }
         public string firstName { get; set; }
         public string lastName { get; set; }
 
@@ -21,9 +18,8 @@ public AuthorDTO()
         public AuthorDTO(User model)
         {
             Id = model.Id;
-            //Profile = new ProfileDTO(model.Profile);
-            firstName = model.Profile.FirstName;
-            lastName = model.Profile.LastName;
+            firstName = model.FirstName;
+            lastName = model.LastName;
         }
     }
 }

exercise.wwwapi/DTOs/Posts/GetPosts/CommentDTO.cs

@@ -19,8 +19,8 @@ public CommentDTO(Comment model)
             UserId = model.UserId;
             Body = model.Body;
             CreatedAt = model.CreatedAt;
-            firstName = model.User.Profile.FirstName;
-            lastName = model.User.Profile.LastName;
+            firstName = model.User.FirstName;
+            lastName = model.User.LastName;
         }
     }
 }

exercise.wwwapi/DTOs/Posts/GetPosts/PostDTOVol2.cs

@@ -24,8 +24,8 @@ public PostDTOVol2(Post model)
             AuthorId = model.AuthorId;
             Body = model.Body;
             CreatedAt = model.CreatedAt;
-            Firstname = model.Author.Profile.FirstName;
-            Lastname = model.Author.Profile.LastName;
+            Firstname = model.Author.FirstName;
+            Lastname = model.Author.LastName;
             Comments = model.Comments.Select(c => new CommentDTO(c)).ToList();
             Likes = model.Likes.Select(l => new LikeDTO(l)).ToList();
         }

exercise.wwwapi/DTOs/Register/RegisterRequestDTO.cs

@@ -21,7 +21,10 @@ public class RegisterRequestDTO
 
     [JsonPropertyName("lastName")]
     public string? LastName { get; set; }
-
+
+    [JsonPropertyName("mobile")]
+    public string? Mobile { get; set; }
+
     [JsonPropertyName("bio")]
     public string? Bio { get; set; }
 

exercise.wwwapi/DTOs/UpdateUser/UpdateUserRequestDTO.cs

@@ -26,8 +26,8 @@ public class UpdateUserRequestDTO
     [JsonPropertyName("username")]
     public string? Username { get; set; }
 
-    [JsonPropertyName("phone")]
-    public string? Phone { get; set; }
+    [JsonPropertyName("mobile")]
+    public string? Mobile { get; set; }
 
     [JsonPropertyName("cohortId")]
     public int? CohortId { get; set; }

exercise.wwwapi/DTOs/UpdateUser/UpdateUserSuccessDTO.cs

@@ -26,8 +26,8 @@ public class UpdateUserSuccessDTO
     [JsonPropertyName("github")]
     public string? Github { get; set; }
 
-    [JsonPropertyName("phone")]
-    public string? Phone { get; set; }
+    [JsonPropertyName("Mobile")]
+    public string? Mobile { get; set; }
 
     [JsonPropertyName("cohortId")]
     public int? CohortId { get; set; }

exercise.wwwapi/DTOs/UserDTO.cs

@@ -29,21 +29,12 @@ public class UserDTO
     [JsonPropertyName("username")]
     public string? Username { get; set; }
 
-    [JsonPropertyName("phone")]
-    public string? Phone { get; set; }
-
-    [JsonPropertyName("startDate")]
-    public DateTime? StartDate { get; set; }
-
-    [JsonPropertyName("endDate")]
-    public DateTime? EndDate { get; set; }
+    [JsonPropertyName("mobile")]
+    public string? Mobile { get; set; }
 
     [JsonPropertyName("specialism")]
     public Specialism? Specialism { get; set; }
 
-    [JsonPropertyName("cohortId")]
-    public int? CohortId { get; set; }
-
     [JsonPropertyName("notes")]
     public ICollection<NoteDTO> Notes { get; set; }
     [JsonPropertyName("role")]

exercise.wwwapi/Data/ModelSeeder.cs

@@ -1,6 +1,5 @@
 using exercise.wwwapi.Enums;
 using exercise.wwwapi.Models;
-using exercise.wwwapi.Models.UserInfo;
 using Microsoft.AspNetCore.Http.HttpResults;
 using Microsoft.EntityFrameworkCore;
 

exercise.wwwapi/Endpoints/NoteEndpoints.cs

@@ -5,7 +5,6 @@
 using exercise.wwwapi.Factories;
 using exercise.wwwapi.Helpers;
 using exercise.wwwapi.Models;
-using exercise.wwwapi.Models.UserInfo;
 using exercise.wwwapi.Repository;
 using FluentValidation;
 using Microsoft.AspNetCore.Mvc;

exercise.wwwapi/Endpoints/PostEndpoints.cs

@@ -88,7 +88,7 @@ private static async Task<IResult> GetAllPosts(IRepository<Post> postRepository,
             ClaimsPrincipal user)
     {
         var results = (await postRepository.GetAllAsync(
-            p => p.Author.Profile,
+            p => p.Author,
             p => p.Comments
         )).ToList();
 
@@ -113,7 +113,7 @@ private static async Task<IResult> GetAllPostsVol2(IRepository<Post> postReposit
         ClaimsPrincipal user)
     {
         var results = (await postRepository.GetAllAsync(
-            p => p.Author.Profile,
+            p => p.Author,
             p => p.Comments,
             p => p.Likes
         )).ToList();

exercise.wwwapi/Endpoints/SecureApi.cs

@@ -1,9 +1,9 @@
 using exercise.wwwapi.Helpers;
+using exercise.wwwapi.Models;
 using exercise.wwwapi.Repository;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using System.Security.Claims;
-using exercise.wwwapi.Models.UserInfo;
 
 namespace exercise.wwwapi.EndPoints;