moved internal refresh-model to model lib · fokklz/295-ski-service-management@513ea25

SkiServiceModels

Core Models

RefreshResult

public class RefreshResult
{
    public TokenData TokenData { get; set; }

    public User User { get; set; }
}

EF Models

Service Model

back up

public class ServiceBase : IGenericModel
{
    [StringLength(50)]
    [BsonElement("name")]
    public required string Name { get; set; }

    [StringLength(1000)]
    [BsonElement("description")]
    public required string Description { get; set; }

    [BsonElement("price")]
    public int Price { get; set; }

    [BsonElement("is_deleted")]
    public bool IsDeleted { get; set; } = false;

}

public class Service : ServiceBase, IGenericEFModel
{
    [Key]
    public int Id { get; set; }
}

Priority Model

back up

public class PriorityBase : IGenericModel
{
    [StringLength(20)]
    [BsonElement("name")]
    public required string Name { get; set; }

    [BsonElement("days")]
    public int Days { get; set; }

    [BsonElement("is_deleted")]
    public bool IsDeleted { get; set; } = false;

}

public class Priority : PriorityBase, IGenericEFModel
{
    [Key]
    public int Id { get; set; }
}

State Model

back up

public class StateBase : IGenericModel
{
    [StringLength(20)]
    [BsonElement("name")]
    public required string Name { get; set; }

    [BsonElement("is_deleted")]
    public bool IsDeleted { get; set; } = false;

}

public class State : StateBase, IGenericEFModel
{
    [Key]
    public int Id { get; set; }
}

User Model

back up

public class UserBase : IGenericModel
{
    [StringLength(50)]
    [BsonElement("username")]
    public required string Username { get; set; }

    [BsonElement("password_hash")]
    public byte[] PasswordHash { get; set; }

    [BsonElement("password_salt")]
    public byte[] PasswordSalt { get; set; }

    [BsonElement("locked")]
    public bool Locked { get; set; } = false;

    [BsonElement("role")]
    [BsonRepresentation(BsonType.String)]
    public RoleNames Role { get; set; } = RoleNames.User;

    [BsonElement("login_attempts")]
    public int LoginAttempts { get; set; } = 0;

    [BsonElement("refresh_token")]
    public string? RefreshToken { get; set; } = null;
    public string RefreshToken { get; set; } = null;

    [BsonElement("is_deleted")]
    public bool IsDeleted { get; set; } = false;

}

public class User : UserBase, IGenericEFModel
{
    [Key]
    public int Id { get; set; }
}

Order Model

back up

public class OrderBase : IGenericModel
{
    [StringLength(50)]
    [BsonElement("name")]
    public required string Name { get; set; }

    [StringLength(100)]
    [BsonElement("email")]
    public required string Email { get; set; }

    [StringLength(20)]
    [BsonElement("phone")]
    public required string Phone { get; set; }

    [StringLength(1000)]
    [BsonElement("note")]
    public string? Note { get; set; } = null;

    [BsonElement("created")]
    public DateTime Created { get; set; } = DateTime.Now;

    [BsonElement("is_deleted")]
    public bool IsDeleted { get; set; } = false;

}

public class Order : OrderBase, IGenericEFModel
{
    [Key]
    public int Id { get; set; }

    // Foreign keys
    public int ServiceId { get; set; }
    public int PriorityId { get; set; }
    public int StateId { get; set; }
    public int? UserId { get; set; } = null;

    // Navigation properties
    public virtual User? User { get; set; }
    public virtual Service Service { get; set; }
    public virtual Priority Priority { get; set; } 
    public virtual State State { get; set; }
}

BSON Models

Service Model

back up

public class ServiceBase : IGenericModel
{
    [StringLength(50)]
    [BsonElement("name")]
    public required string Name { get; set; }

    [StringLength(1000)]
    [BsonElement("description")]
    public required string Description { get; set; }

    [BsonElement("price")]
    public int Price { get; set; }

    [BsonElement("is_deleted")]
    public bool IsDeleted { get; set; } = false;

}

public class Service : ServiceBase, IGenericBSONModel
{
    [BsonId]
    public ObjectId Id { get; set; }
    [BsonRepresentation(BsonType.ObjectId)]
    public string Id { get; set; }
}

Priority Model

back up

public class PriorityBase : IGenericModel
{
    [StringLength(20)]
    [BsonElement("name")]
    public required string Name { get; set; }

    [BsonElement("days")]
    public int Days { get; set; }

    [BsonElement("is_deleted")]
    public bool IsDeleted { get; set; } = false;

}

public class Priority : PriorityBase, IGenericBSONModel
{
    [BsonId]
    public ObjectId Id { get; set; }
    [BsonRepresentation(BsonType.ObjectId)]
    public string Id { get; set; }
}

State Model

back up

public class StateBase : IGenericModel
{
    [StringLength(20)]
    [BsonElement("name")]
    public required string Name { get; set; }

    [BsonElement("is_deleted")]
    public bool IsDeleted { get; set; } = false;

}

public class State : StateBase, IGenericBSONModel
{
    [BsonId]
    public ObjectId Id { get; set; }
    [BsonRepresentation(BsonType.ObjectId)]
    public string Id { get; set; }
}

User Model

back up

public class UserBase : IGenericModel
{
    [StringLength(50)]
    [BsonElement("username")]
    public required string Username { get; set; }

    [BsonElement("password_hash")]
    public byte[] PasswordHash { get; set; }

    [BsonElement("password_salt")]
    public byte[] PasswordSalt { get; set; }

    [BsonElement("locked")]
    public bool Locked { get; set; } = false;

    [BsonElement("role")]
    [BsonRepresentation(BsonType.String)]
    public RoleNames Role { get; set; } = RoleNames.User;

    [BsonElement("login_attempts")]
    public int LoginAttempts { get; set; } = 0;

    [BsonElement("refresh_token")]
    public string? RefreshToken { get; set; } = null;
    public string RefreshToken { get; set; } = null;

    [BsonElement("is_deleted")]
    public bool IsDeleted { get; set; } = false;

}

public class User : UserBase, IGenericBSONModel
{
    [BsonId]
    public ObjectId Id { get; set; }
    [BsonRepresentation(BsonType.ObjectId)]
    public string Id { get; set; }
}

Order Model

back up

public class OrderBase : IGenericModel
{
    [StringLength(50)]
    [BsonElement("name")]
    public required string Name { get; set; }

    [StringLength(100)]
    [BsonElement("email")]
    public required string Email { get; set; }

    [StringLength(20)]
    [BsonElement("phone")]
    public required string Phone { get; set; }

    [StringLength(1000)]
    [BsonElement("note")]
    public string? Note { get; set; } = null;

    [BsonElement("created")]
    public DateTime Created { get; set; } = DateTime.Now;

    [BsonElement("is_deleted")]
    public bool IsDeleted { get; set; } = false;

}

public class Order : OrderBase, IGenericBSONModel
{
    [BsonId]
    public ObjectId Id { get; set; }
    [BsonRepresentation(BsonType.ObjectId)]
    public string Id { get; set; }


    [BsonElement("priority_id")]
    public ObjectId PriorityId { get; set; }
    public string PriorityId { get; set; }

    [BsonElement("service_id")]
    public ObjectId ServiceId { get; set; }
    public string ServiceId { get; set; }

    [BsonElement("state_id")]
    public ObjectId StateId { get; set; }
    public string StateId { get; set; }

    [BsonElement("user_id")]
    public ObjectId? UserId { get; set; } = null;
    public string? UserId { get; set; } = null;

    [BsonElement("priority")]
    [BsonIgnore]
    public virtual Priority Priority { get; set; }
    public bool ShouldSerializePriority() => false;

    [BsonElement("service")]
    [BsonIgnore]
    public virtual Service Service { get; set; }
    public bool ShouldSerializeService() => false;

    [BsonElement("state")]
    [BsonIgnore]
    public virtual State State { get; set; }
    public bool ShouldSerializeState() => false;

    [BsonElement("user")]
    [BsonIgnore]
    public virtual User? User { get; set; }
    public bool ShouldSerializeUser() => false;

}

DTOs

TokenData

This DTO is used for any token data sent by the API.

back up

public class TokenData : IDTO
{
    public string Token { get; set; }

    public string? RefreshToken { get; set; }

    public string TokenType { get; set; } = "Bearer";

    public DateTime Issued { get; set; } = DateTime.UtcNow;

    public DateTime Expires { get; set; }
}

ErrorData

This DTO is used for any error data sent by the API.

back up

public class ErrorData : IDTO
{

    public string MessageCode { get; set; }

    public bool Breaking { get; set; } = false;
}

Response DTOs

DeleteResponse

back up

public class DeleteResponse : IResponseDTO
{
    public int Count { get; set; }
}

LoginResponse

back up

public class LoginResponse : UserResponse, IResponseDTO
{
    public TokenData Auth { get; set; }
}

OrderResponse

back up

public class OrderResponse : IResponseDTO
{
    public int Id { get; set; }

    public string Name { get; set; }

    public string Email { get; set; }

    public string Phone { get; set; }

    public string? Note { get; set; }

    public DateTime Created { get; set; }

    // Navigation properties
    public UserResponse User { get; set; }
    public ServiceResponse Service { get; set; }
    public PriorityResponse Priority { get; set; }
    public StateResponse State { get; set; }
}
public class OrderResponseAdmin : OrderResponse, IResponseDTO
{
    public bool IsDeleted { get; set; }

    // Navigation properties
    new public UserResponseAdmin User { get; set; }
    new public ServiceResponseAdmin Service { get; set; }
    new public PriorityResponseAdmin Priority { get; set; }
    new public StateResponseAdmin State { get; set; }
}

PriorityResponse

back up

public class PriorityResponse : IResponseDTO
{
    public int Id { get; set; }

    public string Name { get; set; }

    public int Days { get; set; }
}
public class PriorityResponseAdmin : PriorityResponse, IResponseDTO
{
    public bool IsDeleted { get; set; }
}

ServiceResponse

back up

public class ServiceResponse : IResponseDTO
{
    public int Id { get; set; }

    public string Name { get; set; }

    public string Description { get; set; }

    public int Price { get; set; }
}
public class ServiceResponseAdmin : ServiceResponse, IResponseDTO
{
    public bool IsDeleted { get; set; }
}

StateResponse

back up

public class StateResponse : IResponseDTO
{
    public int Id { get; set; }

    public string Name { get; set; }
}
public class StateResponseAdmin : StateResponse, IResponseDTO
{
    public bool IsDeleted { get; set; }
}

UserResponse

back up

public class UserResponse : IResponseDTO
{
    public int Id { get; set; }
    public string Username { get; set; }
    public bool Locked { get; set; }
    public RoleNames Role { get; set; }

}
public class UserResponseAdmin : UserResponse, IResponseDTO
{
    public bool IsDeleted { get; set; }
    public int LoginAttempts { get; set; } = 0;
}

Request DTOs

LoginRequest

back up

public class LoginRequest : ILoginRequest
{
    [Required]
    public string Username { get; set; }

    [Required]
    public string Password { get; set; }

    public bool RememberMe { get; set; } = false;
}

RefreshRequest

back up

public class RefreshRequest : ILoginRequest
{
    [Required]
    public string Token { get; set; }

    [Required]
    public string RefreshToken { get; set; }
}

CreateOrderRequest

back up

public class CreateOrderRequest : IRequestDTO
{
    [Required]
    public int ServiceId { get; set; }
    [Required]
    public int PriorityId { get; set; }
    [Required]
    public int StateId { get; set; }

    public int? UserId { get; set; }

    [Required]
    [StringLength(50)]
    public string Name { get; set; }

    [Required]
    [StringLength(100)]
    [EmailAddress]
    public string Email { get; set; }

    [Required]
    [StringLength(20)]
    [RegularExpression(@"^(\+\d{1,3}[- ]?)?\d{10}$", ErrorMessage = "Invalid phone number")]
    public string Phone { get; set; }

    [StringLength(1000)]
    public string? Note { get; set; } = null;
}

CreatePriorityRequest

back up

public class CreatePriorityRequest : IRequestDTO
{

    [Required]
    [StringLength(20)]
    public string Name { get; set; }

    [Required]
    [Range(1, 365)]
    public int Days { get; set; }
}

CreateServiceRequest

back up

public class CreateServiceRequest : IRequestDTO
{
    [Required]
    [StringLength(50)]
    public string Name { get; set; }

    [Required]
    [StringLength(1000)]
    public string Description { get; set; }

    [Required]
    [Range(1, 1000)]
    public int Price { get; set; }
}

CreateStateRequest

back up

public class CreateStateRequest : IRequestDTO
{

    [Required]
    [StringLength(20)]
    public string Name { get; set; }
}

CreateUserRequest

back up

public class CreateUserRequest : IRequestDTO
{
    [Required]
    [StringLength(50)]
    public string Username { get; set; }

    [Required]
    [MinLength(8)]
    public string Password { get; set; }

    public bool? Locked { get; set; }

    public RoleNames? Role { get; set; }
}

UpdateOrderRequest

back up

public class UpdateOrderRequest : IRequestDTO
{
    public int? ServiceId { get; set; } = null;

    public int? PriorityId { get; set; } = null;

    public int? StateId { get; set; } = null;

    public int? UserId { get; set; } = null;

    [StringLength(50)]
    public string? Name { get; set; } = null;

    [StringLength(100)]
    [EmailAddress]
    public string? Email { get; set; } = null;

    [StringLength(20)]
    [RegularExpression(@"^(\+\d{1,3}[- ]?)?\d{10}$", ErrorMessage = "Invalid phone number")]
    public string? Phone { get; set; } = null;

    [StringLength(1000)]
    public string? Note { get; set; } = null;
}

UpdatePriorityRequest

back up

public class UpdatePriorityRequest : IRequestDTO
{
    [StringLength(20)]
    public string? Name { get; set; } = null;

    [Range(1, 365)]
    public int? Days { get; set; } = null;
}

UpdateServiceRequest

back up

public class UpdateServiceRequest : IRequestDTO
{
    [StringLength(50)]
    public string? Name { get; set; } = null;

    [StringLength(1000)]
    public string? Description { get; set; } = null;

    [Range(1, 1000)]
    public int? Price { get; set; } = null;
}

UpdateStateRequest

back up

public class UpdateStateRequest : IRequestDTO
{
    [StringLength(20)]
    public string? Name { get; set; } = null;
}

UpdateUserRequest

back up

public class UpdateUserRequest : IRequestDTO
{
    [StringLength(50)]
    public string? Username { get; set; } = null;

    [MinLength(8)]
    public string? Password { get; set; } = null;

    public bool? Locked { get; set; } = null;

    public RoleNames? Role { get; set; } = null;
}

Enums

RoleNames Enum

back up

public enum RoleNames
{
    User,
    SuperAdmin
}

Interfaces

IGenericModel Interface

Base Interface for all models.

back up

public interface IGenericModel
{
    bool IsDeleted { get; set; }
}

IGenericEFModel Interface

Base Interface for all models.

back up

public interface IGenericEFModel : IGenericModel
{
    public int Id { get; set; }
}

IGenericBSONModel Interface

Base Interface for all models.

back up

public interface IGenericBSONModel : IGenericModel
{
    public ObjectId Id { get; set; }
    public string Id { get; set; }
}

DTO Interface

Base Interface for all DTOs.

back up

public interface IDTO
{
}

Response DTO Interface

Base Interface for all Response DTOs.

back up

public interface IResponseDTO : IDTO
{
}

Request DTO Interface

Base Interface for all Request DTOs.

back up

public interface IRequestDTO : IDTO
{
}

ILoginRequest Interface

Interface for LoginRequest & RefreshRequest

back up

public interface ILoginRequest : IRequestDTO
{
}

-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,6 @@ @@
         <IsTestProject>true</IsTestProject>
       </PropertyGroup>
       <ItemGroup>
-        <PackageReference Include="FluentAssertions" Version="6.12.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
         <PackageReference Include="Moq" Version="4.20.69" />
         <PackageReference Include="xunit" Version="2.4.2" />
@@ Expand Down @@

-Original file line number
+Diff line change
@@ -1,6 +1,6 @@
     using SkiServiceAPI.Common;
-    using SkiServiceAPI.Models;
     using SkiServiceModels.DTOs;
+    using SkiServiceModels.Models;
     using SkiServiceModels.Models.EF;
     namespace SkiServiceAPI.Interfaces
@@ Expand Down @@

-Original file line number
+Diff line change
@@ -1,8 +1,8 @@
     using Microsoft.IdentityModel.Tokens;
     using SkiServiceAPI.Common;
     using SkiServiceAPI.Interfaces;
-    using SkiServiceAPI.Models;
     using SkiServiceModels.DTOs;
+    using SkiServiceModels.Models;
     using SkiServiceModels.Models.EF;
     using System.IdentityModel.Tokens.Jwt;
     using System.Security.Claims;
@@ Expand Down @@

-Original file line number
+Diff line change
@@ -1,7 +1,7 @@
     using SkiServiceModels.DTOs;
     using SkiServiceModels.Models.EF;
-    namespace SkiServiceAPI.Models
+    namespace SkiServiceModels.Models
     {
         public class RefreshResult
         {
@@ Expand Down @@

-Original file line number
+Diff line change
@@ -1,6 +1,10 @@
     # SkiServiceModels <!-- omit in toc -->
+    ## Contents <!-- omit in toc -->
     <!--TOC-->
+    - [Core Models](#core-models)
+      - [RefreshResult](#refreshresult)
     - [EF Models](#ef-models)
       - [Service Model](#service-model)
       - [Priority Model](#priority-model)
@@ Expand Down Expand Up / @@ -49,6 +53,12 @@ @@
       - [ILoginRequest Interface](#iloginrequest-interface)
     <!--/TOC-->
+    ## Core Models
+    ### RefreshResult
+    <<COREMODEL::RefreshResult>>
     ## EF Models
     ### Service Model
@@ Expand Down @@

Commit

There are no files selected for viewing

SkiServiceModels

Contents

Core Models

RefreshResult

EF Models

Service Model

Priority Model

State Model

User Model

Order Model

BSON Models

Service Model

Priority Model

State Model

User Model

Order Model

DTOs

TokenData

ErrorData

Response DTOs

DeleteResponse

LoginResponse

OrderResponse

PriorityResponse

ServiceResponse

StateResponse

UserResponse

Request DTOs

LoginRequest

RefreshRequest

CreateOrderRequest

CreatePriorityRequest

CreateServiceRequest

CreateStateRequest

CreateUserRequest

UpdateOrderRequest

UpdatePriorityRequest

UpdateServiceRequest

UpdateStateRequest

UpdateUserRequest

Enums

RoleNames Enum

Interfaces

IGenericModel Interface

IGenericEFModel Interface

IGenericBSONModel Interface

DTO Interface

Response DTO Interface

Request DTO Interface

ILoginRequest Interface

0 comments on commit 513ea25

0 comments on commit `513ea25`