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

Jump to bottom

Feature/netomr der skal kunne katagoriseres s dette senere kan anvendes #3582

Merged
merged 9 commits into from
Sep 26, 2024
Merged

Feature/netomr der skal kunne katagoriseres s dette senere kan anvendes #3582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7b90f3f
Added type and status to netarea
mimse Sep 25, 2024
662b155
Schema
mimse Sep 25, 2024
7fffe12
Merge branch 'main' into feature/netomr-der-skal-kunne-katagoriseres-…
mimse Sep 26, 2024
91c9549
Merge remote-tracking branch 'origin' into feature/netomr-der-skal-ku…
mimse Sep 26, 2024
d00002c
Fixed mock data
mimse Sep 26, 2024
f86c6d6
Merge branch 'feature/netomr-der-skal-kunne-katagoriseres-s-dette-sen…
mimse Sep 26, 2024
c1996aa
Add implicitDependency to api-dh from all graphql projects
ManBearTM Sep 25, 2024
0016564
Add implicitDependenc to market particpant data-access-graphql
ManBearTM Sep 26, 2024
9263c01
Fixed layout issues
mimse Sep 26, 2024
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
25 changes: 24 additions & 1 deletion apps/dh/api-dh/source/DataHub.WebApi.Tests/Snapshots/SchemaTests.ChangeTest.verified.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,25 +274,30 @@ type GetUserProfileResponse {
type GridAreaDto {
priceAreaCode: PriceAreaCode!
displayName: String!
status: GridAreaStatus!
includedInCalculation: Boolean!
id: UUID!
code: String!
name: String!
type: GridAreaType!
validFrom: DateTime!
validTo: DateTime
}

type GridAreaOverviewItemDto {
priceAreaCode: PriceAreaCode!
displayName: String!
status: GridAreaStatus!
id: UUID!
code: String!
name: String!
priceAreaCode: String!
validFrom: DateTime!
validTo: DateTime
actorNumber: String
actorName: String
organizationName: String
fullFlexDate: DateTime
type: GridAreaType!
}

"Imbalance price"
Expand Down Expand Up @@ -1140,6 +1145,24 @@ enum ExchangeEventSortProperty {
LATEST_DISPATCHED
}

enum GridAreaStatus {
Created
Active
Expired
Archived
}

enum GridAreaType {
NotSet
Transmission
Distribution
Other
Test
GridLossDK
GridLossAbroad
Aboard
}

enum ImbalancePriceStatus {
NO_DATA
IN_COMPLETE
Expand Down
242 changes: 28 additions & 214 deletions apps/dh/api-dh/source/DataHub.WebApi/Clients/MarketParticipant/V1/MarketParticipantClient.cs
View file
Open in desktop

Large diffs are not rendered by default.

215 changes: 59 additions & 156 deletions apps/dh/api-dh/source/DataHub.WebApi/Clients/MarketParticipant/V1/swagger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1148,77 +1148,6 @@
}
},
"/GridArea": {
"post": {
"tags": [
"GridArea"
],
"operationId": "GridAreaPOST",
"parameters": [
{
"name": "api-version",
"in": "query",
"schema": {
"type": "string"
}
}
],
"requestBody": {
"content": {
"application/json": {
"schema": {
"allOf": [
{
"$ref": "#/components/schemas/CreateGridAreaDto"
}
]
}
},
"text/json": {
"schema": {
"allOf": [
{
"$ref": "#/components/schemas/CreateGridAreaDto"
}
]
}
},
"application/*+json": {
"schema": {
"allOf": [
{
"$ref": "#/components/schemas/CreateGridAreaDto"
}
]
}
}
}
},
"responses": {
"200": {
"description": "OK",
"content": {
"text/plain": {
"schema": {
"type": "string",
"format": "uuid"
}
},
"application/json": {
"schema": {
"type": "string",
"format": "uuid"
}
},
"text/json": {
"schema": {
"type": "string",
"format": "uuid"
}
}
}
}
}
},
"get": {
"tags": [
"GridArea"
Expand Down Expand Up @@ -1267,71 +1196,11 @@
}
},
"/GridArea/{gridAreaId}": {
"put": {
"tags": [
"GridArea"
],
"operationId": "GridAreaPUT",
"parameters": [
{
"name": "gridAreaId",
"in": "path",
"required": true,
"schema": {
"type": "string",
"format": "uuid"
}
},
{
"name": "api-version",
"in": "query",
"schema": {
"type": "string"
}
}
],
"requestBody": {
"content": {
"application/json": {
"schema": {
"allOf": [
{
"$ref": "#/components/schemas/ChangeGridAreaDto"
}
]
}
},
"text/json": {
"schema": {
"allOf": [
{
"$ref": "#/components/schemas/ChangeGridAreaDto"
}
]
}
},
"application/*+json": {
"schema": {
"allOf": [
{
"$ref": "#/components/schemas/ChangeGridAreaDto"
}
]
}
}
}
},
"responses": {
"200": {
"description": "OK"
}
}
},
"get": {
"tags": [
"GridArea"
],
"operationId": "GridAreaGET",
"operationId": "GridArea",
"parameters": [
{
"name": "gridAreaId",
Expand Down Expand Up @@ -4165,15 +4034,6 @@
}
}
},
"ChangeGridAreaDto": {
"type": "object",
"additionalProperties": false,
"properties": {
"name": {
"type": "string"
}
}
},
"ChangeOrganizationDto": {
"type": "object",
"additionalProperties": false,
Expand Down Expand Up @@ -4297,21 +4157,6 @@
}
}
},
"CreateGridAreaDto": {
"type": "object",
"additionalProperties": false,
"properties": {
"name": {
"type": "string"
},
"code": {
"type": "string"
},
"priceAreaCode": {
"type": "string"
}
}
},
"CreateOrganizationDto": {
"type": "object",
"additionalProperties": false,
Expand Down Expand Up @@ -4720,6 +4565,23 @@
"priceAreaCode": {
"type": "string"
},
"type": {
"x-enumNames": [
"NotSet",
"Transmission",
"Distribution",
"Other",
"Test",
"GridLossDK",
"GridLossAbroad",
"Aboard"
],
"allOf": [
{
"$ref": "#/components/schemas/GridAreaType"
}
]
},
"validFrom": {
"type": "string",
"format": "date-time"
Expand Down Expand Up @@ -4773,9 +4635,50 @@
"type": "string",
"format": "date-time",
"nullable": true
},
"type": {
"x-enumNames": [
"NotSet",
"Transmission",
"Distribution",
"Other",
"Test",
"GridLossDK",
"GridLossAbroad",
"Aboard"
],
"allOf": [
{
"$ref": "#/components/schemas/GridAreaType"
}
]
}
}
},
"GridAreaType": {
"type": "integer",
"format": "int32",
"x-enumNames": [
"NotSet",
"Transmission",
"Distribution",
"Other",
"Test",
"GridLossDK",
"GridLossAbroad",
"Aboard"
],
"enum": [
0,
1,
2,
3,
4,
5,
6,
7
]
},
"InvitationUserDetailsDto": {
"type": "object",
"additionalProperties": false,
Expand Down
23 changes: 23 additions & 0 deletions apps/dh/api-dh/source/DataHub.WebApi/GraphQL/Enums/GridAreaStatus.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// 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.GraphQL.Enums;

public enum GridAreaStatus
{
Created,
Active,
Expired,
Archived,
}
Loading
Loading