Merge branch 'main' into feat/util-apollo-type-narrowing

Author: ManBearTM

apps/dh/api-dh/source/DataHub.WebApi.Tests/Snapshots/SchemaTests.ChangeTest.verified.graphql

@@ -62,7 +62,7 @@ type Actor {
   glnOrEicNumber: String!
   displayName: String!
   marketRole: EicFunction!
-  userRoles: [ActorUserRole!]!
+  userRoles(userId: UUID): [ActorUserRole!]!
   status: ActorStatus!
   gridAreas: [GridAreaDto!]!
   contact: ActorContactDto
@@ -670,12 +670,6 @@ type MeteringGridAreaImbalanceSearchResult {
   outgoingImbalancePerDay: [MeteringGridAreaImbalancePerDayDto!]!
 }
 
-type MeteringPointDetails {
-  meteringPointId: String!
-  currentCommercialRelation: CommercialRelationDto
-  currentMeteringPointPeriod: MeteringPointPeriodDto
-}
-
 type MeteringPointDto {
   meteringPointPeriods("Returns the first _n_ elements from the list." first: Int "Returns the elements in the list that come after the specified cursor." after: String "Returns the last _n_ elements from the list." last: Int "Returns the elements in the list that come before the specified cursor." before: String): MeteringPointPeriodsConnection
   commercialRelations("Returns the first _n_ elements from the list." first: Int "Returns the elements in the list that come after the specified cursor." after: String "Returns the last _n_ elements from the list." last: Int "Returns the elements in the list that come before the specified cursor." before: String): CommercialRelationsConnection
@@ -688,11 +682,13 @@ type MeteringPointDto {
 }
 
 type MeteringPointPeriodDto {
+  gridArea: GridAreaDto
+  fromGridArea: GridAreaDto
+  toGridArea: GridAreaDto
   id: Long!
   validFrom: DateTime!
   validTo: DateTime!
   createdAt: DateTime!
-  gridAreaCode: String!
   ownedBy: String!
   connectionState: ConnectionState!
   type: ElectricityMarketMeteringPointType!
@@ -704,8 +700,6 @@ type MeteringPointPeriodDto {
   assetType: AssetType!
   disconnectionType: DisconnectionType!
   fuelType: String!
-  fromGridAreaCode: String!
-  toGridAreaCode: String!
   meterNumber: String!
   meterReadingOccurrence: String!
   capacity: String!
@@ -917,7 +911,7 @@ type Query {
   userRoles(actorId: UUID): [UserRoleDto!]!
   meteringPointWithHistory(filter: String): MeteringPointDto! @authorize(policy: "fas")
   meteringPointContactCpr(contactId: Long!): String! @authorize(policy: "fas")
-  meteringPoint(meteringPointId: String!): MeteringPointDetails! @authorize(policy: "fas")
+  meteringPoint(meteringPointId: String!): MeteringPointDto! @authorize(policy: "fas")
   gridAreas: [GridAreaDto!]!
   relevantGridAreas(actorId: UUID period: DateRange!): [GridAreaDto!]!
   gridAreaOverviewItemById(gridAreaId: UUID!): GridAreaOverviewItemDto!

apps/dh/api-dh/source/DataHub.WebApi/Clients/ElectricityMarket/Import/ElectricityMarketImportClient.cs

@@ -0,0 +1,36 @@
+// Copyright 2020 Energinet DataHub A/S
+//
+// Licensed under the Apache License, Version 2.0 (the "License2");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace Energinet.DataHub.WebApi.Clients.ElectricityMarket.Import;
+
+public sealed class ElectricityMarketImportClient : IElectricityMarketImportClient
+{
+    private readonly HttpClient _httpClient;
+
+    public ElectricityMarketImportClient(HttpClient httpClient)
+    {
+        ArgumentNullException.ThrowIfNull(httpClient);
+
+        _httpClient = httpClient;
+    }
+
+    public async Task ImportTransactionsAsync(Stream content, CancellationToken cancellationToken)
+    {
+        using var request = new HttpRequestMessage(HttpMethod.Post, "import/transactions");
+        request.Content = new StreamContent(content);
+
+        using var response = await _httpClient.SendAsync(request, cancellationToken);
+        response.EnsureSuccessStatusCode();
+    }
+}

apps/dh/api-dh/source/DataHub.WebApi/Clients/ElectricityMarket/Import/IElectricityMarketImportClient.cs

@@ -0,0 +1,29 @@
+// Copyright 2020 Energinet DataHub A/S
+//
+// Licensed under the Apache License, Version 2.0 (the "License2");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace Energinet.DataHub.WebApi.Clients.ElectricityMarket.Import;
+
+/// <summary>
+/// Provides an interface for importing capacity settlement data.
+/// </summary>
+public interface IElectricityMarketImportClient
+{
+    /// <summary>
+    /// Asynchronously imports transactions to Electricity Market.
+    /// </summary>
+    /// <param name="content">The stream containing capacity settlement data to be imported.</param>
+    /// <param name="cancellationToken">A token used to cancel the import operation.</param>
+    /// <returns>A task that represents the asynchronous import operation.</returns>
+    Task ImportTransactionsAsync(Stream content, CancellationToken cancellationToken);
+}

apps/dh/api-dh/source/DataHub.WebApi/Controllers/ElectricityMarketController.cs

@@ -0,0 +1,50 @@
+// Copyright 2020 Energinet DataHub A/S
+//
+// Licensed under the Apache License, Version 2.0 (the "License2");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+using Energinet.DataHub.WebApi.Clients.ElectricityMarket.Import;
+using Energinet.DataHub.WebApi.Clients.ImbalancePrices.v1;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Energinet.DataHub.WebApi.Controllers;
+
+[ApiController]
+[Route("v1/[controller]")]
+public sealed class ElectricityMarketController : ControllerBase
+{
+    private readonly IElectricityMarketImportClient _client;
+
+    public ElectricityMarketController(IElectricityMarketImportClient client)
+    {
+        _client = client;
+    }
+
+    [HttpPost]
+    [Route("ImportTransactions")]
+    [RequestSizeLimit(10485760)]
+    [Authorize(Policy = "fas")]
+    public async Task<ActionResult> ImportTransactionsAsync(IFormFile csvFile)
+    {
+        try
+        {
+            await using var openReadStream = csvFile.OpenReadStream();
+            await _client.ImportTransactionsAsync(openReadStream, default);
+            return Ok();
+        }
+        catch (ApiException ex)
+        {
+            return StatusCode(ex.StatusCode, ex.Response);
+        }
+    }
+}

apps/dh/api-dh/source/DataHub.WebApi/DataHub.WebApi.csproj

@@ -55,8 +55,8 @@ limitations under the License.
 
   <ItemGroup>
     <PackageReference Include="Azure.Monitor.OpenTelemetry.AspNetCore" Version="1.2.0" />
-    <PackageReference Include="Energinet.DataHub.ProcessManager.Client" Version="1.3.1" />
-    <PackageReference Include="Energinet.DataHub.ProcessManager.Orchestrations.Abstractions" Version="1.3.1" />
+    <PackageReference Include="Energinet.DataHub.ProcessManager.Client" Version="1.4.0" />
+    <PackageReference Include="Energinet.DataHub.ProcessManager.Orchestrations.Abstractions" Version="1.3.3" />
     <PackageReference Include="HotChocolate.AspNetCore" Version="14.2.0" />
     <PackageReference Include="HotChocolate.AspNetCore.Authorization" Version="14.2.0" />
     <PackageReference Include="HotChocolate.AspNetCore.CommandLine" Version="14.2.0" />

apps/dh/api-dh/source/DataHub.WebApi/GraphQL/Resolvers/MarketParticipantResolvers.cs

@@ -154,13 +154,13 @@ await client.UserActorsGetAsync(user.Id)).ActorIds
         ActorPublicContactByActorId dataLoader) => dataLoader.LoadAsync(actor.ActorId);
 
     public async Task<IEnumerable<ActorUserRole>> GetActorsRolesAsync(
+        Guid? userId,
         [Parent] ActorDto actor,
-        [ScopedState] IUser? user,
         [Service] IMarketParticipantClient_V1 client)
     {
         var roles = await client.ActorsRolesAsync(actor.ActorId);
 
-        if (user is null)
+        if (userId is null)
         {
             return roles.Select(r => new ActorUserRole(
                 r.Id,
@@ -172,7 +172,7 @@ public async Task<IEnumerable<ActorUserRole>> GetActorsRolesAsync(
         }
 
         var assignedRoles = await client
-                    .ActorsUsersRolesGetAsync(actor.ActorId, user.Id)
+                    .ActorsUsersRolesGetAsync(actor.ActorId, userId.Value)
                     .ConfigureAwait(false);
 
         var assignmentLookup = assignedRoles

apps/dh/api-dh/source/DataHub.WebApi/GraphQL/Types/Actor/ActorType.cs

@@ -50,6 +50,7 @@ var actor when string.IsNullOrWhiteSpace(actor.MarketRole.EicFunction.ToString()
 
         descriptor
             .Field("userRoles")
+            .Argument("userId", a => a.Type<UuidType>())
             .ResolveWith<MarketParticipantResolvers>(c => c.GetActorsRolesAsync(default!, default!, default!));
 
         descriptor

apps/dh/api-dh/source/DataHub.WebApi/Modules/ElectricityMarket/ElectricityMarketOperations.cs

@@ -14,8 +14,6 @@
 
 using Energinet.DataHub.WebApi.Clients.ElectricityMarket.v1;
 using Energinet.DataHub.WebApi.Extensions;
-using Energinet.DataHub.WebApi.GraphQL.Attribute;
-using Energinet.DataHub.WebApi.Modules.ElectricityMarket.Types;
 using HotChocolate.Authorization;
 using MarketParticipantClient = Energinet.DataHub.WebApi.Clients.MarketParticipant.v1;
 
@@ -77,17 +75,12 @@ public static async Task<string> GetMeteringPointContactCprAsync(
 
     [Query]
     [Authorize(Policy = "fas")]
-    public static async Task<MeteringPointDetails> GetMeteringPointAsync(
+    public static async Task<MeteringPointDto> GetMeteringPointAsync(
         string meteringPointId,
         CancellationToken ct,
         [Service] IElectricityMarketClient_V1 electricityMarketClient)
     {
-        var result = await electricityMarketClient.ElectricityMarketAsync(meteringPointId, ct).ConfigureAwait(false);
-
-        return new MeteringPointDetails(
-            meteringPointId,
-            result.CurrentCommercialRelation,
-            result.CurrentMeteringPointPeriod);
+        return await electricityMarketClient.ElectricityMarketAsync(meteringPointId, ct).ConfigureAwait(false);
     }
 
     private static EicFunction FromMarketPartEicFunctionToElectricityMarketEicFunction(

apps/dh/api-dh/source/DataHub.WebApi/Modules/ElectricityMarket/Types/MeteringPointDetails.cs

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 using Energinet.DataHub.WebApi.Clients.ElectricityMarket.v1;
+using Energinet.DataHub.WebApi.Clients.MarketParticipant.v1;
 
 namespace Energinet.DataHub.WebApi.Modules.ElectricityMarket.Types;
 

apps/dh/api-dh/source/DataHub.WebApi/Modules/ElectricityMarket/Types/MeteringPointDtoType.cs

@@ -0,0 +1,53 @@
+// Copyright 2020 Energinet DataHub A/S
+//
+// Licensed under the Apache License, Version 2.0 (the "License2");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+using Energinet.DataHub.WebApi.Clients.ElectricityMarket.v1;
+using Energinet.DataHub.WebApi.Clients.MarketParticipant.v1;
+
+namespace Energinet.DataHub.WebApi.Modules.ElectricityMarket.Types;
+
+[ObjectType<MeteringPointPeriodDto>]
+public static partial class MeteringPointPeriodDtoType
+{
+    public static async Task<GridAreaDto?> GetGridAreaAsync(
+        [Parent] MeteringPointPeriodDto meteringPointPeriod,
+        MarketParticipant.GridAreas.IGridAreaByCodeDataLoader dataLoader) =>
+            await dataLoader.LoadAsync(meteringPointPeriod.GridAreaCode);
+
+    public static async Task<GridAreaDto?> GetFromGridAreaAsync(
+        [Parent] MeteringPointPeriodDto meteringPointPeriod,
+        MarketParticipant.GridAreas.IGridAreaByCodeDataLoader dataLoader) =>
+            await dataLoader.LoadAsync(meteringPointPeriod.FromGridAreaCode);
+
+    public static async Task<GridAreaDto?> GetToGridAreaAsync(
+        [Parent] MeteringPointPeriodDto meteringPointPeriod,
+        MarketParticipant.GridAreas.IGridAreaByCodeDataLoader dataLoader) =>
+            await dataLoader.LoadAsync(meteringPointPeriod.ToGridAreaCode);
+
+    static partial void Configure(
+        IObjectTypeDescriptor<MeteringPointPeriodDto> descriptor)
+    {
+        descriptor
+            .Field(f => f.GridAreaCode)
+            .Ignore();
+
+        descriptor
+            .Field(f => f.FromGridAreaCode)
+            .Ignore();
+
+        descriptor
+            .Field(f => f.ToGridAreaCode)
+            .Ignore();
+    }
+}

apps/dh/api-dh/source/DataHub.WebApi/Modules/ElectricityMarket/Types/MeteringPointPeriodDtoType.cs

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 using Energinet.DataHub.WebApi.Clients.MarketParticipant.v1;
+using Energinet.DataHub.WebApi.GraphQL.Attribute;
 
 namespace Energinet.DataHub.WebApi.Modules.MarketParticipant.User;