diff --git a/Controllers/Vehicle/NoteController.cs b/Controllers/Vehicle/NoteController.cs index f1552cd..c3d07a9 100644 --- a/Controllers/Vehicle/NoteController.cs +++ b/Controllers/Vehicle/NoteController.cs @@ -32,10 +32,11 @@ namespace CarCareTracker.Controllers return Json(false); } note.Files = note.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList(); + bool isCreate = note.Id == default; //needed here since Notes don't use an input object. var result = _noteDataAccess.SaveNoteToVehicle(note); if (result) { - StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromNoteRecord(note, note.Id == default ? "noterecord.add" : "noterecord.update", User.Identity.Name)); + StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromNoteRecord(note, isCreate ? "noterecord.add" : "noterecord.update", User.Identity.Name)); } return Json(result); } diff --git a/Models/Shared/WebHookPayload.cs b/Models/Shared/WebHookPayload.cs index 1b83e07..e3e1101 100644 --- a/Models/Shared/WebHookPayload.cs +++ b/Models/Shared/WebHookPayload.cs @@ -43,33 +43,61 @@ namespace CarCareTracker.Models { var recordType = actionTypeParts[0]; var recordAction = actionTypeParts[1]; - if (recordAction == "add") + switch (recordAction) { - recordAction = "ADDED"; + case "add": + recordAction = "Added"; + break; + case "update": + recordAction = "Updated"; + break; + case "delete": + recordAction = "Deleted"; + break; + } + if (recordType.ToLower().Contains("record")) + { + var cleanedRecordType = recordType.ToLower().Replace("record", ""); + cleanedRecordType = $"{char.ToUpper(cleanedRecordType[0])}{cleanedRecordType.Substring(1)} Record"; + recordType = cleanedRecordType; } else { - recordAction = $"{recordAction.ToUpper()}D"; + recordType = $"{char.ToUpper(recordType[0])}{recordType.Substring(1)}"; } - return $"{recordAction} {recordType.ToUpper()}"; + return $"{recordAction} {recordType}"; } else if (actionTypeParts.Length == 3) { var recordType = actionTypeParts[0]; var recordAction = actionTypeParts[1]; var thirdPart = actionTypeParts[2]; - if (recordAction == "add") + switch (recordAction) { - recordAction = "ADDED"; + case "add": + recordAction = "Added"; + break; + case "update": + recordAction = "Updated"; + break; + case "delete": + recordAction = "Deleted"; + break; + } + if (recordType.ToLower().Contains("record")) + { + var cleanedRecordType = recordType.ToLower().Replace("record", ""); + cleanedRecordType = $"{char.ToUpper(cleanedRecordType[0])}{cleanedRecordType.Substring(1)} Record"; + recordType = cleanedRecordType; } else { - recordAction = $"{recordAction.ToUpper()}D"; + recordType = $"{char.ToUpper(recordType[0])}{recordType.Substring(1)}"; } if (thirdPart == "api") { - return $"{recordAction} {recordType.ToUpper()} via API"; + return $"{recordAction} {recordType} via API"; } else { - return $"{recordAction} {recordType.ToUpper()}"; + return $"{recordAction} {recordType}"; } } return actionType; @@ -218,7 +246,7 @@ namespace CarCareTracker.Models Data = payloadDictionary, VehicleId = string.IsNullOrWhiteSpace(vehicleId) ? "N/A" : vehicleId, Username = userName, - Action = string.IsNullOrWhiteSpace(payload) ? GetFriendlyActionType(actionType) : payload + Action = string.IsNullOrWhiteSpace(payload) ? $"{userName} {GetFriendlyActionType(actionType)}" : $"{userName} {payload}" }; } }