Merge fixes into main: pinned magazines param, improvements, /overview cost fields

components/bypass_system.yaml

@@ -63,7 +63,7 @@ properties:
               format: float
               description: Required flow rate in liters per second
               x-faker:
-                datatype.float:
+                number.float:
                   min: 50.0
                   max: 150.0
               example: 100.0

components/generator.yaml

@@ -13,7 +13,7 @@ properties:
     format: float
     description: Rated capacity (merkeytelse) of the generator, typically as indicated on the nameplate, in MW
     x-faker:
-      datatype.float:
+      number.float:
         min: 0
         max: 50
     example: 25.5

components/location.yaml

@@ -6,7 +6,7 @@ properties:
     format: float
     description: Latitude of the location
     x-faker:
-      datatype.float:
+      number.float:
         min: 66.0
         max: 69.5
     example: 67.5
@@ -15,7 +15,7 @@ properties:
     format: float
     description: Longitude of the location
     x-faker:
-      datatype.float:
+      number.float:
         min: 13.0
         max: 20.0
     example: 15.5

components/magazine.yaml

@@ -24,39 +24,39 @@ properties:
         format: float
         description: Highest regulated water level in elevation as MASL (metres above sea level) for magazine
         x-faker:
-          datatype.float:
+          number.float:
             min: 0.0
             max: 100.0
       lowest_regulated_water_level_elevation_MASL:
         type: number
         format: float
         description: Lowest regulated water level in elevation as MASL (metres above sea level) for magazine
         x-faker:
-          datatype.float:
+          number.float:
             min: 0.0
             max: 100.0
       capacity_gwh:
         type: number
         format: float
         description: Capacity of the reservoir (GWh)
         x-faker:
-          datatype.float:
+          number.float:
             min: 0.0
             max: 1000.0
       capacity_million_m3:
         type: number
         format: float
         description: Capacity of the reservoir (Mm3)
         x-faker:
-          datatype.float:
+          number.float:
             min: 0.0
             max: 1000.0
       elevation_MASL: # Remove maybe?
         type: number
         format: float
         description: Elevation of the reservoir as MASL (meters above sea level)
         x-faker:
-          datatype.float:
+          number.float:
             min: 0.0
             max: 5000.0
   storage:

components/overview.yaml

@@ -13,7 +13,7 @@ properties:
         description: Current production as a percentage of maximum capacity
         example: 70
         x-faker:
-          datatype.float:
+          number.float:
             min: 0
             max: 100
       max_capacity_mw:
@@ -22,7 +22,7 @@ properties:
         description: Maximum capacity in MW
         example: 484
         x-faker:
-          datatype.float:
+          number.float:
             min: 400
             max: 500
       production_today_mwh:
@@ -31,7 +31,7 @@ properties:
         description: Production so far today in MWh
         example: 584.4
         x-faker:
-          datatype.float:
+          number.float:
             min: 0
             max: 1000
       production_last_7_days_gwh:
@@ -40,7 +40,7 @@ properties:
         description: Production in the last 7 days in GWh
         example: 34.4
         x-faker:
-          datatype.float:
+          number.float:
             min: 0
             max: 100
 
@@ -53,7 +53,7 @@ properties:
         description: Current fillgrade of all magazines as a percentage
         example: 42
         x-faker:
-          datatype.float:
+          number.float:
             min: 0
             max: 100
 
@@ -67,6 +67,21 @@ properties:
       income_last_7_days:
         $ref: "#/components/schemas/monetary_value"
         description: Income from production in the last 7 days
+      grid_feed_cost_today:
+        $ref: "#/components/schemas/monetary_value"
+        description: Grid feed-in cost today (innmatningskostnad)
+      production_fee_today:
+        $ref: "#/components/schemas/monetary_value"
+        description: Production fee/levy today (avgift produksjon)
+      personnel_cost_today:
+        $ref: "#/components/schemas/monetary_value"
+        description: Personnel cost today (personalkostnad)
+      net_income_today:
+        $ref: "#/components/schemas/monetary_value"
+        description: >-
+          Net income today after deducting grid feed cost, production fee and
+          personnel cost from gross spot-market income (nettoinntekt etter
+          kostnader)
       spot_price_now:
         description: Current spot price per MWh.
         $ref: "#/components/schemas/monetary_value"

components/reading_float.yaml

@@ -9,7 +9,7 @@ properties:
     format: float
     description: A given reading as float
     x-faker:
-      datatype.float:
+      number.float:
         min: 0
         max: 500
     example: 245.5

components/simple_reading_float.yaml

@@ -9,7 +9,7 @@ properties:
     format: float
     description: A given reading as float
     x-faker:
-      datatype.float:
+      number.float:
         min: 0
         max: 500
     example: 245.5

components/station.yaml

@@ -38,7 +38,7 @@ properties:
         format: float
         description: Total production today in MWh
         x-faker:
-          datatype.float:
+          number.float:
             min: 1
             max: 50
         example: 120.5
@@ -47,7 +47,7 @@ properties:
         format: float
         description: Total production in the last 7 days in MWh
         x-faker:
-          datatype.float:
+          number.float:
             min: 1
             max: 250
         example: 700.0
@@ -56,7 +56,7 @@ properties:
         format: float
         description: Percentage of capacity used today
         x-faker:
-          datatype.float:
+          number.float:
             min: 1
             max: 100
         example: 75.0
@@ -65,7 +65,7 @@ properties:
         format: float
         description: Percentage of capacity used in the last 7 days
         x-faker:
-          datatype.float:
+          number.float:
             min: 1
             max: 100
         example: 80.0

components/station_history.yaml

@@ -32,7 +32,7 @@ properties:
                 type: number
                 format: float
                 x-faker:
-                  datatype.float:
+                  number.float:
                     min: 0
                     max: 50
               is_producing:

openapi.yaml

@@ -149,6 +149,13 @@ paths:
   /magazines:
     get:
       summary: Get list of water reservoirs (magazines) and their details
+      parameters:
+        - in: query
+          name: pinned
+          required: false
+          schema:
+            type: boolean
+          description: If true, returns only the curated list of pinned/priority magazines
       responses:
         "200":
           description: List of water reservoirs with levels and deviations