demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-10 07:02:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

[aWATTar] make service fee configurable

Browse Source 
Signed-off-by: Thomas Leber <thomas@tl-photography.at>
This commit is contained in:
Thomas Leber 2024-10-26 21:04:27 +02:00
parent c81b9799f4
commit 39ab65fdf8
6 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bundles/org.openhab.binding.awattar/README.md
View File

@ -36,8 +36,7 @@ Auto discovery is not supported.
| basePrice | The net(!) base price you have to pay for every kWh. Optional, but you most probably want to set it based on you delivery contract. |
| timeZone | The time zone the hour definitions of the things below refer to. Default is `CET`, as it corresponds to the aWATTar API. It is strongly recommended not to change this. However, if you do so, be aware that the prices delivered by the API will not cover a whole calendar day in this timezone. **Advanced** |
| country | The country prices should be received for. Use `DE` for Germany or `AT` for Austria. `DE` is the default. |
Note: The prices include already the 3% and 1.5 €cent per kWh fees for the aWATTar service.
| serviceFee | The service fee in percent. Will be added to the total price. Will be calculated on top of the absolute price per hour. Default is `0`. |
### Prices Thing
@ -110,7 +109,7 @@ All prices are available in each of the following channel groups:
awattar.things:
```java
Bridge awattar:bridge:bridge1 "aWATTar Bridge" [ country="DE", vatPercent="19", basePrice="17.22"] {
Bridge awattar:bridge:bridge1 "aWATTar Bridge" [ country="DE", vatPercent="19", basePrice="17.22", serviceFee="3" ] {
Thing prices price1 "aWATTar Price" []
// The car should be loaded for 4 hours during the night
Thing bestprice carloader "Car Loader" [ rangeStart="22", rangeDuration="8", length="4", consecutive="true" ]

1
bundles/org.openhab.binding.awattar/src/main/java/org/openhab/binding/awattar/internal/AwattarBridgeConfiguration.java
View File

@ -23,5 +23,6 @@ import org.eclipse.jdt.annotation.NonNullByDefault;
public class AwattarBridgeConfiguration {
public double basePrice;
public double vatPercent;
public double serviceFee;
public String country = "";
}

17
bundles/org.openhab.binding.awattar/src/main/java/org/openhab/binding/awattar/internal/api/AwattarApi.java
View File

@ -57,13 +57,12 @@ public class AwattarApi {
private double vatFactor;
private double basePrice;
private double serviceFee;
private ZoneId zone;
private Gson gson;
private String country;
/**
* Generic exception for the aWATTar API.
*/
@ -84,12 +83,12 @@ public class AwattarApi {
public AwattarApi(HttpClient httpClient, ZoneId zone, AwattarBridgeConfiguration config) {
this.zone = zone;
this.httpClient = httpClient;
this.country = config.country;
this.gson = new Gson();
vatFactor = 1 + (config.vatPercent / 100);
basePrice = config.basePrice;
serviceFee = config.serviceFee;
if (config.country.equals("DE")) {
this.url = URL_DE;
@ -145,17 +144,11 @@ public class AwattarApi {
double grossMarket = netMarket * vatFactor;
double netTotal = netMarket + basePrice;
// in Austria the fee is added as absolute value
if ("AT".equals(country)) {
// add 3% absolute fee for the aWATTar service (Ausgleichskomponente)
netTotal += Math.abs(netTotal) * 0.03;
} else if ("DE".equals(country)) {
// add 3% fee for the aWATTar service (Ausgleichskomponente)
netTotal = netTotal * 1.03;
// add service fee for the aWATTar service (Ausgleichskomponente)
if (serviceFee > 0) {
netTotal += Math.abs(netTotal) * (serviceFee / 100);
}
netTotal = netTotal + 1.5; // add 1.5 €/MWh for aWATTar service (Beschaffungskomponente)
double grossTotal = netTotal * vatFactor;
result.add(new AwattarPrice(netMarket, grossMarket, netTotal, grossTotal,

5
bundles/org.openhab.binding.awattar/src/main/resources/OH-INF/config/config.xml
View File

@ -24,6 +24,11 @@
<description>Specifies the net base price per kWh</description>
<default>0</default>
</parameter>
<parameter name="serviceFee" type="decimal" min="0" max="100">
<label>Service Fee</label>
<description>Specifies the service fee in percent.</description>
<default>0</default>
</parameter>
</config-description>
<config-description uri="thing-type:awattar:bestprice">

2
bundles/org.openhab.binding.awattar/src/main/resources/OH-INF/i18n/awattar.properties
View File

@ -12,6 +12,8 @@ bridge-type.config.awattar.bridge.basePrice.label = Base price
bridge-type.config.awattar.bridge.basePrice.description = Specifies the net base price per kWh
bridge-type.config.awattar.bridge.timeZone.label = Time zone
bridge-type.config.awattar.bridge.timeZone.description = Time zone to apply to the hour definitions. Default CET aligns to the aWATTar API
brifge-type.config.awattar.bridge.serviceFee.label = Service fee
bridge-type.config.awattar.bridge.serviceFee.description = Specifies the service fee in percent
# thing types
thing-type.awattar.prices.label = aWATTar Hourly Prices

1
bundles/org.openhab.binding.awattar/src/test/java/org/openhab/binding/awattar/internal/api/AwattarApiTest.java
View File

@ -92,6 +92,7 @@ class AwattarApiTest extends JavaTest {
config.basePrice = 0.0;
config.vatPercent = 0.0;
config.serviceFee = 0.0;
config.country = "DE";
api = new AwattarApi(httpClientMock, ZoneId.of("GMT+2"), config);