phares3757/mesa-fab-approval
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved System.IO references from DMO classes to Static Helpers

Browse Source 
Removed nugetSource from pipeline
Removed more comments
Created Static Classes for most DMO / Controller Classes
Push ConfigurationManager.AppSettings to controller
Align Tests with other Projects
This commit is contained in:
Mike Phares
2024-12-11 09:29:01 -07:00
parent b1c6903c1c
commit b99b721458
86 changed files with 2961 additions and 4432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

142
Fab2ApprovalSystem/DMO/AuditDMO.cs
View File

@ -17,8 +17,6 @@ using System.Transactions;
using Fab2ApprovalSystem.Misc;
using Fab2ApprovalSystem.Utilities;
using System.IO;
namespace Fab2ApprovalSystem.DMO;
public class AuditDMO {
@ -31,8 +29,6 @@ public class AuditDMO {
public Audit InsertAudit(Audit audit) {
DynamicParameters parameters = new();
parameters = new DynamicParameters();
parameters.Add("@AuditNo", value: audit.AuditNo, dbType: DbType.Int32, direction: ParameterDirection.InputOutput);
parameters.Add("@OriginatorID", audit.OriginatorID);
@ -45,14 +41,11 @@ public class AuditDMO {
public Audit GetAuditItem(int auditNo, int userID) {
Audit audit = new();
//isITAR = 2;
// isITAR = 2;
DynamicParameters parameters = new();
parameters.Add("@AuditNo", value: auditNo);
parameters.Add("@UserID", userID);
//parameters.Add("@IsITAR", value: isITAR, dbType: DbType.Int32, direction: ParameterDirection.InputOutput);
//audit = this.db.Query<Audit>("_8DGetAuditItem", parameters, commandType: CommandType.StoredProcedure).Single();
using (var multipleResultItems = db.QueryMultiple("_8DGetAuditItem", parameters, commandType: CommandType.StoredProcedure)) {
audit = multipleResultItems.Read<Audit>().SingleOrDefault();
@ -76,29 +69,15 @@ public class AuditDMO {
audit.AuditedAreaIDs.AddRange(auditorAreas);
}
}
//FabApprovalSystemEntitiesAll auditDb = new FabApprovalSystemEntitiesAll();
//var auditedStandardIDs = (from a in auditDb.C_8DAuditedStandardByAudit where a.AuditNo == audit.AuditNo select a.AuditedStandardID).ToList();
//foreach (var id in auditedStandardIDs)
//{
// audit.AuditedStandardIDs.Add(id);
//}
return audit;
}
public Audit GetAuditItemReadOnly(int auditNo, int userID) {
Audit audit = new();
//isITAR = 2;
DynamicParameters parameters = new();
parameters.Add("@AuditNo", value: auditNo);
parameters.Add("@UserID", userID);
//parameters.Add("@IsITAR", value: isITAR, dbType: DbType.Int32, direction: ParameterDirection.InputOutput);
//audit = this.db.Query<Audit>("_8DGetAuditItem", parameters, commandType: CommandType.StoredProcedure).Single();
using (var multipleResultItems = db.QueryMultiple("_8DGetAuditItemReadOnly", parameters, commandType: CommandType.StoredProcedure)) {
audit = multipleResultItems.Read<Audit>().SingleOrDefault();
@ -164,11 +143,9 @@ public class AuditDMO {
try {
parameters.Add("AuditNo", audit.AuditNo);
parameters.Add("Title", audit.AuditTitle);
//parameters.Add("AuditTypeID", audit.AuditTypeID);
parameters.Add("AuditDate", audit.AuditDate);
parameters.Add("AuditStatus", audit.AuditStatus);
parameters.Add("AuditScore", audit.AuditScore);
//parameters.Add("AuditedAreaID", audit.AuditedAreaID);
parameters.Add("Auditees", audit.Auditees);
db.Execute("_8DUpdateAudit", param: parameters, commandType: CommandType.StoredProcedure);
@ -218,31 +195,6 @@ public class AuditDMO {
throw new Exception(ex.Message + " " + ex.InnerException);
}
}
//FabApprovalSystemEntitiesAll auditDb = new FabApprovalSystemEntitiesAll();
//List<int> auditedStandards = audit.AuditedStandardIDs;
//if (auditedStandards != null)
//{
// foreach (int auditedStandard in auditedStandards)
// {
// var auditStandardExists = (from a in auditDb.C_8DAuditedStandardByAudit where a.AuditNo == audit.AuditNo && a.AuditedStandardID == auditedStandard select a).ToList();
// if (auditStandardExists.Count() <= 0)
// {
// C_8DAuditedStandardByAudit standard = new C_8DAuditedStandardByAudit
// {
// AuditNo = audit.AuditNo,
// AuditedStandardID = auditedStandard
// };
// auditDb.C_8DAuditedStandardByAudit.Add(standard);
// auditDb.SaveChanges();
// }
// }
//}
//parameters = new DynamicParameters();
//parameters.Add("AuditNo", audit.AuditNo);
//this.db.Execute("_8DUpdateAuditScore", parameters, commandType: CommandType.StoredProcedure);
}
public IEnumerable<AuditReportAttachment> GetAuditReportAttachments(int auditNo) {
@ -450,7 +402,7 @@ public class AuditDMO {
}
audit = GetAuditItem(issueID, userId);
//transform audit users from string to list, delimited by a comma.
// transform audit users from string to list, delimited by a comma.
if (audit.Auditees == null) {
result.AuditeeNames = new List<string>();
} else {
@ -468,7 +420,7 @@ public class AuditDMO {
result.IsAdmin = true;
}
if ((audit.RecordLockIndicator && audit.RecordLockedBy != userId)
|| audit.AuditStatus != 0) //open
|| audit.AuditStatus != 0) // open
{
result.RedirectToAction = true;
}
@ -486,33 +438,16 @@ public class AuditDMO {
return result;
}
public List<string> GetFileNameAndDocument(string fileGuid, int auditNo) {
List<string> results = new();
string fileName = GetAuditReportAttachmentFileName(fileGuid);
string fileExtension = fileName.Substring(fileName.LastIndexOf("."), fileName.Length - fileName.LastIndexOf("."));
string ecnFolderPath = _AppSettings.AttachmentFolder + "Audit\\" + auditNo.ToString();
string sDocument = Path.Combine(ecnFolderPath, fileGuid + fileExtension);
string FDir_AppData = _AppSettings.AttachmentFolder;
if (!sDocument.StartsWith(FDir_AppData)) {
sDocument = string.Empty;
}
results.Add(fileName);
results.Add(sDocument);
return results;
}
public Audit InsertAndGetAudit(CorrectiveActionDMO caDMO, AuditFindings data, int userID) {
Audit audit = new();
InsertAuditFindingsItem(data);
audit = GetAuditItem(data.AuditNo, userID);
//Transfer Finding Details to CA
// Transfer Finding Details to CA
if (data.CANo != 0) {
CorrectiveAction ca = caDMO.GetCAItem(data.CANo, userID);
ca.CATitle = data.Title;
ca.CASourceID = 1;//Audit
ca.CASourceID = 1; // Audit
caDMO.UpdateCorrectiveAction(ca);
}
@ -524,11 +459,11 @@ public class AuditDMO {
UpdateAuditFindingsItem(data);
audit = GetAuditItem(data.AuditNo, userID);
//Transfer Finding Details to CA
// Transfer Finding Details to CA
if (data.CANo != 0) {
CorrectiveAction ca = caDMO.GetCAItem(data.CANo, userID);
ca.CATitle = data.Title;
ca.CASourceID = 1;//Audit
ca.CASourceID = 1; // Audit
caDMO.UpdateCorrectiveAction(ca);
}
@ -542,72 +477,9 @@ public class AuditDMO {
return audit;
}
public void AuditReportAttachSave(int auditNo, int userId, string fullFileName, Stream stream) {
// Some browsers send file names with full path.
// We are only interested in the file name.
var fileName = Path.GetFileName(fullFileName);
var fileExtension = Path.GetExtension(fullFileName);
//var physicalPath = Path.Combine(Server.MapPath("~/UserUploads"), fileName);
DirectoryInfo di;
var ccPhysicalPath = _AppSettings.AttachmentFolder + @"Audit\" + auditNo;
di = new DirectoryInfo(ccPhysicalPath);
if (!di.Exists)
di.Create();
var guid = Guid.NewGuid().ToString();
var physicalPath = Path.Combine(_AppSettings.AttachmentFolder + @"Audit\" + auditNo + @"\", guid + fileExtension);
using (FileStream fileStream = new(physicalPath, FileMode.Create, FileAccess.Write)) {
stream.CopyTo(fileStream);
}
AuditReportAttachment attach = new() {
AuditNo = auditNo,
FileGUID = guid,
FileName = fileName,
UploadedByID = userId
};
//ccDMO.InsertCCAttachment(attach);
InsertAuditReportAttachment(attach);
}
public void SaveAndInsert(int caFindingsID, int auditNo, int userId, string fullFileName, Stream stream) {
// Some browsers send file names with full path.
// We are only interested in the file name.
var fileName = Path.GetFileName(fullFileName);
var fileExtension = Path.GetExtension(fullFileName);
//var physicalPath = Path.Combine(Server.MapPath("~/UserUploads"), fileName);
DirectoryInfo di;
var ccPhysicalPath = _AppSettings.AttachmentFolder + @"Audit\" + auditNo;
di = new DirectoryInfo(ccPhysicalPath);
if (!di.Exists)
di.Create();
var guid = Guid.NewGuid().ToString();
var physicalPath = Path.Combine(_AppSettings.AttachmentFolder + @"Audit\" + auditNo + @"\", guid + fileExtension);
using (FileStream fileStream = new(physicalPath, FileMode.Create, FileAccess.Write)) {
stream.CopyTo(fileStream);
}
AuditReportAttachment attach = new() {
CAFindingsID = caFindingsID,
AuditNo = auditNo,
FileGUID = guid,
FileName = fileName,
UploadedByID = userId
};
InsertAuditReportAttachment(attach);
}
public string NotifyActionItemOwner(int issueID, DateTime? dueDate, int? responsibleOwnerID, string emailTemplatesPath) {
string emailSentList = "";
//List<string> emailIst = ldDMO.GetApproverEmailList(@issueID, currentStep).Distinct().ToList();
string email = MiscDMO.GetEmail(responsibleOwnerID);
string emailTemplate = "CorrectiveActionFindingAssigned.txt";