Skip to content

Commit a6a75fb

Browse files
ky-oneky-one
committed
Update Odata and EntityFramework actions
1 parent 0a3ed9a commit a6a75fb

File tree

51 files changed

+299
-64
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+299
-64
lines changed

‎Angular/KY.Generator.Angular.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Authors>KY-Programming</Authors>
66
<Company>KY-Programming</Company>
77
<Product>KY.Generator</Product>
8-
<Version>2.2.0-rc.10</Version>
8+
<Version>2.2.0</Version>
99
<Copyright>2019 - KY-Programming</Copyright>
1010
<Description>Angular Module for KY-Generator</Description>
1111
<PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>

‎AspDotNet/KY.Generator.AspDotNet.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFramework>netstandard2.0</TargetFramework>
55
<Company>KY-Programming</Company>
66
<Authors>KY-Programming</Authors>
7-
<Version>2.2.0-rc.10</Version>
7+
<Version>2.2.0</Version>
88
<Product>KY.Generator</Product>
99
<Description>ASP.net Module for KY-Generator</Description>
1010
<Copyright>2019 - KY-Programming</Copyright>

‎AspDotNet/Writers/AspDotNetEntityControllerWriter.cs

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,17 @@ public void Write(AspDotNetWriteConfiguration configuration, List<ITransferObjec
3838

3939
if (controllerConfiguration.Get != null)
4040
{
41-
// TODO: Implement filters
42-
controller.AddMethod("Get", Code.Generic("IEnumerable", modelType))
43-
.WithAttribute("HttpGet", Code.String(controllerConfiguration.Get.Name ?? "[action]"))
44-
.Code.AddLine(Code.Return(Code.This().Field(repositoryField).Method("Get")));
41+
controller.AddUsing("System.Linq");
42+
MethodTemplate method = controller.AddMethod("Get", Code.Generic("IEnumerable", modelType))
43+
.WithAttribute("HttpGet", Code.String(controllerConfiguration.Get.Name ?? "[action]"));
44+
DeclareTemplate queryable = Code.Declare(Code.Generic("IQueryable", modelType), "queryable", Code.This().Field(repositoryField).Method("Get"));
45+
method.Code.AddLine(queryable);
46+
foreach (PropertyTransferObject property in entity.Model.Properties)
47+
{
48+
ParameterTemplate parameter = method.AddParameter(property.Type.ToTemplate(), property.Name, Code.Local("default")).FormatName(configuration.Language, configuration.FormatNames);
49+
method.Code.AddLine(Code.If(Code.Local(parameter).NotEquals().Local("default"), x => x.Code.AddLine(Code.Local(queryable).Assign(Code.Local(queryable).Method("Where", Code.Lambda("x", Code.Local("x").Property(property.Name).Equals().Local(parameter)))).Close())));
50+
}
51+
method.Code.AddLine(Code.Return(Code.Local(queryable)));
4552
}
4653
if (controllerConfiguration.Post != null)
4754
{

‎CLI.Core.Minimal/nuget.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package >
33
<metadata>
44
<id>KY.Generator.CLI.Core.Minimal</id>
5-
<version>2.2.0-rc.10</version>
5+
<version>2.2.0</version>
66
<title>KY.Generator.CLI.Core.Minimal</title>
77
<authors>KY-Programming</authors>
88
<owners>KY-Programming</owners>

‎CLI.Core.Standalone/nuget.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package >
33
<metadata>
44
<id>KY.Generator.CLI.Core.Standalone</id>
5-
<version>2.2.0-rc.10</version>
5+
<version>2.2.0</version>
66
<title>KY.Generator.CLI.Core.Standalone</title>
77
<authors>KY-Programming</authors>
88
<owners>KY-Programming</owners>

‎CLI.Core/nuget.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package >
33
<metadata>
44
<id>KY.Generator.CLI.Core</id>
5-
<version>2.2.0-rc.10</version>
5+
<version>2.2.0</version>
66
<title>KY.Generator.CLI.Core</title>
77
<authors>KY-Programming</authors>
88
<owners>KY-Programming</owners>

‎CLI.Minimal/nuget.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package >
33
<metadata>
44
<id>KY.Generator.CLI.Minimal</id>
5-
<version>2.2.0-rc.10</version>
5+
<version>2.2.0</version>
66
<title>KY.Generator.CLI.Full</title>
77
<authors>KY-Programming</authors>
88
<owners>KY-Programming</owners>

‎CLI.Standalone/nuget.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package >
33
<metadata>
44
<id>KY.Generator.CLI.Standalone</id>
5-
<version>2.2.0-rc.10</version>
5+
<version>2.2.0</version>
66
<title>KY.Generator.CLI</title>
77
<authors>KY-Programming</authors>
88
<owners>KY-Programming</owners>

‎CLI/nuget.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package >
33
<metadata>
44
<id>KY.Generator.CLI</id>
5-
<version>2.2.0-rc.10</version>
5+
<version>2.2.0</version>
66
<title>KY.Generator.CLI</title>
77
<authors>KY-Programming</authors>
88
<owners>KY-Programming</owners>

‎Core.Tests/Models/TestConfiguration.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using KY.Generator.Configurations;
1+
using System.Collections.Generic;
2+
using KY.Generator.Configurations;
23
using KY.Generator.Languages;
34

45
namespace KY.Generator.Core.Tests.Models
@@ -10,6 +11,7 @@ internal class TestConfiguration : IModelConfiguration
1011
public string RelativePath { get; set; }
1112
public bool AddHeader { get; set; }
1213
public bool SkipNamespace { get; set; }
14+
public List<string> Usings { get; }
1315
public bool FieldsToProperties { get; set; }
1416
public bool PropertiesToFields { get; set; }
1517
public bool FormatNames { get; set; }
@@ -18,6 +20,7 @@ internal class TestConfiguration : IModelConfiguration
1820
public TestConfiguration()
1921
{
2022
this.Language = new TestLanguage();
23+
this.Usings = new List<string>();
2124
}
2225
}
2326
}

0 commit comments

Comments
 (0)