Merge pull request #5 from Elyas-Amini/develop

Update Questions and answers
EasyMicroservices · Sep 12, 2023 · 86735c1 · 86735c1
2 parents 61ee343 + d040743
commit 86735c1
Show file tree

Hide file tree

Showing 11 changed files with 273 additions and 174 deletions.
diff --git a/...es.QuestionsMicroservice.Clients/Connected Services/QuestionsGeneratedServices/OpenAPI.cs b/...es.QuestionsMicroservice.Clients/Connected Services/QuestionsGeneratedServices/OpenAPI.cs
diff --git a/...ionsMicroservice.Clients/Connected Services/QuestionsGeneratedServices/OpenAPI.nswag.json b/...ionsMicroservice.Clients/Connected Services/QuestionsGeneratedServices/OpenAPI.nswag.json
@@ -427,27 +427,27 @@
         }
       }
     },
-    "/api/Question/GetAllQuestionsWithAnswers": {
+    "/api/Question/Add": {
       "post": {
         "tags": [
           "Question"
         ],
-        "operationId": "GetAllQuestionsWithAnswers",
+        "operationId": "Add2",
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/GetAllQuestionsWithAnswersRequestContract"
+                "$ref": "#/components/schemas/CreateQuestionRequestContract"
               }
             },
             "text/json": {
               "schema": {
-                "$ref": "#/components/schemas/GetAllQuestionsWithAnswersRequestContract"
+                "$ref": "#/components/schemas/CreateQuestionRequestContract"
               }
             },
             "application/*+json": {
               "schema": {
-                "$ref": "#/components/schemas/GetAllQuestionsWithAnswersRequestContract"
+                "$ref": "#/components/schemas/CreateQuestionRequestContract"
               }
             }
           }
@@ -458,45 +458,45 @@
             "content": {
               "text/plain": {
                 "schema": {
-                  "$ref": "#/components/schemas/GetAllQuestionsWithAnswersResponseListMessageContract"
+                  "$ref": "#/components/schemas/Int64MessageContract"
                 }
               },
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/GetAllQuestionsWithAnswersResponseListMessageContract"
+                  "$ref": "#/components/schemas/Int64MessageContract"
                 }
               },
               "text/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/GetAllQuestionsWithAnswersResponseListMessageContract"
+                  "$ref": "#/components/schemas/Int64MessageContract"
                 }
               }
             }
           }
         }
       }
     },
-    "/api/Question/Add": {
-      "post": {
+    "/api/Question/Update": {
+      "put": {
         "tags": [
           "Question"
         ],
-        "operationId": "Add2",
+        "operationId": "Update2",
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/CreateQuestionRequestContract"
+                "$ref": "#/components/schemas/UpdateQuestionRequestContract"
               }
             },
             "text/json": {
               "schema": {
-                "$ref": "#/components/schemas/CreateQuestionRequestContract"
+                "$ref": "#/components/schemas/UpdateQuestionRequestContract"
               }
             },
             "application/*+json": {
               "schema": {
-                "$ref": "#/components/schemas/CreateQuestionRequestContract"
+                "$ref": "#/components/schemas/UpdateQuestionRequestContract"
               }
             }
           }
@@ -507,45 +507,45 @@
             "content": {
               "text/plain": {
                 "schema": {
-                  "$ref": "#/components/schemas/Int64MessageContract"
+                  "$ref": "#/components/schemas/QuestionContractMessageContract"
                 }
               },
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/Int64MessageContract"
+                  "$ref": "#/components/schemas/QuestionContractMessageContract"
                 }
               },
               "text/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/Int64MessageContract"
+                  "$ref": "#/components/schemas/QuestionContractMessageContract"
                 }
               }
             }
           }
         }
       }
     },
-    "/api/Question/Update": {
-      "put": {
+    "/api/Question/GetAllQuestionsWithAnswers": {
+      "post": {
         "tags": [
           "Question"
         ],
-        "operationId": "Update2",
+        "operationId": "GetAllQuestionsWithAnswers",
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/UpdateQuestionRequestContract"
+                "$ref": "#/components/schemas/GetAllQuestionsWithAnswersRequestContract"
               }
             },
             "text/json": {
               "schema": {
-                "$ref": "#/components/schemas/UpdateQuestionRequestContract"
+                "$ref": "#/components/schemas/GetAllQuestionsWithAnswersRequestContract"
               }
             },
             "application/*+json": {
               "schema": {
-                "$ref": "#/components/schemas/UpdateQuestionRequestContract"
+                "$ref": "#/components/schemas/GetAllQuestionsWithAnswersRequestContract"
               }
             }
           }
@@ -556,17 +556,17 @@
             "content": {
               "text/plain": {
                 "schema": {
-                  "$ref": "#/components/schemas/QuestionContractMessageContract"
+                  "$ref": "#/components/schemas/GetAllQuestionsWithAnswersResponseContractListMessageContract"
                 }
               },
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/QuestionContractMessageContract"
+                  "$ref": "#/components/schemas/GetAllQuestionsWithAnswersResponseContractListMessageContract"
                 }
               },
               "text/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/QuestionContractMessageContract"
+                  "$ref": "#/components/schemas/GetAllQuestionsWithAnswersResponseContractListMessageContract"
                 }
               }
             }
@@ -991,13 +991,13 @@
             "type": "integer",
             "format": "int64"
           },
-          "englishContent": {
-            "type": "string",
-            "nullable": true
-          },
-          "persianContent": {
-            "type": "string",
-            "nullable": true
+          "contents": {
+            "title": "List<LanguageDataContract>",
+            "type": "array",
+            "nullable": true,
+            "items": {
+              "$ref": "#/components/schemas/LanguageDataContract"
+            }
           },
           "uniqueIdentity": {
             "type": "string",
@@ -1009,13 +1009,17 @@
         "type": "object",
         "additionalProperties": false,
         "properties": {
-          "title": {
-            "type": "string",
-            "nullable": true
-          },
           "uniqueIdentity": {
             "type": "string",
             "nullable": true
+          },
+          "titles": {
+            "title": "List<LanguageDataContract>",
+            "type": "array",
+            "nullable": true,
+            "items": {
+              "$ref": "#/components/schemas/LanguageDataContract"
+            }
           }
         }
       },
@@ -1178,7 +1182,7 @@
           }
         }
       },
-      "GetAllQuestionsWithAnswersResponse": {
+      "GetAllQuestionsWithAnswersResponseContract": {
         "type": "object",
         "additionalProperties": false,
         "properties": {
@@ -1204,8 +1208,8 @@
           }
         }
       },
-      "GetAllQuestionsWithAnswersResponseListMessageContract": {
-        "title": "ListMessageContract<GetAllQuestionsWithAnswersResponse>",
+      "GetAllQuestionsWithAnswersResponseContractListMessageContract": {
+        "title": "ListMessageContract<GetAllQuestionsWithAnswersResponseContract>",
         "type": "object",
         "additionalProperties": false,
         "properties": {
@@ -1216,11 +1220,11 @@
             "$ref": "#/components/schemas/ErrorContract"
           },
           "result": {
-            "title": "List<GetAllQuestionsWithAnswersResponse>",
+            "title": "List<GetAllQuestionsWithAnswersResponseContract>",
             "type": "array",
             "nullable": true,
             "items": {
-              "$ref": "#/components/schemas/GetAllQuestionsWithAnswersResponse"
+              "$ref": "#/components/schemas/GetAllQuestionsWithAnswersResponseContract"
             }
           },
           "hasItems": {
@@ -1292,6 +1296,20 @@
           }
         }
       },
+      "LanguageDataContract": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "languageName": {
+            "type": "string",
+            "nullable": true
+          },
+          "data": {
+            "type": "string",
+            "nullable": true
+          }
+        }
+      },
       "MessageContract": {
         "type": "object",
         "additionalProperties": false,
@@ -1402,13 +1420,13 @@
             "type": "integer",
             "format": "int64"
           },
-          "englishContent": {
-            "type": "string",
-            "nullable": true
-          },
-          "persianContent": {
-            "type": "string",
-            "nullable": true
+          "content": {
+            "title": "List<LanguageDataContract>",
+            "type": "array",
+            "nullable": true,
+            "items": {
+              "$ref": "#/components/schemas/LanguageDataContract"
+            }
           },
           "uniqueIdentity": {
             "type": "string",
@@ -1424,9 +1442,13 @@
             "type": "integer",
             "format": "int64"
           },
-          "title": {
-            "type": "string",
-            "nullable": true
+          "titles": {
+            "title": "List<LanguageDataContract>",
+            "type": "array",
+            "nullable": true,
+            "items": {
+              "$ref": "#/components/schemas/LanguageDataContract"
+            }
           },
           "uniqueIdentity": {
             "type": "string",

diff --git a/...ices.QuestionsMicroservice.Clients/EasyMicroservices.QuestionsMicroservice.Clients.csproj b/...ices.QuestionsMicroservice.Clients/EasyMicroservices.QuestionsMicroservice.Clients.csproj
@@ -5,7 +5,7 @@
     <Platforms>AnyCPU;x64;x86</Platforms>
     <Authors>EasyMicroservices</Authors>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>0.0.0.2</Version>
+    <Version>0.0.0.3</Version>
     <Description>client generated code.</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>microservice,Question,Questions,client</PackageTags>

diff --git a/...p/EasyMicroservices.QuestionsMicroservice.Domain/Contracts/Common/LanguageDataContract.cs b/...p/EasyMicroservices.QuestionsMicroservice.Domain/Contracts/Common/LanguageDataContract.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace EasyMicroservices.QuestionsMicroservice.Contracts.Common
+{
+    public class LanguageDataContract
+    {
+        public string LanguageName { get; set; }
+        public string Data { get; set; }
+    }
+}
diff --git a/...Sharp/EasyMicroservices.QuestionsMicroservice.Domain/Contracts/Common/QuestionContract.cs b/...Sharp/EasyMicroservices.QuestionsMicroservice.Domain/Contracts/Common/QuestionContract.cs
@@ -1,4 +1,5 @@
-using EasyMicroservices.Cores.Interfaces;
+using EasyMicroservices.ContentsMicroservice.Clients.Attributes;
+using EasyMicroservices.Cores.Interfaces;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -10,6 +11,7 @@ namespace EasyMicroservices.QuestionsMicroservice.Contracts.Common
     public class QuestionContract : IUniqueIdentitySchema, ISoftDeleteSchema, IDateTimeSchema
     {
         public long Id { get; set; }
+        [ContentLanguage]
         public string Title { get; set; }
         public DateTime CreationDateTime { get; set; }
         public DateTime? ModificationDateTime { get; set; }

diff --git a/...roservices.QuestionsMicroservice.Domain/Contracts/Requests/CreateAnswerRequestContract.cs b/...roservices.QuestionsMicroservice.Domain/Contracts/Requests/CreateAnswerRequestContract.cs
@@ -3,14 +3,14 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using EasyMicroservices.QuestionsMicroservice.Contracts.Common;
 
 namespace EasyMicroservices.QuestionsMicroservice.Contracts.Requests
 {
     public class CreateAnswerRequestContract
     {
         public long QuestionId { get; set; }
-        public string EnglishContent { get; set; }
-        public string PersianContent { get; set; }
+        public List<LanguageDataContract> Contents { get; set; }
         public string UniqueIdentity { get; set; }
     }
 }
diff --git a/...services.QuestionsMicroservice.Domain/Contracts/Requests/CreateQuestionRequestContract.cs b/...services.QuestionsMicroservice.Domain/Contracts/Requests/CreateQuestionRequestContract.cs
@@ -1,4 +1,5 @@
-using System;
+using EasyMicroservices.QuestionsMicroservice.Contracts.Common;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -8,8 +9,8 @@ namespace EasyMicroservices.QuestionsMicroservice.Contracts.Requests
 {
     public class CreateQuestionRequestContract
     {
-        public string Title { get; set; }
         public string UniqueIdentity { get; set; }
+        public List<LanguageDataContract> Titles { get; set; }
 
     }
 }
diff --git a/...roservices.QuestionsMicroservice.Domain/Contracts/Requests/UpdateAnswerRequestContract.cs b/...roservices.QuestionsMicroservice.Domain/Contracts/Requests/UpdateAnswerRequestContract.cs
@@ -1,4 +1,5 @@
-using System;
+using EasyMicroservices.QuestionsMicroservice.Contracts.Common;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -10,8 +11,7 @@ public class UpdateAnswerRequestContract
     {
         public long Id { get; set; }
         public long QuestionId { get; set; }
-        public string EnglishContent { get; set; }
-        public string PersianContent { get; set; }
+        public List<LanguageDataContract> Content { get; set; }
         public string UniqueIdentity { get; set; }
     }
 }