From a7e60d010e6ad6aa2f4301d0e9a3c0bb07e756e2 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Wed, 4 Jun 2025 19:41:23 +0900 Subject: [PATCH 01/41] feat(config): add AsyncConfig with s3UploadExecutor thread pool --- .../gtable/global/config/AsyncConfig.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 src/main/java/com/example/gtable/global/config/AsyncConfig.java diff --git a/src/main/java/com/example/gtable/global/config/AsyncConfig.java b/src/main/java/com/example/gtable/global/config/AsyncConfig.java new file mode 100644 index 0000000..6b01fae --- /dev/null +++ b/src/main/java/com/example/gtable/global/config/AsyncConfig.java @@ -0,0 +1,21 @@ +package com.example.gtable.global.config; + +import java.util.concurrent.Executor; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; + +@Configuration +public class AsyncConfig { + @Bean(name = "s3UploadExecutor") + public Executor s3UploadExecutor() { + ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); + executor.setCorePoolSize(5); + executor.setMaxPoolSize(10); + executor.setQueueCapacity(100); + executor.setThreadNamePrefix("S3Upload-"); + executor.initialize(); + return executor; + } +} From 71155f86f1a9448e2f1fe369fd98ed17ef7a6ec8 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Wed, 4 Jun 2025 19:41:58 +0900 Subject: [PATCH 02/41] feat(config): add AwsS3Config for AwsS3Client bean configuration --- .../gtable/global/config/AwsS3Config.java | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 src/main/java/com/example/gtable/global/config/AwsS3Config.java diff --git a/src/main/java/com/example/gtable/global/config/AwsS3Config.java b/src/main/java/com/example/gtable/global/config/AwsS3Config.java new file mode 100644 index 0000000..ffb6bd1 --- /dev/null +++ b/src/main/java/com/example/gtable/global/config/AwsS3Config.java @@ -0,0 +1,33 @@ +package com.example.gtable.global.config; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import com.amazonaws.auth.AWSStaticCredentialsProvider; +import com.amazonaws.auth.BasicAWSCredentials; +import com.amazonaws.services.s3.AmazonS3Client; +import com.amazonaws.services.s3.AmazonS3ClientBuilder; + +@Configuration +public class AwsS3Config { + + @Value("${cloud.aws.credentials.access-key}") + private String accessKey; + + @Value("${cloud.aws.credentials.secret-key}") + private String secretKey; + + @Value("${cloud.aws.region.static}") + private String region; + + @Bean + public AmazonS3Client amazonS3Client() { + BasicAWSCredentials awsCredentials = new BasicAWSCredentials(accessKey, secretKey); + return (AmazonS3Client)AmazonS3ClientBuilder.standard() + .withRegion(region) + .withCredentials(new AWSStaticCredentialsProvider(awsCredentials)) + .build(); + } + +} From 68a5c2bfd7c4a4e031c9ce43ba92f623d5ac41ee Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Wed, 4 Jun 2025 19:42:52 +0900 Subject: [PATCH 03/41] chore(build): add AWS S3 and Resilience4j depende --- build.gradle | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/build.gradle b/build.gradle index 1985f13..d2241b3 100644 --- a/build.gradle +++ b/build.gradle @@ -51,6 +51,15 @@ dependencies { // Validation implementation 'org.springframework.boot:spring-boot-starter-validation' + // S3 + implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE' + implementation 'com.amazonaws:aws-java-sdk-s3:1.12.683' + // Resilience4j + implementation 'io.github.resilience4j:resilience4j-spring-boot2:1.7.1' + implementation 'io.github.resilience4j:resilience4j-bulkhead:1.7.1' + // 비동기 실행 + implementation 'org.springframework.boot:spring-boot-starter-aop' + testImplementation 'org.springframework.security:spring-security-test' testImplementation 'org.awaitility:awaitility:4.3.0' testImplementation 'com.h2database:h2' From 27a8dad71544b64d0628690aa2cac11ae6d8ff38 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Wed, 4 Jun 2025 19:43:48 +0900 Subject: [PATCH 04/41] feat(s3): implements S3Service with async upload and delete method --- .../example/gtable/global/s3/S3Service.java | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 src/main/java/com/example/gtable/global/s3/S3Service.java diff --git a/src/main/java/com/example/gtable/global/s3/S3Service.java b/src/main/java/com/example/gtable/global/s3/S3Service.java new file mode 100644 index 0000000..1fecf4a --- /dev/null +++ b/src/main/java/com/example/gtable/global/s3/S3Service.java @@ -0,0 +1,57 @@ +package com.example.gtable.global.s3; + +import java.io.InputStream; +import java.util.UUID; +import java.util.concurrent.CompletableFuture; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import com.amazonaws.services.s3.AmazonS3Client; +import com.amazonaws.services.s3.model.ObjectMetadata; + +import io.github.resilience4j.bulkhead.annotation.Bulkhead; +import lombok.RequiredArgsConstructor; + +@Service +@RequiredArgsConstructor +public class S3Service { + private final AmazonS3Client amazonS3Client; + + @Value("${cloud.aws.s3.bucket}") + private String bucket; + + public record S3UploadResult(String key, String url) { + } + + @Bulkhead(name = "s3UploadBulkhead", type = Bulkhead.Type.THREADPOOL) + @Async("s3UploadExecutor") + public CompletableFuture upload(Long storeId, MultipartFile file) { + try (InputStream inputStream = file.getInputStream()) { + String key = createFileKey(storeId, file.getOriginalFilename()); + ObjectMetadata metadata = new ObjectMetadata(); + metadata.setContentLength(file.getSize()); + + amazonS3Client.putObject(bucket, key, inputStream, metadata); + String url = amazonS3Client.getUrl(bucket, key).toString(); + + return CompletableFuture.completedFuture(new S3UploadResult(key, url)); + } catch (Exception e) { + throw new RuntimeException("S3 업로드 실패", e); + } + } + + public void delete(String filename) { + try { + amazonS3Client.deleteObject(bucket, filename); + } catch (Exception e) { + throw new RuntimeException("S3 파일 삭제 실패", e); + } + } + + private String createFileKey(Long storeId, String filename) { + return "store/" + storeId + "/" + UUID.randomUUID() + "-" + filename; + } +} From 7624cb65ae06822b742884b5de45372c7d662f03 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Wed, 4 Jun 2025 19:45:02 +0900 Subject: [PATCH 05/41] chore(security): permit all requests to /stores/** --- .../java/com/example/gtable/global/config/SecurityConfig.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/example/gtable/global/config/SecurityConfig.java b/src/main/java/com/example/gtable/global/config/SecurityConfig.java index 8c817cc..f54ed19 100644 --- a/src/main/java/com/example/gtable/global/config/SecurityConfig.java +++ b/src/main/java/com/example/gtable/global/config/SecurityConfig.java @@ -51,7 +51,8 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { .requestMatchers( "/oauth2/authorization/kakao", // 카카오 로그인 요청 "/login/oauth2/code/**", // 카카오 인증 콜백 - "/api/refresh-token") // refresh token (토큰 갱신) + "/api/refresh-token", + "/stores/**") // refresh token (토큰 갱신) .permitAll() .anyRequest().authenticated() // 그외 요청은 허가된 사람만 인가 ) From 57d554cf0db14ce281b1a2ccbb6767abeb99ea32 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Wed, 4 Jun 2025 19:45:54 +0900 Subject: [PATCH 06/41] feat(store-images): add StoreImage entity --- .../gtable/storeImage/model/StoreImage.java | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 src/main/java/com/example/gtable/storeImage/model/StoreImage.java diff --git a/src/main/java/com/example/gtable/storeImage/model/StoreImage.java b/src/main/java/com/example/gtable/storeImage/model/StoreImage.java new file mode 100644 index 0000000..3224888 --- /dev/null +++ b/src/main/java/com/example/gtable/storeImage/model/StoreImage.java @@ -0,0 +1,43 @@ +package com.example.gtable.storeImage.model; + +import com.example.gtable.global.entity.BaseTimeEntity; +import com.example.gtable.store.model.Store; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +@Entity +@Table(name = "store_images") +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@SuperBuilder +public class StoreImage extends BaseTimeEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "store_id") + private Store store; + + @Column(nullable = false, length = 500) + private String imageUrl; + + @Column(nullable = false, length = 500) + private String fileKey; + + @Column(length = 20) + private String type; +} From cfb4cfbe1700e598ddc43b429ed4d7ee78e56bee Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Wed, 4 Jun 2025 19:46:29 +0900 Subject: [PATCH 07/41] feat(store-images): add endpoints for uploading and deleting store images --- .../controller/StoreImageController.java | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 src/main/java/com/example/gtable/storeImage/controller/StoreImageController.java diff --git a/src/main/java/com/example/gtable/storeImage/controller/StoreImageController.java b/src/main/java/com/example/gtable/storeImage/controller/StoreImageController.java new file mode 100644 index 0000000..8b92e5a --- /dev/null +++ b/src/main/java/com/example/gtable/storeImage/controller/StoreImageController.java @@ -0,0 +1,56 @@ +package com.example.gtable.storeImage.controller; + +import java.util.List; + +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +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; + +import com.example.gtable.global.api.ApiUtils; +import com.example.gtable.storeImage.dto.StoreImageUploadResponse; +import com.example.gtable.storeImage.service.StoreImageService; + +import lombok.RequiredArgsConstructor; + +@RestController +@RequestMapping("/stores") +@RequiredArgsConstructor +public class StoreImageController { + + private final StoreImageService storeImageService; + + @PostMapping("/{storeId}/images") + public ResponseEntity uploadStoreImage( + @PathVariable Long storeId, + @RequestParam("files") List files, + @RequestParam(value = "types") List types + ) { + List response = storeImageService.saveAll(storeId, files, types); + return ResponseEntity + .status(HttpStatus.CREATED) + .body( + ApiUtils.success( + response + ) + ); + } + + @DeleteMapping("/image/{imageId}") + public ResponseEntity deleteStoreImage(@PathVariable Long imageId) { + storeImageService.delete(imageId); + return ResponseEntity + .status(HttpStatus.NO_CONTENT) + .body( + ApiUtils + .success( + "Store image deleted successfully." + ) + ); + } +} From 95c2b71f53f754113433e8cd1ad0b59a6308b2c9 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Wed, 4 Jun 2025 19:47:00 +0900 Subject: [PATCH 08/41] feat(store-images): add StoreImageRepository --- .../repository/StoreImageRepository.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 src/main/java/com/example/gtable/storeImage/repository/StoreImageRepository.java diff --git a/src/main/java/com/example/gtable/storeImage/repository/StoreImageRepository.java b/src/main/java/com/example/gtable/storeImage/repository/StoreImageRepository.java new file mode 100644 index 0000000..e7db0a0 --- /dev/null +++ b/src/main/java/com/example/gtable/storeImage/repository/StoreImageRepository.java @@ -0,0 +1,15 @@ +package com.example.gtable.storeImage.repository; + +import java.util.List; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import com.example.gtable.store.model.Store; +import com.example.gtable.storeImage.model.StoreImage; + +@Repository +public interface StoreImageRepository extends JpaRepository { + + List findByStore(Store store); +} From eb1ee68114b8dd23819591998156494eb3948016 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Wed, 4 Jun 2025 19:47:38 +0900 Subject: [PATCH 09/41] feat(store-images): add StoreImageService for batch upload and delete of store images --- .../storeImage/service/StoreImageService.java | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 src/main/java/com/example/gtable/storeImage/service/StoreImageService.java diff --git a/src/main/java/com/example/gtable/storeImage/service/StoreImageService.java b/src/main/java/com/example/gtable/storeImage/service/StoreImageService.java new file mode 100644 index 0000000..92ccf1d --- /dev/null +++ b/src/main/java/com/example/gtable/storeImage/service/StoreImageService.java @@ -0,0 +1,68 @@ +package com.example.gtable.storeImage.service; + +import java.util.ArrayList; +import java.util.List; + +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import com.example.gtable.global.s3.S3Service; +import com.example.gtable.store.model.Store; +import com.example.gtable.store.repository.StoreRepository; +import com.example.gtable.storeImage.dto.StoreImageUploadResponse; +import com.example.gtable.storeImage.model.StoreImage; +import com.example.gtable.storeImage.repository.StoreImageRepository; + +import jakarta.persistence.EntityNotFoundException; +import lombok.RequiredArgsConstructor; + +@Service +@RequiredArgsConstructor +public class StoreImageService { + + private final StoreRepository storeRepository; + private final StoreImageRepository storeImageRepository; + private final S3Service s3Service; + + @Transactional + public List saveAll(Long storeId, List files, List types) { + if (files.size() != types.size()) { + throw new IllegalArgumentException("파일과 타입의 개수가 일치해야 합니다."); + } + + Store store = storeRepository.findById(storeId) + .orElseThrow(() -> new EntityNotFoundException("Store not found with id: " + storeId)); + + List imageUploadResponses = new ArrayList<>(); + for (int i = 0; i < files.size(); i++) { + S3Service.S3UploadResult uploadResult; + try { + uploadResult = s3Service.upload(storeId, files.get(i)).get(); + } catch (Exception e) { + throw new RuntimeException("S3 업로드 실패", e); + } + + StoreImage storeImage = StoreImage.builder() + .store(store) + .imageUrl(uploadResult.url()) + .fileKey(uploadResult.key()) + .type(types.get(i)) + .build(); + + storeImageRepository.save(storeImage); + imageUploadResponses.add(StoreImageUploadResponse.fromEntity(storeImage)); + } + + return imageUploadResponses; + } + + @Transactional + public void delete(Long storeImageId) { + StoreImage storeImage = storeImageRepository.findById(storeImageId) + .orElseThrow(() -> new EntityNotFoundException("StoreImage not found with id: " + storeImageId)); + + s3Service.delete(storeImage.getFileKey()); + storeImageRepository.delete(storeImage); + } +} From bf8a1de12cb9cfde375a6dc4d5437bbe3f093073 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Wed, 4 Jun 2025 19:53:04 +0900 Subject: [PATCH 10/41] feat(store-images): add StoreImageUploadResponse dto with fromEntity factory method --- .../dto/StoreImageUploadResponse.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 src/main/java/com/example/gtable/storeImage/dto/StoreImageUploadResponse.java diff --git a/src/main/java/com/example/gtable/storeImage/dto/StoreImageUploadResponse.java b/src/main/java/com/example/gtable/storeImage/dto/StoreImageUploadResponse.java new file mode 100644 index 0000000..0fdfc3e --- /dev/null +++ b/src/main/java/com/example/gtable/storeImage/dto/StoreImageUploadResponse.java @@ -0,0 +1,22 @@ +package com.example.gtable.storeImage.dto; + +import com.example.gtable.storeImage.model.StoreImage; + +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +public class StoreImageUploadResponse { + private final Long id; + private final String imageUrl; + private final String type; + + public static StoreImageUploadResponse fromEntity(StoreImage storeImage) { + return StoreImageUploadResponse.builder() + .id(storeImage.getId()) + .imageUrl(storeImage.getImageUrl()) + .type(storeImage.getType()) + .build(); + } +} From 2be16e42ae0fe5bf2612ac6a2b0e854fb6240b98 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Wed, 4 Jun 2025 20:14:57 +0900 Subject: [PATCH 11/41] refactor(store): remove setters, imageUrl, and add update methods --- .../com/example/gtable/store/model/Store.java | 25 ++++++------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/example/gtable/store/model/Store.java b/src/main/java/com/example/gtable/store/model/Store.java index cefa782..32dc069 100644 --- a/src/main/java/com/example/gtable/store/model/Store.java +++ b/src/main/java/com/example/gtable/store/model/Store.java @@ -36,8 +36,6 @@ public class Store extends BaseTimeEntity { private String description; - private String storeImageUrl; - @Column(name = "is_active", nullable = false) private Boolean isActive = false; @@ -45,39 +43,32 @@ public class Store extends BaseTimeEntity { private Boolean deleted = false; public Store(LocalDateTime createdAt, Long storeId, Long departmentId, String name, String location, - String description, String storeImageUrl, Boolean isActive, Boolean deleted) { + String description, Boolean isActive, Boolean deleted) { super(createdAt); this.storeId = storeId; this.departmentId = departmentId; this.name = name; this.location = location; this.description = description; - this.storeImageUrl = storeImageUrl; this.isActive = isActive; this.deleted = deleted; } - public void setName(String name) { + public void updateInfo(String name, String location, String description) { this.name = name; - } - - public void setLocation(String location) { this.location = location; - } - - public void setDescription(String description) { this.description = description; } - public void setStoreImageUrl(String url) { - this.storeImageUrl = url; + public void markAsDeleted() { + this.deleted = true; } - public void setIsActive(Boolean isActive) { - this.isActive = isActive; + public void activate() { + this.isActive = true; } - public void setDeleted(Boolean deleted) { - this.deleted = deleted; + public void deactivate() { + this.isActive = false; } } From 05f9bb691a50cdab249e91f39b5e3cda7cf70f84 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Wed, 4 Jun 2025 20:15:12 +0900 Subject: [PATCH 12/41] refactor(store): remove imageUrl field --- .../java/com/example/gtable/store/dto/StoreCreateRequest.java | 3 --- .../java/com/example/gtable/store/dto/StoreCreateResponse.java | 2 -- 2 files changed, 5 deletions(-) diff --git a/src/main/java/com/example/gtable/store/dto/StoreCreateRequest.java b/src/main/java/com/example/gtable/store/dto/StoreCreateRequest.java index e400dd3..cdcda45 100644 --- a/src/main/java/com/example/gtable/store/dto/StoreCreateRequest.java +++ b/src/main/java/com/example/gtable/store/dto/StoreCreateRequest.java @@ -23,15 +23,12 @@ public class StoreCreateRequest { private String description; - private String storeImageUrl; - public Store toEntity() { return Store.builder() .departmentId(departmentId) .name(name) .location(location) .description(description) - .storeImageUrl(storeImageUrl) .isActive(false) .deleted(false) .build(); diff --git a/src/main/java/com/example/gtable/store/dto/StoreCreateResponse.java b/src/main/java/com/example/gtable/store/dto/StoreCreateResponse.java index caeeaf4..0e5bfb4 100644 --- a/src/main/java/com/example/gtable/store/dto/StoreCreateResponse.java +++ b/src/main/java/com/example/gtable/store/dto/StoreCreateResponse.java @@ -18,7 +18,6 @@ public class StoreCreateResponse { private String name; private String location; private String description; - private String storeImageUrl; private Boolean isActive; private Boolean deleted; private LocalDateTime createdAt; @@ -31,7 +30,6 @@ public static StoreCreateResponse fromEntity(Store store) { .name(store.getName()) .location(store.getLocation()) .description(store.getDescription()) - .storeImageUrl(store.getStoreImageUrl()) .isActive(store.getIsActive()) .deleted(store.getDeleted()) .build(); From efa11eaa59e1d8aa642d43314fe3a524eacd871f Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Wed, 4 Jun 2025 20:15:41 +0900 Subject: [PATCH 13/41] refactor(store): remove imageUrl, add List --- .../java/com/example/gtable/store/dto/StoreReadDto.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/example/gtable/store/dto/StoreReadDto.java b/src/main/java/com/example/gtable/store/dto/StoreReadDto.java index 610f176..1fb4579 100644 --- a/src/main/java/com/example/gtable/store/dto/StoreReadDto.java +++ b/src/main/java/com/example/gtable/store/dto/StoreReadDto.java @@ -1,8 +1,10 @@ package com.example.gtable.store.dto; import java.time.LocalDateTime; +import java.util.List; import com.example.gtable.store.model.Store; +import com.example.gtable.storeImage.dto.StoreImageUploadResponse; import lombok.AllArgsConstructor; import lombok.Builder; @@ -17,12 +19,12 @@ public class StoreReadDto { private String name; private String location; private String description; - private String storeImageUrl; + private List images; private Boolean isActive; private Boolean deleted; private LocalDateTime createdAt; - public static StoreReadDto fromEntity(Store store) { + public static StoreReadDto fromEntity(Store store, List images) { return StoreReadDto.builder() .createdAt(store.getCreatedAt()) .storeId(store.getStoreId()) @@ -30,9 +32,9 @@ public static StoreReadDto fromEntity(Store store) { .name(store.getName()) .location(store.getLocation()) .description(store.getDescription()) - .storeImageUrl(store.getStoreImageUrl()) .isActive(store.getIsActive()) .deleted(store.getDeleted()) + .images(images) .build(); } } From c2f4ffb02d3de0825056acedd2d77da272a9bf17 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Wed, 4 Jun 2025 20:16:23 +0900 Subject: [PATCH 14/41] refactor(store): rename fromEntity to of in StoreReadResponse --- .../java/com/example/gtable/store/dto/StoreReadResponse.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/example/gtable/store/dto/StoreReadResponse.java b/src/main/java/com/example/gtable/store/dto/StoreReadResponse.java index 061206f..b44c9f7 100644 --- a/src/main/java/com/example/gtable/store/dto/StoreReadResponse.java +++ b/src/main/java/com/example/gtable/store/dto/StoreReadResponse.java @@ -14,7 +14,7 @@ public class StoreReadResponse { private List storeReadDtos; private boolean hasNext; - public static StoreReadResponse fromEntity(List storeReadDtos, boolean hasNext) { + public static StoreReadResponse of(List storeReadDtos, boolean hasNext) { return StoreReadResponse.builder() .storeReadDtos(storeReadDtos) .hasNext(hasNext) From 55a5b5d0965911e847cde414d52db6bdcdf16a0b Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Wed, 4 Jun 2025 20:17:27 +0900 Subject: [PATCH 15/41] feat(store): include store image information in StoreReadDto mapping --- .../store/service/StoreServiceImpl.java | 48 ++++++++++++------- 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/example/gtable/store/service/StoreServiceImpl.java b/src/main/java/com/example/gtable/store/service/StoreServiceImpl.java index 165f3e6..17518cf 100644 --- a/src/main/java/com/example/gtable/store/service/StoreServiceImpl.java +++ b/src/main/java/com/example/gtable/store/service/StoreServiceImpl.java @@ -12,6 +12,9 @@ import com.example.gtable.store.dto.StoreUpdateRequest; import com.example.gtable.store.model.Store; import com.example.gtable.store.repository.StoreRepository; +import com.example.gtable.storeImage.dto.StoreImageUploadResponse; +import com.example.gtable.storeImage.model.StoreImage; +import com.example.gtable.storeImage.repository.StoreImageRepository; import jakarta.persistence.EntityNotFoundException; import lombok.RequiredArgsConstructor; @@ -21,6 +24,7 @@ public class StoreServiceImpl implements StoreService { private final StoreRepository storeRepository; + private final StoreImageRepository storeImageRepository; @Override @Transactional @@ -38,15 +42,18 @@ public StoreReadResponse getAllStores() { List stores = storeRepository.findAllByDeletedFalse(); List storeRead = stores.stream() - .map(StoreReadDto::fromEntity) + .map(store -> { + List images = storeImageRepository.findByStore(store); + List imageDto = images.stream() + .map(StoreImageUploadResponse::fromEntity) + .toList(); + return StoreReadDto.fromEntity(store, imageDto); + }) .toList(); boolean hasNext = false; - return StoreReadResponse.fromEntity( - storeRead, - hasNext - ); + return StoreReadResponse.of(storeRead, hasNext); } @Override @@ -55,7 +62,12 @@ public StoreReadDto getStoreByStoreId(Long storeId) { Store store = storeRepository.findByStoreIdAndDeletedFalse(storeId) .orElseThrow(() -> new EntityNotFoundException(storeId + " store not found.")); - return StoreReadDto.fromEntity(store); + List images = storeImageRepository.findByStore(store); + List imageDto = images.stream() + .map(StoreImageUploadResponse::fromEntity) + .toList(); + + return StoreReadDto.fromEntity(store, imageDto); } @Override @@ -64,20 +76,20 @@ public StoreReadDto updateStore(Long storeId, StoreUpdateRequest request) { Store store = storeRepository.findByStoreIdAndDeletedFalse(storeId) .orElseThrow(() -> new EntityNotFoundException(storeId + " store not found.")); - if (request.getName() != null) - store.setName(request.getName()); - if (request.getLocation() != null) - store.setLocation(request.getLocation()); - if (request.getDescription() != null) - store.setDescription(request.getDescription()); - if (request.getStoreImageUrl() != null) - store.setStoreImageUrl(request.getStoreImageUrl()); - if (request.getIsActive() != null) - store.setIsActive(request.getIsActive()); + store.updateInfo( + request.getName(), + request.getLocation(), + request.getDescription() + ); Store updatedStore = storeRepository.save(store); - return StoreReadDto.fromEntity(updatedStore); + List images = storeImageRepository.findByStore(updatedStore); + List imageDto = images.stream() + .map(StoreImageUploadResponse::fromEntity) + .toList(); + + return StoreReadDto.fromEntity(updatedStore, imageDto); } @Override @@ -86,7 +98,7 @@ public String deleteStore(Long storeId) { Store store = storeRepository.findByStoreIdAndDeletedFalse(storeId) .orElseThrow(() -> new EntityNotFoundException(storeId + " store not found.")); - store.setDeleted(true); + store.markAsDeleted(); storeRepository.save(store); return "Store ID " + storeId + " 삭제되었습니다."; From 455f6bf1125875ef1552064a20b3f24a0b707a23 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Wed, 4 Jun 2025 20:17:45 +0900 Subject: [PATCH 16/41] refactor(store): remove imageUrl --- .../java/com/example/gtable/store/dto/StoreUpdateRequest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/example/gtable/store/dto/StoreUpdateRequest.java b/src/main/java/com/example/gtable/store/dto/StoreUpdateRequest.java index 033b8ee..cb95159 100644 --- a/src/main/java/com/example/gtable/store/dto/StoreUpdateRequest.java +++ b/src/main/java/com/example/gtable/store/dto/StoreUpdateRequest.java @@ -13,6 +13,5 @@ public class StoreUpdateRequest { private String name; private String location; private String description; - private String storeImageUrl; private Boolean isActive; } From 651c8d5419fe03f842bbef08ae389618f33f98b2 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Wed, 4 Jun 2025 20:39:19 +0900 Subject: [PATCH 17/41] feat(store-images): add file count and file size validation for uploads --- .../controller/StoreImageController.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/main/java/com/example/gtable/storeImage/controller/StoreImageController.java b/src/main/java/com/example/gtable/storeImage/controller/StoreImageController.java index 8b92e5a..998c7bc 100644 --- a/src/main/java/com/example/gtable/storeImage/controller/StoreImageController.java +++ b/src/main/java/com/example/gtable/storeImage/controller/StoreImageController.java @@ -31,6 +31,21 @@ public ResponseEntity uploadStoreImage( @RequestParam("files") List files, @RequestParam(value = "types") List types ) { + // TODO 관련 정책 확정되면 메서드로 분리 예정 + // 파일 개수 제한 검증 + if (files.isEmpty() || files.size() > 10) { + throw new IllegalArgumentException("파일은 1개 이상 10개 이하로 업로드해 주세요."); + } + // 파일 크기 검증 + for (MultipartFile file : files) { + if (file.isEmpty()) { + throw new IllegalArgumentException("빈 파일은 업로드할 수 없습니다."); + } + if (file.getSize() > 10 * 1024 * 1024) { // 10MB 제한 + throw new IllegalArgumentException("파일 크기는 10MB를 초과할 수 없습니다."); + } + } + List response = storeImageService.saveAll(storeId, files, types); return ResponseEntity .status(HttpStatus.CREATED) From 26cdf378d688f61680cfda01f0e3eb00222a377a Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Wed, 4 Jun 2025 20:39:51 +0900 Subject: [PATCH 18/41] refactor(store-image): improve async synchronization and transaction scope --- .../storeImage/service/StoreImageService.java | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/example/gtable/storeImage/service/StoreImageService.java b/src/main/java/com/example/gtable/storeImage/service/StoreImageService.java index 92ccf1d..b5efc77 100644 --- a/src/main/java/com/example/gtable/storeImage/service/StoreImageService.java +++ b/src/main/java/com/example/gtable/storeImage/service/StoreImageService.java @@ -2,6 +2,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.concurrent.CompletableFuture; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -34,15 +35,26 @@ public List saveAll(Long storeId, List Store store = storeRepository.findById(storeId) .orElseThrow(() -> new EntityNotFoundException("Store not found with id: " + storeId)); - List imageUploadResponses = new ArrayList<>(); - for (int i = 0; i < files.size(); i++) { - S3Service.S3UploadResult uploadResult; - try { - uploadResult = s3Service.upload(storeId, files.get(i)).get(); - } catch (Exception e) { - throw new RuntimeException("S3 업로드 실패", e); - } + // 모든 파일을 비동기로 업로드 + List> uploadFutures = new ArrayList<>(); + for (MultipartFile file : files) { + uploadFutures.add(s3Service.upload(storeId, file)); + } + // 모든 업로드 완료 대기 + List uploadResults; + try { + uploadResults = uploadFutures.stream() + .map(CompletableFuture::join) + .toList(); + } catch (Exception e) { + throw new RuntimeException("S3 업로드 실패", e); + } + + // DB 저장은 모든 S3 업로드 성공 후 수행 + List imageUploadResponses = new ArrayList<>(); + for (int i = 0; i < uploadResults.size(); i++) { + S3Service.S3UploadResult uploadResult = uploadResults.get(i); StoreImage storeImage = StoreImage.builder() .store(store) .imageUrl(uploadResult.url()) From b2412733c360c70efd1d4774d81365aaeaf5122c Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Wed, 4 Jun 2025 20:43:05 +0900 Subject: [PATCH 19/41] chore(build): update AWS SDK dependencies to newer versions --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index d2241b3..9bd2044 100644 --- a/build.gradle +++ b/build.gradle @@ -52,8 +52,8 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-validation' // S3 - implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE' - implementation 'com.amazonaws:aws-java-sdk-s3:1.12.683' + implementation 'io.awspring.cloud:spring-cloud-starter-aws:3.3.0' + implementation 'software.amazon.awssdk:s3:2.20.14' // Resilience4j implementation 'io.github.resilience4j:resilience4j-spring-boot2:1.7.1' implementation 'io.github.resilience4j:resilience4j-bulkhead:1.7.1' From 6c1c4ed513b545b971ae4cb2d01038f7cca7f1ae Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Fri, 6 Jun 2025 17:42:08 +0900 Subject: [PATCH 20/41] chore(build): update AWS SDK dependencies to newer versions --- build.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 9bd2044..1059596 100644 --- a/build.gradle +++ b/build.gradle @@ -52,8 +52,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-validation' // S3 - implementation 'io.awspring.cloud:spring-cloud-starter-aws:3.3.0' - implementation 'software.amazon.awssdk:s3:2.20.14' + implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE' // Resilience4j implementation 'io.github.resilience4j:resilience4j-spring-boot2:1.7.1' implementation 'io.github.resilience4j:resilience4j-bulkhead:1.7.1' From edb22bc961f80472a3c3b85b65102519e913b5c7 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Fri, 6 Jun 2025 17:42:27 +0900 Subject: [PATCH 21/41] feat(menu): add Menu Entity --- .../com/example/gtable/menu/model/Menu.java | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 src/main/java/com/example/gtable/menu/model/Menu.java diff --git a/src/main/java/com/example/gtable/menu/model/Menu.java b/src/main/java/com/example/gtable/menu/model/Menu.java new file mode 100644 index 0000000..da46d73 --- /dev/null +++ b/src/main/java/com/example/gtable/menu/model/Menu.java @@ -0,0 +1,42 @@ +package com.example.gtable.menu.model; + +import java.time.LocalDateTime; + +import com.example.gtable.global.entity.BaseTimeEntity; + +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +@Entity +@Table(name = "menus") +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@SuperBuilder +public class Menu extends BaseTimeEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long Id; + private Long storeId; + private String name; + private String description; + private String price; + + public Menu(LocalDateTime createdAt, Long id, Long storeId, String name, String description, String price) { + super(createdAt); + this.Id = id; + this.storeId = storeId; + this.name = name; + this.description = description; + this.price = price; + } +} From ee04a42f95d7fc39092955ff792c43355bc18dbc Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Fri, 6 Jun 2025 17:43:15 +0900 Subject: [PATCH 22/41] feat(menu): add endpoints for create, get Menu --- .../menu/controller/MenuController.java | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 src/main/java/com/example/gtable/menu/controller/MenuController.java diff --git a/src/main/java/com/example/gtable/menu/controller/MenuController.java b/src/main/java/com/example/gtable/menu/controller/MenuController.java new file mode 100644 index 0000000..5631cae --- /dev/null +++ b/src/main/java/com/example/gtable/menu/controller/MenuController.java @@ -0,0 +1,50 @@ +package com.example.gtable.menu.controller; + +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +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.RestController; + +import com.example.gtable.global.api.ApiUtils; +import com.example.gtable.menu.dto.MenuCreateRequest; +import com.example.gtable.menu.dto.MenuCreateResponse; +import com.example.gtable.menu.service.MenuService; + +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; + +@RestController +@RequestMapping("/menus") +@RequiredArgsConstructor +public class MenuController { + + private final MenuService menuService; + + @PostMapping("/create") + public ResponseEntity createMenu(@Valid @RequestBody MenuCreateRequest request) { + MenuCreateResponse response = menuService.createMenu(request); + + return ResponseEntity + .status(HttpStatus.CREATED) + .body( + ApiUtils.success( + response + ) + ); + } + + @GetMapping("/{storeId}") + public ResponseEntity getMenusByStoreId(@PathVariable Long storeId) { + return ResponseEntity + .status(HttpStatus.OK) + .body( + ApiUtils.success( + menuService.getMenusByStoreId(storeId) + ) + ); + } +} From 95ab00f93faca9a55c0b9f1c3637715b145e6bbe Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Fri, 6 Jun 2025 17:43:56 +0900 Subject: [PATCH 23/41] feat(menu): add MenuCreateRequest dto with toEntity method --- .../gtable/menu/dto/MenuCreateRequest.java | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 src/main/java/com/example/gtable/menu/dto/MenuCreateRequest.java diff --git a/src/main/java/com/example/gtable/menu/dto/MenuCreateRequest.java b/src/main/java/com/example/gtable/menu/dto/MenuCreateRequest.java new file mode 100644 index 0000000..a4f6229 --- /dev/null +++ b/src/main/java/com/example/gtable/menu/dto/MenuCreateRequest.java @@ -0,0 +1,33 @@ +package com.example.gtable.menu.dto; + +import com.example.gtable.menu.model.Menu; + +import jakarta.validation.constraints.NotNull; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@NoArgsConstructor +@AllArgsConstructor +public class MenuCreateRequest { + + @NotNull + private Long storeId; + @NotNull + private String name; + @NotNull + private String description; + @NotNull + private String price; + + public Menu toEntity() { + return Menu.builder() + .storeId(storeId) + .name(name) + .description(description) + .price(price) + .build(); + } +} + From ddd9263ccfac4f6e9c7e66e677cf32f2a5ab1cc4 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Fri, 6 Jun 2025 17:44:06 +0900 Subject: [PATCH 24/41] feat(menu): add MenuCreateResponse dto with fromEntity method --- .../gtable/menu/dto/MenuCreateResponse.java | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 src/main/java/com/example/gtable/menu/dto/MenuCreateResponse.java diff --git a/src/main/java/com/example/gtable/menu/dto/MenuCreateResponse.java b/src/main/java/com/example/gtable/menu/dto/MenuCreateResponse.java new file mode 100644 index 0000000..e17f0f4 --- /dev/null +++ b/src/main/java/com/example/gtable/menu/dto/MenuCreateResponse.java @@ -0,0 +1,32 @@ +package com.example.gtable.menu.dto; + +import java.time.LocalDateTime; + +import com.example.gtable.menu.model.Menu; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; + +@Getter +@AllArgsConstructor +@Builder +public class MenuCreateResponse { + private Long menuId; + private Long storeId; + private String name; + private String description; + private String price; + private LocalDateTime createdAt; + + public static MenuCreateResponse fromEntity(Menu menu) { + return MenuCreateResponse.builder() + .createdAt(menu.getCreatedAt()) + .menuId(menu.getId()) + .storeId(menu.getStoreId()) + .name(menu.getName()) + .description(menu.getDescription()) + .price(menu.getPrice()) + .build(); + } +} From 04da6f24e1564dd3ac52076f37ce3baf6dfd08e0 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Fri, 6 Jun 2025 17:44:21 +0900 Subject: [PATCH 25/41] feat(menu): add MenuReadDto dto with fromEntity method --- .../example/gtable/menu/dto/MenuReadDto.java | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 src/main/java/com/example/gtable/menu/dto/MenuReadDto.java diff --git a/src/main/java/com/example/gtable/menu/dto/MenuReadDto.java b/src/main/java/com/example/gtable/menu/dto/MenuReadDto.java new file mode 100644 index 0000000..347baeb --- /dev/null +++ b/src/main/java/com/example/gtable/menu/dto/MenuReadDto.java @@ -0,0 +1,33 @@ +package com.example.gtable.menu.dto; + +import java.util.List; + +import com.example.gtable.menu.model.Menu; +import com.example.gtable.menuImage.dto.MenuImageUploadResponse; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; + +@Getter +@AllArgsConstructor +@Builder +public class MenuReadDto { + private Long menuId; + private Long storeId; + private String name; + private String description; + private String price; + private List images; + + public static MenuReadDto fromEntity(Menu menu, List images) { + return MenuReadDto.builder() + .menuId(menu.getId()) + .storeId(menu.getStoreId()) + .name(menu.getName()) + .description(menu.getDescription()) + .price(menu.getPrice()) + .images(images) + .build(); + } +} From a41dbe50cb0e625a54c6a8686e4231019201ea3b Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Fri, 6 Jun 2025 17:44:30 +0900 Subject: [PATCH 26/41] feat(menu): add MenuReadResponse dto with of method --- .../gtable/menu/dto/MenuReadResponse.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 src/main/java/com/example/gtable/menu/dto/MenuReadResponse.java diff --git a/src/main/java/com/example/gtable/menu/dto/MenuReadResponse.java b/src/main/java/com/example/gtable/menu/dto/MenuReadResponse.java new file mode 100644 index 0000000..d88562d --- /dev/null +++ b/src/main/java/com/example/gtable/menu/dto/MenuReadResponse.java @@ -0,0 +1,21 @@ +package com.example.gtable.menu.dto; + +import java.util.List; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; + +@Getter +@AllArgsConstructor +@Builder +public class MenuReadResponse { + + private List menuReadDto; + + public static MenuReadResponse of(List menuReadDto) { + return MenuReadResponse.builder() + .menuReadDto(menuReadDto) + .build(); + } +} From dbb5e9fd9a6c94606cac975cb68d2bc3d50e76e0 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Fri, 6 Jun 2025 17:45:04 +0900 Subject: [PATCH 27/41] feat(menu): add MenuRepository with findAllByStoreId method --- .../gtable/menu/repository/MenuRepository.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/main/java/com/example/gtable/menu/repository/MenuRepository.java diff --git a/src/main/java/com/example/gtable/menu/repository/MenuRepository.java b/src/main/java/com/example/gtable/menu/repository/MenuRepository.java new file mode 100644 index 0000000..abded50 --- /dev/null +++ b/src/main/java/com/example/gtable/menu/repository/MenuRepository.java @@ -0,0 +1,13 @@ +package com.example.gtable.menu.repository; + +import java.util.List; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import com.example.gtable.menu.model.Menu; + +@Repository +public interface MenuRepository extends JpaRepository { + List findAllByStoreId(Long storeId); +} From 687c92f626779ac3ac3fbc9a8240a66d12343bff Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Fri, 6 Jun 2025 17:46:37 +0900 Subject: [PATCH 28/41] feat(menu): MenuService with create and read methods including image mapping --- .../gtable/menu/service/MenuService.java | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 src/main/java/com/example/gtable/menu/service/MenuService.java diff --git a/src/main/java/com/example/gtable/menu/service/MenuService.java b/src/main/java/com/example/gtable/menu/service/MenuService.java new file mode 100644 index 0000000..05ad340 --- /dev/null +++ b/src/main/java/com/example/gtable/menu/service/MenuService.java @@ -0,0 +1,52 @@ +package com.example.gtable.menu.service; + +import java.util.List; + +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.example.gtable.menu.dto.MenuCreateRequest; +import com.example.gtable.menu.dto.MenuCreateResponse; +import com.example.gtable.menu.dto.MenuReadDto; +import com.example.gtable.menu.dto.MenuReadResponse; +import com.example.gtable.menu.model.Menu; +import com.example.gtable.menu.repository.MenuRepository; +import com.example.gtable.menuImage.dto.MenuImageUploadResponse; +import com.example.gtable.menuImage.model.MenuImage; +import com.example.gtable.menuImage.repository.MenuImageRepository; + +import lombok.RequiredArgsConstructor; + +@Service +@RequiredArgsConstructor +public class MenuService { + + private final MenuRepository menuRepository; + private final MenuImageRepository menuImageRepository; + + @Transactional + public MenuCreateResponse createMenu(MenuCreateRequest request) { + Menu toSave = request.toEntity(); + + Menu saved = menuRepository.save(toSave); + + return MenuCreateResponse.fromEntity(saved); + } + + @Transactional(readOnly = true) + public MenuReadResponse getMenusByStoreId(Long storeId) { + List menus = menuRepository.findAllByStoreId(storeId); + + List menuReadRespons = menus.stream() + .map(menu -> { + List images = menuImageRepository.findByMenu(menu); + List imageDto = images.stream() + .map(MenuImageUploadResponse::fromEntity) + .toList(); + return MenuReadDto.fromEntity(menu, imageDto); + }) + .toList(); + + return MenuReadResponse.of(menuReadRespons); + } +} From 2815b87df157fd8d64bea11088f71b3853dd84be Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Fri, 6 Jun 2025 17:47:01 +0900 Subject: [PATCH 29/41] feat(menu-image): add MenuImage entity with BaseTimeEntity and relation to Menu --- .../gtable/menuImage/model/MenuImage.java | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 src/main/java/com/example/gtable/menuImage/model/MenuImage.java diff --git a/src/main/java/com/example/gtable/menuImage/model/MenuImage.java b/src/main/java/com/example/gtable/menuImage/model/MenuImage.java new file mode 100644 index 0000000..489b912 --- /dev/null +++ b/src/main/java/com/example/gtable/menuImage/model/MenuImage.java @@ -0,0 +1,40 @@ +package com.example.gtable.menuImage.model; + +import com.example.gtable.global.entity.BaseTimeEntity; +import com.example.gtable.menu.model.Menu; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +@Entity +@Table(name = "menu_images") +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@SuperBuilder +public class MenuImage extends BaseTimeEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "menu_id") + private Menu menu; + + @Column(nullable = false, length = 500) + private String imageUrl; + + @Column(nullable = false, length = 500) + private String fileKey; +} From 09f0e01d5af229743e6884cef86a3389e073dbdf Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Fri, 6 Jun 2025 17:47:30 +0900 Subject: [PATCH 30/41] feat(menu-image): add endpoints for upload, delete Menu Images --- .../controller/MenuImageController.java | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 src/main/java/com/example/gtable/menuImage/controller/MenuImageController.java diff --git a/src/main/java/com/example/gtable/menuImage/controller/MenuImageController.java b/src/main/java/com/example/gtable/menuImage/controller/MenuImageController.java new file mode 100644 index 0000000..1f716a2 --- /dev/null +++ b/src/main/java/com/example/gtable/menuImage/controller/MenuImageController.java @@ -0,0 +1,57 @@ +package com.example.gtable.menuImage.controller; + +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +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; + +import com.example.gtable.global.api.ApiUtils; +import com.example.gtable.menuImage.dto.MenuImageUploadResponse; +import com.example.gtable.menuImage.service.MenuImageService; + +import lombok.RequiredArgsConstructor; + +@RestController +@RequestMapping("/menus") +@RequiredArgsConstructor +public class MenuImageController { + + private final MenuImageService menuImageService; + + @PostMapping("/{menuId}/images") + public ResponseEntity uploadMenuImage( + @PathVariable Long menuId, + @RequestParam("file") MultipartFile file + ) { + if (file.isEmpty()) { + throw new IllegalArgumentException("빈 파일은 업로드할 수 없습니다."); + } + if (file.getSize() > 10 * 1024 * 1024) { // 10MB 제한 + throw new IllegalArgumentException("파일 크기는 10MB를 초과할 수 없습니다."); + } + + MenuImageUploadResponse response = menuImageService.save(menuId, file); + return ResponseEntity.status(HttpStatus.CREATED).body(ApiUtils.success(response)); + } + + @DeleteMapping("/image/{id}") + public ResponseEntity deleteMenuImage(@PathVariable Long id) { + menuImageService.delete(id); + return ResponseEntity + .status( + HttpStatus.NO_CONTENT + ) + .body( + ApiUtils + .success( + "Menu image deleted successfully." + ) + ); + } + +} From 01f21f8c68a700874ac4103189ad930b52a15b57 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Fri, 6 Jun 2025 17:47:49 +0900 Subject: [PATCH 31/41] feat(menu-image): add MenuImageRepository with findByMenu method --- .../menuImage/repository/MenuImageRepository.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 src/main/java/com/example/gtable/menuImage/repository/MenuImageRepository.java diff --git a/src/main/java/com/example/gtable/menuImage/repository/MenuImageRepository.java b/src/main/java/com/example/gtable/menuImage/repository/MenuImageRepository.java new file mode 100644 index 0000000..84a36d3 --- /dev/null +++ b/src/main/java/com/example/gtable/menuImage/repository/MenuImageRepository.java @@ -0,0 +1,14 @@ +package com.example.gtable.menuImage.repository; + +import java.util.List; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import com.example.gtable.menu.model.Menu; +import com.example.gtable.menuImage.model.MenuImage; + +@Repository +public interface MenuImageRepository extends JpaRepository { + List findByMenu(Menu menu); +} From 86a5215f520a33889cb79907cd4706ff2b492048 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Fri, 6 Jun 2025 17:48:19 +0900 Subject: [PATCH 32/41] feat(menu-image): add MenuImageService for upload and delete operations --- .../menuImage/service/MenuImageService.java | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 src/main/java/com/example/gtable/menuImage/service/MenuImageService.java diff --git a/src/main/java/com/example/gtable/menuImage/service/MenuImageService.java b/src/main/java/com/example/gtable/menuImage/service/MenuImageService.java new file mode 100644 index 0000000..471b2ad --- /dev/null +++ b/src/main/java/com/example/gtable/menuImage/service/MenuImageService.java @@ -0,0 +1,54 @@ +package com.example.gtable.menuImage.service; + +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import com.example.gtable.global.s3.S3Service; +import com.example.gtable.menu.model.Menu; +import com.example.gtable.menu.repository.MenuRepository; +import com.example.gtable.menuImage.dto.MenuImageUploadResponse; +import com.example.gtable.menuImage.model.MenuImage; +import com.example.gtable.menuImage.repository.MenuImageRepository; + +import lombok.RequiredArgsConstructor; + +@Service +@RequiredArgsConstructor +public class MenuImageService { + + private final MenuRepository menuRepository; + private final MenuImageRepository menuImageRepository; + private final S3Service s3Service; + + @Transactional + public MenuImageUploadResponse save(Long menuId, MultipartFile file) { + + String type = "menu"; + Menu menu = menuRepository.findById(menuId) + .orElseThrow(() -> new IllegalArgumentException("Menu not found with id: " + menuId)); + + S3Service.S3UploadResult uploadResult = s3Service.upload(type, menuId, file).join(); + + // MenuImage 엔티티 생성 및 저장 + MenuImage menuImage = MenuImage.builder() + .menu(menu) + .imageUrl(uploadResult.url()) + .fileKey(uploadResult.key()) + .build(); + + menuImageRepository.save(menuImage); + + // 응답 생성 + return MenuImageUploadResponse.fromEntity(menuImage); + } + + @Transactional + public void delete(Long id) { + MenuImage menuImage = menuImageRepository.findById(id) + .orElseThrow(() -> new IllegalArgumentException("MenuImage not found with id: " + id)); + + s3Service.delete(menuImage.getFileKey()); + menuImageRepository.delete(menuImage); + } +} From 38ed521b7a3fda39d7be84eed8155df41e7faa90 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Fri, 6 Jun 2025 17:48:35 +0900 Subject: [PATCH 33/41] feat(menu-image): add MenuImageUploadResponse dto with fromEntity factory method --- .../dto/MenuImageUploadResponse.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 src/main/java/com/example/gtable/menuImage/dto/MenuImageUploadResponse.java diff --git a/src/main/java/com/example/gtable/menuImage/dto/MenuImageUploadResponse.java b/src/main/java/com/example/gtable/menuImage/dto/MenuImageUploadResponse.java new file mode 100644 index 0000000..47e64a4 --- /dev/null +++ b/src/main/java/com/example/gtable/menuImage/dto/MenuImageUploadResponse.java @@ -0,0 +1,20 @@ +package com.example.gtable.menuImage.dto; + +import com.example.gtable.menuImage.model.MenuImage; + +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +public class MenuImageUploadResponse { + private final Long id; + private final String imageUrl; + + public static MenuImageUploadResponse fromEntity(MenuImage menuImage) { + return MenuImageUploadResponse.builder() + .id(menuImage.getId()) + .imageUrl(menuImage.getImageUrl()) + .build(); + } +} From 35cb4fb9307f5a4f4e595aea2042ca9bed748195 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Fri, 6 Jun 2025 17:49:20 +0900 Subject: [PATCH 34/41] refactor(s3): add type parameter to createFileKey for generic file key generation --- src/main/java/com/example/gtable/global/s3/S3Service.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/example/gtable/global/s3/S3Service.java b/src/main/java/com/example/gtable/global/s3/S3Service.java index 1fecf4a..acf83d0 100644 --- a/src/main/java/com/example/gtable/global/s3/S3Service.java +++ b/src/main/java/com/example/gtable/global/s3/S3Service.java @@ -28,9 +28,9 @@ public record S3UploadResult(String key, String url) { @Bulkhead(name = "s3UploadBulkhead", type = Bulkhead.Type.THREADPOOL) @Async("s3UploadExecutor") - public CompletableFuture upload(Long storeId, MultipartFile file) { + public CompletableFuture upload(String type, Long refId, MultipartFile file) { try (InputStream inputStream = file.getInputStream()) { - String key = createFileKey(storeId, file.getOriginalFilename()); + String key = createFileKey(type, refId, file.getOriginalFilename()); ObjectMetadata metadata = new ObjectMetadata(); metadata.setContentLength(file.getSize()); @@ -51,7 +51,7 @@ public void delete(String filename) { } } - private String createFileKey(Long storeId, String filename) { - return "store/" + storeId + "/" + UUID.randomUUID() + "-" + filename; + private String createFileKey(String type, Long refId, String filename) { + return type + "/" + refId + "/" + UUID.randomUUID() + "-" + filename; } } From 13eace4e95b8a7074426d8beca7af5504ecc7543 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Fri, 6 Jun 2025 17:50:22 +0900 Subject: [PATCH 35/41] chore(security): temporarily permit all requests to /menus/** --- .../com/example/gtable/global/config/SecurityConfig.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/example/gtable/global/config/SecurityConfig.java b/src/main/java/com/example/gtable/global/config/SecurityConfig.java index f54ed19..9c0e836 100644 --- a/src/main/java/com/example/gtable/global/config/SecurityConfig.java +++ b/src/main/java/com/example/gtable/global/config/SecurityConfig.java @@ -51,8 +51,9 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { .requestMatchers( "/oauth2/authorization/kakao", // 카카오 로그인 요청 "/login/oauth2/code/**", // 카카오 인증 콜백 - "/api/refresh-token", - "/stores/**") // refresh token (토큰 갱신) + "/api/refresh-token", // refresh token (토큰 갱신) + "/stores/**", + "/menus/**") .permitAll() .anyRequest().authenticated() // 그외 요청은 허가된 사람만 인가 ) From 5bee7f4253e305e25a377fee30e6e58411e9fd8e Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Fri, 6 Jun 2025 17:50:43 +0900 Subject: [PATCH 36/41] refactor(s3): add type parameter to createFileKey for generic file key generation --- .../example/gtable/storeImage/service/StoreImageService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/example/gtable/storeImage/service/StoreImageService.java b/src/main/java/com/example/gtable/storeImage/service/StoreImageService.java index b5efc77..b26b5e5 100644 --- a/src/main/java/com/example/gtable/storeImage/service/StoreImageService.java +++ b/src/main/java/com/example/gtable/storeImage/service/StoreImageService.java @@ -32,13 +32,14 @@ public List saveAll(Long storeId, List throw new IllegalArgumentException("파일과 타입의 개수가 일치해야 합니다."); } + String type = "store"; Store store = storeRepository.findById(storeId) .orElseThrow(() -> new EntityNotFoundException("Store not found with id: " + storeId)); // 모든 파일을 비동기로 업로드 List> uploadFutures = new ArrayList<>(); for (MultipartFile file : files) { - uploadFutures.add(s3Service.upload(storeId, file)); + uploadFutures.add(s3Service.upload(type, storeId, file)); } // 모든 업로드 완료 대기 From eb09e7193b11db3528a0dadc9539a684bc36fb13 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Mon, 16 Jun 2025 23:21:17 +0900 Subject: [PATCH 37/41] =?UTF-8?q?build:=20ci=20cd=20=EB=B0=B0=ED=8F=AC?= =?UTF-8?q?=EB=A5=BC=20=EC=9C=84=ED=95=9C=20=EB=A9=80=ED=8B=B0=20=EB=AA=A8?= =?UTF-8?q?=EB=93=88=20=EC=9D=B4=EC=A0=84=EC=9C=BC=EB=A1=9C=20=EC=9B=90?= =?UTF-8?q?=EC=83=81=20=EB=B3=B5=EA=B7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle/wrapper/gradle-wrapper.jar | Bin 43764 -> 0 bytes gradle/wrapper/gradle-wrapper.properties | 7 ------ gradlew | 12 +++++------ gradlew.bat | 26 +++++++++++------------ 4 files changed, 17 insertions(+), 28 deletions(-) delete mode 100644 gradle/wrapper/gradle-wrapper.jar delete mode 100644 gradle/wrapper/gradle-wrapper.properties diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 1b33c55baabb587c669f562ae36f953de2481846..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 43764 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 /dev/null && printf '%s\n' "$PWD" ) || exit +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -114,7 +112,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH="\\\"\\\"" +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -205,7 +203,7 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # and any embedded shellness will be escaped. # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # treated as '${Hostname}' itself on the command line. @@ -213,7 +211,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ -classpath "$CLASSPATH" \ - -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + org.gradle.wrapper.GradleWrapperMain \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index db3a6ac..93e3f59 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,8 +13,6 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem -@rem SPDX-License-Identifier: Apache-2.0 -@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## @@ -45,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. 1>&2 -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. goto fail @@ -59,22 +57,22 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. 1>&2 -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. goto fail :execute @rem Setup the command line -set CLASSPATH= +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell From 0db3c3b1984e6ff1c6e871fe4dd8b75f68eebab7 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Tue, 17 Jun 2025 00:23:08 +0900 Subject: [PATCH 38/41] =?UTF-8?q?docs:=20.gitignore=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 297 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 297 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2d6b54c --- /dev/null +++ b/.gitignore @@ -0,0 +1,297 @@ +HELP.md +.gradle +build/ +#!gradle/wrapper/gradle-wrapper.jar + +### setiing files +.DS_Store +src/main/resources/application.yml + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +### ReactNative ### +# React Native Stack Base + +.expo +__generated__ + +### ReactNative.Xcode Stack ### +## User settings +xcuserdata/ + +## Xcode 8 and earlier +*.xcscmblueprint +*.xccheckout + +### ReactNative.Gradle Stack ### +.gradle +**/build/ +!src/**/build/ + +# Ignore Gradle GUI config +gradle-app.setting + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar + +# Avoid ignore Gradle wrappper properties +!gradle-wrapper.properties + +# Cache of project +.gradletasknamecache + +# Eclipse Gradle plugin generated files +# Eclipse Core +.project +# JDT-specific (Eclipse Java Development Tools) +.classpath + +### ReactNative.macOS Stack ### +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +### ReactNative.Linux Stack ### +*~ + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +### ReactNative.Node Stack ### +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* +lerna-debug.log* +.pnpm-debug.log* + +# Diagnostic reports (https://nodejs.org/api/report.html) +report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json + +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage +*.lcov + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (https://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ +jspm_packages/ + +# Snowpack dependency directory (https://snowpack.dev/) +web_modules/ + +# TypeScript cache +*.tsbuildinfo + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Optional stylelint cache +.stylelintcache + +# Microbundle cache +.rpt2_cache/ +.rts2_cache_cjs/ +.rts2_cache_es/ +.rts2_cache_umd/ + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variable files +.env +.env.development.local +.env.test.local +.env.production.local +.env.local + +# parcel-bundler cache (https://parceljs.org/) +.cache +.parcel-cache + +# Next.js build output +.next +out + +# Nuxt.js build / generate output +.nuxt +dist + +# Gatsby files +.cache/ +# Comment in the public line in if your project uses Gatsby and not Next.js +# https://nextjs.org/blog/next-9-1#public-directory-support +# public + +# vuepress build output +.vuepress/dist + +# vuepress v2.x temp and cache directory +.temp + +# Docusaurus cache and generated files +.docusaurus + +# Serverless directories +.serverless/ + +# FuseBox cache +.fusebox/ + +# DynamoDB Local files +.dynamodb/ + +# TernJS port file +.tern-port + +# Stores VSCode versions used for testing VSCode extensions +.vscode-test + +# yarn v2 +.yarn/cache +.yarn/unplugged +.yarn/build-state.yml +.yarn/install-state.gz +.pnp.* + +### ReactNative.Buck Stack ### +buck-out/ +.buckconfig.local +.buckd/ +.buckversion +.fakebuckversion + +### ReactNative.Android Stack ### +# Gradle files +.gradle/ +build/ + +# Local configuration file (sdk path, etc) +local.properties + +# Log/OS Files + +# Android Studio generated files and folders +captures/ +.externalNativeBuild/ +.cxx/ +*.apk +output.json + +# IntelliJ +*.iml +.idea/ +misc.xml +deploymentTargetDropDown.xml +render.experimental.xml + +# Keystore files +*.jks +*.keystore + +# Google Services (e.g. APIs or Firebase) +google-services.json + +# Android Profiling +*.hprof + +# data insert +/src/main/resources/data.sql + +# End of https://www.toptal.com/developers/gitignore/api/reactnative From 79869bca128e9022c6257d5e0576e229674f81ff Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Tue, 17 Jun 2025 00:23:27 +0900 Subject: [PATCH 39/41] =?UTF-8?q?build:=20=EB=B0=B0=ED=8F=AC=20=EC=9E=90?= =?UTF-8?q?=EB=8F=99=ED=99=94=20=EC=BD=94=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dev.yml | 56 +++++++++++++++++++++++++++++++++++++++ appspec.yml | 20 ++++++++++++++ scripts/start.sh | 25 +++++++++++++++++ scripts/stop.sh | 22 +++++++++++++++ 4 files changed, 123 insertions(+) create mode 100644 .github/workflows/dev.yml create mode 100644 appspec.yml create mode 100644 scripts/start.sh create mode 100644 scripts/stop.sh diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml new file mode 100644 index 0000000..204b3f9 --- /dev/null +++ b/.github/workflows/dev.yml @@ -0,0 +1,56 @@ +name: Dev CICD + +on: + push: + branches: + - develop +env: + AWS_REGION: ap-northeast-2a + AWS_S3_BUCKET: nowait-deploy-github-actions + AWS_CODE_DEPLOY_APPLICATION: nowaiting + AWS_CODE_DEPLOY_GROUP: nowaiting-deploy-dev + +jobs: + build-with-gradle: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: JDK 17 설치 + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'zulu' + + - name: gradlew에 실행 권한 부여 + run: chmod +x ./gradlew + + - name: Set YML + run: | + mkdir -p src/main/resources + echo "${{ secrets.APPLICATION_DEV_YML }}" | base64 --decode > src/main/resources/application-dev.yml + find src + + - name: 프로젝트 빌드 + run: ./gradlew clean build -x test + + - name: AWS credential 설정 + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-region: ${{ env.AWS_REGION }} + aws-access-key-id: ${{ secrets.DEVSERVER_CICD_ACCESS_KEY }} + aws-secret-access-key: ${{ secrets.DEVSERVER_CICD_SECRET_KEY }} + + - name: S3에 업로드 + run: aws deploy push --application-name ${{ env.AWS_CODE_DEPLOY_APPLICATION }} --ignore-hidden-files --s3-location s3://$AWS_S3_BUCKET/GasipTestServer/$GITHUB_SHA.zip --source . + + - name: EC2에 배포 + run: | + aws deploy create-deployment \ + --application-name ${{ env.AWS_CODE_DEPLOY_APPLICATION }} \ + --deployment-config-name CodeDeployDefault.AllAtOnce \ + --deployment-group-name ${{ env.AWS_CODE_DEPLOY_GROUP }} \ + --s3-location bucket=$AWS_S3_BUCKET,key=GasipTestServer/$GITHUB_SHA.zip,bundleType=zip + + diff --git a/appspec.yml b/appspec.yml new file mode 100644 index 0000000..81d6c21 --- /dev/null +++ b/appspec.yml @@ -0,0 +1,20 @@ +version: 0.0 +os: linux + +files: + - source: / + destination: /home/ubuntu/spring-github-action + overwrite: yes + +permissions: + - object: / + owner: ubuntu + group: ubuntu + +hooks: + AfterInstall: + - location: scripts/stop.sh + timeout: 60 + ApplicationStart: + - location: scripts/start.sh + timeout: 60 diff --git a/scripts/start.sh b/scripts/start.sh new file mode 100644 index 0000000..d17a077 --- /dev/null +++ b/scripts/start.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +REPOSITORY="/home/ubuntu/spring-github-action" +cd $REPOSITORY + +APP_NAME=Gtable +JAR_NAME=$(ls $REPOSITORY/build/libs/ | grep '.jar' | tail -n 1) +JAR_PATH=$REPOSITORY/build/libs/$JAR_NAME + +START_LOG="$REPOSITORY/start.log" +ERROR_LOG="$REPOSITORY/error.log" +APP_LOG="$REPOSITORY/application.log" + +$ chmod 666 $START_LOG +$ chmod 666 ERROR_LOG +$ chmod 666 APP_LOG + +SERVICE_PID=$(pgrep -f ${APP_NAME}.*.jar) # 실행중인 Spring 서버의 PID +NOW=$(date +%c) + + +echo "[$NOW] > $JAR_PATH 실행" >> $START_LOG +nohup java -Xms256m -Xmx512m -XX:+UseG1GC -jar $JAR_PATH --spring.profiles.active=dev > $APP_LOG 2> $ERROR_LOG & + +echo "[$NOW] > 서비스 PID: $SERVICE_PID" >> $START_LOG diff --git a/scripts/stop.sh b/scripts/stop.sh new file mode 100644 index 0000000..2fd10ad --- /dev/null +++ b/scripts/stop.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +REPOSITORY=/home/ubuntu/spring-github-action +cd $REPOSITORY + +APP_NAME=Gtable +JAR_NAME=$(ls $REPOSITORY/build/libs/ | grep '.jar' | tail -n 1) +JAR_PATH=$REPOSITORY/build/libs/$JAR_NAME +STOP_LOG="$REPOSITORY/stop.log" + +$ chmod 666 STOP_LOG + +CURRENT_PID=$(pgrep -f ${APP_NAME}.*.jar) + +if [ -z $CURRENT_PID ] +then + echo "서비스 NouFound" >> $STOP_LOG +else + echo "> kill -15 $CURRENT_PID" + kill -15 $CURRENT_PID + sleep 5 +fi From 559a25e34ed19e2fb0db4ccd9202d9114916b0a1 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Tue, 17 Jun 2025 00:26:36 +0900 Subject: [PATCH 40/41] =?UTF-8?q?build:=20=EB=B0=B0=ED=8F=AC=20=EC=9E=90?= =?UTF-8?q?=EB=8F=99=ED=99=94=20=EC=BD=94=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dev.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 204b3f9..97a08be 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -5,6 +5,7 @@ on: branches: - develop env: + PROJECT_NAME: NoWait AWS_REGION: ap-northeast-2a AWS_S3_BUCKET: nowait-deploy-github-actions AWS_CODE_DEPLOY_APPLICATION: nowaiting @@ -51,6 +52,6 @@ jobs: --application-name ${{ env.AWS_CODE_DEPLOY_APPLICATION }} \ --deployment-config-name CodeDeployDefault.AllAtOnce \ --deployment-group-name ${{ env.AWS_CODE_DEPLOY_GROUP }} \ - --s3-location bucket=$AWS_S3_BUCKET,key=GasipTestServer/$GITHUB_SHA.zip,bundleType=zip + --s3-location bucket=$AWS_S3_BUCKET,key=$PROJECT_NAME/$GITHUB_SHA.zip,bundleType=zip From b0a5dc65924b942746c0918dfedd5e7484e20699 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Tue, 17 Jun 2025 00:28:32 +0900 Subject: [PATCH 41/41] =?UTF-8?q?build:=20=EB=B0=B0=ED=8F=AC=20=EC=9E=90?= =?UTF-8?q?=EB=8F=99=ED=99=94=20=EC=BD=94=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 97a08be..f3f16e4 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -44,7 +44,7 @@ jobs: aws-secret-access-key: ${{ secrets.DEVSERVER_CICD_SECRET_KEY }} - name: S3에 업로드 - run: aws deploy push --application-name ${{ env.AWS_CODE_DEPLOY_APPLICATION }} --ignore-hidden-files --s3-location s3://$AWS_S3_BUCKET/GasipTestServer/$GITHUB_SHA.zip --source . + run: aws deploy push --application-name ${{ env.AWS_CODE_DEPLOY_APPLICATION }} --ignore-hidden-files --s3-location s3://$AWS_S3_BUCKET/$PROJECT_NAME/$GITHUB_SHA.zip --source . - name: EC2에 배포 run: |