Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
6108688
feature: domain 계층 구현
Jin4041 Apr 1, 2026
d6ef8f7
feature: infrastructure 계층 구현
Jin4041 Apr 1, 2026
41afdb7
feature: application, presentation 계층 구현
Jin4041 Apr 1, 2026
2b4c07e
refactor: ProductService 접근제한자 수정, updateby 기록하도록 수정
Jin4041 Apr 1, 2026
e81af68
Merge remote-tracking branch 'origin/develop' into dev_product
Jin4041 Apr 1, 2026
dff8af0
feat: product - read 구현
Jin4041 Apr 1, 2026
ae9e545
Merge remote-tracking branch 'origin/develop' into dev_product
Jin4041 Apr 2, 2026
c01ae4b
refactor: common module 적용, 사용자 정보 추출은 서비스에서 처리
Jin4041 Apr 2, 2026
5e181ff
refactor: 리뷰 내용 반영하여 수정
Jin4041 Apr 2, 2026
d5119c8
test: crud test
Jin4041 Apr 2, 2026
459912b
Merge remote-tracking branch 'origin/develop' into dev_product
Jin4041 Apr 2, 2026
6cdfef6
refactor: 사용하지 않는 import문 제거
Jin4041 Apr 2, 2026
8ad6148
Update product-service/src/main/java/com/shipflow/productservice/appl…
Jin4041 Apr 2, 2026
06adbce
Update product-service/src/main/java/com/shipflow/productservice/appl…
Jin4041 Apr 2, 2026
14e4fec
refactor: build.gradle 내 dependencyManagement 삭제
Jin4041 Apr 2, 2026
303a6ea
Merge remote-tracking branch 'origin/feature/#12-product-api' into de…
Jin4041 Apr 2, 2026
5c6643e
Update product-service/src/main/java/com/shipflow/productservice/doma…
Jin4041 Apr 2, 2026
4215ee3
refactor: 리뷰 수정사항 반영
Jin4041 Apr 2, 2026
dc0ebe9
Merge remote-tracking branch 'origin/feature/#12-product-api' into de…
Jin4041 Apr 2, 2026
5f1bdcb
Update product-service/src/main/java/com/shipflow/productservice/infr…
Jin4041 Apr 2, 2026
dae6ba6
refactor: 리뷰 수정사항 반영
Jin4041 Apr 2, 2026
faeab48
Merge remote-tracking branch 'origin/develop' into dev_product
Jin4041 Apr 3, 2026
8e15cb7
refactor: 리뷰 수정사항 반영 - 인터셉터 추가, audit 관련 부분 수정,
Jin4041 Apr 3, 2026
ab3e075
chore: eureka, feign client 관련 설정
Jin4041 Apr 3, 2026
ba11b2c
feat: order 조회요청 관련 처리
Jin4041 Apr 3, 2026
714c6f0
feat: order 메시징 관련 구현
Jin4041 Apr 3, 2026
940b9f7
test: 주문관련 test 구현 및 수정 반영
Jin4041 Apr 3, 2026
6e1ef40
feat: 삭제된 업체 소속 상품 삭제 구현 및 테스트
Jin4041 Apr 3, 2026
d5264e7
fix: pr 중 실행 오류로 권한 추가
Jin4041 Apr 3, 2026
dfddb2d
Update product-service/src/main/java/com/shipflow/productservice/appl…
Jin4041 Apr 3, 2026
5820303
refactor: 리뷰 반영 수정
Jin4041 Apr 3, 2026
6670706
refactor: 리뷰 반영 수정 2
Jin4041 Apr 3, 2026
2c5f67a
refactor: 리뷰 반영 수정 3
Jin4041 Apr 3, 2026
fc70eef
refactor: 코드래빗 수정 코드 백틱 제거
Jin4041 Apr 4, 2026
7e56a16
refactor: 코드래빗 수정 코드 백틱 제거
Jin4041 Apr 4, 2026
7afd44c
refactor: 컴포즈로 구동 확인
Jin4041 Apr 4, 2026
d529c2f
Merge remote-tracking branch 'origin/develop' into dev_product
Jin4041 Apr 6, 2026
98fc999
refactor: order의 재고 조회 시 반환값 추가
Jin4041 Apr 6, 2026
49e50b0
feat: api 요청 시 companyId 검증, 권한이 업체나 허브 담당자일 경우 담당여부 검증
Jin4041 Apr 6, 2026
e1b6ac4
feat: cascading 삭제 반영
Jin4041 Apr 6, 2026
c92b3c8
test: 추가 기능 반영
Jin4041 Apr 6, 2026
e09a05f
refactor: order 조회 요청 주소에서 company 정보 제외, 내부 삭제 요청 용으로 delete 분리
Jin4041 Apr 6, 2026
5f219ba
refactor: redis stock 정보 수정처리를 transaction 외부로 분리
Jin4041 Apr 6, 2026
54e3a33
Merge branch 'develop' into feature/#39-product-validation
Jin4041 Apr 6, 2026
5a7f333
Merge remote-tracking branch 'origin/develop' into dev_product
Jin4041 Apr 6, 2026
bf25735
refactor: company-업체정보 반환 시 address 필드 추가
Jin4041 Apr 6, 2026
de58651
Merge remote-tracking branch 'origin/feature/#39-product-validation' …
Jin4041 Apr 6, 2026
968fdf4
Merge remote-tracking branch 'origin/develop' into dev_product
Jin4041 Apr 6, 2026
bcd7796
feat: company) user 삭제 시 업체 삭제 추가 - user 쪽 요청주소 수정 포함
Jin4041 Apr 6, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
@FeignClient(name = "product-service")
public interface ProductFeignClient {
@DeleteMapping("/internal/companies/{companyId}/products/deactivate")
Void deleteProductByCompanyId(@PathVariable("companyId") UUID companyId);
Void deleteProductsByCompanyId(@PathVariable("companyId") UUID companyId);

@DeleteMapping("/internal/companies/products/deactivate/bulk")
Void deleteProductsByCompanyIds(@RequestBody List<UUID> companyIds);
Void deleteProductsByCompanyIdList(@RequestBody List<UUID> companyIds);
}
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public void deleteCompany(UUID companyId) {
Company company = findCompanyById(companyId);
company.delete(deleterId);
companyRepository.save(company);
productFeignClient.deleteProductByCompanyId(companyId);
productFeignClient.deleteProductsByCompanyId(companyId);
}

@Transactional
Expand Down Expand Up @@ -143,7 +143,15 @@ public void deleteProductsByHub(UUID hubId) {
company.delete(UserContext.getUserId());
companyRepository.save(company);
});
productFeignClient.deleteProductsByCompanyIds(companyIds);
productFeignClient.deleteProductsByCompanyIdList(companyIds);
}

@Transactional
public void deleteProductByUser(UUID userId) {
Company company = findCompanyByManagerId(userId);
company.delete(UserContext.getUserId());
companyRepository.save(company);
productFeignClient.deleteProductsByCompanyId(company.getId());
Comment thread
Jin4041 marked this conversation as resolved.
}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,9 @@ public VendorInfoResponse getVendorById(@PathVariable("companyId") UUID companyI
public void deleteByHub(@PathVariable("hubId") UUID hubId) {
companyService.deleteProductsByHub(hubId);
}

@DeleteMapping("/user/{userId}")
public void deleteByUser(@PathVariable("userId") UUID userId) {
companyService.deleteProductByUser(userId);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public void delete(UUID productId, UUID companyId) {
validateAuth(companyId);

UUID deleterId = UserContext.getUserId();
Product product = findProductById(productId);
Product product = validateProductOwnership(productId, companyId);
product.delete(deleterId);
productRepository.save(product);

Expand Down Expand Up @@ -173,10 +173,8 @@ public StockInfoResponse getStockInfoAndOccupy(@Param("productId") UUID productI
.orElseThrow(() -> new BusinessException(CommonErrorCode.INTERNAL_SERVER_ERROR));

if(currentStock<0){
Long restoreStock=redisTemplate.opsForValue().increment(stockKey, (long)quantity);
return new StockInfoResponse(productId, product.getName(), product.getCompanyId(),
product.getCompanyName(), product.getHubId(),
restoreStock != null ? restoreStock.intValue() : currentStock.intValue());
redisTemplate.opsForValue().increment(stockKey, (long)quantity);
throw new BusinessException(ProductErrorCode.EXCEEDS_STOCK_LEVEL);
}

redisTemplate.opsForValue().set(occupancyKey, quantity, Duration.ofSeconds(5));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@

@FeignClient(name = "company-service")
public interface CompanyFeignClient {
@DeleteMapping("/internal/companies/{userId}")
@DeleteMapping("/internal/companies/user/{userId}")
ClientApiResponse<Void> deleteManager(@PathVariable UUID userId);
Comment thread
Jin4041 marked this conversation as resolved.
}
Loading