Skip to content

Commit dd4d2cd

Browse files
renemadsenrenemadsen
committed
Major code reformatting.
1 parent 2c8185b commit dd4d2cd

File tree

8 files changed

+571
-455
lines changed

8 files changed

+571
-455
lines changed

‎eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn/Services/BackendConfigurationPropertiesService/BackendConfigurationPropertiesService.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -744,7 +744,7 @@ public async Task<OperationDataResult<List<CommonDictionaryModel>>> GetLinkedSit
744744
var core = await coreHelper.GetCore();
745745
var sdkDbContext = core.DbContextHelper.GetDbContext();
746746

747-
var query = backendConfigurationPnDbContext.PropertyWorkers
747+
var query = backendConfigurationPnDbContext.PropertyWorkers
748748
//.Where(x => propertyIds.Contains(x.PropertyId))
749749
.Where(x => x.WorkflowState != Constants.WorkflowStates.Removed);
750750

@@ -805,6 +805,7 @@ private static PropertyFolderModel MapFolder(Folder folder, List<Folder> allFold
805805

806806
return propertyFolderModel;
807807
}
808+
808809
private static List<CommonDictionaryModel> MapFolder(PropertyFolderModel folder, string rootFolderName = "")
809810
{
810811
var result = new List<CommonDictionaryModel>();

‎eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn/Services/BackendConfigurationReportService/BackendConfigurationReportService.cs‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1126,7 +1126,8 @@ public async Task<OperationResult> Update(ReplyRequest model)
11261126
SentrySdk.CaptureException(ex);
11271127
Log.LogException(ex.Message);
11281128
Log.LogException(ex.StackTrace);
1129-
return new OperationResult(false, $"{backendConfigurationLocalizationService.GetString("CaseCouldNotBeUpdated")} Exception: {ex.Message}");
1129+
return new OperationResult(false,
1130+
$"{backendConfigurationLocalizationService.GetString("CaseCouldNotBeUpdated")} Exception: {ex.Message}");
11301131
}
11311132

11321133
try
@@ -1145,14 +1146,17 @@ public async Task<OperationResult> Update(ReplyRequest model)
11451146

11461147
if (foundCase.DoneAt != null)
11471148
{
1148-
var newDoneAt = new DateTime(model.DoneAt.Year, model.DoneAt.Month, model.DoneAt.Day, foundCase.DoneAt.Value.Hour, foundCase.DoneAt.Value.Minute, foundCase.DoneAt.Value.Second);
1149+
var newDoneAt = new DateTime(model.DoneAt.Year, model.DoneAt.Month, model.DoneAt.Day,
1150+
foundCase.DoneAt.Value.Hour, foundCase.DoneAt.Value.Minute, foundCase.DoneAt.Value.Second);
11491151
foundCase.DoneAtUserModifiable = newDoneAt;
11501152
}
11511153

11521154
foundCase.Status = 100;
11531155
await foundCase.Update(sdkDbContext);
1154-
var planningCase = await itemsPlanningPnDbContext.PlanningCases.SingleAsync(x => x.MicrotingSdkCaseId == model.Id);
1155-
var planningCaseSite = await itemsPlanningPnDbContext.PlanningCaseSites.SingleOrDefaultAsync(x => x.MicrotingSdkCaseId == model.Id && x.PlanningCaseId == planningCase.Id);
1156+
var planningCase =
1157+
await itemsPlanningPnDbContext.PlanningCases.SingleAsync(x => x.MicrotingSdkCaseId == model.Id);
1158+
var planningCaseSite = await itemsPlanningPnDbContext.PlanningCaseSites.SingleOrDefaultAsync(x =>
1159+
x.MicrotingSdkCaseId == model.Id && x.PlanningCaseId == planningCase.Id);
11561160

11571161
if (planningCaseSite == null)
11581162
{
@@ -1188,7 +1192,9 @@ public async Task<OperationResult> Update(ReplyRequest model)
11881192
SentrySdk.CaptureException(ex);
11891193
Log.LogException(ex.Message);
11901194
Log.LogException(ex.StackTrace);
1191-
return new OperationResult(false, backendConfigurationLocalizationService.GetString("CaseCouldNotBeUpdated") + $" Exception: {ex.Message}");
1195+
return new OperationResult(false,
1196+
backendConfigurationLocalizationService.GetString("CaseCouldNotBeUpdated") +
1197+
$" Exception: {ex.Message}");
11921198
}
11931199
}
11941200

@@ -1225,7 +1231,8 @@ private async Task<PlanningCaseSite> SetFieldValue(PlanningCaseSite planningCase
12251231
private async Task<PlanningCase> SetFieldValue(PlanningCase planningCase, Language language)
12261232
{
12271233
var core = await coreHelper.GetCore();
1228-
var planning = await itemsPlanningPnDbContext.Plannings.SingleOrDefaultAsync(x => x.Id == planningCase.PlanningId).ConfigureAwait(false);
1234+
var planning = await itemsPlanningPnDbContext.Plannings
1235+
.SingleOrDefaultAsync(x => x.Id == planningCase.PlanningId).ConfigureAwait(false);
12291236
var caseIds = new List<int> { planningCase.MicrotingSdkCaseId };
12301237
var fieldValues = await core.Advanced_FieldValueReadList(caseIds, language).ConfigureAwait(false);
12311238

‎eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn/Services/BackendConfigurationTaskManagementService/BackendConfigurationTaskManagementService.cs‎

Lines changed: 32 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ public async Task<List<WorkorderCaseModel>> Index(TaskManagementRequestModel fil
6767
{
6868
Thread.Sleep(3000);
6969
}
70+
7071
try
7172
{
7273
var timeZoneInfo = await userService.GetCurrentUserTimeZoneInfo();
@@ -102,9 +103,9 @@ public async Task<List<WorkorderCaseModel>> Index(TaskManagementRequestModel fil
102103

103104
if (filtersModel.Filters.Priority != null)
104105
{
105-
query = filtersModel.Filters.Priority == 3 ?
106-
query.Where(x => x.Priority == null || x.Priority == "3") :
107-
query.Where(x => x.Priority == filtersModel.Filters.Priority.ToString());
106+
query = filtersModel.Filters.Priority == 3
107+
? query.Where(x => x.Priority == null || x.Priority == "3")
108+
: query.Where(x => x.Priority == filtersModel.Filters.Priority.ToString());
108109
}
109110

110111
if (filtersModel.Filters.DateFrom.HasValue && filtersModel.Filters.DateTo.HasValue)
@@ -133,7 +134,8 @@ public async Task<List<WorkorderCaseModel>> Index(TaskManagementRequestModel fil
133134
{
134135
"PropertyName"
135136
};
136-
query = QueryHelper.AddFilterAndSortToQuery(query, filtersModel.Pagination, new List<string>(), excludeSort);
137+
query = QueryHelper.AddFilterAndSortToQuery(query, filtersModel.Pagination, new List<string>(),
138+
excludeSort);
137139

138140
var workOrderCaseFromDb = await query
139141
.Select(x => new WorkorderCaseModel
@@ -146,18 +148,22 @@ public async Task<List<WorkorderCaseModel>> Index(TaskManagementRequestModel fil
146148
Status = x.CaseStatusesEnum.ToString(),
147149
Description = x.Description.Replace("\n", "<br />"),
148150
PropertyName = x.PropertyWorker.Property.Name,
149-
LastUpdateDate = x.UpdatedAt != null ? TimeZoneInfo.ConvertTimeFromUtc((DateTime)x.UpdatedAt, timeZoneInfo) : null,
151+
LastUpdateDate = x.UpdatedAt != null
152+
? TimeZoneInfo.ConvertTimeFromUtc((DateTime)x.UpdatedAt, timeZoneInfo)
153+
: null,
150154
LastUpdatedBy = x.LastUpdatedByName,
151155
LastAssignedTo = x.LastAssignedToName,
152156
ParentWorkorderCaseId = x.ParentWorkorderCaseId,
153-
Priority = string.IsNullOrEmpty(x.Priority) ? 3 : int.Parse(x.Priority) == 0 ? 3 : int.Parse(x.Priority)
157+
Priority = string.IsNullOrEmpty(x.Priority) ? 3 :
158+
int.Parse(x.Priority) == 0 ? 3 : int.Parse(x.Priority)
154159
})
155160
.ToListAsync().ConfigureAwait(false);
156161

157162
if (excludeSort.Contains(filtersModel.Pagination.Sort))
158163
{
159164
workOrderCaseFromDb = QueryHelper
160-
.AddFilterAndSortToQuery(workOrderCaseFromDb.AsQueryable(), filtersModel.Pagination, new List<string>())
165+
.AddFilterAndSortToQuery(workOrderCaseFromDb.AsQueryable(), filtersModel.Pagination,
166+
new List<string>())
161167
.ToList();
162168
}
163169

@@ -202,7 +208,9 @@ public async Task<OperationDataResult<WorkOrderCaseReadModel>> GetTaskById(int w
202208

203209
var uploadIds = await backendConfigurationPnDbContext.WorkorderCaseImages
204210
.Where(x => x.WorkflowState != Constants.WorkflowStates.Removed)
205-
.Where(task.ParentWorkorderCaseId != null ? x => x.WorkorderCaseId == task.ParentWorkorderCaseId : x => x.WorkorderCaseId == task.Id)
211+
.Where(task.ParentWorkorderCaseId != null
212+
? x => x.WorkorderCaseId == task.ParentWorkorderCaseId
213+
: x => x.WorkorderCaseId == task.Id)
206214
.Select(x => x.UploadedDataId)
207215
.ToListAsync().ConfigureAwait(false);
208216

@@ -300,7 +308,10 @@ public async Task<OperationResult> DeleteTaskById(int workOrderCaseId)
300308

301309
if (workOrderCase.CaseId != 0)
302310
{
303-
try { await core.CaseDelete(workOrderCase.CaseId).ConfigureAwait(false); }
311+
try
312+
{
313+
await core.CaseDelete(workOrderCase.CaseId).ConfigureAwait(false);
314+
}
304315
catch (Exception e)
305316
{
306317
SentrySdk.CaptureException(e);
@@ -517,6 +528,7 @@ public async Task<OperationResult> CreateTask(WorkOrderCaseCreateModel createMod
517528
picturesOfTasks.Add($"{uploadData.Id}_700_{uploadData.Checksum}{uploadData.Extension}");
518529
await workOrderCaseImage.Create(backendConfigurationPnDbContext).ConfigureAwait(false);
519530
}
531+
520532
hasImages = true;
521533
}
522534

@@ -551,18 +563,23 @@ public async Task<OperationResult> CreateTask(WorkOrderCaseCreateModel createMod
551563
switch (createModel.Priority)
552564
{
553565
case 1:
554-
priorityText = $"<strong>{localizationService.GetString("Priority")}:</strong> {localizationService.GetString("Urgent")}<br>";
566+
priorityText =
567+
$"<strong>{localizationService.GetString("Priority")}:</strong> {localizationService.GetString("Urgent")}<br>";
555568
break;
556569
case 2:
557-
priorityText = $"<strong>{localizationService.GetString("Priority")}:</strong> {localizationService.GetString("High")}<br>";
570+
priorityText =
571+
$"<strong>{localizationService.GetString("Priority")}:</strong> {localizationService.GetString("High")}<br>";
558572
break;
559573
case 3:
560-
priorityText = $"<strong>{localizationService.GetString("Priority")}:</strong> {localizationService.GetString("Medium")}<br>";
574+
priorityText =
575+
$"<strong>{localizationService.GetString("Priority")}:</strong> {localizationService.GetString("Medium")}<br>";
561576
break;
562577
case 4:
563-
priorityText = $"<strong>{localizationService.GetString("Priority")}:</strong> {localizationService.GetString("Low")}<br>";
578+
priorityText =
579+
$"<strong>{localizationService.GetString("Priority")}:</strong> {localizationService.GetString("Low")}<br>";
564580
break;
565581
}
582+
566583
var description = $"<strong>{localizationService.GetString("AssignedTo")}:</strong> {site.Name}<br>";
567584
description += $"<strong>{localizationService.GetString("Location")}:</strong> {property.Name}<br>" +
568585
(!string.IsNullOrEmpty(newWorkOrderCase.SelectedAreaName)
@@ -611,8 +628,8 @@ await _bus.SendLocal(new WorkOrderCreated(
611628
site,
612629
property.Name,
613630
(int)property.FolderIdForOngoingTasks!,
614-
(int) property.FolderIdForTasks!,
615-
(int) property.FolderIdForCompletedTasks!, hasImages)).ConfigureAwait(false);
631+
(int)property.FolderIdForTasks!,
632+
(int)property.FolderIdForCompletedTasks!, hasImages)).ConfigureAwait(false);
616633
}
617634

618635
return new OperationResult(true, localizationService.GetString("TaskCreatedSuccessful"));

‎eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn/Services/BackendConfigurationTaskTrackerService/BackendConfigurationTaskTrackerService.cs‎

Lines changed: 34 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -43,46 +43,31 @@ namespace BackendConfiguration.Pn.Services.BackendConfigurationTaskTrackerServic
4343
using System.IO;
4444
using ExcelService;
4545

46-
public class BackendConfigurationTaskTrackerService : IBackendConfigurationTaskTrackerService
46+
public class BackendConfigurationTaskTrackerService(
47+
IBackendConfigurationLocalizationService localizationService,
48+
IUserService userService,
49+
BackendConfigurationPnDbContext backendConfigurationPnDbContext,
50+
IEFormCoreService coreHelper,
51+
ItemsPlanningPnDbContext itemsPlanningPnDbContext,
52+
IExcelService excelService)
53+
: IBackendConfigurationTaskTrackerService
4754
{
48-
private readonly IBackendConfigurationLocalizationService _localizationService;
49-
private readonly IUserService _userService;
50-
private readonly BackendConfigurationPnDbContext _backendConfigurationPnDbContext;
51-
private readonly IEFormCoreService _coreHelper;
52-
private readonly ItemsPlanningPnDbContext _itemsPlanningPnDbContext;
53-
private readonly IExcelService _excelService;
54-
55-
public BackendConfigurationTaskTrackerService(
56-
IBackendConfigurationLocalizationService localizationService,
57-
IUserService userService,
58-
BackendConfigurationPnDbContext backendConfigurationPnDbContext,
59-
IEFormCoreService coreHelper,
60-
ItemsPlanningPnDbContext itemsPlanningPnDbContext,
61-
IExcelService excelService)
62-
{
63-
_localizationService = localizationService;
64-
_userService = userService;
65-
_backendConfigurationPnDbContext = backendConfigurationPnDbContext;
66-
_coreHelper = coreHelper;
67-
_itemsPlanningPnDbContext = itemsPlanningPnDbContext;
68-
_excelService = excelService;
69-
}
70-
71-
7255
public async Task<OperationDataResult<List<TaskTrackerModel>>> Index(TaskTrackerFiltrationModel filtersModel)
7356
{
74-
var userLanguageId = (await _userService.GetCurrentUserLanguage()).Id;
75-
var result = await BackendConfigurationTaskTrackerHelper.Index(filtersModel, _backendConfigurationPnDbContext, await _coreHelper.GetCore(), userLanguageId, _itemsPlanningPnDbContext);
76-
return new OperationDataResult<List<TaskTrackerModel>>(result.Success, _localizationService.GetString(result.Message), result.Model ??
77-
[]);
57+
var userLanguageId = (await userService.GetCurrentUserLanguage()).Id;
58+
var result = await BackendConfigurationTaskTrackerHelper.Index(filtersModel, backendConfigurationPnDbContext,
59+
await coreHelper.GetCore(), userLanguageId, itemsPlanningPnDbContext);
60+
return new OperationDataResult<List<TaskTrackerModel>>(result.Success,
61+
localizationService.GetString(result.Message), result.Model ??
62+
[]);
7863
}
79-
64+
8065
public async Task<OperationDataResult<List<TaskTrackerColumn>>> GetColumns()
8166
{
82-
var userId = _userService.UserId;
67+
var userId = userService.UserId;
8368
try
8469
{
85-
var columns = await _backendConfigurationPnDbContext.TaskTrackerColumns
70+
var columns = await backendConfigurationPnDbContext.TaskTrackerColumns
8671
.Where(p => p.UserId == userId)
8772
.Select(p => new TaskTrackerColumn
8873
{
@@ -98,19 +83,19 @@ public async Task<OperationDataResult<List<TaskTrackerColumn>>> GetColumns()
9883
Log.LogException(e.Message);
9984
Log.LogException(e.StackTrace);
10085
return new OperationDataResult<List<TaskTrackerColumn>>(false,
101-
$"{_localizationService.GetString("ErrorWhileGetColumns")}: {e.Message}");
86+
$"{localizationService.GetString("ErrorWhileGetColumns")}: {e.Message}");
10287
}
10388
}
10489

10590
public async Task<OperationResult> UpdateColumns(List<TaskTrackerColumns> updatedColumns)
10691
{
10792
try
10893
{
109-
var userId = _userService.UserId;
94+
var userId = userService.UserId;
11095

11196
foreach (var updatedColumn in updatedColumns)
11297
{
113-
var columnFromDb = await _backendConfigurationPnDbContext.TaskTrackerColumns
98+
var columnFromDb = await backendConfigurationPnDbContext.TaskTrackerColumns
11499
.Where(p => p.UserId == userId)
115100
.Where(p => p.ColumnName == updatedColumn.ColumnName)
116101
.FirstOrDefaultAsync();
@@ -125,7 +110,7 @@ public async Task<OperationResult> UpdateColumns(List<TaskTrackerColumns> update
125110
CreatedByUserId = userId,
126111
UpdatedByUserId = userId
127112
};
128-
await columnFromDb.Create(_backendConfigurationPnDbContext);
113+
await columnFromDb.Create(backendConfigurationPnDbContext);
129114

130115
continue;
131116
}
@@ -134,39 +119,41 @@ public async Task<OperationResult> UpdateColumns(List<TaskTrackerColumns> update
134119
{
135120
columnFromDb.isColumnEnabled = updatedColumn.IsColumnEnabled;
136121
columnFromDb.UpdatedByUserId = userId;
137-
await columnFromDb.Update(_backendConfigurationPnDbContext);
122+
await columnFromDb.Update(backendConfigurationPnDbContext);
138123
}
139124
}
140-
125+
141126
return new OperationDataResult<List<TaskTrackerColumns>>(true,
142-
$"{_localizationService.GetString("ColumnsUpdatedSuccessful")}");
127+
$"{localizationService.GetString("ColumnsUpdatedSuccessful")}");
143128
}
144129
catch (Exception e)
145130
{
146131
SentrySdk.CaptureException(e);
147132
Log.LogException(e.Message);
148133
Log.LogException(e.StackTrace);
149134
return new OperationResult(false,
150-
$"{_localizationService.GetString("ErrorWhileUpdateColumns")}: {e.Message}");
135+
$"{localizationService.GetString("ErrorWhileUpdateColumns")}: {e.Message}");
151136
}
152137
}
153138

154139
public async Task<OperationDataResult<Stream>> GenerateExcelReport(TaskTrackerFiltrationModel filtersModel)
155140
{
156141
try
157142
{
158-
var userLanguageId = (await _userService.GetCurrentUserLanguage()).Id;
159-
var result = await BackendConfigurationTaskTrackerHelper.Index(filtersModel, _backendConfigurationPnDbContext, await _coreHelper.GetCore(), userLanguageId, _itemsPlanningPnDbContext);
143+
var userLanguageId = (await userService.GetCurrentUserLanguage()).Id;
144+
var result = await BackendConfigurationTaskTrackerHelper.Index(filtersModel,
145+
backendConfigurationPnDbContext, await coreHelper.GetCore(), userLanguageId, itemsPlanningPnDbContext);
160146
if (!result.Success)
161147
{
162-
return new OperationDataResult<Stream>(false, _localizationService.GetString(result.Message));
148+
return new OperationDataResult<Stream>(false, localizationService.GetString(result.Message));
163149
}
164150

165-
var report = await _excelService.GenerateTaskTracker(result.Model);
151+
var report = await excelService.GenerateTaskTracker(result.Model);
166152

167153
if (report == null)
168154
{
169-
return new OperationDataResult<Stream>(false, _localizationService.GetString("ErrorWhileGeneratingReport"));
155+
return new OperationDataResult<Stream>(false,
156+
localizationService.GetString("ErrorWhileGeneratingReport"));
170157
}
171158

172159
return new OperationDataResult<Stream>(true, report);
@@ -176,7 +163,8 @@ public async Task<OperationDataResult<Stream>> GenerateExcelReport(TaskTrackerFi
176163
SentrySdk.CaptureException(e);
177164
Log.LogException(e.Message);
178165
Log.LogException(e.StackTrace);
179-
return new OperationDataResult<Stream>(false, $"{_localizationService.GetString("ErrorWhileGeneratingReport")}: {e.Message}");
166+
return new OperationDataResult<Stream>(false,
167+
$"{localizationService.GetString("ErrorWhileGeneratingReport")}: {e.Message}");
180168
}
181169
}
182170
}

0 commit comments

Comments
 (0)