Skip to content

Commit

Permalink
Merge pull request #14 from Ali-YousefiTelori/develop
Browse files Browse the repository at this point in the history 
Fix add FormValues
  • Loading branch information
@Ali-YousefiTelori
Ali-YousefiTelori authored Aug 8, 2023
2 parents 3b4dab2 + 966ec53 commit c212de6
Show file tree
Hide file tree
Showing 29 changed files with 1,213 additions and 139 deletions.
2 changes: 1 addition & 1 deletion ...rvice.Clients/Connected Services/TemplateGeneratorGeneratedServices/ConnectedService.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"ServiceName": "TemplateGeneratorGeneratedServices",
"AcceptAllUntrustedCertificates": true,
"GeneratedFileName": "OpenAPI",
"Endpoint": "https://localhost:7185/swagger/v1/swagger.json",
"Endpoint": "http://localhost:7185/swagger/v1/swagger.json",
"GeneratedFileNamePrefix": null,
"GenerateCSharpClient": true,
"GenerateTypeScriptClient": false,
Expand Down
228 changes: 192 additions & 36 deletions ...atorMicroservice.Clients/Connected Services/TemplateGeneratorGeneratedServices/OpenAPI.cs
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...rMicroservice.Clients/Connected Services/TemplateGeneratorGeneratedServices/OpenAPI.nswag
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"defaultVariables": null,
"documentGenerator": {
"fromDocument": {
"url": "https://localhost:7185/swagger/v1/swagger.json",
"url": "http://localhost:7185/swagger/v1/swagger.json",
"output": "OpenAPI.nswag.json",
"newLineBehavior": "Auto"
}
Expand Down
161 changes: 103 additions & 58 deletions ...oservice.Clients/Connected Services/TemplateGeneratorGeneratedServices/OpenAPI.nswag.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -617,116 +617,116 @@
}
}
},
"/api/FormValues/GetById": {
"get": {
"/api/FormValues/Add": {
"post": {
"tags": [
"FormValues"
],
"operationId": "GetById3",
"parameters": [
{
"name": "id",
"in": "query",
"schema": {
"type": "integer",
"format": "int64"
"operationId": "Add3",
"requestBody": {
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/FormValuesContract"
}
},
"text/json": {
"schema": {
"$ref": "#/components/schemas/FormValuesContract"
}
},
"application/*+json": {
"schema": {
"$ref": "#/components/schemas/FormValuesContract"
}
}
}
],
},
"responses": {
"200": {
"description": "Success",
"content": {
"text/plain": {
"schema": {
"$ref": "#/components/schemas/FormContractMessageContract"
"$ref": "#/components/schemas/Int64MessageContract"
}
},
"application/json": {
"schema": {
"$ref": "#/components/schemas/FormContractMessageContract"
"$ref": "#/components/schemas/Int64MessageContract"
}
},
"text/json": {
"schema": {
"$ref": "#/components/schemas/FormContractMessageContract"
"$ref": "#/components/schemas/Int64MessageContract"
}
}
}
}
}
}
},
"/api/FormValues/GetByUniqueIdentity": {
"/api/FormValues/GetById": {
"get": {
"tags": [
"FormValues"
],
"operationId": "GetByUniqueIdentity3",
"requestBody": {
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/GetUniqueIdentityRequest"
}
},
"text/json": {
"schema": {
"$ref": "#/components/schemas/GetUniqueIdentityRequest"
}
},
"application/*+json": {
"schema": {
"$ref": "#/components/schemas/GetUniqueIdentityRequest"
}
"operationId": "GetById3",
"parameters": [
{
"name": "id",
"in": "query",
"schema": {
"type": "integer",
"format": "int64"
}
}
},
],
"responses": {
"200": {
"description": "Success",
"content": {
"text/plain": {
"schema": {
"$ref": "#/components/schemas/FormContractMessageContract"
"$ref": "#/components/schemas/FormValuesContractMessageContract"
}
},
"application/json": {
"schema": {
"$ref": "#/components/schemas/FormContractMessageContract"
"$ref": "#/components/schemas/FormValuesContractMessageContract"
}
},
"text/json": {
"schema": {
"$ref": "#/components/schemas/FormContractMessageContract"
"$ref": "#/components/schemas/FormValuesContractMessageContract"
}
}
}
}
}
}
},
"/api/FormValues/Add": {
"post": {
"/api/FormValues/GetByUniqueIdentity": {
"get": {
"tags": [
"FormValues"
],
"operationId": "Add3",
"operationId": "GetByUniqueIdentity3",
"requestBody": {
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/FormValuesRequestContract"
"$ref": "#/components/schemas/GetUniqueIdentityRequest"
}
},
"text/json": {
"schema": {
"$ref": "#/components/schemas/FormValuesRequestContract"
"$ref": "#/components/schemas/GetUniqueIdentityRequest"
}
},
"application/*+json": {
"schema": {
"$ref": "#/components/schemas/FormValuesRequestContract"
"$ref": "#/components/schemas/GetUniqueIdentityRequest"
}
}
}
Expand All @@ -737,17 +737,17 @@
"content": {
"text/plain": {
"schema": {
"$ref": "#/components/schemas/Int64MessageContract"
"$ref": "#/components/schemas/FormValuesContractMessageContract"
}
},
"application/json": {
"schema": {
"$ref": "#/components/schemas/Int64MessageContract"
"$ref": "#/components/schemas/FormValuesContractMessageContract"
}
},
"text/json": {
"schema": {
"$ref": "#/components/schemas/Int64MessageContract"
"$ref": "#/components/schemas/FormValuesContractMessageContract"
}
}
}
Expand All @@ -765,17 +765,17 @@
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/FormContract"
"$ref": "#/components/schemas/FormValuesContract"
}
},
"text/json": {
"schema": {
"$ref": "#/components/schemas/FormContract"
"$ref": "#/components/schemas/FormValuesContract"
}
},
"application/*+json": {
"schema": {
"$ref": "#/components/schemas/FormContract"
"$ref": "#/components/schemas/FormValuesContract"
}
}
}
Expand All @@ -786,17 +786,17 @@
"content": {
"text/plain": {
"schema": {
"$ref": "#/components/schemas/FormContractMessageContract"
"$ref": "#/components/schemas/FormValuesContractMessageContract"
}
},
"application/json": {
"schema": {
"$ref": "#/components/schemas/FormContractMessageContract"
"$ref": "#/components/schemas/FormValuesContractMessageContract"
}
},
"text/json": {
"schema": {
"$ref": "#/components/schemas/FormContractMessageContract"
"$ref": "#/components/schemas/FormValuesContractMessageContract"
}
}
}
Expand Down Expand Up @@ -856,17 +856,17 @@
"content": {
"text/plain": {
"schema": {
"$ref": "#/components/schemas/FormContractListMessageContract"
"$ref": "#/components/schemas/FormValuesContractListMessageContract"
}
},
"application/json": {
"schema": {
"$ref": "#/components/schemas/FormContractListMessageContract"
"$ref": "#/components/schemas/FormValuesContractListMessageContract"
}
},
"text/json": {
"schema": {
"$ref": "#/components/schemas/FormContractListMessageContract"
"$ref": "#/components/schemas/FormValuesContractListMessageContract"
}
}
}
Expand Down Expand Up @@ -905,17 +905,17 @@
"content": {
"text/plain": {
"schema": {
"$ref": "#/components/schemas/FormContractListMessageContract"
"$ref": "#/components/schemas/FormValuesContractListMessageContract"
}
},
"application/json": {
"schema": {
"$ref": "#/components/schemas/FormContractListMessageContract"
"$ref": "#/components/schemas/FormValuesContractListMessageContract"
}
},
"text/json": {
"schema": {
"$ref": "#/components/schemas/FormContractListMessageContract"
"$ref": "#/components/schemas/FormValuesContractListMessageContract"
}
}
}
Expand Down Expand Up @@ -1149,6 +1149,10 @@
"type": "integer",
"format": "int64"
},
"defaultValue": {
"type": "string",
"nullable": true
},
"title": {
"type": "string",
"nullable": true
Expand Down Expand Up @@ -1184,14 +1188,18 @@
}
}
},
"FormValuesRequestContract": {
"FormValuesContract": {
"type": "object",
"additionalProperties": false,
"properties": {
"formId": {
"type": "integer",
"format": "int64"
},
"name": {
"type": "string",
"nullable": true
},
"formItemValues": {
"title": "List<FormItemValueContract>",
"type": "array",
Expand All @@ -1202,6 +1210,43 @@
}
}
},
"FormValuesContractListMessageContract": {
"title": "MessageContract<List`1>",
"type": "object",
"additionalProperties": false,
"properties": {
"isSuccess": {
"type": "boolean"
},
"error": {
"$ref": "#/components/schemas/ErrorContract"
},
"result": {
"title": "List<FormValuesContract>",
"type": "array",
"nullable": true,
"items": {
"$ref": "#/components/schemas/FormValuesContract"
}
}
}
},
"FormValuesContractMessageContract": {
"title": "MessageContract<FormValuesContract>",
"type": "object",
"additionalProperties": false,
"properties": {
"isSuccess": {
"type": "boolean"
},
"error": {
"$ref": "#/components/schemas/ErrorContract"
},
"result": {
"$ref": "#/components/schemas/FormValuesContract"
}
}
},
"GetUniqueIdentityRequest": {
"type": "object",
"additionalProperties": false,
Expand Down
2 changes: 1 addition & 1 deletion ...eratorMicroservice.Clients/EasyMicroservices.TemplateGeneratorMicroservice.Clients.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Platforms>AnyCPU;x64;x86</Platforms>
<Authors>EasyMicroservices</Authors>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Version>0.0.0.4</Version>
<Version>0.0.0.5</Version>
<Description>client generated code.</Description>
<Copyright>EasyMicroservices@gmail.com</Copyright>
<PackageTags>Label,microservice,whitelabel,tenant,tenants</PackageTags>
Expand Down
18 changes: 18 additions & 0 deletions ...ices.TemplateGeneratorMicroservice.Database/Database/Contexts/TemplateGeneratorContext.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,24 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
Id = 8,
Title = "TextBox",
Type = DataTypes.ItemType.TextBox
},
new ItemTypeEntity()
{
Id = 9,
Title = "Table",
Type = DataTypes.ItemType.Table
},
new ItemTypeEntity()
{
Id = 10,
Title = "Row",
Type = DataTypes.ItemType.Row
},
new ItemTypeEntity()
{
Id = 11,
Title = "AutoIncrementNumber",
Type = DataTypes.ItemType.AutoIncrementNumber
});
}
}
Expand Down
Loading

0 comments on commit c212de6

Please sign in to comment.