Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed export to not include 'stock' sets. Reset PCII number. #4504

Merged
merged 1 commit into from
Mar 19, 2025
Merged

Fixed export to not include 'stock' sets. Reset PCII number. #4504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 35 additions & 36 deletions CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Export/AssessmentExportManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,9 +494,8 @@ private UploadAssessmentModel RemovePcii(UploadAssessmentModel model)
/// </summary>
private ExportJson CreateJson(int assessmentId, bool scrubData = false)
{

var model = CopyForExport(assessmentId, scrubData);
ExportJson exportModel = new ExportJson();
var model = CopyForExport(assessmentId, scrubData);
ExportJson exportModel = new ExportJson();
foreach (var standard in model.jAVAILABLE_STANDARDS)
{
if (!standard.Selected)
Expand Down Expand Up @@ -531,20 +530,23 @@ join nqs in _context.NEW_QUESTION_SETS on nq.Question_Id equals nqs.Question_Id
set.NEW_REQUIREMENT = new List<NEW_REQUIREMENT>(rq.ToList());



var extStandard = StandardConverter.ToExternalStandard(set, _context);
var setname = Regex.Replace(extStandard.shortName, @"\W", "_");


var jsonStandard = JsonConvert.SerializeObject(extStandard, Formatting.Indented);

SetObject setObject = new SetObject
// export custom standards only
if (set.Is_Custom)
{
SetName = $"{setname}.json",
Json = jsonStandard
};
exportModel.SetObj = setObject;

var setname = Regex.Replace(extStandard.shortName, @"\W", "_");

var jsonStandard = JsonConvert.SerializeObject(extStandard, Formatting.Indented);

SetObject setObject = new SetObject
{
SetName = $"{setname}.json",
Json = jsonStandard
};
exportModel.SetObj = setObject;
model.CustomStandards.Add(extStandard.shortName);
}


//Set the GUID at time of export so we are sure it's right!!!
Expand All @@ -568,14 +570,12 @@ join nqs in _context.NEW_QUESTION_SETS on nq.Question_Id equals nqs.Question_Id
return t;
})).ToList();

model.CustomStandards.Add(extStandard.shortName);


var files = extStandard.requirements.SelectMany(s => s.references.Concat(new ExternalResource[] { s.source })).OfType<ExternalResource>().Distinct();
foreach (var file in files)
{
var genFile = _context.GEN_FILE.FirstOrDefault(s => s.File_Name == file.fileName && (s.Is_Uploaded));
if (genFile == null || model.CustomStandardDocs.Contains(file.fileName))
var genFile = _context.GEN_FILE.FirstOrDefault(s => s.File_Name == file.FileName && (s.Is_Uploaded));
if (genFile == null || model.CustomStandardDocs.Contains(file.FileName))
continue;

var doc = genFile.ToExternalDocument();
Expand All @@ -586,26 +586,25 @@ join nqs in _context.NEW_QUESTION_SETS on nq.Question_Id equals nqs.Question_Id
DocName = $"{doc.ShortName}.json",
Json = jsonDoc
};

exportModel.DocObj = docObject;
model.CustomStandardDocs.Add(file.fileName);
model.CustomStandardDocs.Add(file.FileName);
}

}

model.ExportDateTime = DateTime.UtcNow;

var json = JsonConvert.SerializeObject(model, Formatting.Indented);
ModelObject modelObject = new ModelObject()
{
ModelName = "model.json",
Json = json
};

exportModel.ModelObj = modelObject;
model.ExportDateTime = DateTime.UtcNow;

var json = JsonConvert.SerializeObject(model, Formatting.Indented);
ModelObject modelObject = new ModelObject()
{
ModelName = "model.json",
Json = json
};

exportModel.ModelObj = modelObject;
return exportModel;
}

/// <summary>
/// Export an assessment by its ID.
/// Can optionally provide a password and password hint that will be used during import process.
Expand Down Expand Up @@ -653,7 +652,7 @@ public AssessmentExportFile ExportAssessment(int assessmentId, string fileExtens
{
zipWrapper.AddEntry($"{passwordHint}.hint", passwordHint);
}

zipWrapper.Save();
zipWrapper.CloseStream();
}
Expand All @@ -666,7 +665,7 @@ public AssessmentExportFile ExportAssessment(int assessmentId, string fileExtens

return new AssessmentExportFile(fileName, archiveStream);
}

/// <summary>
/// Export an assessment by its ID.
/// </summary>
Expand All @@ -685,7 +684,7 @@ public AssessmentExportFileJson ExportAssessmentJson(int assessmentId, bool scru

// export the assessment
ExportJson exportFile = CreateJson(assessmentId, scrubData);


// mark the assessment as clean after export
var assessment = _context.ASSESSMENTS.FirstOrDefault(a => a.Assessment_Id == assessmentId);
Expand Down Expand Up @@ -739,7 +738,7 @@ public MemoryStream BulkExportAssessments(Guid[] guids, string fileExtension)


zipWrapper.AddEntry(exportFile.FileName, exportFile.FileContents);

zipWrapper.Save();
zipWrapper.CloseStream();
}
Expand Down
15 changes: 4 additions & 11 deletions CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/ImportManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public async Task ProcessCSETAssessmentImport(byte[] zipFileFromDatabase, int? c
var x = new ZipFile(fs);
ZipEntry e = x.GetEntry("model.json");



if (!String.IsNullOrEmpty(password))
{
Expand Down Expand Up @@ -120,7 +120,6 @@ public async Task ProcessCSETAssessmentImport(byte[] zipFileFromDatabase, int? c

foreach (var standard in model.CustomStandards)
{

var sets = context.SETS.Where(s => s.Short_Name.Contains(standard)).ToList();
if (sets.Count == 0)
{
Expand Down Expand Up @@ -150,12 +149,6 @@ public async Task ProcessCSETAssessmentImport(byte[] zipFileFromDatabase, int? c

if (set == null)
{
//int incr = 1;
//while (sets.Any(s => s.Short_Name == originalSetName))
//{
// setModel.name = originalSetName + " " + incr;
// incr++;
//}
var setResult = await setModel.ToSet(_context);
if (setResult.IsSuccess)
{
Expand Down Expand Up @@ -185,7 +178,7 @@ public async Task ProcessCSETAssessmentImport(byte[] zipFileFromDatabase, int? c
erea.Question_Or_Requirement_Id = req.Requirement_Id;
}
return erea;
}).Concat(model.jANSWER.Where(s => !s.Is_Requirement??false).GroupJoin(setResult.Result.NEW_QUESTION, s => s.Custom_Question_Guid, req => new Guid(MD5.Create().ComputeHash(Encoding.Default.GetBytes(req.Simple_Question))).ToString(), (erer, s) =>
}).Concat(model.jANSWER.Where(s => !s.Is_Requirement ?? false).GroupJoin(setResult.Result.NEW_QUESTION, s => s.Custom_Question_Guid, req => new Guid(MD5.Create().ComputeHash(Encoding.Default.GetBytes(req.Simple_Question))).ToString(), (erer, s) =>
{
var req = s.FirstOrDefault();
if (req != null)
Expand All @@ -208,7 +201,7 @@ public async Task ProcessCSETAssessmentImport(byte[] zipFileFromDatabase, int? c

Importer import = new Importer(model, currentUserId, email, accessKey, context, _token, _assessmentUtil, _utilities);
int newAssessmentId = import.RunImportManualPortion(overwriteAssessment);
import.RunImportAutomatic(newAssessmentId, jsonObject, context);
import.RunImportAutomatic(newAssessmentId, jsonObject, context);

// Save the diagram
var assessment = context.ASSESSMENTS.Where(x => x.Assessment_Id == newAssessmentId).FirstOrDefault();
Expand Down Expand Up @@ -271,7 +264,7 @@ public async Task BulkImportAssessments(Stream assessmentsZipArchive, bool overw
{
using (assessmentsZipArchive)
{
// ZipFile zip = ZipFile.Read(assessmentsZipArchive);
// ZipFile zip = ZipFile.Read(assessmentsZipArchive);

var zip = new ZipFile(assessmentsZipArchive);

Expand Down
24 changes: 12 additions & 12 deletions CSETWebApi/CSETWeb_Api/CSETWebCore.Business/ModuleIO/ModuleImporter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,19 +325,19 @@ int sequence
var reqReference = new REQUIREMENT_REFERENCES();
try
{
reqReference.Destination_String = reference.destination;
reqReference.Page_Number = reference.pageNumber;
reqReference.Section_Ref = String.IsNullOrEmpty(reference.sectionReference) ? "" : reference.sectionReference;
reqReference.Gen_File_Id = importer.LookupGenFileId(reference.fileName);
reqReference.Destination_String = reference.Destination;
reqReference.Page_Number = reference.PageNumber;
reqReference.Section_Ref = String.IsNullOrEmpty(reference.SectionReference) ? "" : reference.SectionReference;
reqReference.Gen_File_Id = importer.LookupGenFileId(reference.FileName);
reqReference.Source = false;
}
catch
{
result.LogError(String.Format("Reference {0} could not be added for requirement {1} {2}.", externalRequirement.source?.fileName, externalRequirement.identifier, externalRequirement.text));
result.LogError(String.Format("Reference {0} could not be added for requirement {1} {2}.", externalRequirement.source?.FileName, externalRequirement.identifier, externalRequirement.text));
}
if (reqReference.Gen_File_Id == 0)
{
result.LogError(String.Format("Reference {0} has not been loaded into CSET. Please add the file and try again.", externalRequirement.source?.fileName, externalRequirement.identifier, externalRequirement.text));
result.LogError(String.Format("Reference {0} has not been loaded into CSET. Please add the file and try again.", externalRequirement.source?.FileName, externalRequirement.identifier, externalRequirement.text));
}
else
{
Expand All @@ -352,14 +352,14 @@ int sequence
{
if (externalRequirement.source != null)
{
reqSource.Gen_File_Id = importer.LookupGenFileId(externalRequirement.source.fileName);
reqSource.Page_Number = externalRequirement.source.pageNumber;
reqSource.Destination_String = externalRequirement.source.destination;
reqSource.Section_Ref = String.IsNullOrEmpty(externalRequirement.source.sectionReference) ? "" : externalRequirement.source.sectionReference;
reqSource.Gen_File_Id = importer.LookupGenFileId(externalRequirement.source.FileName);
reqSource.Page_Number = externalRequirement.source.PageNumber;
reqSource.Destination_String = externalRequirement.source.Destination;
reqSource.Section_Ref = String.IsNullOrEmpty(externalRequirement.source.SectionReference) ? "" : externalRequirement.source.SectionReference;
reqSource.Source = true;
if (reqSource.Gen_File_Id == 0)
{
result.LogError(String.Format("Source {0} has not been loaded into CSET. Please add the file and try again.", externalRequirement.source?.fileName, externalRequirement.identifier, externalRequirement.text));
result.LogError(String.Format("Source {0} has not been loaded into CSET. Please add the file and try again.", externalRequirement.source?.FileName, externalRequirement.identifier, externalRequirement.text));
}
else
{
Expand All @@ -369,7 +369,7 @@ int sequence
}
catch
{
result.LogError(String.Format("Source {0} could not be added for requirement {1} {2}.", externalRequirement.source?.fileName, externalRequirement.identifier, externalRequirement.text));
result.LogError(String.Format("Source {0} could not be added for requirement {1} {2}.", externalRequirement.source?.FileName, externalRequirement.identifier, externalRequirement.text));
}

try
Expand Down
24 changes: 12 additions & 12 deletions CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/RequirementConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,18 +129,18 @@ public static async Task<ConverterResult<NEW_REQUIREMENT>> ToRequirement(this Ex
var reqReference = new REQUIREMENT_REFERENCES();
try
{
reqReference.Destination_String = reference.destination;
reqReference.Page_Number = reference.pageNumber;
reqReference.Section_Ref = String.IsNullOrEmpty(reference.sectionReference) ? "" : reference.sectionReference;
reqReference.Gen_File_Id = importer.LookupGenFileId(reference.fileName);
reqReference.Destination_String = reference.Destination;
reqReference.Page_Number = reference.PageNumber;
reqReference.Section_Ref = String.IsNullOrEmpty(reference.SectionReference) ? "" : reference.SectionReference;
reqReference.Gen_File_Id = importer.LookupGenFileId(reference.FileName);
}
catch
{
result.LogError(String.Format("Reference {0} could not be added for requirement {1} {2}.", externalRequirement.source?.fileName, externalRequirement.identifier, externalRequirement.text));
result.LogError(String.Format("Reference {0} could not be added for requirement {1} {2}.", externalRequirement.source?.FileName, externalRequirement.identifier, externalRequirement.text));
}
if (reqReference.Gen_File_Id == 0)
{
result.LogError(String.Format("Reference {0} has not been loaded into CSET. Please add the file and try again.", externalRequirement.source?.fileName, externalRequirement.identifier, externalRequirement.text));
result.LogError(String.Format("Reference {0} has not been loaded into CSET. Please add the file and try again.", externalRequirement.source?.FileName, externalRequirement.identifier, externalRequirement.text));
}
else
{
Expand All @@ -155,14 +155,14 @@ public static async Task<ConverterResult<NEW_REQUIREMENT>> ToRequirement(this Ex
{
if (externalRequirement.source != null)
{
reqSource.Gen_File_Id = importer.LookupGenFileId(externalRequirement.source.fileName);
reqSource.Page_Number = externalRequirement.source.pageNumber;
reqSource.Destination_String = externalRequirement.source.destination;
reqSource.Section_Ref = String.IsNullOrEmpty(externalRequirement.source.sectionReference) ? "" : externalRequirement.source.sectionReference;
reqSource.Gen_File_Id = importer.LookupGenFileId(externalRequirement.source.FileName);
reqSource.Page_Number = externalRequirement.source.PageNumber;
reqSource.Destination_String = externalRequirement.source.Destination;
reqSource.Section_Ref = String.IsNullOrEmpty(externalRequirement.source.SectionReference) ? "" : externalRequirement.source.SectionReference;
reqSource.Source = true;
if (reqSource.Gen_File_Id == 0)
{
result.LogError(String.Format("Source {0} has not been loaded into CSET. Please add the file and try again.", externalRequirement.source?.fileName, externalRequirement.identifier, externalRequirement.text));
result.LogError(String.Format("Source {0} has not been loaded into CSET. Please add the file and try again.", externalRequirement.source?.FileName, externalRequirement.identifier, externalRequirement.text));
}
else
{
Expand All @@ -172,7 +172,7 @@ public static async Task<ConverterResult<NEW_REQUIREMENT>> ToRequirement(this Ex
}
catch
{
result.LogError(String.Format("Source {0} could not be added for requirement {1} {2}.", externalRequirement.source?.fileName, externalRequirement.identifier, externalRequirement.text));
result.LogError(String.Format("Source {0} could not be added for requirement {1} {2}.", externalRequirement.source?.FileName, externalRequirement.identifier, externalRequirement.text));
}

context.SaveChanges();
Expand Down
17 changes: 9 additions & 8 deletions CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/StandardConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ public static async Task<ConverterResult<SETS>> ToSet(this ExternalStandard exte
{
result.LogError("Module already exists. If this is a new version, please change the ShortName field to reflect this.");
}

category = _context.SETS_CATEGORY.FirstOrDefault(s => s.Set_Category_Name.Trim().ToLower() == externalStandard.category.Trim().ToLower());

if (category == null)
Expand Down Expand Up @@ -199,10 +200,10 @@ public static ExternalStandard ToExternalStandard(this SETS standard, CSETContex
Resources = s.REQUIREMENT_REFERENCES.Where(x => !x.Source).Select(t =>
new ExternalResource
{
destination = t.Destination_String,
fileName = t.Gen_File.File_Name,
pageNumber = t.Page_Number,
sectionReference = t.Section_Ref
Destination = t.Destination_String,
FileName = t.Gen_File.File_Name,
PageNumber = t.Page_Number,
SectionReference = t.Section_Ref
})
}).ToDictionary(t => t.Requirement_Id, t => t.Resources);

Expand All @@ -212,10 +213,10 @@ public static ExternalStandard ToExternalStandard(this SETS standard, CSETContex
Resource = s.REQUIREMENT_REFERENCES.Where(x => x.Source).Select(t =>
new ExternalResource
{
destination = t.Destination_String,
fileName = t.Gen_File.File_Name,
pageNumber = t.Page_Number,
sectionReference = t.Section_Ref
Destination = t.Destination_String,
FileName = t.Gen_File.File_Name,
PageNumber = t.Page_Number,
SectionReference = t.Section_Ref
}).FirstOrDefault()
}).ToDictionary(t => t.Requirement_Id, t => t.Resource);

Expand Down
Loading
Loading