sync

SECAP-Compass · May 15, 2024 · 08d384b · 08d384b
1 parent 5ff5952
commit 08d384b
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 89 deletions.
diff --git a/config/building_measurement_types/en.json b/config/building_measurement_types/en.json
@@ -1,84 +1,20 @@
 {
-  "Coal and Coke": [
-    "Anthracite Coal",
-    "Bituminous Coal",
-    "Sub-bituminous Coal",
-    "Lignite Coal",
-    "Mixed (Commercial Sector)",
-    "Mixed (Electric Power Sector)",
-    "Mixed (Industrial Coking)",
-    "Mixed (Industrial Sector)",
-    "Coal Coke"
-  ],
-  "Other Fuels - Solid": [
-    "Municipal Solid Waste",
-    "Petroleum Coke (Solid)",
-    "Plastics",
-    "Tires"
-  ],
-  "Biomass Fuels - Solid": [
-    "Agricultural Byproducts",
-    "Peat",
-    "Solid Byproducts",
-    "Wood and Wood Residuals"
-  ],
-  "Natural Gas": [
-    "Natural Gas"
-  ],
-  "Other Fuels - Gaseous": [
-    "Blast Furnace Gas",
-    "Coke Oven Gas",
-    "Fuel Gas",
-    "Propane Gas"
-  ],
-  "Biomass Fuels - Gaseous": [
-    "Landfill Gas",
-    "Other Biomass Gases"
-  ],
-  "Petroleum Products": [
-    "Asphalt and Road Oil",
-    "Aviation Gasoline",
-    "Butane",
-    "Butylene",
-    "Crude Oil",
-    "Distillate Fuel Oil No. 1",
-    "Distillate Fuel Oil No. 2",
-    "Distillate Fuel Oil No. 4",
-    "Ethane",
-    "Ethylene",
-    "Heavy Gas Oils",
-    "Isobutane",
-    "Isobutylene",
-    "Kerosene",
-    "Kerosene-Type Jet Fuel",
-    "Liquefied Petroleum Gases (LPG)",
-    "Lubricants",
-    "Motor Gasoline",
-    "Naphtha (<401 deg F)",
-    "Natural Gasoline",
-    "Other Oil (>401 deg F)",
-    "Pentanes Plus",
-    "Petrochemical Feedstocks",
-    "Petroleum Coke",
-    "Propane",
-    "Propylene",
-    "Residual Fuel Oil No. 5",
-    "Residual Fuel Oil No. 6",
-    "Special Naphtha",
-    "Unfinished Oils",
-    "Used Oil"
-  ],
-  "Biomass Fuels - Liquid": [
-    "Biodiesel (100%)",
-    "Ethanol (100%)",
-    "Rendered Animal Fat",
-    "Vegetable Oil"
-  ],
-  "Biomass Fuels - Kraft Pulping Liquor, by Wood Furnish": [
-    "North American Softwood",
-    "North American Hardwood",
-    "Bagasse",
-    "Bamboo",
-    "Straw"
+  "Electricity": ["Electricity"],
+  "District heating and cooling": ["District Heating", "District Cooling"],
+  "Fossil fuels": ["Natural Gas",
+    "Liquid Gas",
+    "Heating Oil",
+    "Diesel",
+    "Gasoline",
+    "Lignite",
+    "Coal",
+    "Other Fossil Fuels"
+  ],
+  "Renewable energies": ["Biogas",
+    "Plant Oil",
+    "Biofuel",
+    "Other Biomass",
+    "Solar Thermal",
+    "Geothermal"
   ]
 }
diff --git a/internal/domain/building/application/measure_building.go b/internal/domain/building/application/measure_building.go
@@ -44,7 +44,7 @@ func (h *measureBuildingCommandHandler) Handle(ctx context.Context, cmd *aggrega
 		return errors.Errorf("building with id %s does not exist", cmd.AggregateId.String())
 	}
 
-	if err := a.MeasureBuildingCommandHandler(cmd); err != nil {
+	if err := a.MeasureBuildingCommandHandler(ctx, cmd); err != nil {
 		h.l.Error("failed to measure building", zap.Error(err), zap.String("id", cmd.AggregateId.String()))
 		return err
 	}

diff --git a/internal/domain/building/core/aggregate/command_handlers.go b/internal/domain/building/core/aggregate/command_handlers.go
@@ -51,14 +51,14 @@ type MeasureBuildingCommand struct {
 	Measurements []*model.Measurement
 }
 
-func (b *BuildingAggregate) MeasureBuildingCommandHandler(cmd *MeasureBuildingCommand) error {
+func (b *BuildingAggregate) MeasureBuildingCommandHandler(ctx context.Context, cmd *MeasureBuildingCommand) error {
 
 	if err := validateMeasurement(cmd.Measurements); err != nil {
 		return err
 	}
 
 	for _, m := range cmd.Measurements {
-		event, err := events.NewBuildingMeasuredEvent(b.AggregateBase, m)
+		event, err := events.NewBuildingMeasuredEvent(ctx, b.AggregateBase, m)
 		if err != nil {
 			return err
 		}

diff --git a/internal/domain/building/core/events/building_measured_event.go b/internal/domain/building/core/events/building_measured_event.go
@@ -1,8 +1,7 @@
 package events
 
 import (
-	"fmt"
-	"github.com/iancoleman/strcase"
+	"context"
 	"secap-input/internal/common/eventsourcing"
 	"secap-input/internal/domain/building/core/model"
 )
@@ -13,17 +12,24 @@ type BuildingMeasuredEvent struct {
 
 const BuildingMeasuredEventType = "building.measured"
 
-func NewBuildingMeasuredEvent(a *eventsourcing.AggregateBase, measurement *model.Measurement) (*eventsourcing.Event, error) {
+func NewBuildingMeasuredEvent(ctx context.Context, a *eventsourcing.AggregateBase, measurement *model.Measurement) (*eventsourcing.Event, error) {
+	//measurement.MeasurementTypeHeader = model.MeasurementTypeHeader(strcase.ToCamel(string(measurement.MeasurementTypeHeader)))
+	//measurement.MeasurementType = model.MeasurementType(strcase.ToCamel(string(measurement.MeasurementType)))
 	eventData := &BuildingMeasuredEvent{
 		Measurement: measurement,
 	}
 
-	eventType := fmt.Sprintf("%s.%s", BuildingMeasuredEventType, strcase.ToCamel(string(measurement.MeasurementType)))
+	//eventType := fmt.Sprintf("%s.%s", BuildingMeasuredEventType, strcase.ToCamel(string(measurement.MeasurementType)))
 
-	event := eventsourcing.NewEvent(a, eventType)
+	event := eventsourcing.NewEvent(a, BuildingMeasuredEventType)
 	if err := event.SetEventData(eventData); err != nil {
 		return nil, err
 	}
 
+	md := eventsourcing.NewEventMetadataFromContext(ctx)
+	if err := event.SetMetaData(md); err != nil {
+		return nil, err
+	}
+
 	return event, nil
 }