Merge pull request #6 from noisrucer/develop

🔧 fix: Fixed unable to detect app code in docker error
noisrucer · Feb 12, 2024 · 1a3d8d8 · 1a3d8d8
2 parents ac6010b + 05093c5
commit 1a3d8d8
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 10 deletions.
diff --git a/src/main/java/com/girok/girokserver/domain/auth/controller/AuthController.java b/src/main/java/com/girok/girokserver/domain/auth/controller/AuthController.java
@@ -150,5 +150,4 @@ public ResponseEntity<CheckEmailRegisteredResponse> checkEmailRegistered(@Reques
     public ValidateAccessTokenResponse validateAccessToken() {
         return new ValidateAccessTokenResponse(true);
     }
-
 }
diff --git a/src/main/java/com/girok/girokserver/domain/category/controller/CategoryController.java b/src/main/java/com/girok/girokserver/domain/category/controller/CategoryController.java
@@ -10,10 +10,7 @@
 import com.girok.girokserver.domain.category.controller.request.CreateCategoryByPathRequest;
 import com.girok.girokserver.domain.category.controller.request.UpdateCategoryInfoRequest;
 import com.girok.girokserver.domain.category.controller.request.UpdateCategoryParentRequest;
-import com.girok.girokserver.domain.category.controller.response.CreateCategoryByIdResponse;
-import com.girok.girokserver.domain.category.controller.response.CreateCategoryByPathResponse;
-import com.girok.girokserver.domain.category.controller.response.GetCategoriesResponse;
-import com.girok.girokserver.domain.category.controller.response.GetCategoryIdByPathResponse;
+import com.girok.girokserver.domain.category.controller.response.*;
 import com.girok.girokserver.domain.category.entity.Category;
 import com.girok.girokserver.domain.category.facade.CategoryFacade;
 import com.girok.girokserver.domain.category.facade.dto.CategoryUpdateDto;
@@ -51,6 +48,16 @@ public ResponseEntity<GetCategoriesResponse> getCategories() {
         return ResponseEntity.ok().body(new GetCategoriesResponse(categoryResponseDtos));
     }
 
+    @GetMapping("/categories{id}")
+    @ResponseStatus(HttpStatus.OK)
+    @Operation(summary = "Get a category information")
+    public ResponseEntity<GetCategoryResponse> getCategory(@PathVariable(name = "id") Long categoryId) {
+        JwtUserInfo jwtUserInfo = jwtTokenProvider.getCurrentUserInfo();
+        Long memberId = jwtUserInfo.getMemberId();
+        GetCategoryResponse responseBody = categoryFacade.getCategory(memberId, categoryId);
+        return ResponseEntity.ok().body(responseBody);
+    }
+
     @PostMapping("/categories")
     @ResponseStatus(HttpStatus.OK)
     @Operation(summary = "Create a new category with parent id",

diff --git a/...n/java/com/girok/girokserver/domain/category/controller/response/GetCategoryResponse.java b/...n/java/com/girok/girokserver/domain/category/controller/response/GetCategoryResponse.java
@@ -0,0 +1,14 @@
+package com.girok.girokserver.domain.category.controller.response;
+
+import com.girok.girokserver.global.enums.CategoryColor;
+import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+public class GetCategoryResponse {
+
+    @NotNull
+    private CategoryColor color;
+}
diff --git a/src/main/java/com/girok/girokserver/domain/category/facade/CategoryFacade.java b/src/main/java/com/girok/girokserver/domain/category/facade/CategoryFacade.java
@@ -1,7 +1,6 @@
 package com.girok.girokserver.domain.category.facade;
 
-import com.girok.girokserver.domain.category.controller.dto.CategoryResponseDto;
-import com.girok.girokserver.domain.category.controller.mapper.CategoryMapper;
+import com.girok.girokserver.domain.category.controller.response.GetCategoryResponse;
 import com.girok.girokserver.domain.category.entity.Category;
 import com.girok.girokserver.domain.category.facade.dto.CategoryUpdateDto;
 import com.girok.girokserver.domain.category.service.CategoryService;
@@ -13,9 +12,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 
 @Service
 @Transactional(readOnly = true)
@@ -30,6 +27,12 @@ public List<Category> getCategoriesAsTree(Long memberId) {
         return categoryService.getCategoriesAsTree(member);
     }
 
+    public GetCategoryResponse getCategory(Long memberId, Long categoryId) {
+        Member member = memberService.getMemberById(memberId);
+        Category category = categoryService.getCategoryByMemberAndId(member, categoryId);
+        return new GetCategoryResponse(category.getColor());
+    }
+
 
     @Transactional
     public Long createCategoryByPath(Long memberId, CategoryColor color, CategoryPath path) {

diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml
@@ -14,7 +14,7 @@ spring:
 
   jpa:
     hibernate:
-      ddl-auto: update
+      ddl-auto: create
     properties:
       hibernate:
         format_sql: true