Handle code change for Videbæk (#114)

Author: CodeReaper

.github/dependabot.yml

@@ -5,6 +5,6 @@ updates:
     schedule:
       interval: weekly
   - package-ecosystem: docker
-    directory: /
+    directory: /docker
     schedule:
       interval: weekly

Makefile

@@ -16,7 +16,8 @@ test-dependabot:
 	$(COMPOSE_RUN) runner check-jsonschema --builtin-schema dependabot .github/dependabot.yml
 
 test-docker:
-	$(COMPOSE_RUN) dockerlint Dockerfile
+	$(COMPOSE_RUN) dockerlint docker/builder.Dockerfile
+	$(COMPOSE_RUN) dockerlint docker/runner.Dockerfile
 	docker compose config -q
 
 test-editorcheck:
@@ -54,6 +55,42 @@ _unit-tests:
 swagger: ## Runs a local swagger
 	docker compose up swagger
 
+build:
+	$(COMPOSE_RUN) builder make _build
+
+_build:
+	mkdir build
+	echo '*' > build/.gitignore
+	curl --fail --output build/datahub-prices.json "https://api.energidataservice.dk/dataset/DatahubPricelist/download?format=json&limit=0"
+	jq 'group_by(.GLN_Number) | map({gln: .[0].GLN_Number, name:.[0].ChargeOwner}) | unique' < build/datahub-prices.json > build/gln-names.json
+
+find-charge: build | guard-id ## Looks up charge type codes for a given id
+	$(COMPOSE_RUN) runner make id=$(id) _find-charge
+
+_find-charge:
+	jq -r --arg id "$(id)" '.[] | select(.GLN_Number == $$id) |select(.ChargeType == "D03") | {uniq: "\(.ChargeTypeCode) / \(.Note)"}' < build/datahub-prices.json | grep '^ '| sort -u
+
+find-charge-verbose: build | guard-id ## Looks up charge type codes for a given id, but with more data
+	$(COMPOSE_RUN) runner make id=$(id) _find-charge-verbose
+
+_find-charge-verbose:
+	jq -r --arg id "$(id)" '[.[] | select(.GLN_Number == $$id) |select(.ChargeType == "D03")] | map(.from = (.ValidFrom + "Z"|fromdateiso8601) | .ValidTo = if .ValidTo == null or (.ValidTo|type) == "object" then null else .ValidTo end) | group_by(.ChargeTypeCode) | map(max_by(.from))[] | {item: "\(.ChargeTypeCode) / \(.Note) / \(.ValidFrom) / \(.ValidTo)"}' < build/datahub-prices.json| grep '^ '|cut -d\: -f2- | sort -u
+
+view-glns: build ## View company names and their GLN numbers
+	$(COMPOSE_RUN) runner cat build/gln-names.json
+
+view-prices: build | guard-id guard-code ## View prices for a given id and code
+	$(COMPOSE_RUN) runner make id=$(id) code=$(code) _view-prices
+
+_view-prices:
+	jq -r --arg id "$(id)" --arg code "$(code)" '[.[] | select(.GLN_Number == $$id) |select(.ChargeType == "D03")| select(.ChargeTypeCode == $$code)]' < build/datahub-prices.json
+
+guard-%:
+	@if [ "${${*}}" = "" ]; then \
+		echo "Environment variable $* not set"; \
+		exit 1; \
+	fi
+
 help: ## Display this help
 	@$(COMPOSE_RUN) runner make _help
 _help:
@@ -62,5 +99,10 @@ _help:
 shell: ## Enters a shell on the runner
 	@$(COMPOSE_RUN) runner sh
 
-clean: ## Clears docker to trigger re-pulling and re-build images
-	docker compose down --rmi all --remove-orphans
+clean: ## Clears data and docker to trigger re-pulling and re-build images
+	@$(COMPOSE_RUN) builder make _clean
+	docker compose down --rmi all --remove-orphans
+
+_clean:
+	@-rm -rf build.backup
+	mv build build.backup

compose.yml

@@ -1,8 +1,15 @@
 services:
+  builder:
+    build:
+      context: .
+      dockerfile: docker/builder.Dockerfile
+    volumes:
+      - .:/workspace
+    working_dir: /workspace
   runner:
     build:
       context: .
-      dockerfile: Dockerfile
+      dockerfile: docker/runner.Dockerfile
     volumes:
       - .:/workspace:ro
     working_dir: /workspace

configuration/networks.json

@@ -110,8 +110,13 @@
       "codes": [
         {
           "from": 0,
-          "to": null,
+          "to": 1735686000,
           "code": "VE-NT-01"
+        },
+        {
+          "from": 1735686000,
+          "to": null,
+          "code": "VE-VN-01"
         }
       ]
     },

docker/builder.Dockerfile

@@ -0,0 +1,3 @@
+FROM alpine:3.21
+
+RUN apk add --no-cache -q jq make curl

Dockerfile docker/runner.DockerfileDockerfile renamed to docker/runner.Dockerfile

@@ -1,28 +1,17 @@
-# Resolving Datahub Prices
+# Resolving DataHub Prices
 
-_Datahub contains only prices for Denmark and this document is scoped only for Denmark for that reason._
+_DataHub contains only prices for Denmark and this document is scoped only for Denmark for that reason._
 
 ## Prerequisites
 
 ### A list of network areas
 
 The currently best known source for this is [this map](https://ens.dk/sites/ens.dk/files/Statistik/elnetgraenser_2023_04.pdf). There must be a better source...
 
-### The tool `jq`
+### Software
 
-[`jq`](https://jqlang.github.io/jq/) is json manipulation tool - you will find all tools are present in the [`devcontainer`](https://containers.dev) for this repo.
-
-### A local copy of price data
-
-We will prepare two files using these two commands:
-
-```sh
-curl -v "https://api.energidataservice.dk/dataset/DatahubPricelist/download?format=json&limit=0" > list.json
-```
-
-```sh
-jq 'group_by(.GLN_Number) | map({gln: .[0].GLN_Number, name:.[0].ChargeOwner}) | unique' < list.json > gln-names.json
-```
+- `make`
+- `docker`
 
 ## Searching data
 
@@ -40,7 +29,13 @@ The company name ("Zero Power") must be used to search online for an actual pric
 
 ### Look up GLN
 
-The prepared file `gls-names.json` should contain the name of the company and its GLN number, for instance:
+You can view the names of the companies and theirs GLN numbers by running:
+
+```sh
+make view-glns
+```
+
+The output should view the following example:
 
 ```jsonc
 // ...
@@ -53,16 +48,11 @@ The prepared file `gls-names.json` should contain the name of the company and it
 
 ### Look up available `ChargeTypeCode`
 
-We can list available `ChargeTypeCode` with some description using the following command:
+We can list available `ChargeTypeCode` with some description using the following commands:
 
 ```sh
-jq -r '.[] | select(.GLN_Number == "5790000000000") |select(.ChargeType == "D03") | {uniq: "\(.ChargeTypeCode) / \(.Note)"}' < list.json | grep '^ '| sort -u
-```
-
-Or attempt to list relevant `ChargeTypeCode` based on dates using the following command:
-
-```sh
-jq -r '[.[] | select(.GLN_Number == "5790000000000") |select(.ChargeType == "D03")] | map(.from = (.ValidFrom + "Z"|fromdateiso8601) | .ValidTo = if .ValidTo == null or (.ValidTo|type) == "object" then null else .ValidTo end) | group_by(.ChargeTypeCode) | map(max_by(.from))[] | {item: "\(.ChargeTypeCode) / \(.Note) / \(.ValidFrom) / \(.ValidTo)"}' < list.json| grep '^ '|cut -d\: -f2- | sort -u
+make id=5790000000000 find-charge
+make id=5790000000000 find-charge-verbose # for additional data
 ```
 
 _Note that must replace 5790000000000 with the actual GLN number_.
@@ -105,6 +95,12 @@ The expected output will vary a lot, but here is an example:
   "uniq": "8070 / Nettarif indfødning A høj"
 ```
 
+The verbose output will include date ranges for the codes, like so:
+```text
+"8040 / Nettarif indfødning B høj / 2015-10-01T00:00:00 / 2015-10-03T00:00:00"
+"8070 / Nettarif indfødning A høj / 2025-02-01T00:00:00 / null"
+```
+
 ### Find class `C` `ChargeTypeCode`
 
 One thing to note is that the `ChargeTypeCode` can be the same for multiple "notes".
@@ -123,7 +119,7 @@ At this point we have:
 
 With these items we can execute a command to view the prices:
 ```sh
-jq -r '[.[] | select(.GLN_Number == "5790000000000") |select(.ChargeType == "D03")| select(.ChargeTypeCode == "4000")]' < list.json|less
+make id=5790000000000 code=4000 view-prices |less
 ```
 
 _Note you can exit less by typing 'q'_.