Merge pull request #34 from Capstone-QuarterBack/feature

Feature

Author: PlusUltraCode

.gitignore

@@ -36,5 +36,4 @@ out/
 ### VS Code ###
 .vscode/
 
-application.yml
-application-test.yml
+application.yml

src/main/java/com/example/quaterback/api/domain/charger/domain/ChargerDomain.java

@@ -1,6 +1,8 @@
 package com.example.quaterback.api.domain.charger.domain;
 
 import com.example.quaterback.api.domain.charger.constant.ChargerStatus;
+import com.example.quaterback.api.domain.charger.entity.ChargerEntity;
+import com.example.quaterback.api.feature.overview.dto.response.CsAndChargerParams;
 import lombok.*;
 
 import java.time.LocalDateTime;
@@ -11,6 +13,7 @@
 @AllArgsConstructor
 @ToString
 public class ChargerDomain {
+    private Long id;
     private Integer evseId;
     private ChargerStatus chargerStatus;
     private LocalDateTime updateStatusTimeStamp;
@@ -22,4 +25,22 @@ public void updateChargerStatus(ChargerStatus status) {
             this.updateStatusTimeStamp = LocalDateTime.now();
         }
     }
+
+    public static ChargerDomain fromEntityToDomain(ChargerEntity entity){
+        return ChargerDomain.builder()
+                .id(entity.getId())
+                .evseId(entity.getEvseId())
+                .chargerStatus(entity.getChargerStatus())
+                .updateStatusTimeStamp(entity.getUpdateStatusTimeStamp())
+                .stationId(entity.getStation().getStationId())
+                .build();
+    }
+    public static ChargerDomain fromRequestToDomain(Integer evseId, String stationId){
+        return ChargerDomain.builder()
+                .evseId(evseId)
+                .stationId(stationId)
+                .chargerStatus(ChargerStatus.UNAVAILABLE)
+                .updateStatusTimeStamp(LocalDateTime.now())
+                .build();
+    }
 }

src/main/java/com/example/quaterback/api/domain/charger/entity/ChargerEntity.java

@@ -3,18 +3,21 @@
 import com.example.quaterback.api.domain.charger.constant.ChargerStatus;
 import com.example.quaterback.api.domain.charger.domain.ChargerDomain;
 import com.example.quaterback.api.domain.station.entity.ChargingStationEntity;
+import com.example.quaterback.api.domain.txinfo.entity.TransactionInfoEntity;
 import jakarta.persistence.*;
 import lombok.*;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 
 @Entity
 @Table(name = "charger_info")
 @Getter
 @Setter
+@Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@Builder
 public class ChargerEntity {
 
     @Id
@@ -28,9 +31,15 @@ public class ChargerEntity {
 
     private LocalDateTime updateStatusTimeStamp;
 
-    @ManyToOne
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "station_id", referencedColumnName = "stationId")
     private ChargingStationEntity station;
+    //@OneToMany(mappedBy ="evseId", cascade = CascadeType.ALL)
+    //private List<TransactionInfoEntity> txInfoList = new ArrayList<>();
+
+
+/***연관 관계 메서드 작성 필요!!!!***/
+
 
     public ChargerDomain toDomain() {
         return ChargerDomain.builder()
@@ -54,4 +63,14 @@ public void assignStation(ChargingStationEntity stationEntity) {
             stationEntity.getChargerList().add(this);
         }
     }
+
+    public static ChargerEntity fromChargerDomainToEntity(ChargerDomain chargerDomain, ChargingStationEntity csEntity){
+        return ChargerEntity.builder()
+                .chargerStatus(chargerDomain.getChargerStatus())
+                .evseId(chargerDomain.getEvseId())
+                .updateStatusTimeStamp(chargerDomain.getUpdateStatusTimeStamp())
+                .station(csEntity)
+                .build();
+
+    }
 }

src/main/java/com/example/quaterback/api/domain/charger/repository/ChargerRepository.java

@@ -1,14 +1,16 @@
 package com.example.quaterback.api.domain.charger.repository;
 
 import com.example.quaterback.api.domain.charger.domain.ChargerDomain;
+import com.example.quaterback.api.domain.charger.entity.ChargerEntity;
 
 import java.util.List;
 
+
 public interface ChargerRepository {
 
     ChargerDomain findByStationIdAndEvseId(String stationId, Integer evseId);
     Integer update(ChargerDomain domain);
     List<ChargerDomain> findAllByStationId(String stationId);
-
-
+    List<ChargerDomain> findByStationID(String stationId);
+    void save(ChargerDomain chargerDomain);
 }

src/main/java/com/example/quaterback/api/domain/charger/repository/JpaChargerRepository.java

@@ -2,16 +2,22 @@
 
 import com.example.quaterback.api.domain.charger.entity.ChargerEntity;
 import com.example.quaterback.api.domain.charger.domain.ChargerDomain;
+import com.example.quaterback.api.domain.station.entity.ChargingStationEntity;
+import com.example.quaterback.api.domain.station.repository.ChargingStationRepository;
+import com.example.quaterback.api.domain.station.repository.SpringDataJpaChargingStationRepository;
 import jakarta.persistence.EntityNotFoundException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.stream.Collectors;
+
+
 
 @Repository
 @RequiredArgsConstructor
 public class JpaChargerRepository implements ChargerRepository {
-
+    private final SpringDataJpaChargingStationRepository springDataJpaChargingStationRepository;
     private final SpringDataJpaChargerRepository chargerRepository;
     @Override
     public ChargerDomain findByStationIdAndEvseId(String stationId, Integer evseId) {
@@ -31,6 +37,24 @@ public Integer update(ChargerDomain domain) {
         return entity.getEvseId();
     }
 
+    @Override
+    public List<ChargerDomain> findByStationID(String stationId) {
+        List<ChargerEntity> chargerEntities = chargerRepository.findByStation_StationId(stationId);
+        List<ChargerDomain> chargerDomains = chargerEntities.stream()
+                .map(ChargerDomain :: fromEntityToDomain)
+                .collect(Collectors.toList());
+        return chargerDomains;
+    }
+
+    @Override
+    public void save(ChargerDomain chargerDomain) {
+        String stationId = chargerDomain.getStationId();
+        ChargingStationEntity chargingStationEntity =  springDataJpaChargingStationRepository.findByStationId(stationId)
+                .orElseThrow(() -> new EntityNotFoundException("entity not found"));
+        ChargerEntity chargerEntity = ChargerEntity.fromChargerDomainToEntity(chargerDomain, chargingStationEntity);
+        chargerRepository.save(chargerEntity);
+    }
+
     @Override
     public List<ChargerDomain> findAllByStationId(String stationId) {
         List<ChargerEntity> entityList = chargerRepository.findAllByStationId(stationId);

src/main/java/com/example/quaterback/api/domain/charger/repository/SpringDataJpaChargerRepository.java

@@ -10,6 +10,7 @@
 
 public interface SpringDataJpaChargerRepository extends JpaRepository<ChargerEntity, Long> {
     Optional<ChargerEntity> findByStation_StationIdAndEvseId(String stationId, Integer evseId);
+    List<ChargerEntity> findByStation_StationId(String stationId);
 
     @Query("select c from ChargerEntity c where c.station.stationId =:stationId")
     List<ChargerEntity> findAllByStationId(@Param("stationId")String stationId);

src/main/java/com/example/quaterback/api/domain/customer/repository/CustomerRepository.java

@@ -9,6 +9,7 @@ public interface CustomerRepository {
     Page<CustomerDomain>  findAll(Pageable pageable);
     CustomerDomain findByCustomerId(String customerId);
     String updateCustomerInfo(CustomerDomain customerDomain);
-    Page<CustomerDomain> findByCustomerIdContating(String keyword, Pageable pageable);
+    Page<CustomerDomain> findByCustomerIdContaining(String keyword, Pageable pageable);
     Page<CustomerDomain> findByCustomerNameContaining(String keyword, Pageable pageable);
+    boolean existsByIdToken(String idToken);
 }

src/main/java/com/example/quaterback/api/domain/customer/repository/JpaCustomerRepository.java

@@ -38,7 +38,7 @@ public String updateCustomerInfo(CustomerDomain customerDomain) {
     }
 
     @Override
-    public Page<CustomerDomain> findByCustomerIdContating(String keyword, Pageable pageable) {
+    public Page<CustomerDomain> findByCustomerIdContaining(String keyword, Pageable pageable) {
         Page<CustomerEntity> customerEntityPage = springDataJpaCustomerRepository.findByCustomerIdContaining(keyword, pageable);
         return customerEntityPage.map(CustomerEntity::toDomain);
     }
@@ -49,5 +49,9 @@ public Page<CustomerDomain> findByCustomerNameContaining(String keyword, Pageabl
         return customerEntityPage.map(CustomerEntity::toDomain);
     }
 
+    @Override
+    public boolean existsByIdToken(String idToken) {
+        return springDataJpaCustomerRepository.existsByIdToken(idToken);
+    }
 
 }

src/main/java/com/example/quaterback/api/domain/customer/repository/SpringDataJpaCustomerRepository.java

@@ -13,4 +13,5 @@ public interface SpringDataJpaCustomerRepository extends JpaRepository<CustomerE
     Optional<CustomerEntity> findByCustomerId(String customerId);
     Page<CustomerEntity> findByCustomerIdContaining(String keyword, Pageable pageable);
     Page<CustomerEntity> findByCustomerNameContaining(String keyword, Pageable pageable);
+    boolean existsByIdToken(String idToken);
 }

src/main/java/com/example/quaterback/api/domain/customer/service/CustomerService.java

@@ -27,7 +27,7 @@ public CustomerListResponse findAllCustomers(Pageable pageable) {
     }
 
     public CustomerListResponse searchCustomersByCustomerId(String customerId, Pageable pageable) {
-        Page<CustomerDomain> result = customerRepository.findByCustomerIdContating(customerId, pageable);
+        Page<CustomerDomain> result = customerRepository.findByCustomerIdContaining(customerId, pageable);
         return CustomerListResponse.from(result.map(CustomerResponse::fromDomain));
     }