Merge pull request #4 from TeamProject-Daewoo/dev

Yongseok-2 · web-flow · commit 425bb9e4bcf0 · 2025-10-01T20:06:21.000+09:00
Dev
diff --git a/pom.xml b/pom.xml
@@ -75,6 +75,10 @@
 			<artifactId>lombok</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-mail</artifactId>
+		</dependency>
 
 		<dependency>
 			<groupId>io.jsonwebtoken</groupId>
diff --git a/src/main/java/com/example/backend/CustomerService/Inquiry.java b/src/main/java/com/example/backend/CustomerService/Inquiry.java
@@ -5,6 +5,7 @@
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import com.example.backend.authentication.*;
 
 @Entity
 @Getter
@@ -32,23 +33,24 @@ public class Inquiry {
     private LocalDateTime createdAt;
 
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "username", referencedColumnName = "user_name", nullable = false)
-    private UserInquiryDto user;
+@JoinColumn(name = "username", referencedColumnName = "user_name", nullable = false)
+private User user;
+
 
     @OneToMany(mappedBy = "inquiry", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<InquiryFile> inquiryFiles = new ArrayList<>();
 
     // 생성자 헬퍼 (첨부파일 관련 파라미터는 따로 처리)
-    public static Inquiry create(String category, String title, String content, UserInquiryDto user) {
-        return Inquiry.builder()
-                .category(category)
-                .title(title)
-                .content(content)
-                .status(InquiryStatus.PENDING)
-                .createdAt(LocalDateTime.now())
-                .user(user)
-                .build();
-    }
+    public static Inquiry create(String category, String title, String content, User user) {
+    return Inquiry.builder()
+            .category(category)
+            .title(title)
+            .content(content)
+            .status(InquiryStatus.PENDING)
+            .createdAt(LocalDateTime.now())
+            .user(user)
+            .build();
+}
 
     public void markAsAnswered() {
         this.status = InquiryStatus.ANSWERED;
diff --git a/src/main/java/com/example/backend/CustomerService/InquiryAnswer.java b/src/main/java/com/example/backend/CustomerService/InquiryAnswer.java
@@ -3,7 +3,7 @@
 import jakarta.persistence.*;
 import lombok.*;
 import java.time.LocalDateTime;
-
+import com.example.backend.authentication.User;
 
 @Entity
 @Getter
@@ -25,7 +25,7 @@ public class InquiryAnswer {
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "admin_username", referencedColumnName = "user_name", nullable = false)
-    private UserInquiryDto adminUser;
+    private User adminUser;
 
     @OneToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "inquiry_id", unique = true)
@@ -40,11 +40,11 @@ public void setAnsweredAt(LocalDateTime answeredAt) {
         this.answeredAt = answeredAt;
     }
 
-    public void setAdminUser(UserInquiryDto adminUser) {
+    public void setAdminUser(User adminUser) {
         this.adminUser = adminUser;
     }
 
-    public static InquiryAnswer create(Inquiry inquiry, String answerContent, UserInquiryDto adminUser) {
+    public static InquiryAnswer create(Inquiry inquiry, String answerContent, User adminUser) {
         return InquiryAnswer.builder()
                 .inquiry(inquiry)
                 .answerContent(answerContent)
diff --git a/src/main/java/com/example/backend/CustomerService/InquiryAnswerService.java b/src/main/java/com/example/backend/CustomerService/InquiryAnswerService.java
@@ -4,6 +4,11 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import com.example.backend.authentication.UserRepository;
+import com.example.backend.authentication.*;
+
+
+
 import java.time.LocalDateTime;
 
 @Service
@@ -12,15 +17,19 @@ public class InquiryAnswerService {
 
     private final InquiryRepository inquiryRepository;
     private final InquiryAnswerRepository inquiryAnswerRepository;
-    private final UserInquiryRepository userRepository;
+    private final UserRepository userRepository; 
 
     @Transactional
     public void saveAnswer(Long inquiryId, String answerContent, String adminUsername) {
         Inquiry inquiry = inquiryRepository.findById(inquiryId)
                 .orElseThrow(() -> new IllegalArgumentException("문의가 존재하지 않습니다."));
 
-        UserInquiryDto adminUser = userRepository.findByUsername(adminUsername)
-                .orElseThrow(() -> new IllegalArgumentException("관리자 사용자를 찾을 수 없습니다."));
+        // 진짜 User 엔티티 조회
+User adminUser = userRepository.findById(adminUsername)
+        .orElseThrow(() -> new IllegalArgumentException("관리자 사용자를 찾을 수 없습니다."));
+
+// DTO로 변환
+UserInquiryDto adminDto = UserInquiryDto.from(adminUser);
 
         InquiryAnswer answer = inquiryAnswerRepository.findByInquiryId(inquiryId)
                 .orElseGet(() -> InquiryAnswer.create(inquiry, answerContent, adminUser));
diff --git a/src/main/java/com/example/backend/CustomerService/UserInquiryDto.java b/src/main/java/com/example/backend/CustomerService/UserInquiryDto.java
@@ -1,31 +1,27 @@
 package com.example.backend.CustomerService;
 
 import com.example.backend.authentication.Role;
-
-import jakarta.persistence.*;
 import lombok.*;
 
-@Entity
-@Table(name = "users")  // DB 테이블 이름은 그대로 유지해야 함
 @Getter
-@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@NoArgsConstructor
 @AllArgsConstructor
 @Builder
 public class UserInquiryDto {
-
-    @Id
-    @Column(name = "user_name")
     private String username;
-
-    @Column(name = "name")
     private String name;
-
-    @Enumerated(EnumType.STRING)
-    @Column(name = "role")
     private Role role;
 
-    // 필요시: admin 여부 확인용 헬퍼 메서드
     public boolean isAdmin() {
-    	return this.role.name().startsWith("ADMIN_");
+        return this.role != null && this.role.name().startsWith("ADMIN_");
+    }
+
+    // 정적 팩토리 메서드로 Entity → DTO 변환
+    public static UserInquiryDto from(com.example.backend.authentication.User user) {
+        return UserInquiryDto.builder()
+                .username(user.getUsername())
+                .name(user.getName())
+                .role(user.getRole())
+                .build();
     }
 }
diff --git a/src/main/java/com/example/backend/CustomerService/UserInquiryRepository.java b/src/main/java/com/example/backend/CustomerService/UserInquiryRepository.java
diff --git a/src/main/java/com/example/backend/announcement/NoticeController.java b/src/main/java/com/example/backend/announcement/NoticeController.java
@@ -17,7 +17,13 @@ public class NoticeController {
 
         private final NoticeService noticeService;
 
+        
+@GetMapping
+    public List<NoticeDTO> getAllNotices() {
+        return noticeService.getAllNotices();
+    }
       
+    
 @GetMapping("/paged")
 public ResponseEntity<Page<NoticeDTO>> getNoticesPaged(
         @RequestParam int page,
diff --git a/src/main/java/com/example/backend/announcement/NoticeService.java b/src/main/java/com/example/backend/announcement/NoticeService.java
@@ -67,4 +67,20 @@ private NoticeDTO entityToDto(Notice notice) {
                 .createdAt(notice.getCreatedAt())
                 .build();
     }
+
+      public List<NoticeDTO> getAllNotices() {
+        return noticeRepository.findAll().stream()
+                .map(this::convertToDTO)
+                .collect(Collectors.toList());
+    }
+
+       private NoticeDTO convertToDTO(Notice notice) {
+        return NoticeDTO.builder()
+                .id(notice.getId())
+                .category(notice.getCategory())
+                .title(notice.getTitle())
+                .content(notice.getContent())
+                .createdAt(notice.getCreatedAt())
+                .build();
+    }
 }
diff --git a/src/main/java/com/example/backend/authentication/User.java b/src/main/java/com/example/backend/authentication/User.java
@@ -61,7 +61,7 @@ public class User implements UserDetails {
     private String business_registration_number;
     
     @Column(name = "points")
-    private Integer points = 0;
+    private Integer point = 0;
 
     @Builder
     public User(String username, String password, String name, String phoneNumber, Role role, String uuid, String business_registration_number, String loginType, Integer points) {
@@ -74,7 +74,7 @@ public User(String username, String password, String name, String phoneNumber, R
         this.uuid = uuid;
         this.business_registration_number = business_registration_number;
         this.loginType = loginType;
-        this.points = points;
+        this.point = points;
 
         if (role == Role.BUSINESS) {
             this.approvalStatus = ApprovalStatus.PENDING;
@@ -118,4 +118,11 @@ public boolean isCredentialsNonExpired() {
     public boolean isEnabled() {
         return true;
     }
+
+    public void addPoints(int pointsToAdd) {
+        if (pointsToAdd < 0) {
+            throw new IllegalArgumentException("포인트는 음수일 수 없습니다.");
+        }
+        this.point += pointsToAdd;
+    }
 }
diff --git a/src/main/java/com/example/backend/config/AppConfig.java b/src/main/java/com/example/backend/config/AppConfig.java
@@ -0,0 +1,15 @@
+package com.example.backend.config;
+
+// AppConfig.java 등 설정 파일
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestTemplate;
+
+@Configuration
+public class AppConfig {
+
+    @Bean
+    public RestTemplate restTemplate() {
+        return new RestTemplate();
+    }
+}
diff --git a/src/main/java/com/example/backend/config/SecurityConfig.java b/src/main/java/com/example/backend/config/SecurityConfig.java
@@ -49,7 +49,9 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                     .requestMatchers("/api/user/**").permitAll()
                     .requestMatchers("/api/reviews/**").hasAnyRole("BUSINESS", "ADMIN_SUPER")
                     .requestMatchers("/api/business/**").hasAnyRole("BUSINESS")
+                    .requestMatchers("/api/payment/**").hasAnyRole("BUSINESS", "ADMIN_SUPER")
             		.requestMatchers("/api/notices/**").hasAnyRole("ADMIN_CS", "ADMIN_SUPER")
+            		.requestMatchers("/api/admin/notices/**").hasAnyRole("ADMIN_CS", "ADMIN_SUPER")
             		.requestMatchers("/api/admin/business-users").hasAnyRole("ADMIN_BIZ", "ADMIN_SUPER")
             		.requestMatchers("/api/admin/inquiries/**").hasAnyRole("ADMIN_CS", "ADMIN_SUPER")
             		.requestMatchers("/api/admin/**").hasAnyRole("ADMIN_SUPER")
diff --git a/src/main/java/com/example/backend/mail/EmailService.java b/src/main/java/com/example/backend/mail/EmailService.java
@@ -0,0 +1,44 @@
+package com.example.backend.mail;
+
+import com.example.backend.reservation.Reservation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.mail.SimpleMailMessage;
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class EmailService {
+    
+    private final JavaMailSender mailSender;
+
+    public void sendCancellationConfirmationEmail(Reservation reservation, int refundAmount, int cancelFee) {
+        if (reservation.getUser() == null || reservation.getUser().getUsername() == null) {
+            return;
+        }
+
+        SimpleMailMessage message = new SimpleMailMessage();
+        message.setTo(reservation.getUser().getUsername());
+        message.setSubject("[HotelHub] 예약이 취소되었습니다.");
+
+        String emailText = String.format(
+                "안녕하세요, %s님.\n\n" +
+                        "요청하신 예약이 정상적으로 취소되었음을 알려드립니다.\n\n" +
+                        "■ 예약 번호: %d\n" +
+                        "■ 숙소명: %s\n" +
+                        "■ 취소 수수료: %,d원\n" +
+                        "■ 최종 환불 금액: %,d원\n\n" +
+                        "환불은 영업일 기준 3~5일 이내에 처리됩니다.\n" +
+                        "이용해주셔서 감사합니다.",
+                reservation.getUser().getName(),
+                reservation.getReservationId(),
+                reservation.getHotel().getTitle(),
+                cancelFee,
+                refundAmount
+        );
+
+        message.setText(emailText);
+
+        mailSender.send(message);
+    }
+}
diff --git a/src/main/java/com/example/backend/payment/PaymentController.java b/src/main/java/com/example/backend/payment/PaymentController.java
@@ -0,0 +1,35 @@
+package com.example.backend.payment;
+
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import lombok.RequiredArgsConstructor;
+
+@RestController
+@RequestMapping("/api/payment")
+@RequiredArgsConstructor
+public class PaymentController {
+
+    private final PaymentService paymentService;
+    
+    @Value("${toss.widget-secret-key}")
+    private String widgetSecretKey;
+
+    @PostMapping("/cancel")
+    public ResponseEntity<String> cancelPayment(@RequestBody Map<String, Object> payload) {
+        try {
+            Long reservationId = Long.parseLong(payload.get("reservationId").toString());
+            String cancelReason = payload.get("cancelReason").toString();
+            String resultMessage = paymentService.cancelPayment(reservationId, cancelReason);
+            return ResponseEntity.ok(resultMessage);
+        } catch (Exception e) {
+            return ResponseEntity.badRequest().body(e.getMessage());
+        }
+    }
+}
diff --git a/src/main/java/com/example/backend/payment/PaymentRepository.java b/src/main/java/com/example/backend/payment/PaymentRepository.java
@@ -6,8 +6,12 @@
 import org.springframework.data.jpa.repository.*;
 import org.springframework.data.repository.query.Param;
 
+import com.example.backend.reservation.Reservation;
+
 public interface PaymentRepository extends JpaRepository<Payment, Long> {
 
+  Optional<Payment> findByReservation(Reservation reservation);
+
   List<Payment> findByReservationReservationId(Long reservationId);
 
   List<Payment> findByReservationReservationIdIn(Collection<Long> reservationIds);
diff --git a/src/main/java/com/example/backend/payment/PaymentService.java b/src/main/java/com/example/backend/payment/PaymentService.java
diff --git a/src/main/java/com/example/backend/reservation/Reservation.java b/src/main/java/com/example/backend/reservation/Reservation.java
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
