Skip to content

Commit d3244bc

Browse files
committed
Updates to naming standards
1 parent 2f657f8 commit d3244bc

6 files changed

Lines changed: 250 additions & 28 deletions

File tree

src/Architecture/CodeFactory.Architecture.Blazor.Server/RefreshEFRepository.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,11 @@ await VisualStudioActions.GetProjectFolderFromConfigAsync(command.Project(Integr
382382
?? throw new CodeFactoryException($"Could not load the entity that supports the ef model '{efModel.Name}', cannot refresh the EF repository.");
383383

384384
NameManagement modelValidatorNameManagement = null;
385-
if(!string.IsNullOrEmpty(modelValidatorSuffix) | !string.IsNullOrEmpty(modelValidatorPrefix)) modelValidatorNameManagement = NameManagement.Init(null,null,modelValidatorPrefix, modelValidatorSuffix);
385+
386+
string removePrefixes = null;
387+
388+
string removeSuffixes = null;
389+
if(!string.IsNullOrEmpty(modelValidatorSuffix) | !string.IsNullOrEmpty(modelValidatorPrefix)) modelValidatorNameManagement = NameManagement.Init(removePrefixes,removeSuffixes,modelValidatorPrefix, modelValidatorSuffix);
386390

387391

388392
var validation = (await VisualStudioActions.RefreshValidationAsync(appModel,appModelProject,appModelFolder,modelValidatorNameManagement))

src/Architecture/CodeFactory.Architecture.Blazor.Server/RefreshFluentValidation.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,12 @@ await VisualStudioActions.GetProjectFromConfigAsync(command.ExecutionProject)
168168

169169
var validatorSuffix = command.ExecutionProject.ParameterValue(ModelValidatorSuffix);
170170

171+
string removePrefixes = null;
172+
string removeSuffixes = null;
173+
171174
NameManagement nameManagement = null;
172175

173-
if(!string.IsNullOrEmpty(validatorPrefix) | !string.IsNullOrEmpty(validatorSuffix)) nameManagement = NameManagement.Init(null,null, validatorPrefix, validatorSuffix);
176+
if(!string.IsNullOrEmpty(validatorPrefix) | !string.IsNullOrEmpty(validatorSuffix)) nameManagement = NameManagement.Init(removePrefixes,removeSuffixes, validatorPrefix, validatorSuffix);
174177

175178
var validationClass = VisualStudioActions.RefreshValidationAsync(sourceClass, sourceProject,sourceFolder,nameManagement);
176179
}

src/Architecture/CodeFactory.Architecture.Blazor.Server/RefreshRestService.cs

Lines changed: 90 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using CodeFactory.Automation.NDF.Logic.AspNetCore.Service.Rest.Json;
2+
using CodeFactory.Automation.Standard.Logic;
23
using CodeFactory.WinVs;
34
using CodeFactory.WinVs.Commands;
45
using CodeFactory.WinVs.Commands.SolutionExplorer;
@@ -88,6 +89,32 @@ public RefreshRestService(ILogger logger, IVsActions vsActions) : base(logger, v
8889
/// </summary>
8990
public static string ContractFolder = "ContractFolder";
9091

92+
/// <summary>
93+
/// Comma seperated list of prefixes to remove from the logc contract when creating the service name.
94+
/// </summary>
95+
public static string ServiceNameRemovePrefixes = "ServiceNameRemovePrefixes";
96+
97+
/// <summary>
98+
/// Comma sperated list of suffixes to remove from the logic contract when creating the service name.
99+
/// </summary>
100+
public static string ServiceNameRemoveSuffixes = "ServiceNameRemoveSuffixes";
101+
102+
/// <summary>
103+
/// Prefix to start the service name with.
104+
/// </summary>
105+
public static string ServiceNameAppendPrefix = "ServiceNameAppendPrefix";
106+
107+
/// <summary>
108+
/// Prefix to start the service client name with.
109+
/// </summary>
110+
public static string ServiceClientNameAppendPrefix = "ServiceClientNameAppendPrefix";
111+
112+
/// <summary>
113+
/// Suffix to append to the service client name.
114+
/// </summary>
115+
public static string ServiceClientNameAppendSuffix = "ServiceClientNameAppendPrefix";
116+
117+
91118
/// <summary>
92119
/// Loads the external configuration definition for this command.
93120
/// </summary>
@@ -104,7 +131,7 @@ public override ConfigCommand LoadExternalConfigDefinition()
104131
Guidance = "Enter the fully project name for the logic contracts project."
105132
}
106133
.AddFolder
107-
(
134+
(
108135
new ConfigFolder
109136
{
110137
Name = ExecutionFolder,
@@ -113,6 +140,49 @@ public override ConfigCommand LoadExternalConfigDefinition()
113140
"Optional, set the relative path from the root of the project. If it is more then one directory deep then use forward slash instead of back slashes."
114141
}
115142
)
143+
.AddParameter
144+
(
145+
new ConfigParameter
146+
{
147+
Name = ServiceNameRemovePrefixes,
148+
Guidance = "Optional, provide a comma seperated value of each prefix to check for to be removed from the logic contract name when creating a service name."
149+
}
150+
)
151+
.AddParameter
152+
(
153+
new ConfigParameter
154+
{
155+
Name = ServiceNameRemoveSuffixes,
156+
Guidance = "Optional, provide a comma seperated value of each suffix to check for to be removed from the logic contract name when creating a service name.",
157+
Value = "Logic"
158+
}
159+
)
160+
.AddParameter
161+
(
162+
new ConfigParameter
163+
{
164+
Name = ServiceNameAppendPrefix,
165+
Guidance = "Optional, provide the prefix to append to the service name."
166+
}
167+
)
168+
.AddParameter
169+
(
170+
new ConfigParameter
171+
{
172+
Name = ServiceClientNameAppendPrefix,
173+
Guidance = "Optional, provide the prefix to append to the service client name."
174+
}
175+
)
176+
.AddParameter
177+
(
178+
new ConfigParameter
179+
{
180+
Name = ServiceClientNameAppendSuffix,
181+
Guidance = "Optional, provide the suffix to append to the service client name.",
182+
Value = "Client"
183+
}
184+
)
185+
116186
)
117187
.AddProject
118188
(
@@ -270,15 +340,31 @@ await VisualStudioActions.GetProjectFromConfigAsync(command.Project(ContractProj
270340
var contractFolder =
271341
await VisualStudioActions.GetProjectFolderFromConfigAsync(command.Project(ContractProject), ContractFolder);
272342

273-
var serviceClass = await VisualStudioActions.RefreshJsonRestService(logicContract, serviceProject, serviceFolder,
343+
//Execution command parameters.
344+
var serviceNameRemovePrefixes = command.ExecutionProject.ParameterValue(ServiceNameRemovePrefixes);
345+
var serviceNameRemoveSuffixes = command.ExecutionProject.ParameterValue(ServiceNameRemoveSuffixes);
346+
var serviceNameAppendPrefix = command.ExecutionProject.ParameterValue(ServiceNameAppendPrefix);
347+
var serviceClientNameAppendPrefix = command.ExecutionProject.ParameterValue(ServiceClientNameAppendPrefix);
348+
var serviceClientNameAppendSuffix = command.ExecutionProject.ParameterValue(ServiceClientNameAppendSuffix);
349+
350+
351+
var serviceNameManagement = NameManagement.Init(serviceNameRemovePrefixes,serviceNameRemoveSuffixes,serviceNameAppendPrefix,null);
352+
353+
var serviceName = serviceNameManagement.FormatName(logicContract.Name.GenerateCSharpFormattedClassName());
354+
355+
var serviceClass = await VisualStudioActions.RefreshJsonRestService(serviceName,logicContract, serviceProject, serviceFolder,
274356
modelProject,modelFolder)
275357
?? throw new CodeFactoryException("Could not refresh the rest json service, cannot refresh the abstraction implementation.");
276358

277359

278-
var abstractionContract = await VisualStudioActions.RefreshCSharpAbstractionContractAsync(logicContract, contractProject, contractFolder)
360+
var serviceClientNameManagement = NameManagement.Init(serviceNameRemovePrefixes,serviceNameRemoveSuffixes,serviceClientNameAppendPrefix,serviceClientNameAppendSuffix);
361+
362+
var serviceClientName = serviceClientNameManagement.FormatName(logicContract.Name.GenerateCSharpFormattedClassName());
363+
364+
var abstractionContract = await VisualStudioActions.RefreshCSharpAbstractionContractAsync($"I{serviceClientName}", logicContract, contractProject, contractFolder)
279365
?? throw new CodeFactoryException("Could not refresh the abstraction contract. The abstraction cannot be updated.");
280366

281-
var abstractionClass = await VisualStudioActions.RefreshAbstractionClass(serviceClass,abstractionContract,serviceProject,abstractionProject,modelProject,abstractionFolder,modelFolder);
367+
var abstractionClass = await VisualStudioActions.RefreshAbstractionClass(serviceClientName, serviceClass,abstractionContract,serviceProject,abstractionProject,modelProject,abstractionFolder,modelFolder);
282368

283369

284370
}

0 commit comments

Comments
 (0)