refactor: Balancing rules refactored to have more clearer statements/…

…transaction in case of peer 2 peer trading of energy.
energychain · Feb 10, 2024 · ab11bb3 · ab11bb3
1 parent 8449030
commit ab11bb3
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 7 deletions.
diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [0.6.12](https://github.com/energychain/ZSG_DynamischeStromtarife/compare/v0.6.11...v0.6.12) (2024-02-07)
+
+
+### Bug Fixes
+
+* Usage of empty query in find operation should act same for in-memory and mongoDB. ([8449030](https://github.com/energychain/ZSG_DynamischeStromtarife/commit/8449030e3f4abb41d5c49bfe0265e060cc41cad0))
+
 ## [0.6.11](https://github.com/energychain/ZSG_DynamischeStromtarife/compare/v0.6.10...v0.6.11) (2024-02-07)
 
 

diff --git a/framework/package-lock.json b/framework/package-lock.json
diff --git a/framework/package.json b/framework/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stromdao-eaf",
-  "version": "0.6.11",
+  "version": "0.6.12",
   "description": "STROMDAO Energy Application Framework - Referenzimplementierung für dynamische Stromtarife",
   "scripts": {
     "dev": "node ./run-eaf",

diff --git a/framework/services/balancing.service.js b/framework/services/balancing.service.js
@@ -614,6 +614,12 @@ module.exports = {
             co2eq: intermediateBalance.clearing.co2eq,
             label: ".end"
           }
+          if(statement.energy < 0) {
+            const tmp_to = statement.to;
+            statement.to = statement.from;
+            statement.from = tmp_to; 
+            statement.energy *= -1;
+          }
           await ctx.call("balance_settlements_active_model.insert",{entity:statement});
           intermediateBalance = await ctx.call("balancing.unsealedBalance",ctx.params); // Hier könnte man die MOL danach abrufen
           // Fix who is upstream
@@ -623,7 +629,6 @@ module.exports = {
         }
         if((intermediateBalance.energy == 0)||(intermediateBalance.clearing.energy == 0)) {
             intermediateBalance.balancesum = Math.round(intermediateBalance.balancesum/2);
-
             const audit = await ctx.call("audit.requestApproval",intermediateBalance);
             if( (audit).success ) {
               intermediateBalance.auditId = audit.auditId;

diff --git a/framework/services/contract.service.js b/framework/services/contract.service.js
@@ -38,6 +38,7 @@ module.exports = {
        * @return {Array} the result of the function
        */
       async handler(ctx) {
+        console.log("*********** Process",ctx.params);
         let findContract = await ctx.call("contract_model.find",{query:{contractId:ctx.params.contractId}});
         if(findContract.length == 1) {
             findContract[0].balanced += 1 * ctx.params.energy;

diff --git a/framework/services/meritorder.service.js b/framework/services/meritorder.service.js
@@ -127,7 +127,7 @@ module.exports = {
                 let counterTransaction = {
 
                 }
-
+               
                 if(
                   (energy_in > 0) &&
                   (mol[i].direction == "from")
@@ -162,9 +162,16 @@ module.exports = {
                             "contractId": mol[i].contractId
                         }
                 }
-                if((energy_out >0) &&
+                if(energy_in < 0) {
+                  energy_out = Math.abs(energy_in);
+                }
+                energy_out = Math.abs(energy_out);
+
+                if((Math.abs(energy_out) >0) &&
                   (mol[i].direction == "to")
                 ) {
+
+                        // Da energy_out < 0 ist, wird dies hier fehlerhaft!
                         if(energy_out > mol[i].load_max) {
                           energy_out = mol[i].load_max;
                         }
@@ -195,7 +202,6 @@ module.exports = {
                           "contractId": mol[i].contractId
                       }
                 }
-
                 ctx.params.transactions.push(transaction);
                 ctx.params.transactions.push(counterTransaction);
 
@@ -226,6 +232,7 @@ module.exports = {
           mol = mol[0].mol; // We only allow 1 mol per balancing point
 
           for(let i=0;i<ctx.params.transactions.length;i++) {
+
               // Identify relevant transactions and change balanced of contract
               if(ctx.params.transactions[i].accounting == 'mol') {
                 ctx.params.transactions[i].assetId = ctx.params.assetId;