merge with develop

cisagov · Nov 1, 2023 · 3698bf9 · 3698bf9
2 parents 57451dc + f38211e
commit 3698bf9
Show file tree

Hide file tree

Showing 56 changed files with 458 additions and 197 deletions.
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Acet/AcetBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Acet/AcetBusiness.cs
@@ -248,7 +248,10 @@ public static Dictionary<int, SpanishQuestionRow> buildQuestionDictionary()
             {
                 try
                 {
-                    dict.Add(item.Value.Mat_Question_Id, item.Value);
+                    if (!dict.ContainsKey(item.Value.Mat_Question_Id))
+                    {
+                        dict.Add(item.Value.Mat_Question_Id, item.Value);
+                    }
                 }
                 catch (Exception e)
                 {
@@ -285,7 +288,10 @@ public static Dictionary<int, GroupingSpanishRow> buildGroupingDictionary()
             {
                 try
                 {
-                    dict.Add(item.Value.Grouping_Id, item.Value);
+                    if (!dict.ContainsKey(item.Value.Grouping_Id))
+                    {
+                        dict.Add(item.Value.Grouping_Id, item.Value);
+                    }
                 }
                 catch (Exception e)
                 {
@@ -326,7 +332,10 @@ public static Dictionary<string, GroupingSpanishRow> buildResultsGroupingDiction
             {
                 try
                 {
-                    dict.Add(item.Value.English_Title, item.Value);
+                    if (!dict.ContainsKey(item.Value.English_Title))
+                    {
+                        dict.Add(item.Value.English_Title, item.Value);
+                    }
                 }
                 catch (Exception e)
                 {
@@ -365,7 +374,10 @@ public static Dictionary<int, IRPModel> buildIRPDictionary()
             {
                 try
                 {
-                    dict.Add(item.Value.IRP_Id, item.Value);
+                    if (!dict.ContainsKey(item.Value.IRP_Id))
+                    {
+                        dict.Add(item.Value.IRP_Id, item.Value);
+                    }
                 }
                 catch (Exception e)
                 {
@@ -403,7 +415,10 @@ public static Dictionary<int, IRPSpanishRow> buildIRPHeaderDictionary()
             {
                 try
                 {
-                    dict.Add(item.Value.IRP_Header_Id, item.Value);
+                    if (!dict.ContainsKey(item.Value.IRP_Header_Id))
+                    {
+                        dict.Add(item.Value.IRP_Header_Id, item.Value);
+                    }
                 }
                 catch (Exception e)
                 {
@@ -443,7 +458,10 @@ public static Dictionary<string, IRPSpanishRow> buildIRPDashboardDictionary()
             {
                 try
                 {
-                    dict.Add(item.Value.EnglishHeader, item.Value);
+                    if (!dict.ContainsKey(item.Value.EnglishHeader))
+                    {
+                        dict.Add(item.Value.EnglishHeader, item.Value);
+                    }
                 }
                 catch (Exception e)
                 {

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Assessment/ACETAssessmentBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Assessment/ACETAssessmentBusiness.cs
@@ -4,8 +4,10 @@
 // 
 // 
 //////////////////////////////// 
+using CSETWebCore.Business.Aggregation;
 using CSETWebCore.Business.Maturity;
 using CSETWebCore.DataLayer.Model;
+using CSETWebCore.Helpers;
 using CSETWebCore.Interfaces;
 using CSETWebCore.Interfaces.Assessment;
 using CSETWebCore.Interfaces.Contact;
@@ -152,13 +154,30 @@ public void CreateIrpHeaders(int assessmentId)
             _context.SaveChanges();
         }
 
+        /// <summary>
+        /// Returns the ISE Merit submission status
+        /// </summary>
+        public Boolean? GetIseSubmission(int assessmentId)
+        {
+            var query = from i in _context.INFORMATION
+                        where i.Id == assessmentId
+                        select i.Ise_Submitted;
+
+            var result = query.ToList().FirstOrDefault();
+            return result;
+        }
 
         /// <summary>
         /// Updates the INFORMATION table to track ISE Merit Submissions for NCUA
         /// </summary>
         public void UpdateIseSubmission(int assessmentId)
         {
             INFORMATION information = _context.INFORMATION.FirstOrDefault(a => a.Id == assessmentId);
+            if (information != null)
+            {
+                information.Ise_Submitted = true;
+                information.Submitted_Date = DateTime.Today;
+            }
             information.Ise_Submitted = true;
             _context.SaveChanges();
         }

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Assessment/AssessmentBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Assessment/AssessmentBusiness.cs
@@ -852,5 +852,15 @@ public void SaveOtherRemarks(int assessmentId, string remark)
             dd.StringValue = remark;
             _context.SaveChanges();
         }
+
+        public void clearFirstTime(int userid, int assessment_id)
+        {
+            var us = _context.USERS.Where(x => x.UserId == userid).FirstOrDefault();
+            if(us != null)
+            {
+                us.IsFirstLogin = false;
+                _context.SaveChanges();
+            }
+        }
     }
 }
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/ColumnImportRules.xml b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/ColumnImportRules.xml
@@ -61,6 +61,19 @@
     </Column>
   </Table>
 
+  <Table name="DETAILS_DEMOGRAPHICS" />
+
+  <Table name="CIS_CSI_SERVICE_DEMOGRAPHICS"/>
+
+  <Table name="CIS_CSI_USER_COUNTS"/>
+
+  <Table name="CIS_CSI_SERVICE_COMPOSITION_SECONDARY_DEFINING_SYSTEMS"/>
+
+  <Table name="CIS_CSI_SERVICE_COMPOSITION"/>
+
+  <Table name="CIS_CSI_ORGANIZATION_DEMOGRAPHICS"/>
+
+
   <Table name="DOCUMENT_FILE">
     <Column name="CreatedTimestamp">
       <Rule action="defaultDatetime" />

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/ResourceLibraryRepository.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/ResourceLibraryRepository.cs
@@ -177,6 +177,8 @@ public void CreateResourceLibraryData()
 
                 Dictionary<int, List<PROCUREMENTLANGUAGEDATA>> dictionaryProcurementLanguageData = new Dictionary<int, List<PROCUREMENTLANGUAGEDATA>>();
 
+                TinyMapper.Bind<PROCUREMENT_LANGUAGE_DATA, PROCUREMENTLANGUAGEDATA>();
+
                 foreach (PROCUREMENT_LANGUAGE_DATA data in dbContext.PROCUREMENT_LANGUAGE_DATA.ToList())
                 {
                     List<PROCUREMENTLANGUAGEDATA> list;
@@ -207,6 +209,8 @@ public void CreateResourceLibraryData()
 
                 Dictionary<int, List<CATALOGRECOMMENDATIONSDATA>> dictionaryCatalogRecommendations = new Dictionary<int, List<CATALOGRECOMMENDATIONSDATA>>();
 
+                TinyMapper.Bind<CATALOG_RECOMMENDATIONS_DATA, CATALOGRECOMMENDATIONSDATA>();
+
                 foreach (CATALOG_RECOMMENDATIONS_DATA data in dbContext.CATALOG_RECOMMENDATIONS_DATA.ToList())
                 {
                     List<CATALOGRECOMMENDATIONSDATA> list;
@@ -231,7 +235,6 @@ public void CreateResourceLibraryData()
                         procHeadingModel.Nodes.Add(procModel);
                     }
                 }
-
             }
             catch (Exception exc)
             {

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/CsetwebContext.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/CsetwebContext.cs
@@ -2720,6 +2720,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             entity.ToTable(tb => tb.HasComment("A collection of USERS records"));
 
             entity.Property(e => e.IsActive).HasDefaultValueSql("((1))");
+            entity.Property(e => e.IsFirstLogin).HasDefaultValueSql("((1))");
             entity.Property(e => e.Lang).HasDefaultValueSql("('en')");
             entity.Property(e => e.PasswordResetRequired).HasDefaultValueSql("((1))");
             entity.Property(e => e.PreventEncrypt).HasDefaultValueSql("((1))");

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/INFORMATION.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/INFORMATION.cs
@@ -114,6 +114,7 @@ public partial class INFORMATION
     public int? Region_Code { get; set; }
 
     public bool? Ise_Submitted { get; set; }
+    public DateTime? Submitted_Date { get; set; }
 
     [ForeignKey("Id")]
     [InverseProperty("INFORMATION")]

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/USERS.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/USERS.cs
@@ -54,6 +54,9 @@ public partial class USERS
     [StringLength(10)]
     public string Lang { get; set; }
 
+    [Required]
+    public bool? IsFirstLogin { get; set; }
+
     [InverseProperty("AssessmentCreator")]
     public virtual ICollection<ASSESSMENTS> ASSESSMENTS { get; set; } = new List<ASSESSMENTS>();
 

diff --git a/...bApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/usp_Assessments_Completion_For_UserResult.cs b/...bApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/usp_Assessments_Completion_For_UserResult.cs
@@ -7,5 +7,6 @@ namespace CSETWebCore.DataLayer.Model
 {
     public partial class usp_Assessments_Completion_For_UserResult
     {
+
     }
 }
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/usp_Assessments_For_UserResult.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/usp_Assessments_For_UserResult.cs
@@ -22,5 +22,6 @@ public partial class usp_Assessments_For_UserResult
         public bool? AltTextMissing { get; set; }
         public int? UserId { get; set; }
         public bool? IseSubmitted { get; set; }
+        public DateTime? SubmittedDate { get; set; }
     }
 }
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/efpt.config.json b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/efpt.config.json
@@ -1409,6 +1409,7 @@
    "UseLegacyPluralizer": false,
    "UseManyToManyEntity": true,
    "UseNoDefaultConstructor": false,
+   "UseNoNavigations": false,
    "UseNoObjectFilter": false,
    "UseNodaTime": false,
    "UseNullableReferences": false,

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/UserAuthentication.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/UserAuthentication.cs
@@ -123,7 +123,8 @@ public LoginResponse Authenticate(Login login)
                 ResetRequired = loginUser.PasswordResetRequired ?? true,
                 ExportExtension = IOHelper.GetExportFileExtension(login.Scope),
                 ImportExtensions = IOHelper.GetImportFileExtensions(login.Scope),
-                LinkerTime = new BuildNumberHelper().GetLinkerTime()
+                LinkerTime = new BuildNumberHelper().GetLinkerTime(),
+                IsFirstLogin = loginUser.IsFirstLogin??false
             };
 
 
@@ -245,7 +246,8 @@ public LoginResponse AuthenticateStandalone(Login login, ITokenManager tokenMana
                 UserId = userIdSO,
                 ExportExtension = IOHelper.GetExportFileExtension(login.Scope),
                 ImportExtensions = IOHelper.GetImportFileExtensions(login.Scope),
-                LinkerTime = new BuildNumberHelper().GetLinkerTime()
+                LinkerTime = new BuildNumberHelper().GetLinkerTime(),
+                IsFirstLogin = user.IsFirstLogin??false
             };
 
 

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Assessment/IACETAssessmentBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Assessment/IACETAssessmentBusiness.cs
@@ -12,6 +12,7 @@ namespace CSETWebCore.Interfaces.Assessment
     public interface IACETAssessmentBusiness
     {
         int SaveAssessmentDetail(int assessmentId, AssessmentDetail assessmentDetail);
+        bool? GetIseSubmission(int assessmentId);
         void UpdateIseSubmission(int assessmentId);
     }
 }
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Assessment/IAssessmentBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Assessment/IAssessmentBusiness.cs
@@ -36,5 +36,6 @@ public interface IAssessmentBusiness
 
         string GetOtherRemarks(int assessmentId);
         void SaveOtherRemarks(int assessmentId, string remark);
+        void clearFirstTime(int userid, int assessmentId);
     }
 }
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Authentication/LoginResponse.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Authentication/LoginResponse.cs
@@ -20,5 +20,6 @@ public class LoginResponse
         public string ExportExtension { get; set; }
         public string ImportExtensions { get; set; }
         public string LinkerTime { get; set; }
+        public bool IsFirstLogin { get; set; }
     }
 }
diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AggregationController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AggregationController.cs
@@ -141,9 +141,9 @@ public IActionResult SaveAssessmentAlias([FromBody] AliasSaveRequest req)
             }
 
             var aggreg = new AggregationBusiness(_context);
-            aggreg.SaveAssessmentAlias((int)aggregationID, req.aliasAssessment.AssessmentId, req.aliasAssessment.Alias, req.assessmentList);
+            var newAlias = aggreg.SaveAssessmentAlias((int)aggregationID, req.aliasAssessment.AssessmentId, req.aliasAssessment.Alias, req.assessmentList);
 
-            return Ok();
+            return Ok(newAlias);
         }
 
 

diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AssessmentController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AssessmentController.cs
@@ -435,6 +435,15 @@ public IActionResult SaveOtherRemarks([FromBody] string remark)
             return Ok();
         }
 
+        [HttpGet]
+        [Route("api/getIseSubmissionStatus")]
+        public IActionResult GetSubmissionStatus()
+        {
+            int assessmentId = _tokenManager.AssessmentForUser();
+            var result = this._acsetAssessmentBusiness.GetIseSubmission(assessmentId);
+            return Ok(result);
+        }
+
         [HttpPost]
         [Route("api/updateIseSubmissionStatus")]
         public IActionResult UpdateSubmissionStatus()
@@ -443,5 +452,15 @@ public IActionResult UpdateSubmissionStatus()
             this._acsetAssessmentBusiness.UpdateIseSubmission(assessmentId);
             return Ok();
         }
+
+        [HttpGet]
+        [Route("api/clearFirstTime")]
+        public IActionResult clearFirstTime()
+        {
+            int assessmentId = _tokenManager.AssessmentForUser();
+            int userid = _tokenManager.GetCurrentUserId()??0;
+            this._assessmentBusiness.clearFirstTime(userid,assessmentId);
+            return Ok();
+        }
     }
 }
diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ResetPasswordController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ResetPasswordController.cs
@@ -23,6 +23,7 @@
 using System.Text.RegularExpressions;
 using CSETWebCore.Model.Auth;
 using CSETWebCore.Api.Models;
+using NLog;
 
 namespace CSETWebCore.Api.Controllers
 {
@@ -243,6 +244,8 @@ public IActionResult PostRegisterUser([FromBody] CreateUser user)
 
                 if (beta)
                 {
+                    LogManager.GetCurrentClassLogger().Info("CreateUser - CSET is set to 'online beta' mode - no email sent to new user");
+
                     // create the user but DO NOT send the temp password email (test/beta)
                     var rval = resetter.CreateUser(user, false);
                     if (rval)

diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/UserController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/UserController.cs
@@ -5,6 +5,7 @@
 using CSETWebCore.Interfaces.User;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
+using NLog;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -90,13 +91,13 @@ public IActionResult GetUsers([FromQuery] bool? onlyInactive, [FromQuery] string
         public IActionResult ChangeUserActivation(
             [FromQuery] int userId, [FromQuery] bool isActive, [FromQuery] string apiKey)
         {
+            LogManager.GetCurrentClassLogger().Info($"ChangeUserActivation:  changing isActive property to {isActive}");
+
             if (!IsApiKeyValid(apiKey))
             {
                 return Unauthorized();
             }
 
-
-            // set the IsActive flag on the user
             var user = _context.USERS.FirstOrDefault(x => x.UserId == userId);
             if (user == null)
             {
@@ -118,6 +119,8 @@ public IActionResult ChangeUserActivation(
             // if the user is being activated, send them a new temp password
             if (isActive)
             {
+                LogManager.GetCurrentClassLogger().Info($"ChangeUserActivation:  sending temporary password email to {user.PrimaryEmail}");
+
                 var resetter = new UserAccountSecurityManager(_context, _userBusiness, _notificationBusiness, _configuration);
                 resetter.ResetPassword(user.PrimaryEmail, "Temporary Password", "CSET");
             }

diff --git a/.../CSETWeb_Api/CSETWeb_ApiCore/Documents/Due Diligence over 3rd Party Service Providers.pdf b/.../CSETWeb_Api/CSETWeb_ApiCore/Documents/Due Diligence over 3rd Party Service Providers.pdf
diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/cybersecurity-assessment-tool-espanol.pdf b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/cybersecurity-assessment-tool-espanol.pdf
diff --git a/CSETWebNg/src/app/aggregation/alias-assessments/alias-assessments.component.ts b/CSETWebNg/src/app/aggregation/alias-assessments/alias-assessments.component.ts
@@ -130,7 +130,12 @@ export class AliasAssessmentsComponent implements OnInit {
         alias: assessment.alias
       },
       assessmentList
-    ).subscribe();
+    ).subscribe((newAlias: string) => {
+      const a = this.aliasData.assessments.find(x => x.assessmentId == assessment.assessmentId);
+      if (!!a) {
+        a.alias = newAlias;
+      }
+    });
   }
 
   /**

diff --git a/...sessment/prepare/assessment-info/assessment-config-iod/assessment-config-iod.component.ts b/...sessment/prepare/assessment-info/assessment-config-iod/assessment-config-iod.component.ts
@@ -78,7 +78,7 @@ export class AssessmentConfigIodComponent implements OnInit {
   }
 
   changeCriticalService(evt: any) {
-    this.demographics.criticalServiceName = evt.target.value;
+    this.demographics.criticalService = evt.target.value;
     this.updateDemographics();
   }
 

diff --git a/...ssment/prepare/assessment-info/assessment-convert-cf/assessment-convert-cf.component.html b/...ssment/prepare/assessment-info/assessment-convert-cf/assessment-convert-cf.component.html
@@ -1,8 +1,8 @@
 <ng-container *ngIf="isCfEntry">
     <div *transloco="let t" style="border: 2px solid #333; border-radius: .3rem; padding: 1rem">
         <div class="mb-3">
-            {{t('cyberFlorida.convert message')}}
+            {{t('cyberFlorida.upgrade message')}}
         </div>
-        <button class="btn btn-primary" (click)="convert()">{{t('buttons.convert')}}</button>
+        <button class="btn btn-primary" (click)="convert()">{{t('cyberFlorida.upgradeButton')}}</button>
     </div>
 </ng-container>