title added to context

equinor · Oct 3, 2023 · 23667f7 · 23667f7
1 parent 568ca5d
commit 23667f7
Show file tree

Hide file tree

Showing 13 changed files with 92 additions and 21 deletions.
diff --git a/...tionPortal.Application/Commands/OnboardedContexts/OnboardContext/OnboardContextCommand.cs b/...tionPortal.Application/Commands/OnboardedContexts/OnboardContext/OnboardContextCommand.cs
@@ -39,7 +39,7 @@ public async Task<string> Handle(OnboardContextCommand command, CancellationToke
                 throw new InvalidActionException($"Context: '{command.ExternalId}' is already onboarded");
             }
 
-            var onboardedContext = new OnboardedContext(command.ExternalId, command.Type, null, command.Description);
+            var onboardedContext = new OnboardedContext(command.ExternalId, command.Type, command.Description);
 
             await _readWriteContext.Set<OnboardedContext>().AddAsync(onboardedContext, cancellationToken);
             await _readWriteContext.SaveChangesAsync(cancellationToken);

diff --git a/...tal.Application/Queries/OnboardedContexts/GetOnboardedContext/GetOnboardedContextQuery.cs b/...tal.Application/Queries/OnboardedContexts/GetOnboardedContext/GetOnboardedContextQuery.cs
@@ -1,4 +1,5 @@
 using AutoMapper;
+using Equinor.ProjectExecutionPortal.Application.Services.ContextService;
 using Equinor.ProjectExecutionPortal.Domain.Infrastructure;
 using Equinor.ProjectExecutionPortal.Infrastructure;
 using MediatR;
@@ -19,20 +20,25 @@ public class Handler : IRequestHandler<GetOnboardedContextQuery, OnboardedContex
     {
         private readonly IReadWriteContext _readWriteContext;
         private readonly IMapper _mapper;
+        private readonly IContextService _contextService;
 
-        public Handler(IReadWriteContext readWriteContext, IMapper mapper)
+        public Handler(IReadWriteContext readWriteContext, IMapper mapper, IContextService contextService)
         {
             _readWriteContext = readWriteContext;
             _mapper = mapper;
+            _contextService = contextService;
         }
 
         public async Task<OnboardedContextDto?> Handle(GetOnboardedContextQuery request, CancellationToken cancellationToken)
         {
             var entity = await _readWriteContext.Set<Domain.Entities.OnboardedContext>()
                 .AsNoTracking()
                 .FirstOrDefaultAsync(x => x.ExternalId == request.ExternalId, cancellationToken);
+            var onboardedContext = _mapper.Map<Domain.Entities.OnboardedContext?, OnboardedContextDto?>(entity);
+
+            await _contextService.EnrichContextWithFusionContextData(onboardedContext, cancellationToken);
 
-            return _mapper.Map<Domain.Entities.OnboardedContext?, OnboardedContextDto?>(entity);
+            return onboardedContext;
         }
     }
 }
diff --git a/...l.Application/Queries/OnboardedContexts/GetOnboardedContexts/GetOnboardedContextsQuery.cs b/...l.Application/Queries/OnboardedContexts/GetOnboardedContexts/GetOnboardedContextsQuery.cs
@@ -1,4 +1,5 @@
 using AutoMapper;
+using Equinor.ProjectExecutionPortal.Application.Services.ContextService;
 using Equinor.ProjectExecutionPortal.Domain.Infrastructure;
 using Equinor.ProjectExecutionPortal.Infrastructure;
 using MediatR;
@@ -12,20 +13,27 @@ public class Handler : IRequestHandler<GetOnboardedContextsQuery, IList<Onboarde
     {
         private readonly IReadWriteContext _context;
         private readonly IMapper _mapper;
+        private readonly IContextService _contextService;
 
-        public Handler(IReadWriteContext context, IMapper mapper)
+        public Handler(IReadWriteContext context, IMapper mapper, IContextService contextService)
         {
             _context = context;
             _mapper = mapper;
+            _contextService = contextService;
         }
 
         public async Task<IList<OnboardedContextDto>> Handle(GetOnboardedContextsQuery request, CancellationToken cancellationToken)
         {
-            var enitity = await _context.Set<Domain.Entities.OnboardedContext>()
+            var entity = await _context.Set<Domain.Entities.OnboardedContext>()
                 .AsNoTracking()
-                .ToListAsync(cancellationToken);
+            .ToListAsync(cancellationToken);
+
+            var onboardedContext =  _mapper.Map<List<Domain.Entities.OnboardedContext>, List<OnboardedContextDto>>(entity);
+
+            await _contextService.EnrichContextsWithFusionContextData(onboardedContext, cancellationToken);
+
+            return onboardedContext;
 
-            return _mapper.Map<List<Domain.Entities.OnboardedContext>, List<OnboardedContextDto>>(enitity);
         }
     }
 }
diff --git a/...uinor.ProjectExecutionPortal.Application/Queries/OnboardedContexts/OnboardedContextDto.cs b/...uinor.ProjectExecutionPortal.Application/Queries/OnboardedContexts/OnboardedContextDto.cs
@@ -1,5 +1,6 @@
 using Equinor.ProjectExecutionPortal.Application.Infrastructure.Mappings;
 using Equinor.ProjectExecutionPortal.Domain.Entities;
+using Fusion.Integration;
 
 namespace Equinor.ProjectExecutionPortal.Application.Queries.OnboardedContexts;
 
@@ -8,5 +9,11 @@ public class OnboardedContextDto : IMapFrom<OnboardedContext>
     public Guid Id { get; set; }
     public string ExternalId { get; set; }
     public string Type { get; set; }
+    public string Title { get; set; }
     public string? Description { get; set; }
+
+    public void SupplyWithFusionData(FusionContext context)
+    {
+        Title = context.Title;
+    }
 }
diff --git a/.../src/Equinor.ProjectExecutionPortal.Application/Services/ContextService/ContextService.cs b/.../src/Equinor.ProjectExecutionPortal.Application/Services/ContextService/ContextService.cs
@@ -0,0 +1,45 @@
+using Equinor.ProjectExecutionPortal.Application.Queries.OnboardedContexts;
+using Fusion.Integration;
+
+namespace Equinor.ProjectExecutionPortal.Application.Services.ContextService
+{
+    public class ContextService : IContextService
+    {
+        private readonly IFusionContextResolver _fusionContextResolver;
+
+
+        public ContextService(IFusionContextResolver contextResolver)
+        {
+            _fusionContextResolver = contextResolver;
+        }
+
+        public async Task<OnboardedContextDto> EnrichContextWithFusionContextData(OnboardedContextDto context, CancellationToken cancellationToken)
+        {
+            var contextIdentifier = ContextIdentifier.FromExternalId(context.ExternalId);
+            var fusionContext = await _fusionContextResolver.ResolveContextAsync(contextIdentifier);
+
+            if (fusionContext != null)
+            {
+                context.SupplyWithFusionData(fusionContext);
+            }
+
+            return context;
+        }
+
+        public async Task<IList<OnboardedContextDto>> EnrichContextsWithFusionContextData(IList<OnboardedContextDto> contexts, CancellationToken cancellationToken)
+        {
+            foreach (var onboardedContextDto in contexts)
+            {
+                var contextIdentifier = ContextIdentifier.FromExternalId(onboardedContextDto.ExternalId);
+                var fusionContext = await _fusionContextResolver.ResolveContextAsync(contextIdentifier);
+
+                if (fusionContext != null)
+                {
+                    onboardedContextDto.SupplyWithFusionData(fusionContext);
+                }
+            }
+
+            return contexts;
+        }
+    }
+}
diff --git a/...src/Equinor.ProjectExecutionPortal.Application/Services/ContextService/IContextService.cs b/...src/Equinor.ProjectExecutionPortal.Application/Services/ContextService/IContextService.cs
@@ -0,0 +1,10 @@
+using Equinor.ProjectExecutionPortal.Application.Queries.OnboardedContexts;
+
+namespace Equinor.ProjectExecutionPortal.Application.Services.ContextService
+{
+    public interface IContextService
+    {
+        Task<OnboardedContextDto> EnrichContextWithFusionContextData(OnboardedContextDto context, CancellationToken cancellationToken);
+        Task<IList<OnboardedContextDto>> EnrichContextsWithFusionContextData(IList <OnboardedContextDto> contexts, CancellationToken cancellationToken);
+    }
+}
diff --git a/backend/src/Equinor.ProjectExecutionPortal.Domain/Entities/OnboardedContext.cs b/backend/src/Equinor.ProjectExecutionPortal.Domain/Entities/OnboardedContext.cs
@@ -11,22 +11,20 @@ public class OnboardedContext : AuditableEntityBase, ICreationAuditable, IModifi
 {
     public const int ExternalIdLengthMax = 200;
     public const int TypeLengthMax = 200;
-    public const int TitleLengthMax = 400;
     public const int DescriptionLengthMax = 4000;
 
     private readonly List<WorkSurfaceApp> _apps = new();
 
-    public OnboardedContext(string externalId, string type, string? title, string? description)
+    public OnboardedContext(string externalId, string type, string? description)
     {
         ExternalId = externalId;
         Type = type;
-        Title = title;
+        //  Title = title;
         Description = description;
     }
 
     public string ExternalId { get; }
     public string Type { get; } // TODO: Necessary? Type can alternatively be resolved by Fusion Context
-    public string? Title { get; set; } // TODO: Could this change? Should perhaps be fetched from Fusion Context resolver.
     public string? Description { get; set; }
 
     public IReadOnlyCollection<WorkSurfaceApp> Apps => _apps.AsReadOnly();

diff --git a/...ojectExecutionPortal.Infrastructure/EntityConfigurations/OnboardedContextConfiguration.cs b/...ojectExecutionPortal.Infrastructure/EntityConfigurations/OnboardedContextConfiguration.cs
@@ -22,9 +22,6 @@ public void Configure(EntityTypeBuilder<OnboardedContext> builder)
         builder.Property(x => x.Type)
             .HasMaxLength(OnboardedContext.TypeLengthMax);
 
-        builder.Property(t => t.Title)
-            .HasMaxLength(OnboardedContext.TitleLengthMax);
-
         builder.Property(t => t.Description)
             .HasMaxLength(OnboardedContext.DescriptionLengthMax);
 

diff --git a/backend/src/Equinor.ProjectExecutionPortal.WebApi/Controllers/OnboardedContextController.cs b/backend/src/Equinor.ProjectExecutionPortal.WebApi/Controllers/OnboardedContextController.cs
@@ -16,7 +16,7 @@ namespace Equinor.ProjectExecutionPortal.WebApi.Controllers
     public class OnboardedContextController : ApiControllerBase
     {
         [HttpGet("")]
-        public async Task<ActionResult<IList<ApiOnboardedContext>>> OboardedContexts()
+        public async Task<ActionResult<IList<ApiOnboardedContext>>> OnboardedContexts()
         {
             var onboardedContextsDto = await Mediator.Send(new GetOnboardedContextsQuery());
 

diff --git a/backend/src/Equinor.ProjectExecutionPortal.WebApi/DiModules/ApplicationServicesModule.cs b/backend/src/Equinor.ProjectExecutionPortal.WebApi/DiModules/ApplicationServicesModule.cs
@@ -1,4 +1,5 @@
 using Equinor.ProjectExecutionPortal.Application.Services.AppService;
+using Equinor.ProjectExecutionPortal.Application.Services.ContextService;
 using Equinor.ProjectExecutionPortal.Application.Services.WorkSurfaceService;
 
 namespace Equinor.ProjectExecutionPortal.WebApi.DiModules;
@@ -9,5 +10,6 @@ public static void AddApplicationServicesModules(this IServiceCollection service
     {
         services.AddScoped<IAppService, AppService>();
         services.AddScoped<IWorkSurfaceService, WorkSurfaceService>();
+        services.AddScoped<IContextService, ContextService>();
     }
 }
diff --git a/.../Equinor.ProjectExecutionPortal.WebApi/ViewModels/OnboardedContext/ApiOnboardedContext.cs b/.../Equinor.ProjectExecutionPortal.WebApi/ViewModels/OnboardedContext/ApiOnboardedContext.cs
@@ -12,11 +12,13 @@ public ApiOnboardedContext(OnboardedContextDto onboardedAppDto)
             ExternalId = onboardedAppDto.ExternalId;
             Type = onboardedAppDto.Type;
             Description = onboardedAppDto.Description;
+            Title = onboardedAppDto.Title;
         }
 
         public Guid Id { get; set; }
         public string ExternalId { get; set; } = null!;
         public string Type { get; set; } = null!;
+        public string Title { get; set; }
         public string? Description { get; set; }
     }
 }
diff --git a/...r.ProjectExecutionPortal.WebApi/ViewModels/OnboardedContext/ApiOnboardedContextRequest.cs b/...r.ProjectExecutionPortal.WebApi/ViewModels/OnboardedContext/ApiOnboardedContextRequest.cs
@@ -21,10 +21,6 @@ public OnboardContextRequestValidator()
                     .NotEmpty()
                     .NotContainScriptTag()
                     .WithMessage("External Id is required");
-
-                RuleFor(x => x.Description)
-                    .MaximumLength(Domain.Entities.OnboardedContext.TitleLengthMax)
-                    .NotContainScriptTag();
             }
         }
     }

diff --git a/backend/src/tests/Equinor.ProjectExecutionPortal.Tests.WebApi/Data/OnboardedContextsData.cs b/backend/src/tests/Equinor.ProjectExecutionPortal.Tests.WebApi/Data/OnboardedContextsData.cs
@@ -6,8 +6,8 @@ internal class OnboardedContextsData
     {
         public class InitialSeedData
         {
-            public static OnboardedContext JcaContext = new(FusionContextData.InitialSeedData.JcaContextExternalId, FusionContextData.InitialSeedData.ContextType, "title", "desc");
-            public static OnboardedContext OgpContext = new(FusionContextData.InitialSeedData.OgpContextExternalId, FusionContextData.InitialSeedData.ContextType, "title", "desc");
+            public static OnboardedContext JcaContext = new(FusionContextData.InitialSeedData.JcaContextExternalId, FusionContextData.InitialSeedData.ContextType, "desc");
+            public static OnboardedContext OgpContext = new(FusionContextData.InitialSeedData.OgpContextExternalId, FusionContextData.InitialSeedData.ContextType, "desc");
         }
     }
 }