Merge pull request #1816 from steve-community/367-chargingprofilepurpose-missing-parameter-for-txprofile

transactionId support for SetChargingProfile (i.e. TxProfile support for ChargingProfilePurpose)

Author: goekay

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

@@ -65,5 +65,15 @@ protected static void checkAdditionalConstraints(SetChargingProfileRequest reque
             && request.getConnectorId() < 1) {
             throw new SteveException("TxProfile should only be set at Charge Point ConnectorId > 0");
         }
+
+        if (ChargingProfilePurposeType.TX_PROFILE == purpose
+            && request.getCsChargingProfiles().getTransactionId() == null) {
+            throw new SteveException("transaction id is required for TxProfile");
+        }
+
+        if (ChargingProfilePurposeType.TX_PROFILE != purpose
+            && request.getCsChargingProfiles().getTransactionId() != null) {
+            throw new SteveException("transaction id should only be set for TxProfile");
+        }
     }
 }

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

@@ -42,6 +42,7 @@
 public class SetChargingProfileTaskFromDB extends SetChargingProfileTask {
 
     private final int connectorId;
+    private final Integer transactionId;
     private final ChargingProfile.Details details;
     private final ChargingProfileRepository chargingProfileRepository;
 
@@ -50,6 +51,7 @@ public SetChargingProfileTaskFromDB(SetChargingProfileParams params,
                                         ChargingProfileRepository chargingProfileRepository) {
         super(params);
         this.connectorId = params.getConnectorId();
+        this.transactionId = params.getTransactionId();
         this.details = details;
         this.chargingProfileRepository = chargingProfileRepository;
     }
@@ -59,9 +61,10 @@ public OcppCallback<String> defaultCallback() {
         return new DefaultOcppCallback<String>() {
             @Override
             public void success(String chargeBoxId, String statusValue) {
+                ChargingProfilePurposeType purpose = ChargingProfilePurposeType.fromValue(details.getProfile().getChargingProfilePurpose());
                 addNewResponse(chargeBoxId, statusValue);
 
-                if ("Accepted".equalsIgnoreCase(statusValue)) {
+                if ("Accepted".equalsIgnoreCase(statusValue) && ChargingProfilePurposeType.TX_PROFILE != purpose) {
                     int chargingProfilePk = details.getProfile().getChargingProfilePk();
                     chargingProfileRepository.setProfile(chargingProfilePk, chargeBoxId, connectorId);
                 }
@@ -71,7 +74,7 @@ public void success(String chargeBoxId, String statusValue) {
 
     @Override
     public SetChargingProfileRequest getOcpp16Request() {
-        ocpp.cp._2015._10.ChargingProfile ocppProfile = ChargingProfileDetailsMapper.mapToOcpp(details);
+        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()))

src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SetChargingProfileParams.java

@@ -40,4 +40,7 @@ public class SetChargingProfileParams extends MultipleChargePointSelect {
     @NotNull
     @Positive
     private Integer chargingProfilePk;
+
+    @Positive
+    private Integer transactionId;
 }

src/main/resources/webapp/WEB-INF/views/op-forms/SetChargingProfileForm.jsp

@@ -34,6 +34,10 @@
             <td>Connector ID (integer):</td>
             <td><form:input path="connectorId" placeholder="0 = charge point as a whole"/></td>
         </tr>
+        <tr>
+            <td>Transaction ID (integer):</td>
+            <td><form:input path="transactionId" placeholder="only necessary for TxProfile"/></td>
+        </tr>
         <tr><td></td><td><div class="submit-button"><input type="submit" value="Perform"></div></td></tr>
     </table>
 </form:form>