updated models to also support no-sql. disabled docker-publish for now

The Backend was not updated with the new data
fokklz · Jan 13, 2024 · 5de1b62 · 5de1b62
1 parent 27dd34b
commit 5de1b62
Show file tree

Hide file tree

Showing 25 changed files with 284 additions and 110 deletions.
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -2,9 +2,9 @@ name: Docker Image CI
 
 on:
   push:
-    branches: [main]
+    branches: [mainxx]
   pull_request:
-    branches: [main]
+    branches: [mainxx]
 
 jobs:
   build:

diff --git a/SkiServiceModels/DTOs/Responses/DeleteResponse.cs b/SkiServiceModels/DTOs/Responses/DeleteResponse.cs
@@ -7,6 +7,6 @@ namespace SkiServiceModels.DTOs.Responses
     /// </summary>
     public class DeleteResponse : IResponseDTO
     {
-        public int Id { get; set; }
+        public int Count { get; set; }
     }
 }
diff --git a/SkiServiceModels/Interfaces/IGenericBSONModel.cs b/SkiServiceModels/Interfaces/IGenericBSONModel.cs
@@ -0,0 +1,7 @@
+namespace SkiServiceModels.Interfaces
+{
+    public interface IGenericBSONModel : IGenericModel
+    {
+        public string Id { get; set; }
+    }
+}
diff --git a/SkiServiceModels/Interfaces/IGenericEFModel.cs b/SkiServiceModels/Interfaces/IGenericEFModel.cs
@@ -0,0 +1,7 @@
+namespace SkiServiceModels.Interfaces
+{
+    public interface IGenericEFModel : IGenericModel
+    {
+        public int Id { get; set; }
+    }
+}
diff --git a/SkiServiceModels/Interfaces/IGenericModel.cs b/SkiServiceModels/Interfaces/IGenericModel.cs
@@ -2,9 +2,6 @@
 {
     public interface IGenericModel
     {
-        int Id { get; set; }
-
         bool IsDeleted { get; set; }
-
     }
 }
diff --git a/SkiServiceModels/Interfaces/ILoginRequest.cs b/SkiServiceModels/Interfaces/ILoginRequest.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SkiServiceModels.Interfaces
+namespace SkiServiceModels.Interfaces
 {
     public interface ILoginRequest : IRequestDTO
     {

diff --git a/SkiServiceModels/Models/BSON/Order.cs b/SkiServiceModels/Models/BSON/Order.cs
@@ -0,0 +1,29 @@
+using MongoDB.Bson;
+using MongoDB.Bson.Serialization.Attributes;
+using SkiServiceModels.Interfaces;
+using SkiServiceModels.Models.Base;
+
+namespace SkiServiceModels.Models.BSON
+{
+    public class Order : OrderBase, IGenericBSONModel
+    {
+        [BsonId]
+        [BsonRepresentation(BsonType.ObjectId)]
+        public string Id { get; set; }
+
+        public string PriorityId { get; set; }
+        public string ServiceId { get; set; }
+        public string StateId { get; set; }
+        public string? UserId { get; set; } = null;
+
+        [BsonIgnore]
+        public virtual Priority Priority { get; set; }
+        [BsonIgnore]
+        public virtual Service Service { get; set; }
+        [BsonIgnore]
+        public virtual State State { get; set; }
+        [BsonIgnore]
+        public virtual User? User { get; set; }
+
+    }
+}
diff --git a/SkiServiceModels/Models/BSON/Priority.cs b/SkiServiceModels/Models/BSON/Priority.cs
@@ -0,0 +1,14 @@
+using MongoDB.Bson;
+using MongoDB.Bson.Serialization.Attributes;
+using SkiServiceModels.Interfaces;
+using SkiServiceModels.Models.Base;
+
+namespace SkiServiceModels.Models.BSON
+{
+    public class Priority : PriorityBase, IGenericBSONModel
+    {
+        [BsonId]
+        [BsonRepresentation(BsonType.ObjectId)]
+        public string Id { get; set; }
+    }
+}
diff --git a/SkiServiceModels/Models/BSON/Service.cs b/SkiServiceModels/Models/BSON/Service.cs
@@ -0,0 +1,14 @@
+using MongoDB.Bson;
+using MongoDB.Bson.Serialization.Attributes;
+using SkiServiceModels.Interfaces;
+using SkiServiceModels.Models.Base;
+
+namespace SkiServiceModels.Models.BSON
+{
+    public class Service : ServiceBase, IGenericBSONModel
+    {
+        [BsonId]
+        [BsonRepresentation(BsonType.ObjectId)]
+        public string Id { get; set; }
+    }
+}
diff --git a/SkiServiceModels/Models/BSON/State.cs b/SkiServiceModels/Models/BSON/State.cs
@@ -0,0 +1,14 @@
+using MongoDB.Bson;
+using MongoDB.Bson.Serialization.Attributes;
+using SkiServiceModels.Interfaces;
+using SkiServiceModels.Models.Base;
+
+namespace SkiServiceModels.Models.BSON
+{
+    public class State : StateBase, IGenericBSONModel
+    {
+        [BsonId]
+        [BsonRepresentation(BsonType.ObjectId)]
+        public string Id { get; set; }
+    }
+}
diff --git a/SkiServiceModels/Models/BSON/User.cs b/SkiServiceModels/Models/BSON/User.cs
@@ -0,0 +1,14 @@
+using MongoDB.Bson;
+using MongoDB.Bson.Serialization.Attributes;
+using SkiServiceModels.Interfaces;
+using SkiServiceModels.Models.Base;
+
+namespace SkiServiceModels.Models.BSON
+{
+    public class User : UserBase, IGenericBSONModel
+    {
+        [BsonId]
+        [BsonRepresentation(BsonType.ObjectId)]
+        public string Id { get; set; }
+    }
+}
diff --git a/SkiServiceModels/Models/Base/OrderBase.cs b/SkiServiceModels/Models/Base/OrderBase.cs
@@ -0,0 +1,25 @@
+using SkiServiceModels.Interfaces;
+using System.ComponentModel.DataAnnotations;
+
+namespace SkiServiceModels.Models.Base
+{
+    public class OrderBase : IGenericModel
+    {
+        [StringLength(50)]
+        public required string Name { get; set; }
+
+        [StringLength(100)]
+        public required string Email { get; set; }
+
+        [StringLength(20)]
+        public required string Phone { get; set; }
+
+        [StringLength(1000)]
+        public string? Note { get; set; } = null;
+
+        public DateTime Created { get; set; } = DateTime.Now;
+
+        public bool IsDeleted { get; set; } = false;
+
+    }
+}
diff --git a/SkiServiceModels/Models/Priority.cs → SkiServiceModels/Models/Base/PriorityBase.cs b/SkiServiceModels/Models/Priority.cs → SkiServiceModels/Models/Base/PriorityBase.cs
@@ -1,15 +1,12 @@
 using SkiServiceModels.Interfaces;
 using System.ComponentModel.DataAnnotations;
 
-namespace SkiServiceModels
+namespace SkiServiceModels.Models.Base
 {
-    public class Priority : IGenericModel
+    public class PriorityBase : IGenericModel
     {
-        [Key]
-        public int Id { get; set; }
-
         [StringLength(20)]
-        public string Name { get; set; }
+        public required string Name { get; set; }
 
         public int Days { get; set; }
 

diff --git a/SkiServiceModels/Models/Service.cs → SkiServiceModels/Models/Base/ServiceBase.cs b/SkiServiceModels/Models/Service.cs → SkiServiceModels/Models/Base/ServiceBase.cs
@@ -1,18 +1,15 @@
 using SkiServiceModels.Interfaces;
 using System.ComponentModel.DataAnnotations;
 
-namespace SkiServiceModels
+namespace SkiServiceModels.Models.Base
 {
-    public class Service : IGenericModel
+    public class ServiceBase : IGenericModel
     {
-        [Key]
-        public int Id { get; set; }
-
         [StringLength(50)]
-        public string Name { get; set; }
+        public required string Name { get; set; }
 
         [StringLength(1000)]
-        public string Description { get; set; }
+        public required string Description { get; set; }
 
         public int Price { get; set; }
 

diff --git a/SkiServiceModels/Models/State.cs → SkiServiceModels/Models/Base/StateBase.cs b/SkiServiceModels/Models/State.cs → SkiServiceModels/Models/Base/StateBase.cs
@@ -1,16 +1,12 @@
 using SkiServiceModels.Interfaces;
 using System.ComponentModel.DataAnnotations;
 
-namespace SkiServiceModels
+namespace SkiServiceModels.Models.Base
 {
-    public class State : IGenericModel
+    public class StateBase : IGenericModel
     {
-
-        [Key]
-        public int Id { get; set; }
-
         [StringLength(20)]
-        public string Name { get; set; }
+        public required string Name { get; set; }
 
         public bool IsDeleted { get; set; } = false;
 

diff --git a/SkiServiceModels/Models/User.cs → SkiServiceModels/Models/Base/UserBase.cs b/SkiServiceModels/Models/User.cs → SkiServiceModels/Models/Base/UserBase.cs
@@ -2,17 +2,12 @@
 using SkiServiceModels.Enums;
 using SkiServiceModels.Interfaces;
 
-#nullable disable
-
-namespace SkiServiceModels
+namespace SkiServiceModels.Models.Base
 {
-    public class User : IGenericModel
+    public class UserBase : IGenericModel
     {
-        [Key]
-        public int Id { get; set; }
-
         [StringLength(50)]
-        public string Username { get; set; }
+        public required string Username { get; set; }
 
         public byte[] PasswordHash { get; set; }
 
@@ -24,8 +19,9 @@ public class User : IGenericModel
 
         public int LoginAttempts { get; set; } = 0;
 
+        public string RefreshToken { get; set; } = null;
+
         public bool IsDeleted { get; set; } = false;
 
-        public string RefreshToken { get; set; } = null;
     }
 }
diff --git a/SkiServiceModels/Models/Order.cs → SkiServiceModels/Models/EF/Order.cs b/SkiServiceModels/Models/Order.cs → SkiServiceModels/Models/EF/Order.cs
@@ -1,9 +1,10 @@
 using SkiServiceModels.Interfaces;
+using SkiServiceModels.Models.Base;
 using System.ComponentModel.DataAnnotations;
 
-namespace SkiServiceModels
+namespace SkiServiceModels.Models.EF
 {
-    public class Order : IGenericModel
+    public class Order : OrderBase, IGenericEFModel
     {
         [Key]
         public int Id { get; set; }
@@ -17,24 +18,7 @@ public class Order : IGenericModel
         // Navigation properties
         public virtual User? User { get; set; }
         public virtual Service Service { get; set; }
-        public virtual Priority Priority { get; set; }
+        public virtual Priority Priority { get; set; } 
         public virtual State State { get; set; }
-
-        [StringLength(50)]
-        public string Name { get; set; }
-
-        [StringLength(100)]
-        public string Email { get; set; }
-
-        [StringLength(20)]
-        public string Phone { get; set; }
-
-        [StringLength(1000)]
-        public string? Note { get; set; } = null;
-
-        public DateTime Created { get; set; } = DateTime.Now;
-
-        public bool IsDeleted { get; set; } = false;
-
     }
 }
diff --git a/SkiServiceModels/Models/EF/Priority.cs b/SkiServiceModels/Models/EF/Priority.cs
@@ -0,0 +1,12 @@
+using SkiServiceModels.Interfaces;
+using SkiServiceModels.Models.Base;
+using System.ComponentModel.DataAnnotations;
+
+namespace SkiServiceModels.Models.EF
+{
+    public class Priority : PriorityBase, IGenericEFModel
+    {
+        [Key]
+        public int Id { get; set; }
+    }
+}
diff --git a/SkiServiceModels/Models/EF/Service.cs b/SkiServiceModels/Models/EF/Service.cs
@@ -0,0 +1,12 @@
+using SkiServiceModels.Interfaces;
+using SkiServiceModels.Models.Base;
+using System.ComponentModel.DataAnnotations;
+
+namespace SkiServiceModels.Models.EF
+{
+    public class Service : ServiceBase, IGenericEFModel
+    {
+        [Key]
+        public int Id { get; set; }
+    }
+}
diff --git a/SkiServiceModels/Models/EF/State.cs b/SkiServiceModels/Models/EF/State.cs
@@ -0,0 +1,12 @@
+using SkiServiceModels.Interfaces;
+using SkiServiceModels.Models.Base;
+using System.ComponentModel.DataAnnotations;
+
+namespace SkiServiceModels.Models.EF
+{
+    public class State : StateBase, IGenericEFModel
+    {
+        [Key]
+        public int Id { get; set; }
+    }
+}
diff --git a/SkiServiceModels/Models/EF/User.cs b/SkiServiceModels/Models/EF/User.cs
@@ -0,0 +1,12 @@
+using SkiServiceModels.Interfaces;
+using SkiServiceModels.Models.Base;
+using System.ComponentModel.DataAnnotations;
+
+namespace SkiServiceModels.Models.EF
+{
+    public class User : UserBase, IGenericEFModel
+    {
+        [Key]
+        public int Id { get; set; }
+    }
+}
diff --git a/SkiServiceModels/README.md b/SkiServiceModels/README.md