From 55ee000a39b10683c0f9ac4e16ceb44727861b0d Mon Sep 17 00:00:00 2001 From: Daniel Hufnagl Date: Thu, 24 Oct 2024 09:47:46 +0200 Subject: [PATCH] minor --- .../Generators/ManagerGenerator.cs | 180 +++++++++--------- 1 file changed, 90 insertions(+), 90 deletions(-) diff --git a/src/Generators/Web/WebManager.Generator/Generators/ManagerGenerator.cs b/src/Generators/Web/WebManager.Generator/Generators/ManagerGenerator.cs index 6f23e38..5e0fb99 100644 --- a/src/Generators/Web/WebManager.Generator/Generators/ManagerGenerator.cs +++ b/src/Generators/Web/WebManager.Generator/Generators/ManagerGenerator.cs @@ -147,104 +147,104 @@ RecordDeclarationSyntax foreignKeyDto result.AddProperty($"_{repo.Item2}").SetType(repo.Item1).WithReadonlyValue(); } - if (foreignRepos.Any()) + //if (foreignRepos.Any()) + //{ + //Generate GetFull methode { - //Generate GetFull methode - { - var getMethode = baseRepo.GetMethodsWithAttributes(repos).First(); - var getMethodeFull = baseManager - .GetMethodsWithAttributes(managers) - .First(); - result - .AddMethod(ApiUrls.GetFull, Accessibility.Public) - .Override() - .WithReturnTypeTask("object") - .MakeAsync() - .AddParameter( - "Guid", - $"{dto.GetIdProperty(baseDtos).GetPropertyName().GetParameterName()}" - ) - .WithBody(x => + var getMethode = baseRepo.GetMethodsWithAttributes(repos).First(); + var getMethodeFull = baseManager + .GetMethodsWithAttributes(managers) + .First(); + result + .AddMethod(ApiUrls.GetFull, Accessibility.Public) + .Override() + .WithReturnTypeTask("object") + .MakeAsync() + .AddParameter( + "Guid", + $"{dto.GetIdProperty(baseDtos).GetPropertyName().GetParameterName()}" + ) + .WithBody(x => + { + x.AppendLine( + $"{dto.GetFullModelName()} {dto.GetFullModelName()} = new ();" + ); + x.AppendLine( + $"var {dto.GetName().GetParameterName()} = await {getMethode.GetName()}({dto.GetIdProperty(baseDtos).GetPropertyName().GetParameterName()});" + ); + x.AppendLine( + $"{dto.GetFullModelName()}.{dto.GetName().GetParameterName()} = {dto.GetName().GetParameterName()};" + ); + foreach (var repo in foreignRepos) { - x.AppendLine( - $"{dto.GetFullModelName()} {dto.GetFullModelName()} = new ();" - ); - x.AppendLine( - $"var {dto.GetName().GetParameterName()} = await {getMethode.GetName()}({dto.GetIdProperty(baseDtos).GetPropertyName().GetParameterName()});" - ); - x.AppendLine( - $"{dto.GetFullModelName()}.{dto.GetName().GetParameterName()} = {dto.GetName().GetParameterName()};" - ); - foreach (var repo in foreignRepos) + bool isNull = repo.propertySymbol.GetPropertyType().Contains("?"); + string managerParametervalue = isNull + ? repo.propertySymbol.GetPropertyName() + ".Value" + : repo.propertySymbol.GetPropertyName(); + string returnLine = + $"{dto.GetFullModelName()}.{repo.propertySymbol.GetFullModelNameFromProperty()} = ({repo.foreignKeyDto.GetFullModelName()})await _{repo.repoName}.{getMethodeFull.GetName()}({dto.GetName().GetParameterName()}.{managerParametervalue});"; + if (isNull) { - bool isNull = repo.propertySymbol.GetPropertyType().Contains("?"); - string managerParametervalue = isNull - ? repo.propertySymbol.GetPropertyName() + ".Value" - : repo.propertySymbol.GetPropertyName(); - string returnLine = - $"{dto.GetFullModelName()}.{repo.propertySymbol.GetFullModelNameFromProperty()} = ({repo.foreignKeyDto.GetFullModelName()})await _{repo.repoName}.{getMethodeFull.GetName()}({dto.GetName().GetParameterName()}.{managerParametervalue});"; - if (isNull) - { - x.If( - $"{dto.GetName().GetParameterName()}.{repo.propertySymbol.GetPropertyName()}.HasValue" - ) - .WithBody(x => - { - x.AppendLine(returnLine); - }) - .EndIf(); - } - else - { - x.If( - $"{dto.GetName().GetParameterName()}.{repo.propertySymbol.GetPropertyName()} != default" - ) - .WithBody(x => - { - x.AppendLine(returnLine); - }) - .EndIf(); - } + x.If( + $"{dto.GetName().GetParameterName()}.{repo.propertySymbol.GetPropertyName()}.HasValue" + ) + .WithBody(x => + { + x.AppendLine(returnLine); + }) + .EndIf(); } + else + { + x.If( + $"{dto.GetName().GetParameterName()}.{repo.propertySymbol.GetPropertyName()} != default" + ) + .WithBody(x => + { + x.AppendLine(returnLine); + }) + .EndIf(); + } + } - x.AppendLine($"return {dto.GetFullModelName()};"); - }) - .AddAttribute(typeof(GetFullAttribute).FullName); - } + x.AppendLine($"return {dto.GetFullModelName()};"); + }) + .AddAttribute(typeof(GetFullAttribute).FullName); + } - { - string returnName = dto.GetFullModelName().GetParameterName() + "s"; - //Generate GetAllFull methode - var getAllMethode = baseRepo - .GetMethodsWithAttributes(repos) - .First(); - result - .AddMethod(ApiUrls.GetAllFull, Accessibility.Public) - .Override() - .WithReturnTypeTaskList("object") - .MakeAsync() - .WithBody(x => - { - x.AppendLine($"List {returnName} = new ();"); - x.AppendLine( - $"var {dto.GetName().GetParameterName()}s = await {getAllMethode.GetName()}();" - ); - x.ForEach( - $"var {dto.GetName().GetParameterName()}", - $"{dto.GetName().GetParameterName()}s" - ) - .WithBody(x => - { - x.AppendLine( - $"{returnName}.Add(await {ApiUrls.GetFull}({dto.GetName().GetParameterName()}.{dto.GetIdPropertyMethodeName(baseDtos)}));" - ); - }); + { + string returnName = dto.GetFullModelName().GetParameterName() + "s"; + //Generate GetAllFull methode + var getAllMethode = baseRepo + .GetMethodsWithAttributes(repos) + .First(); + result + .AddMethod(ApiUrls.GetAllFull, Accessibility.Public) + .Override() + .WithReturnTypeTaskList("object") + .MakeAsync() + .WithBody(x => + { + x.AppendLine($"List {returnName} = new ();"); + x.AppendLine( + $"var {dto.GetName().GetParameterName()}s = await {getAllMethode.GetName()}();" + ); + x.ForEach( + $"var {dto.GetName().GetParameterName()}", + $"{dto.GetName().GetParameterName()}s" + ) + .WithBody(x => + { + x.AppendLine( + $"{returnName}.Add(await {ApiUrls.GetFull}({dto.GetName().GetParameterName()}.{dto.GetIdPropertyMethodeName(baseDtos)}));" + ); + }); - x.AppendLine($"return {returnName};"); - }) - .AddAttribute(typeof(GetFullAttribute).FullName); - } + x.AppendLine($"return {returnName};"); + }) + .AddAttribute(typeof(GetFullAttribute).FullName); } + //} //Add abstract methods result