clean up

back-end/src/main/java/com/opensourcedev/backend/controller/MainController.java

@@ -38,7 +38,7 @@ public List<Rental> getRentalHistory(@PathVariable String username) {
 
   @PostMapping("/return/{rentalId}")
   public String returnCharger(@PathVariable Integer rentalId) {
-    return (mainService.returnCharger(rentalId))
+    return (mainService.returnPowerBank(rentalId))
       ? "Rental returned successfully"
       : "Error, rental couldn't be returned.";
   }

back-end/src/main/java/com/opensourcedev/backend/mapper/RentalMapper.java

@@ -7,13 +7,12 @@
 import java.util.Map;
 
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface RentalMapper {
     List<Rental> getRentalHistory(Integer userId);
 
-    boolean returnCharger(Map<String, Object> paramMap);
+    boolean returnPowerBank(Map<String, Object> paramMap);
 
     boolean returnChargerStation(Integer chargingStationId);
 

back-end/src/main/java/com/opensourcedev/backend/service/MainService.java

@@ -17,7 +17,7 @@ public interface MainService {
 
     List<Rental> getRentalHistory(String username);
 
-    boolean returnCharger(Integer rentalId);
+    boolean returnPowerBank(Integer rentalId);
 
     boolean rentPowerBank(RentalDetail rentalDetail);
 

back-end/src/main/java/com/opensourcedev/backend/service/MainServiceImpl.java

@@ -42,10 +42,11 @@ public List<Rental> getRentalHistory(String username) {
   }
 
   @Override
-  public boolean returnCharger(Integer rentalId) {
+  public boolean returnPowerBank(Integer rentalId) {
     Rental rentalToReturn = rentalMapper.getRentalByID(rentalId);
     Date startTime = rentalToReturn.getRentalDate();
-    Integer hoursBetween = calculateHoursBetweenDates(startTime, new Date());
+    long durationInMillis = new Date().getTime() - startTime.getTime();
+    int hoursBetween = (int) TimeUnit.MILLISECONDS.toHours(durationInMillis);
 
     Integer chargesPerHour = rentalToReturn.getCharges();
     Integer endPrice = chargesPerHour;
@@ -58,7 +59,7 @@ public boolean returnCharger(Integer rentalId) {
     paramMap.put("charges", endPrice);
     paramMap.put("duration", hoursBetween);
     return (
-      rentalMapper.returnCharger(paramMap) &&
+      rentalMapper.returnPowerBank(paramMap) &&
       rentalMapper.returnChargerStation(rentalToReturn.getChargingStationId())
     );
   }
@@ -85,11 +86,6 @@ public boolean rentPowerBank(RentalDetail rentalDetail) {
     }
   }
 
-  private Integer calculateHoursBetweenDates(Date startDate, Date endDate) {
-    long durationInMillis = endDate.getTime() - startDate.getTime();
-    return (int) TimeUnit.MILLISECONDS.toHours(durationInMillis);
-  }
-
   @Override
   public ResponseEntity<LoginResponse> registerUser(User user) {
     boolean isRegistered = false;

back-end/src/main/resources/xml/RentalMapper.xml

@@ -18,7 +18,7 @@
         SELECT * FROM rental_history WHERE user_id = #{userId};
     </select>
 
-    <update id="returnCharger" parameterType="Integer">
+    <update id="returnPowerBank" parameterType="Integer">
         UPDATE rental_history
         SET
         rental_status = 'Returned',

front-end/src/App.js

@@ -36,8 +36,8 @@ function App() {
       },
       {
         path: "/rentals",
-        element: <RentalHistory />
-        //Todo: once it's working add: loader: checkAuthLoader,
+        element: <RentalHistory />,
+        loader: checkAuthLoader,
       },
       {
         path: "/logout",

front-end/src/RentalHistory.js

@@ -15,9 +15,7 @@ const RentalHistory = () => {
 
   const fetchRentalHistory = async () => {
     try {
-      //Todo: fetch current username / user id
       const username = localStorage.getItem("username");
-      //const username = 'fe';
       const response = await fetch(
         `${API_BASE_URL + "/getRentalHistory/" + username}`
       );