Skip to content

Commit

Permalink
Merge pull request #21 from potenday-23/feature/login_exception
Browse files Browse the repository at this point in the history
์ถ”๊ฐ€: ํ‹ฐ์ผ“ ์ƒ์„ฑ ์™„๋ฃŒ
  • Loading branch information
rrosiee authored Jul 14, 2024
2 parents 8bd9a94 + b195362 commit 9e9ca6d
Show file tree
Hide file tree
Showing 50 changed files with 434 additions and 1,455 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,9 @@
import project.backend.domain.category.entity.Category;
import project.backend.domain.category.mapper.CategoryMapper;
import project.backend.domain.category.service.CategoryService;
import project.backend.domain.ticket.dto.TicketPostRequestDto;
import project.backend.domain.ticket.entity.Ticket;
import project.backend.global.error.exception.BusinessException;
import project.backend.global.error.exception.ErrorCode;
import project.backend.global.s3.service.ImageService;

import javax.validation.Valid;
import javax.validation.constraints.Positive;

import java.awt.image.BufferedImage;

import static project.backend.global.validator.LocalDateTimeValidation.convertStringToLocalDateTime;

@RestController
@RequestMapping("/api/categorys")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import lombok.RequiredArgsConstructor;
import project.backend.domain.category.dto.CategoryPatchRequestDto;
import project.backend.domain.common.entity.BaseEntity;
import project.backend.domain.memberTicketLike.entity.MemberTicketLike;
import project.backend.domain.onboardingmembercategory.entity.OnboardingMemberCategory;
import project.backend.domain.ticket.entity.Ticket;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import java.util.List;
import java.util.stream.IntStream;

@Api(tags = "A. ๋ฌธํ™”์ƒํ™œ")
@Api(tags = "CulturalEvent - ๋ฌธํ™”์ƒํ™œ")
@RestController
@RequestMapping("/api/cultural-events")
@RequiredArgsConstructor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import lombok.*;
import project.backend.domain.common.entity.BaseEntity;
import project.backend.domain.culturaleventevalutaion.entity.CulturalEventEvaluation;
import project.backend.domain.like.entity.CulturalEventLike;
import project.backend.domain.culturalevnetcategory.entity.CulturalEventCategory;
import project.backend.domain.culturalevnetinfo.entity.CulturalEventInfo;
Expand Down Expand Up @@ -73,9 +72,6 @@ public class CulturalEvent extends BaseEntity {
@OneToMany(mappedBy = "culturalEvent", cascade = {CascadeType.PERSIST, CascadeType.REMOVE})
public List<TicketingSite> ticketingSiteList = new ArrayList<>();

@OneToMany(mappedBy = "culturalEvent", cascade = {CascadeType.PERSIST, CascadeType.REMOVE})
public List<CulturalEventEvaluation> culturalEventEvaluationList = new ArrayList<>();

@OneToMany(mappedBy = "culturalEvent", cascade = {CascadeType.PERSIST, CascadeType.REMOVE})
public List<CulturalEventLike> culturalEventLikeList = new ArrayList<>();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import project.backend.domain.culturalevent.entity.CulturalEvent;
import project.backend.domain.culturalevent.mapper.CulturalEventMapper;
import project.backend.domain.culturalevent.repository.CulturalEventRepository;
import project.backend.domain.culturaleventevalutaion.service.CulturalEventEvaluationService;
import project.backend.domain.culturalevnetcategory.entity.CategoryTitle;
import project.backend.domain.culturalevnetcategory.entity.CulturalEventCategory;
import project.backend.domain.culturalevnetcategory.service.CulturalEventCategoryService;
Expand All @@ -43,7 +42,6 @@ public class CulturalEventBatchService {
private final CulturalEventCategoryService culturalEventCategoryService;
private final CulturalEventInfoService culturalEventInfoService;
private final TicketingSiteService ticketingSiteService;
private final CulturalEventEvaluationService culturalEventEvaluationService;

/**
* CulturalEvent ์ƒ์„ฑ
Expand Down Expand Up @@ -98,9 +96,6 @@ public CulturalEvent createCulturalEvent(String goodsCode, CulturalEventCreateDt
// ์ €์žฅ
CulturalEvent savedCulturalEvent = culturalEventRepository.save(culturalEvent);

// CulturalEventEvaluation ์—ฐ๊ด€๊ด€๊ณ„ ๋งคํ•‘
culturalEventEvaluationService.createCulturalEventEvaluations(goodsCode, savedCulturalEvent);

// CulturalEventInfo ์—ฐ๊ด€๊ด€๊ณ„ ๋งคํ•‘
List<String> imageUrlList = culturalEventInfoService.extractImageUrlList(culturalEventCreateDto.getInformation());
for (int i = 0; i < imageUrlList.size(); i++) {
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

import java.util.List;

@Api(tags = "A. ๋ฌธํ™”์ƒํ™œ - ์นดํ…Œ๊ณ ๋ฆฌ")
@Api(tags = "CulturalEvent - ๋ฌธํ™”์ƒํ™œ ์นดํ…Œ๊ณ ๋ฆฌ")
@RestController
@RequestMapping("/api/categories/cultural-events")
@RequiredArgsConstructor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
}

if (path.startsWith("/api/auth/login") || path.startsWith("/swagger-ui/") || path.startsWith("/backoffice")
|| path.startsWith("/favicon.ico") || path.startsWith("/v3/api-docs") || path.startsWith("/api/tickets")
|| path.startsWith("/api/tickets/**") || path.startsWith("/api/categorys")) {
|| path.startsWith("/favicon.ico") || path.startsWith("/v3/api-docs") || path.startsWith("/api/categorys")) {
filterChain.doFilter(request, response);
return;
}
Expand Down
Loading

0 comments on commit 9e9ca6d

Please sign in to comment.