imporved bson support as well as the documentation generation

fokklz · Jan 14, 2024 · aef2c05 · aef2c05
1 parent 5de1b62
commit aef2c05
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 6 deletions.
diff --git a/SkiServiceModels/Models/BSON/Order.cs b/SkiServiceModels/Models/BSON/Order.cs
@@ -11,9 +11,17 @@ public class Order : OrderBase, IGenericBSONModel
         [BsonRepresentation(BsonType.ObjectId)]
         public string Id { get; set; }
 
+
+        [BsonElement("priority_id")]
         public string PriorityId { get; set; }
+
+        [BsonElement("service_id")]
         public string ServiceId { get; set; }
+
+        [BsonElement("state_id")]
         public string StateId { get; set; }
+
+        [BsonElement("user_id")]
         public string? UserId { get; set; } = null;
 
         [BsonIgnore]

diff --git a/SkiServiceModels/Models/Base/OrderBase.cs b/SkiServiceModels/Models/Base/OrderBase.cs
@@ -1,24 +1,31 @@
-using SkiServiceModels.Interfaces;
+using MongoDB.Bson.Serialization.Attributes;
+using SkiServiceModels.Interfaces;
 using System.ComponentModel.DataAnnotations;
 
 namespace SkiServiceModels.Models.Base
 {
     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;
 
     }

diff --git a/SkiServiceModels/Models/Base/PriorityBase.cs b/SkiServiceModels/Models/Base/PriorityBase.cs
@@ -1,15 +1,19 @@
-using SkiServiceModels.Interfaces;
+using MongoDB.Bson.Serialization.Attributes;
+using SkiServiceModels.Interfaces;
 using System.ComponentModel.DataAnnotations;
 
 namespace SkiServiceModels.Models.Base
 {
     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;
 
     }

diff --git a/SkiServiceModels/Models/Base/ServiceBase.cs b/SkiServiceModels/Models/Base/ServiceBase.cs
@@ -1,18 +1,23 @@
-using SkiServiceModels.Interfaces;
+using MongoDB.Bson.Serialization.Attributes;
+using SkiServiceModels.Interfaces;
 using System.ComponentModel.DataAnnotations;
 
 namespace SkiServiceModels.Models.Base
 {
     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;
 
     }

diff --git a/SkiServiceModels/Models/Base/StateBase.cs b/SkiServiceModels/Models/Base/StateBase.cs
@@ -1,13 +1,16 @@
-using SkiServiceModels.Interfaces;
+using MongoDB.Bson.Serialization.Attributes;
+using SkiServiceModels.Interfaces;
 using System.ComponentModel.DataAnnotations;
 
 namespace SkiServiceModels.Models.Base
 {
     public class StateBase : IGenericModel
     {
         [StringLength(20)]
+        [BsonElement("name")]
         public required string Name { get; set; }
 
+        [BsonElement("is_deleted")]
         public bool IsDeleted { get; set; } = false;
 
     }

diff --git a/SkiServiceModels/Models/Base/UserBase.cs b/SkiServiceModels/Models/Base/UserBase.cs
@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations;
+using MongoDB.Bson.Serialization.Attributes;
 using SkiServiceModels.Enums;
 using SkiServiceModels.Interfaces;
 
@@ -7,20 +8,28 @@ namespace SkiServiceModels.Models.Base
     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")]
         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;
 
+        [BsonElement("is_deleted")]
         public bool IsDeleted { get; set; } = false;
 
     }

diff --git a/SkiServiceModels/README.md b/SkiServiceModels/README.md
diff --git a/SkiServiceModels/RawREADME.md b/SkiServiceModels/RawREADME.md
@@ -52,35 +52,45 @@
 ## EF Models
 
 ### Service Model
+<<MODEL::ServiceBase>>
 <<EFMODEL::Service>>
 
 ### Priority Model
+<<MODEL::PriorityBase>>
 <<EFMODEL::Priority>>
 
 ### State Model
+<<MODEL::StateBase>>
 <<EFMODEL::State>>
 
 ### User Model
+<<MODEL::UserBase>>
 <<EFMODEL::User>>
 
 ### Order Model
+<<MODEL::OrderBase>>
 <<EFMODEL::Order>>
 
 ## BSON Models
 
 ### Service Model
+<<MODEL::ServiceBase>>
 <<BSONMODEL::Service>>
 
 ### Priority Model
+<<MODEL::PriorityBase>>
 <<BSONMODEL::Priority>>
 
 ### State Model
+<<MODEL::StateBase>>
 <<BSONMODEL::State>>
 
 ### User Model
+<<MODEL::UserBase>>
 <<BSONMODEL::User>>
 
 ### Order Model
+<<MODEL::OrderBase>>
 <<BSONMODEL::Order>>
 
 ## DTOs

diff --git a/SkiServiceModels/prepublish.ps1 b/SkiServiceModels/prepublish.ps1
@@ -14,7 +14,7 @@ $inputFile = Join-Path $workingDirectory "RawREADME.md"
 $outputFile = Join-Path $workingDirectory "README.md"
 
 $directories = @{
-    "MODEL" = "Models"
+    "MODEL" = "Models\Base"
     "EFMODEL" = "Models\EF"
     "BSONMODEL" = "Models\BSON"
     "DTO" = "DTOs"
@@ -93,7 +93,12 @@ function Extract-ClassDefinition {
     $codeBlockStart = '```csharp'
     $codeBlockEnd = '```'
     $codeBlockInner = $classContent -join "`r`n"
-    return "[back up](#contents)`r`n$codeBlockStart`r`n$codeBlockInner`r`n$codeBlockEnd`r`n"
+
+    if($Type -eq 'EFMODEL' -or $Type -eq 'BSONMODEL' ){
+        return "$codeBlockStart`r`n$codeBlockInner`r`n$codeBlockEnd`r`n"
+    }else{
+        return "[back up](#contents)`r`n$codeBlockStart`r`n$codeBlockInner`r`n$codeBlockEnd`r`n"
+    }
 }
 
 $content = Get-Content $inputFile