diff --git a/Fab2ApprovalSystem/Controllers/AuditController.cs b/Fab2ApprovalSystem/Controllers/AuditController.cs index 96328f5..d8653c6 100644 --- a/Fab2ApprovalSystem/Controllers/AuditController.cs +++ b/Fab2ApprovalSystem/Controllers/AuditController.cs @@ -58,6 +58,7 @@ public class AuditController : Controller { try { bool isAdmin = (bool)Session[GlobalVars.IS_ADMIN]; int userId = (int)Session[GlobalVars.SESSION_USERID]; + audit = auditDMO.GetAuditItem(issueID, userId); AuditEdit auditEdit = auditDMO.GetAuditEdit(issueID, audit, isAdmin, userId); if (auditEdit.RedirectToAction) return RedirectToAction("ReadOnlyAudit", new { auditNo = audit.AuditNo }); diff --git a/Fab2ApprovalSystem/DMO/AuditDMO.cs b/Fab2ApprovalSystem/DMO/AuditDMO.cs index 6c33b53..e87469b 100644 --- a/Fab2ApprovalSystem/DMO/AuditDMO.cs +++ b/Fab2ApprovalSystem/DMO/AuditDMO.cs @@ -401,7 +401,6 @@ public class AuditDMO { result.Is8DQA = "true"; } - audit = GetAuditItem(issueID, userId); // transform audit users from string to list, delimited by a comma. if (audit.Auditees == null) { result.AuditeeNames = new List(); diff --git a/Fab2ApprovalTests/DMO/AuditDMOTests.cs b/Fab2ApprovalTests/DMO/AuditDMOTests.cs index 36337d1..b96fca8 100644 --- a/Fab2ApprovalTests/DMO/AuditDMOTests.cs +++ b/Fab2ApprovalTests/DMO/AuditDMOTests.cs @@ -51,7 +51,7 @@ public class AuditDMOTests { try { throw new Exception(); } catch (Exception) { } } - private static void AuditDMO(ILogger? logger, AppSettings appSettings) { + private static void AuditDMO(ILogger? logger, AppSettings appSettings, int auditNo, bool isAdmin) { #pragma warning disable IDE0059 SetGlobalVars(logger, appSettings); AuditDMO auditDMO = new(appSettings); @@ -61,25 +61,25 @@ public class AuditDMOTests { AuditedArea[] auditedAreas = auditDMO.GetAuditAreaList().ToArray(); // IEnumerable GetAuditFindingCategoryIdsByFindingId(int auditFindingsID); // AuditFindings GetAuditFindingsByID(int auditFindingsID); - // IEnumerable GetAuditFindingsList(int auditNo); - // Audit GetAuditItem(int auditNo, appSettings.UserId); - // Audit GetAuditItemReadOnly(int auditNo, appSettings.UserId); + AuditFindings[] auditFindings = auditDMO.GetAuditFindingsList(auditNo).ToArray(); + Audit auditB = auditDMO.GetAuditItem(auditNo, appSettings.UserId); + Audit auditC = new(); + AuditEdit auditEdit = auditDMO.GetAuditEdit(auditNo, auditC, isAdmin, appSettings.UserId); + Audit auditD = auditDMO.GetAuditItemReadOnly(auditNo, appSettings.UserId); Auditor[] auditors = auditDMO.GetAuditorList().ToArray(); - // IEnumerable GetAuditReportAttachments(int auditNo); + AuditReportAttachment[] auditReportAttachments = auditDMO.GetAuditReportAttachments(auditNo).ToArray(); // C_8DAuditedStandard[] c_8DAuditedStandards = auditDMO.GetAuditStandardList().ToArray(); AuditType[] auditTypes = auditDMO.GetAuditTypeList().ToArray(); // CAFindings GetCAFindingsItem(int caFindingsID); // IEnumerable GetCAFindingsItemAttachments(int caFindingsID); - // IEnumerable GetCAFindingsList(int auditNo); + CAFindings[] caFindings = auditDMO.GetCAFindingsList(auditNo).ToArray(); CANoList[] cANoLists = auditDMO.GetCorrectiveActionNoList().ToArray(); - // int GetOpenCACountByAuditNo(int auditNo); + int openCACountByAuditNo = auditDMO.GetOpenCACountByAuditNo(auditNo); CAUserList[] cAUserLists = auditDMO.GetUserList().ToArray(); - // Audit InsertAudit(Audit audit); // void InsertAuditReportAttachment(AuditReportAttachment attach); // void InsertCAFindings(CAFindings model); // int IsCAAssignedToAudit(int CANo, int auditNo); // void ReleaseLockOnDocument(appSettings.UserId, int issueID); - // void UpdateAudit(Audit audit, appSettings.UserId); // void UpdateCAFindings(CAFindings model); if (auditDMO is null) { } #pragma warning restore IDE0059 @@ -89,13 +89,14 @@ public class AuditDMOTests { [Ignore] #endif [TestMethod] - public void AuditDMOIsAttachedOnly() { + [DataRow(250, true)] + public void AuditDMOIsAttachedOnly(int auditNo, bool isAdmin) { _Logger?.LogInformation("Starting Web Application"); IServiceProvider? serviceProvider = _WebApplicationFactory?.Services.CreateScope().ServiceProvider; AppSettings? appSettings = serviceProvider?.GetRequiredService(); Assert.IsTrue(appSettings is not null); if (System.Diagnostics.Debugger.IsAttached) - AuditDMO(_Logger, appSettings); + AuditDMO(_Logger, appSettings, auditNo, isAdmin); _Logger?.LogInformation("{TestName} completed", _TestContext?.TestName); NonThrowTryCatch(); }