Merge pull request #10 from Invoices-Manager/dev_01

Dev 01

Author: Schecher1

Controllers/v01/InvoiceController.cs

@@ -136,9 +136,9 @@ public async Task<IActionResult> Add([FromBody] InvoiceWrapperModel wrapper)
                 if (newInvoice.Id != 0)
                     return new BadRequestObjectResult(ResponseMgr.CreateResponse(400, traceId, "You are not allowed to set the Id!", new Dictionary<string, object> { { "id", newInvoice.Id } }));
 
-                //check if the user already set an file id
-                if (!string.IsNullOrEmpty(newInvoice.FileID))
-                    return new BadRequestObjectResult(ResponseMgr.CreateResponse(400, traceId, "You are not allowed to set the FileID!", new Dictionary<string, object> { { "fileId", newInvoice.FileID } }));
+                //check if the user has set a file id
+                if (String.IsNullOrWhiteSpace(newInvoice.FileID))
+                    return new BadRequestObjectResult(ResponseMgr.CreateResponse(400, traceId, "You have to set an File Id!", new Dictionary<string, object> { { "fileId", newInvoice.FileID } }));
 
                 //check if the enums are valid
                 if (!Enum.IsDefined(typeof(ImportanceStateEnum), newInvoice.ImportanceState))
@@ -166,33 +166,22 @@ public async Task<IActionResult> Add([FromBody] InvoiceWrapperModel wrapper)
                 if (invoiceFileInfo.Length > 32 * 1024 * 1024)
                     return new BadRequestObjectResult(ResponseMgr.CreateResponse(400, traceId, "The file is too big (32 mb)"));
 
-                //get the file id
-                var fileId = Security.FileHasher.GetMd5Hash(invoiceFileInfo.FullName);
-
                 //check if the file id already exist
-                if (user.Invoices.Any(x => x.FileID == fileId))
+                if (user.Invoices.Any(x => x.FileID == newInvoice.FileID))
                     return new BadRequestObjectResult(ResponseMgr.CreateResponse(400, traceId, "The file already exist"));
 
-                //check if the file id is valid
-                if (string.IsNullOrEmpty(fileId))
-                    return new BadRequestObjectResult(ResponseMgr.CreateResponse(400, traceId, "The file id is not valid"));
-
                 //move the file to the new path
-                FileCore.MoveInvoiceFile_IntoUserFolder(invoiceFileInfo.FullName, fileId, user);
+                FileCore.MoveInvoiceFile_IntoUserFolder(invoiceFileInfo.FullName, newInvoice.FileID, user);
 
                 //set the creation date
                 newInvoice.CaptureDate = DateTime.Now;
 
-                //set the file id
-                newInvoice.FileID = fileId;
-
                 //add the invoices to the db
                 user.Invoices.Add(newInvoice);
                 await _db.SaveChangesAsync();
 
                 //return the invoices
                 return new CreatedAtActionResult("Get", "Invoice", new { id = newInvoice.Id }, ResponseMgr.CreateResponse(201, traceId, "Invoice created successfully", new Dictionary<string, object> { { "invoice", newInvoice } }));
-
             }
         }
 
@@ -240,6 +229,10 @@ public async Task<IActionResult> Edit([FromBody] InvoiceModel editInvoice)
                 //get the invoice id
                 int index = user.Invoices.FindIndex(x => x.Id == editInvoice.Id);
 
+                //check if the file id was manipulated
+                if (user.Invoices[index].FileID != editInvoice.FileID)
+                    return new BadRequestObjectResult(ResponseMgr.CreateResponse(400, traceId, "The file id was manipulated", new Dictionary<string, object> { { "fileId", editInvoice.FileID } }));
+
                 //create a new invoice and delete the old one
                 editInvoice.Id = user.Invoices[index].Id;
                 editInvoice.FileID = user.Invoices[index].FileID;

Invoices-Manager-API.csproj

@@ -5,8 +5,8 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>Invoices_Manager_API</RootNamespace>
-    <FileVersion>1.0.3.2</FileVersion>
-    <AssemblyVersion>1.0.3.2</AssemblyVersion>
+    <FileVersion>1.0.3.3</FileVersion>
+    <AssemblyVersion>1.0.3.3</AssemblyVersion>
     <UserSecretsId>8e8f9154-9968-4e4a-81e6-a05431d2d71a</UserSecretsId>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <DockerfileContext>.</DockerfileContext>

Models/InvoiceModel.cs

@@ -34,6 +34,7 @@ public string TagsAsString
 
         [Required(ErrorMessage = "PaidState is missing!")]
         public PaidStateEnum PaidState { get; set; } = default!;  // { Paid , Unpaid,  NoInvoice }
-        public double MoneyTotal { get; set; }
+        
+        public  string? MoneyTotal { get; set; }
     }
 }

Models/UserModel.cs

@@ -22,7 +22,7 @@ public class UserModel
         public string LastName { get; set; } = default!;
 
         [Required(ErrorMessage = "Email is missing!")]
-        [EmailAddress(ErrorMessage = "Invalid Email Address")]
+        [RegularExpression(@"^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$", ErrorMessage = "Invalid email format")]
         public string Email { get; set; } = default!;
 
         [NotMapped]

README.md

@@ -77,14 +77,25 @@ Press [here](https://github.com/Invoices-Manager/Invoices-Manager-API/blob/maste
 ### Z = Minor version (small updates)
 ### W = Revision version (bug fixes)
 
+## v1.0.4.0
+- The money total is now a string instant of a double (for the encryption)
+- The Postman is updated belong to the new changes
+- The API Doc is updated belong to the new changes
+
+        !!! THAT MEANS YOU HAVE TO DO STEP 13. and 14. FROM THE LIST ABOVE, IF YOU UPDATE UR API  !!!
+    !!! name the migrations something with "version1040" but not "firstInit", because this migration already exists. !!!
+
 ## v1.0.3.2 (HOTFIX)
 -Tokens are no longer hashed, because it broked the logic for "DeleteOldTokens"  
 -Hasher class was deleted, is no longer needed  
 -The table "logins" has changed (CreationDate is useless, is already in the token)  
-  
+
         !!! THAT MEANS YOU HAVE TO DO STEP 13. and 14. FROM THE LIST ABOVE, IF YOU UPDATE UR API  !!!
     !!! name the migrations something with "version1032" but not "firstInit", because this migration already exists. !!!
 
+## v1.0.3.3
+- FIX: The API needs a FileID from the client and should not create it by itself
+
 ## v1.0.3.1
 - The Salt will be send at the who am i query
 

Resources/ApiDoc_V01/Invoice/DEL__Invoice.md

@@ -56,7 +56,7 @@ Content-Type: application/json*
             "importanceState": 1,
             "moneyState": 1,
             "paidState": 1,
-            "moneyTotal": 10000
+            "moneyTotal": "10000"
         }
     }
 }

Resources/ApiDoc_V01/Invoice/GET__Invoice.md

@@ -57,7 +57,7 @@ Content-Type: application/json*
                 "importanceState": 1,
                 "moneyState": 1,
                 "paidState": 1,
-                "moneyTotal": 100
+                "moneyTotal": "100"
             },
             "base64": "SGFsbG8="
         }

Resources/ApiDoc_V01/Invoice/GET__Invoice_GetAll.md

@@ -57,7 +57,7 @@ Content-Type: application/json*
                 "importanceState": 1,
                 "moneyState": 1,
                 "paidState": 1,
-                "moneyTotal": 100
+                "moneyTotal": "100"
             }
         ]
     }

Resources/ApiDoc_V01/Invoice/POST__Invoice.md

@@ -22,6 +22,8 @@
 ```json
 {
   "NewInvoice": {
+     //no matter what, best a hash from the file, and no special characters
+    "fileId": "asd435fgddxf34456456fgdh",
     "CaptureDate": "2022-01-01T00:00:00Z",
     "ExhibitionDate": "2022-01-01T00:00:00Z",
     "Reference": "Ref-123",
@@ -35,7 +37,7 @@
     "ImportanceState": 1,
     "MoneyState": 1,
     "PaidState": 1,
-    "MoneyTotal": 100.00
+    "MoneyTotal": "100.00"
   },
   "InvoiceFileBase64": "SGFsbG8="
 }
@@ -72,7 +74,7 @@ Content-Type: application/json*
             "importanceState": 1,
             "moneyState": 1,
             "paidState": 1,
-            "moneyTotal": 100
+            "moneyTotal": "100"
         }
     }
 }

Resources/ApiDoc_V01/Invoice/PUT__Invoice.md

@@ -36,7 +36,7 @@
     "importanceState": 1,
     "moneyState": 1,
     "paidState": 1,
-    "moneyTotal": 10000
+    "moneyTotal": "10000"
 }
 ```
 
@@ -71,7 +71,7 @@ Content-Type: application/json*
             "importanceState": 1,
             "moneyState": 1,
             "paidState": 1,
-            "moneyTotal": 10000
+            "moneyTotal": "10000"
         }
     }
 }