refactor

Author: goekay

src/main/java/de/rwth/idsg/steve/ocpp/task/SetChargingProfileTaskFromDB.java

@@ -74,9 +74,7 @@ public void success(String chargeBoxId, String statusValue) {
 
     @Override
     public SetChargingProfileRequest getOcpp16Request() {
-        ocpp.cp._2015._10.ChargingProfile ocppProfile = ChargingProfileDetailsMapper.mapToOcpp(details);
-
-        ocppProfile.setTransactionId(transactionId);
+        ocpp.cp._2015._10.ChargingProfile ocppProfile = ChargingProfileDetailsMapper.mapToOcpp(details, transactionId);
 
         var request = new SetChargingProfileRequest()
                 .withConnectorId(connectorId)

src/main/java/de/rwth/idsg/steve/service/ChargePointServiceClient.java

@@ -205,7 +205,7 @@ public final int remoteStartTransaction(RemoteStartTransactionParams params,
         Integer chargingProfilePk = params.getChargingProfilePk();
         if (chargingProfilePk != null) {
             ChargingProfile.Details details = chargingProfileRepository.getDetails(chargingProfilePk);
-            chargingProfile = ChargingProfileDetailsMapper.mapToOcpp(details);
+            chargingProfile = ChargingProfileDetailsMapper.mapToOcpp(details, null);
             if (chargingProfile.getChargingProfilePurpose() != ChargingProfilePurposeType.TX_PROFILE) {
                 throw new SteveException("ChargingProfilePurposeType is not TX_PROFILE");
             }

src/main/java/de/rwth/idsg/steve/utils/mapper/ChargingProfileDetailsMapper.java

@@ -41,7 +41,8 @@
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class ChargingProfileDetailsMapper {
 
-    public static ocpp.cp._2015._10.ChargingProfile mapToOcpp(ChargingProfile.Details details) {
+    public static ocpp.cp._2015._10.ChargingProfile mapToOcpp(ChargingProfile.Details details,
+                                                              Integer transactionId) {
         ChargingProfileRecord profile = details.getProfile();
 
         List<ChargingSchedulePeriod> schedulePeriods =
@@ -65,6 +66,7 @@ public static ocpp.cp._2015._10.ChargingProfile mapToOcpp(ChargingProfile.Detail
 
         return new ocpp.cp._2015._10.ChargingProfile()
             .withChargingProfileId(profile.getChargingProfilePk())
+            .withTransactionId(transactionId)
             .withStackLevel(profile.getStackLevel())
             .withChargingProfilePurpose(ChargingProfilePurposeType.fromValue(profile.getChargingProfilePurpose()))
             .withChargingProfileKind(ChargingProfileKindType.fromValue(profile.getChargingProfileKind()))