Merge pull request #13 from DMU-Capstone/feat/#10

Feat/#10

Author: HuitaePark

src/main/java/com/waitit/capstone/domain/admin/AdminController.java

@@ -2,24 +2,31 @@
 
 import com.waitit.capstone.domain.admin.dto.AllHostRequest;
 import com.waitit.capstone.domain.admin.dto.AllUserRequest;
+import com.waitit.capstone.domain.admin.dto.MainBannerResponse;
 import com.waitit.capstone.domain.admin.dto.UpdatedRequest;
+import com.waitit.capstone.domain.image.AllImageResponse;
+import com.waitit.capstone.domain.image.ImageService;
 import com.waitit.capstone.global.util.PageResponse;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+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.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
 
 
 @AllArgsConstructor
@@ -28,7 +35,7 @@
 public class AdminController {
 
     private final AdminService adminService;
-
+    private final ImageService imageService;
     //모든 회원 조회
     @GetMapping("/users")
     @PreAuthorize("hasRole('ADMIN')")
@@ -63,8 +70,37 @@ public ResponseEntity<?> deleteUser(@PathVariable Long id){
     }
 
     //이벤트 배너 등록
+    @PostMapping("/event/upload")
+    @PreAuthorize("hasRole('ADMIN')")
+    public ResponseEntity<?> uploadEventBanner(@RequestParam("images") List<MultipartFile> eventImages){
+        adminService.uploadEventImage(eventImages);
+        return ResponseEntity.status(HttpStatus.CREATED).body("이미지 저장 완료");
+    }
+
     //이벤트 배너 조회
+    @GetMapping("/event")
+    public ResponseEntity<PageResponse<AllImageResponse>> getAllImages(
+            @RequestParam(defaultValue = "1") int page,
+            @RequestParam(defaultValue = "10") int size) {
+        Pageable pageable = PageRequest.of(page - 1, size, Sort.by("id").descending());
+        PageResponse<AllImageResponse> images = imageService.getAllImage(pageable);
+        return ResponseEntity.ok(images);
+    }
+    //메인 이벤트 배너 결정 기능
+    @PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/event/select")
+    public ResponseEntity<?> selectEventBanner(@RequestParam Long imgId,@RequestParam int number){
+        adminService.selectBanner(imgId,number);
+        return ResponseEntity.status(HttpStatus.OK).body("이미지 이벤트 등록 완료");
+    }
 
+    //메인 이벤트배너 조회
+    @PreAuthorize("hasRole('ADMIN')")
+    @GetMapping("/event/select")
+    public ResponseEntity<MainBannerResponse> getAllBanner(){
+        MainBannerResponse responseList = adminService.getEventBanner();
+        return ResponseEntity.ok(responseList);
+    }
 
     //대기열 현황 조회
 

src/main/java/com/waitit/capstone/domain/admin/AdminService.java

@@ -1,19 +1,24 @@
 package com.waitit.capstone.domain.admin;
 
+import com.sun.tools.javac.Main;
 import com.waitit.capstone.domain.admin.dto.AllHostRequest;
 import com.waitit.capstone.domain.admin.dto.AllUserRequest;
+import com.waitit.capstone.domain.admin.dto.MainBannerResponse;
 import com.waitit.capstone.domain.admin.dto.UpdatedRequest;
 
+import com.waitit.capstone.domain.image.ImageService;
 import com.waitit.capstone.domain.manager.Host;
-import com.waitit.capstone.domain.manager.HostMapper;
 import com.waitit.capstone.domain.manager.HostRepository;
 import com.waitit.capstone.domain.member.Entity.Member;
 import com.waitit.capstone.domain.member.MemberRepository;
 import com.waitit.capstone.global.util.PageResponse;
+import java.util.List;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
 
 @AllArgsConstructor
@@ -23,7 +28,10 @@ public class AdminService {
     private final MemberRepository memberRepository;
     private final AdminMapper adminMapper;
     private final HostRepository hostRepository;
-    private final HostMapper hostMapper;
+    private final ImageService imageService;
+    private final StringRedisTemplate redisTemplate;
+
+
     //모든 유저를 조회후 페이징
     public PageResponse<AllUserRequest> getAllUser(Pageable pageable) {
         Page<Member> members = memberRepository.findAll(pageable);
@@ -32,7 +40,7 @@ public PageResponse<AllUserRequest> getAllUser(Pageable pageable) {
         return new PageResponse<>(allUserRequests);
     }
 
-    //유저 리퀘스트 바디를 받아서 수정후 저장
+    //유저 리퀘스트 바디를 받아서 멤버 수정후 저장
     public void updateMember(UpdatedRequest request) {
         Long memberId = Long.parseLong(request.getId());
         Member member = memberRepository.findMemberById(memberId);
@@ -41,19 +49,36 @@ public void updateMember(UpdatedRequest request) {
         memberRepository.save(member);
     }
 
-    //아이디로 삭제
+    //아이디로 멤버삭제
     public void deleteMember(Long id) {
         memberRepository.deleteById(id);
     }
 
     //이벤트 배너 등록
-    //이벤트 배너 조회
+    public void uploadEventImage(List<MultipartFile> images) {
+        imageService.uploadEvent(images);
+    }
+
+    //이벤트 배너 메인 등록
+    public void selectBanner(Long imgId, int number) {
+        //레디스에 imgId 받은걸 db 패스를 찾음
+        String img = imageService.getImgPath(imgId);
+        String redisKey = "main_banner";
+        // 레디스 리스트의  number 인덱스에 등록
+        redisTemplate.opsForList().set(redisKey, number, img);
+    }
 
     //모든 대기열 내역 조회
-    public PageResponse<AllHostRequest> getAllHost(Pageable pageable){
+    public PageResponse<AllHostRequest> getAllHost(Pageable pageable) {
         Page<Host> hosts = hostRepository.findAll(pageable);
         Page<AllHostRequest> allHostRequests = hosts.map(adminMapper::toAllHostRequest);
 
         return new PageResponse<>(allHostRequests);
     }
+
+    public MainBannerResponse getEventBanner() {
+        String redisKey = "main_banner";
+        List<String> list = redisTemplate.opsForList().range(redisKey, 0, 4);
+        return new MainBannerResponse("mainBanner", list);
+    }
 }

src/main/java/com/waitit/capstone/domain/admin/dto/MainBannerResponse.java

@@ -0,0 +1,13 @@
+package com.waitit.capstone.domain.admin.dto;
+
+import java.util.List;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@AllArgsConstructor
+public class MainBannerResponse {
+    private String banner;
+    private List<String> imgList;
+}

src/main/java/com/waitit/capstone/domain/image/AllImageResponse.java

@@ -0,0 +1,15 @@
+package com.waitit.capstone.domain.image;
+
+import java.time.LocalDateTime;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@Builder
+@AllArgsConstructor
+public class AllImageResponse {
+    private Long id;
+    private String dbFilePath;
+    private LocalDateTime createdAt;
+}

src/main/java/com/waitit/capstone/domain/image/EventImage.java

@@ -0,0 +1,34 @@
+package com.waitit.capstone.domain.image;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import java.time.LocalDateTime;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Table(name = "event_image")
+public class EventImage {
+
+    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    private String imgPath;
+    @Column(columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
+    private LocalDateTime createdAt;
+
+
+    public EventImage(String dbFilePath) {
+        this.imgPath = dbFilePath;
+        this.createdAt = LocalDateTime.now(); // 명시적으로 설정해야 함
+    }
+}

src/main/java/com/waitit/capstone/domain/image/EventImageRepository.java

@@ -0,0 +1,6 @@
+package com.waitit.capstone.domain.image;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface EventImageRepository extends JpaRepository<EventImage,Long> {
+}

src/main/java/com/waitit/capstone/domain/image/ImageMapper.java

@@ -0,0 +1,8 @@
+package com.waitit.capstone.domain.image;
+
+import org.mapstruct.Mapper;
+
+@Mapper(componentModel = "spring")
+public interface ImageMapper {
+    AllImageResponse toAllImageResponse(EventImage eventImage);
+}

src/main/java/com/waitit/capstone/domain/image/ImageService.java

@@ -0,0 +1,63 @@
+package com.waitit.capstone.domain.image;
+
+import com.waitit.capstone.global.util.PageResponse;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.UUID;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+@Service
+@AllArgsConstructor
+public class ImageService {
+    private final EventImageRepository eventImageRepository;
+    private final ImageMapper imageMapper;
+    public void uploadEvent(List<MultipartFile> images){
+        try{
+            //이미지 파일 저장을 위한 경로 설정
+            String uploadDir = "src/main/resources/static/uploads/events/";
+
+            //각 이미지 파일에 대해 업로드 및 db 저장 수행
+            for(MultipartFile image : images){
+                String dbFilePath = saveImage(image,uploadDir);
+                EventImage eventImage = new EventImage(dbFilePath);
+                eventImageRepository.save(eventImage);
+            }
+
+        }catch (IOException e) {
+            // 파일 저장 중 오류가 발생한 경우 처리
+            e.printStackTrace();
+        }
+    }
+
+    private String saveImage(MultipartFile image, String uploadDir) throws IOException {
+        //파일 이름 생성
+        String fileName = UUID.randomUUID().toString().replace("-","")+"_"+image.getOriginalFilename();
+        //실제 파일이 저장될 경로
+        String filePath = uploadDir + fileName;
+        //db에 저장할 경로 문자열
+        String dbFilePath = "/uploads/events/" + fileName;
+
+        Path path = Paths.get(filePath);
+        Files.createDirectories(path.getParent());
+        Files.write(path,image.getBytes());
+
+        return dbFilePath;
+    }
+
+    public PageResponse<AllImageResponse> getAllImage(Pageable pageable){
+        Page<EventImage> eventImages = eventImageRepository.findAll(pageable);
+        Page<AllImageResponse> page = eventImages.map(imageMapper::toAllImageResponse);
+        return new PageResponse<>(page);
+    }
+    public String getImgPath(Long id){
+      EventImage eventImage =  eventImageRepository.findById(id).orElseThrow(()->new IllegalArgumentException("없는 이미지 입니다."));
+      return eventImage.getImgPath();
+    }
+}

src/main/java/com/waitit/capstone/global/common/RedisInitializer.java

@@ -0,0 +1,20 @@
+package com.waitit.capstone.global.common;
+
+import jakarta.annotation.PostConstruct;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class RedisInitializer {
+    private final StringRedisTemplate redisTemplate;
+
+    @PostConstruct
+    public void initList() {
+        String LIST_KEY = "main_banner";
+        if (Boolean.FALSE.equals(redisTemplate.hasKey(LIST_KEY))) {
+            redisTemplate.opsForList().leftPushAll(LIST_KEY, "default1","default2","default3","default4","default5");
+        }
+    }
+}

src/main/java/com/waitit/capstone/global/config/RedisConfig.java

@@ -32,4 +32,4 @@ public StringRedisTemplate stringRedisTemplate(RedisConnectionFactory connection
         template.setConnectionFactory(connectionFactory);
         return template;
     }
-}
+}