feat: add api for chargebox/reservation/user

Author: juherr

src/main/java/de/rwth/idsg/steve/repository/ReservationRepository.java

@@ -25,12 +25,14 @@
 import org.jooq.Select;
 
 import java.util.List;
+import java.util.Optional;
 
 /**
  * @author Sevket Goekay <sevketgokay@gmail.com>
  * @since 19.08.2014
  */
 public interface ReservationRepository {
+    Optional<Reservation> getReservation(int id);
     List<Reservation> getReservations(ReservationQueryForm form);
 
     List<Integer> getActiveReservationIds(String chargeBoxId);

src/main/java/de/rwth/idsg/steve/repository/UserRepository.java

@@ -23,16 +23,17 @@
 import de.rwth.idsg.steve.web.dto.UserQueryForm;
 
 import java.util.List;
+import java.util.Optional;
 
 /**
  * @author Sevket Goekay <sevketgokay@gmail.com>
  * @since 25.11.2015
  */
 public interface UserRepository {
     List<User.Overview> getOverview(UserQueryForm form);
-    User.Details getDetails(int userPk);
+    Optional<User.Details> getDetails(int userPk);
 
-    void add(UserForm form);
+    Integer add(UserForm form);
     void update(UserForm form);
     void delete(int userPk);
 }

src/main/java/de/rwth/idsg/steve/repository/impl/ReservationRepositoryImpl.java

@@ -25,6 +25,7 @@
 import de.rwth.idsg.steve.repository.dto.Reservation;
 import de.rwth.idsg.steve.utils.DateTimeUtils;
 import de.rwth.idsg.steve.web.dto.ReservationQueryForm;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.joda.time.DateTime;
 import org.jooq.DSLContext;
@@ -36,10 +37,10 @@
 import org.jooq.SelectQuery;
 import org.jooq.exception.DataAccessException;
 import org.jooq.impl.DSL;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Optional;
 
 import static jooq.steve.db.tables.ChargeBox.CHARGE_BOX;
 import static jooq.steve.db.tables.Connector.CONNECTOR;
@@ -52,13 +53,34 @@
  */
 @Slf4j
 @Repository
+@RequiredArgsConstructor
 public class ReservationRepositoryImpl implements ReservationRepository {
 
     private final DSLContext ctx;
 
-    @Autowired
-    public ReservationRepositoryImpl(DSLContext ctx) {
-        this.ctx = ctx;
+    @Override
+    public Optional<Reservation> getReservation(int id) {
+        SelectQuery selectQuery = ctx.selectQuery();
+        selectQuery.addFrom(RESERVATION);
+        selectQuery.addJoin(OCPP_TAG, OCPP_TAG.ID_TAG.eq(RESERVATION.ID_TAG));
+        selectQuery.addJoin(CONNECTOR, CONNECTOR.CONNECTOR_PK.eq(RESERVATION.CONNECTOR_PK));
+        selectQuery.addJoin(CHARGE_BOX, CONNECTOR.CHARGE_BOX_ID.eq(CHARGE_BOX.CHARGE_BOX_ID));
+
+        selectQuery.addSelect(
+                RESERVATION.RESERVATION_PK,
+                RESERVATION.TRANSACTION_PK,
+                OCPP_TAG.OCPP_TAG_PK,
+                CHARGE_BOX.CHARGE_BOX_PK,
+                OCPP_TAG.ID_TAG,
+                CHARGE_BOX.CHARGE_BOX_ID,
+                RESERVATION.START_DATETIME,
+                RESERVATION.EXPIRY_DATETIME,
+                RESERVATION.STATUS,
+                CONNECTOR.CONNECTOR_ID
+        );
+        selectQuery.addConditions(RESERVATION.RESERVATION_PK.eq(id));
+        Reservation result = (Reservation) selectQuery.fetchOne(new ReservationMapper());
+        return Optional.ofNullable(result);
     }
 
     @Override

src/main/java/de/rwth/idsg/steve/repository/impl/UserRepositoryImpl.java

@@ -37,14 +37,10 @@
 import org.jooq.SelectConditionStep;
 import org.jooq.exception.DataAccessException;
 import org.jooq.impl.DSL;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import static de.rwth.idsg.steve.utils.CustomDSL.includes;
 import static jooq.steve.db.Tables.USER_OCPP_TAG;
@@ -79,31 +75,31 @@ public List<User.Overview> getOverview(UserQueryForm form) {
     }
 
     @Override
-    public User.Details getDetails(int userPk) {
-        UserRecord ur = ctx.selectFrom(USER)
+    public Optional<User.Details> getDetails(int userPk) {
+        var ur = ctx.selectFrom(USER)
                            .where(USER.USER_PK.equal(userPk))
                            .fetchOne();
 
         if (ur == null) {
-            throw new SteveException("There is no user with id '%s'", userPk);
+            return Optional.empty();
         }
 
-        return User.Details.builder()
+        return Optional.of(User.Details.builder()
                            .userRecord(ur)
                            .address(addressRepository.get(ctx, ur.getAddressPk()))
                            .ocppTagEntries(getOcppTagsInternal(userPk, null).getOrDefault(userPk, List.of()))
-                           .build();
+                           .build());
     }
 
     @Override
-    public void add(UserForm form) {
-        ctx.transaction(configuration -> {
-            DSLContext ctx = DSL.using(configuration);
+    public Integer add(UserForm form) {
+        return ctx.transactionResult(configuration -> {
+            var ctx = DSL.using(configuration);
             try {
-                Integer addressId = addressRepository.updateOrInsert(ctx, form.getAddress());
-                Integer userPk = addInternal(ctx, form, addressId);
+                var addressId = addressRepository.updateOrInsert(ctx, form.getAddress());
+                var userPk = addInternal(ctx, form, addressId);
                 refreshOcppTagsInternal(ctx, form, userPk);
-
+                return userPk;
             } catch (DataAccessException e) {
                 throw new SteveException("Failed to add the user", e);
             }
@@ -113,9 +109,9 @@ public void add(UserForm form) {
     @Override
     public void update(UserForm form) {
         ctx.transaction(configuration -> {
-            DSLContext ctx = DSL.using(configuration);
+            var ctx = DSL.using(configuration);
             try {
-                Integer addressId = addressRepository.updateOrInsert(ctx, form.getAddress());
+                var addressId = addressRepository.updateOrInsert(ctx, form.getAddress());
                 updateInternal(ctx, form, addressId);
                 refreshOcppTagsInternal(ctx, form, form.getUserPk());
 
@@ -128,11 +124,10 @@ public void update(UserForm form) {
     @Override
     public void delete(int userPk) {
         ctx.transaction(configuration -> {
-            DSLContext ctx = DSL.using(configuration);
+            var ctx = DSL.using(configuration);
             try {
                 addressRepository.delete(ctx, selectAddressId(userPk));
                 deleteInternal(ctx, userPk);
-
             } catch (DataAccessException e) {
                 throw new SteveException("Failed to delete the user", e);
             }
@@ -186,7 +181,7 @@ private Result<Record5<Integer, String, String, String, String>> getOverviewInte
     }
 
     private Map<Integer, List<User.OcppTagEntry>> getOcppTagsInternal(Integer userPk, String ocppIdTag) {
-        List<Condition> conditions = new ArrayList<>();
+        var conditions = new ArrayList<Condition>();
 
         if (userPk != null) {
             conditions.add(USER_OCPP_TAG.USER_PK.eq(userPk));
@@ -205,7 +200,7 @@ private Map<Integer, List<User.OcppTagEntry>> getOcppTagsInternal(Integer userPk
             .where(conditions)
             .fetch();
 
-        Map<Integer, List<User.OcppTagEntry>> map = new HashMap<>();
+        var map = new HashMap<Integer, List<User.OcppTagEntry>>();
         for (var entry : results) {
             map.computeIfAbsent(entry.value1(), k -> new ArrayList<>())
                 .add(new User.OcppTagEntry(entry.value2(), entry.value3()));

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

@@ -0,0 +1,67 @@
+/*
+ * SteVe - SteckdosenVerwaltung - https://github.com/steve-community/steve
+ * Copyright (C) 2013-2025 SteVe Community Team
+ * All Rights Reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package de.rwth.idsg.steve.service;
+
+import de.rwth.idsg.steve.repository.ChargePointRepository;
+import de.rwth.idsg.steve.repository.dto.ChargePoint;
+import de.rwth.idsg.steve.web.dto.ChargePointForm;
+import de.rwth.idsg.steve.web.dto.ChargePointQueryForm;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class ChargeboxService {
+
+    private final ChargePointRepository chargePointRepository;
+
+    public List<ChargePoint.Overview> getOverview(ChargePointQueryForm form) {
+        return chargePointRepository.getOverview(form);
+    }
+
+    public ChargePoint.Details getDetails(int chargeBoxPk) {
+        return chargePointRepository.getDetails(chargeBoxPk);
+    }
+
+    public int addChargePoint(ChargePointForm form) {
+        return chargePointRepository.addChargePoint(form);
+    }
+
+    public void updateChargePoint(ChargePointForm form) {
+        chargePointRepository.updateChargePoint(form);
+    }
+
+    public void deleteChargePoint(int chargeBoxPk) {
+        chargePointRepository.deleteChargePoint(chargeBoxPk);
+    }
+
+    public List<String> getChargeBoxIds() {
+        return chargePointRepository.getChargeBoxIds();
+    }
+
+    public void addChargePointList(List<String> chargeBoxIdList) {
+        chargePointRepository.addChargePointList(chargeBoxIdList);
+    }
+
+    public List<Integer> getNonZeroConnectorIds(String chargeBoxId) {
+        return chargePointRepository.getNonZeroConnectorIds(chargeBoxId);
+    }
+}

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

@@ -0,0 +1,64 @@
+/*
+ * SteVe - SteckdosenVerwaltung - https://github.com/steve-community/steve
+ * Copyright (C) 2013-2025 SteVe Community Team
+ * All Rights Reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package de.rwth.idsg.steve.service;
+
+import de.rwth.idsg.steve.repository.ReservationRepository;
+import de.rwth.idsg.steve.repository.dto.InsertReservationParams;
+import de.rwth.idsg.steve.repository.dto.Reservation;
+import de.rwth.idsg.steve.web.dto.ReservationForm;
+import de.rwth.idsg.steve.web.dto.ReservationQueryForm;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Optional;
+
+@Service
+@RequiredArgsConstructor
+public class ReservationService {
+
+    private final ReservationRepository reservationRepository;
+
+    public List<Reservation> getReservations(ReservationQueryForm form) {
+        return reservationRepository.getReservations(form);
+    }
+
+    public int addReservation(ReservationForm form) {
+        var params = InsertReservationParams.builder()
+                .idTag(form.getIdTag())
+                .chargeBoxId(form.getChargeBoxId())
+                .connectorId(form.getConnectorId())
+                .startTimestamp(form.getStartTimestamp())
+                .expiryTimestamp(form.getExpiryTimestamp())
+                .build();
+        return reservationRepository.insert(params);
+    }
+
+    public void deleteReservation(int reservationId) {
+        reservationRepository.delete(reservationId);
+    }
+
+    public Optional<Reservation> getReservation(int id) {
+        return reservationRepository.getReservation(id);
+    }
+
+    public List<Integer> getActiveReservationIds(String chargeBoxId) {
+        return reservationRepository.getActiveReservationIds(chargeBoxId);
+    }
+}