updated implementation changes added

eclipse-tractusx · Feb 7, 2024 · 6981c47 · 6981c47
1 parent 35424d2
commit 6981c47
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/src/administration/Administration.Service/BusinessLogic/CompanyDataBusinessLogic.cs b/src/administration/Administration.Service/BusinessLogic/CompanyDataBusinessLogic.cs
@@ -363,7 +363,7 @@ private async Task HandleCompanyCertificateCreationAsync(CompanyCertificateTypeI
                 x.DocumentStatusId = DocumentStatusId.PENDING;
             });
 
-        var companyCertificate = companyCertificateRepository.CreateCompanyCertificateData(_identityData.CompanyId, companyCertificateTypeId, doc.Id, expiryDate);
+        var companyCertificate = companyCertificateRepository.CreateCompanyCertificateData(_identityData.CompanyId, companyCertificateTypeId, doc.Id, (!expiryDate.HasValue) ? expiryDate : expiryDate.Value.UtcDateTime);
 
         await _portalRepositories.SaveAsync().ConfigureAwait(false);
     }

diff --git a/src/portalbackend/PortalBackend.DBAccess/Repositories/CompanyCertificateRepository.cs b/src/portalbackend/PortalBackend.DBAccess/Repositories/CompanyCertificateRepository.cs
@@ -53,7 +53,7 @@ public Task<bool> CheckCompanyCertificateId(Guid id) =>
     /// <inheritdoc />
     public CompanyCertificate CreateCompanyCertificateData(Guid companyId, CompanyCertificateTypeId companyCertificateTypeId, Guid docId, DateTimeOffset? expiryDate, Action<CompanyCertificate>? setOptionalFields)
     {
-        var companyCertificate = new CompanyCertificate(Guid.NewGuid(), DateTimeOffset.UtcNow, companyCertificateTypeId, CompanyCertificateStatusId.ACTIVE, companyId, docId);
+        var companyCertificate = new CompanyCertificate(Guid.NewGuid(), DateTimeOffset.UtcNow, companyCertificateTypeId, CompanyCertificateStatusId.ACTIVE, companyId, docId, expiryDate);
         setOptionalFields?.Invoke(companyCertificate);
         return _context.CompanyCertificates.Add(companyCertificate).Entity;
     }

diff --git a/src/portalbackend/PortalBackend.PortalEntities/Entities/CompanyCertificate.cs b/src/portalbackend/PortalBackend.PortalEntities/Entities/CompanyCertificate.cs
@@ -27,14 +27,15 @@ public class CompanyCertificate
 {
     private CompanyCertificate() { }
 
-    public CompanyCertificate(Guid id, DateTimeOffset validFrom, CompanyCertificateTypeId companyCertificateTypeId, CompanyCertificateStatusId companyCertificateStatusId, Guid companyId, Guid documentId) : this()
+    public CompanyCertificate(Guid id, DateTimeOffset validFrom, CompanyCertificateTypeId companyCertificateTypeId, CompanyCertificateStatusId companyCertificateStatusId, Guid companyId, Guid documentId, DateTimeOffset? validTill) : this()
     {
         Id = id;
         ValidFrom = validFrom;
         CompanyCertificateTypeId = companyCertificateTypeId;
         CompanyCertificateStatusId = companyCertificateStatusId;
         CompanyId = companyId;
         DocumentId = documentId;
+        ValidTill = validTill;
     }
 
     public Guid Id { get; private set; }

diff --git a/...dministration/Administration.Service.Tests/BusinessLogic/CompanyDataBusinessLogicTests.cs b/...dministration/Administration.Service.Tests/BusinessLogic/CompanyDataBusinessLogicTests.cs
@@ -1020,7 +1020,7 @@ public async Task CheckCompanyCertificate_WithValidCall_CreatesExpected()
         A.CallTo(() => _companyCertificateRepository.CreateCompanyCertificateData(_identity.CompanyId, CompanyCertificateTypeId.IATF, A<Guid>._, expiryDate, A<Action<CompanyCertificate>>._))
             .Invokes((Guid companyId, CompanyCertificateTypeId companyCertificateTypeId, Guid docId, DateTimeOffset? expiryDate, Action<CompanyCertificate>? setOptionalFields) =>
             {
-                var companyCertificateData = new CompanyCertificate(Guid.NewGuid(), DateTime.UtcNow, companyCertificateTypeId, CompanyCertificateStatusId.ACTIVE, companyId, docId);
+                var companyCertificateData = new CompanyCertificate(Guid.NewGuid(), DateTime.UtcNow, companyCertificateTypeId, CompanyCertificateStatusId.ACTIVE, companyId, docId, expiryDate);
                 setOptionalFields?.Invoke(companyCertificateData);
                 companyCertificates.Add(companyCertificateData);
             });