$$config title: TESBRO(테스형) keywords: - 필라테스 예약 시스템 - IT $$ # ? 개요 ## 가. 소개 ``` ☝ SpringBoot Framework를 통하여 필라테스 통합 예약 관리 시스템 구현 ``` ``` ✌ 회원/ 학원 등록/ 예약/ 결제 /게시판 기능 구현 ``` ``` ? NCP, Nginx , Docker와 Jenkins 를 사용한 배포 및 자동화 ``` ㅤ ## 나. 사이트 - [TESBRO](https://tesbro.yup2.dev/tesbro) - [발표](https://www.youtube.com/watch?v=XOH94hUINjg) $$youtube XOH94hUINjg $$ # ? 환경 ## 가. 형상관리 GitHub Repository : [https://github.com/yup2dev/Team_TESBRO](https://github.com/yup2dev/Team_TESBRO) Trello : [https://trello.com/3조김다은-김상엽-이승열-전세린](https://trello.com/invite/b/jZugixdM/ATTI021e0ffedfd866ecc612ca5aeb7f12ed5ABEFD03/3조김다은-김상엽-이승열-전세린) ㅤ ## 나. 사용기술 ### ⚓ 기술스택 ``` - Spring Boot - HTML5 / CSS5 / JS - Ajax - JPA - jQuery - MariaDB - Java ``` ### ⚓ 개발환경 ``` - SQL yog - DBeaver - Chrome - Intellij - Windows 10 ``` ### ⚓ 배포 ``` - GITHUB - Docker - Jenkins CI / CD ``` ### ⚓ 서비스 환경 ``` - NGINX - MariaDB - Docker - CentOS7 - NCP ``` ㅤ ### ⚓ ERD ![ERD](https://i.imgur.com/KnaKqhU.png) ㅤ # ? 기능 ### ? 로그인 ``` - 회원가입 - 로그인 및 로그아웃(이메일인증) ``` ### ? 메인페이지 ``` - 학원 검색 - 최신 공지 표시 - 최신 댓글 표시 - 최근 등록된 학원/내 주변 학원(비로그인/로그인) ``` ### ? 학원 ``` - 학원등록(File 첨부) - 혼합태그 활용 검색 및 정렬 기능 - 학원 상세정보 조회 - 리뷰 등록, 수정, 삭제 - 강사 등록, 보기 - 찜하기 - 날짜 선택 및 해당 날짜의 수업 조회 및 선택 - 필라테스 수업 예약 - 예약 내역 확인 - Kakaomap 학원 위치 조회 ``` ### ? 게시판 ``` - 공지사항 조회 - 공지사항 검색/ 추천 기능 - 문의하기 목록 조회 - 문의글 작성, 수정, 삭제, 추천 기능 - 문의하기 관리자 댓글 작성 기능 ``` ### ? 수강권 ``` - Toss Payment 연동 결제 기능 - 결제시 예약 가능 ``` ### ? 마이페이지 ``` - 회원 정보 조회 기능 ``` ㅤ ## ?주요 폴더 및 파일 ``` - academy : 학원 - teacher : 학원 강사 - lesson : 학원 수업 - lesson_ticket : 수강권 - review : 학원 리뷰 - board : 공지사항, 문의하기 - user : 회원 - static : css, js 파일 - datepicker.css & js : 달력 - template : html 파일 - build.gradle : 의존성 파일 - Dockerfile : Docker Image를 만들기 위한 설정 파일 ``` ㅤ ## ⭐ 페이지설명 ### ✔ 메인페이지 - nav ![img](https://i.imgur.com/7mZKt0x.png) - main ![img](https://i.imgur.com/jPCOHcT.png) ![img](https://i.imgur.com/Hk2ap8A.png) ![img](https://i.imgur.com/WmS9olI.png) ![img](https://i.imgur.com/XaMcqfw.png) ![img](https://i.imgur.com/JXfQOXG.png) ![img](https://i.imgur.com/LeCxewh.png) - footer ![img](https://i.imgur.com/9WPtmOO.png) --- ㅤ #### 메인페이지 Controller ```java @RequiredArgsConstructor @Controller public class TesbroController { private final BoardService boardService; private final AcademyService academyService; private final TeacherService teacherService; private final ReviewService reviewService; private final UserService userService; @GetMapping("/tesbro") public String tesbroMain(Model model, Principal principal) { // 가장 최근 공지사항 List Board latestNotice = boardService.getLastestNotice(); model.addAttribute("latestNotice", latestNotice); // 전체 등록된 학원 수 long academyCount = academyService.countAcademyIds(); model.addAttribute("academyCount", academyCount); // 전체 등록된 강사 수 long teacherCount = teacherService.countTeacherIds(); model.addAttribute("teacherCount", teacherCount); // 전체 등록된 리뷰 수 long reviewCount = reviewService.countReviewIds(); model.addAttribute("reviewCount", reviewCount); // 가장 최근 달린 4개의 리뷰 List recentReviews = reviewService.get4RecentReviews(); model.addAttribute("recentReviews", recentReviews); // 인기순을 출력하기 위한 학원 추천 순 List List mostjjimAcademy = academyService.getAcademyByVoter(); model.addAttribute("mostjjimAcademy", mostjjimAcademy); // 로그인시 사용자의 주소를 기준으로 근처 학원 List // 비로그인시 가장 최근에 등록된 학원 List if (principal != null) { String userAddress = userService.getUser(principal.getName()).getAddress(); List closerAcademyList = academyService.getCloserAcademy2(userAddress); model.addAttribute("cAcademyList", closerAcademyList); // return "main"; } else { model.addAttribute("cAcademyList", academyService.getRecentlyAcademy()); } return "main"; } // redirect @GetMapping("/") public String root() { return "redirect:/tesbro"; } } ``` ㅤ #### 게시판 Service ``` java @Service @RequiredArgsConstructor public class BoardService { private final BoardRepository boardRepository; // 가장 최근 공지사항 불러오기 public Board getLastestNotice() { return boardRepository.findLatestNotice(); } } ``` ㅤ #### 학원 Service ``` java @Service @RequiredArgsConstructor public class AcademyService { private final AcademyRepository academyRepository; private final GenFileRepository genFileRepository; // 총 등록된 학원 수 public long countAcademyIds() { return academyRepository.count(); } // 추천순 학원 불러오기 public List getAcademyByVoter() { return academyRepository.findMostJjimAcademy(); } // 주소로 유사도 찾기 ver2 public List getCloserAcademy2(String address) { // 주소를 split해서 쪼갬 String splitNum = ""; String[] splitAddress = address.split(" "); List academyList = new ArrayList<>(); String[] keyWordArray = new String[splitAddress.length]; for (int i = 0; i < splitAddress.length; i++) { splitNum += splitAddress[i] + " "; keyWordArray[i] = splitNum; System.out.println(splitNum); } // 키워드 거꾸로 돌리고 마지막 띄워쓰기 없앰 List reversedKeywords = new ArrayList<>(Arrays.asList(keyWordArray)); reversedKeywords.replaceAll(keyword -> keyword.trim()); Collections.reverse(reversedKeywords); for (int i = 0; i < 5; i++) { if (i >= reversedKeywords.size()) { break; } String keyword = reversedKeywords.get(i); List matchingAcademies = academyRepository.findByAcademyAddressContaining(keyword); // 최대 5개 까지만 academyList.addAll(matchingAcademies.subList(0, Math.min(5, matchingAcademies.size()))); } List uniqueAcademies = new ArrayList<>(new HashSet<>(academyList)); Collections.reverse(uniqueAcademies); Collections.sort(uniqueAcademies, new Comparator() { @Override public int compare(Academy a1, Academy a2) { int overlapCount1 = getOverlapCount(a1, reversedKeywords); int overlapCount2 = getOverlapCount(a2, reversedKeywords); // 겹치는 횟수가 많은 순서대로 정렬 return Integer.compare(overlapCount2, overlapCount1); } private int getOverlapCount(Academy academy, List reversedKeywords) { int count = 0; for (String keyword : reversedKeywords) { if (academy.getAcademyAddress().contains(keyword)) { count++; } } return count; } }); return uniqueAcademies; } // 가장 최근에 등록된 학원 불러오기 public List getRecentlyAcademy() { return academyRepository.findMostRecentlyAcademy(); } } ``` ㅤ #### 강사 Service ``` java @Service @RequiredArgsConstructor public class TeacherService { private final TeacherRepository teacherRepository; // 총 등록된 강사 수 public long countTeacherIds() { return teacherRepository.count(); } } ``` ㅤ #### 학원리뷰 Service ``` java @Service @RequiredArgsConstructor public class ReviewService { private final ReviewRepository reviewRepository; // 총 등록된 리뷰 수 public long countReviewIds() { return reviewRepository.count(); } // 메인 프론트에 보여줄 최신순 리뷰(4개) public List get4RecentReviews() { return reviewRepository.find4RecentReviews(); } } ``` ㅤ #### 사용자 Service ``` java @RequiredArgsConstructor @Service public class UserService { private final UserRepository userRepository; private final PasswordEncoder passwordEncoder; // 사용자 이름으로 사용자 객체 불러오기 public SiteUser getUser(String username) { Optional siteUser = this.userRepository.findByUsername(username); if (siteUser.isPresent()) { return siteUser.get(); } else { throw new DataNotFoundException("siteuser not found"); } } } ``` ㅤ #### 게시판 Repository ``` java @Repository public interface BoardRepository extends JpaRepository { @Query(value = "SELECT * FROM board WHERE BOARD_CATEGORY = 'notice' ORDER BY CREATE_DATE DESC LIMIT 1", nativeQuery = true) Board findLatestNotice(); } ``` ㅤ #### 학원 Repository ``` java @Repository public interface AcademyRepository extends JpaRepository { @Query("SELECT a FROM Academy a ORDER BY a.jjim DESC LIMIT 5") List findMostJjimAcademy(); @Query("SELECT a FROM Academy a ORDER BY a.createDate DESC LIMIT 5") List findMostRecentlyAcademy(); List findByAcademyAddressContaining(String address); } ``` ㅤ --- ### ✔ 로그인, 회원가입 페이지 - signup ![img](https://i.imgur.com/I0kCEb6.png) ![img](https://i.imgur.com/CcxXvZY.png) ![img](https://i.imgur.com/i1VqNKs.png) ![img](https://i.imgur.com/MxbYFT2.png) ![img](https://i.imgur.com/NL222ka.png) - email ![img](https://i.imgur.com/R034l20.png) ![img](https://i.imgur.com/oh13hMz.png) ![img](https://i.imgur.com/IYjiR8k.png) - login ![img](https://i.imgur.com/oIYUOzk.png) ㅤ #### 로그인, 회원가입 Controller ``` java @Controller @RequiredArgsConstructor @RequestMapping("/user") public class UserController { private final UserService userService; // 회원가입 폼 @GetMapping("/signup") public String signup(UserCreateForm userCreateForm, Model model) { return "signup_form"; } // 회원가입 @PostMapping("/signup") public String signup(@Valid UserCreateForm userCreateForm, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return "signup_form"; } if (!userCreateForm.getPassword1().equals(userCreateForm.getPassword2())) { bindingResult.rejectValue("password2", "passwordInCorrect", "2개의 패스워드가 일치하지 않습니다."); return "signup_form"; } try { UserRole role = userCreateForm.getUsername().startsWith("admin") ? UserRole.ADMIN : UserRole.USER; userService.create(userCreateForm.getUsername(), userCreateForm.getEmail(), userCreateForm.getPassword1(), role, userCreateForm.getAddress()); } catch (DataIntegrityViolationException e) { e.printStackTrace(); bindingResult.reject("signupFailed", "이미 등록된 사용자입니다."); return "signup_form"; } catch (Exception e) { e.printStackTrace(); bindingResult.reject("signupFailed", e.getMessage()); return "signup_form"; } return "redirect:/tesbro"; } @GetMapping("/signup/mail") public String mail() { return "mail"; } // 로그인 페이지 @GetMapping("/login") public String login() { return "login_form"; } // 마이페이지 @PreAuthorize("isAuthenticated()") @GetMapping("/my") public String my(Model model, Principal principal) { userService.getUser(principal.getName()).getUsername(); model.addAttribute("siteUser", userService.getUser(principal.getName())); return "my"; } } ``` ㅤ ### 사용자 권한 ```java @Getter public enum UserRole { ADMIN("ROLE_ADMIN"), ACADEMY("ROLE_ACADEMY"), USER("ROLE_USER"); UserRole(String value) { this.value = value; } private String value; } ``` ㅤ #### 사용자 Security Service ```java @Service @RequiredArgsConstructor public class UserSecurityService implements UserDetailsService { private final UserRepository userRepository; @Override public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { Optional _siteUser = this.userRepository.findByUsername(username); if (_siteUser.isEmpty()) { throw new UsernameNotFoundException("사용자를 찾을수 없습니다."); } SiteUser siteUser = _siteUser.get(); List authorities = new ArrayList<>(); // admin으로 가입한다면 관리자 권한 부여 if ("admin".equals(username)) { authorities.add(new SimpleGrantedAuthority(UserRole.ADMIN.getValue())); } // admin이 아니라면 일반 사용자로 권한 부여 else { authorities.add(new SimpleGrantedAuthority(UserRole.USER.getValue())); } return new User(siteUser.getUsername(), siteUser.getPassword(), authorities); } } ``` ㅤ #### 사용자 Service ```java @RequiredArgsConstructor @Service public class UserService { private final UserRepository userRepository; private final PasswordEncoder passwordEncoder; // 사용자 생성 public SiteUser create(String username, String email, String password, UserRole role, String address) { SiteUser user = new SiteUser(); user.setUsername(username); user.setEmail(email); user.setPassword(passwordEncoder.encode(password)); user.setAddress(address); user.setRole(role); user.setAddress(address); this.userRepository.save(user); return user; } // 사용자 객체 불러오기 public SiteUser getUser(String username) { Optional siteUser = this.userRepository.findByUsername(username); if (siteUser.isPresent()) { return siteUser.get(); } else { throw new DataNotFoundException("siteuser not found"); } } // 학원 관리자 업데이트 private void updateAcademyUserRole(String username) { Optional siteUserOpt = userRepository.findByUsername(username); if (siteUserOpt.isPresent()) { SiteUser siteUser = siteUserOpt.get(); siteUser.setRole(UserRole.ACADEMY); userRepository.save(siteUser); } } } ``` ㅤ #### 사용자 Repository ```java public interface UserRepository extends JpaRepository { Optional findByUsername(String username); } ``` ㅤ #### 사용자 입력 시 오류 검증할 Form ```java @Getter @Setter public class UserCreateForm { @Size(min = 3, max = 25) @NotEmpty(message = "사용자ID는 필수항목입니다.") private String username; @NotEmpty(message = "비밀번호는 필수항목입니다.") private String password1; @NotEmpty(message = "비밀번호 확인은 필수항목입니다.") private String password2; @NotEmpty(message = "이메일은 필수항목입니다.") @Email private String email; @NotEmpty private String confirmN; @NotEmpty private String address; } ``` ㅤ #### Security Config ```java @Configuration @EnableWebSecurity @EnableMethodSecurity(prePostEnabled = true) public class SecurityConfig { @Bean SecurityFilterChain filterChain(HttpSecurity http) throws Exception { http.authorizeHttpRequests().requestMatchers( new AntPathRequestMatcher("/**")).permitAll() .and() .csrf().ignoringRequestMatchers( new AntPathRequestMatcher("/h2-console/**")) .and() .headers() .addHeaderWriter(new XFrameOptionsHeaderWriter( XFrameOptionsHeaderWriter.XFrameOptionsMode.SAMEORIGIN)) .and() .formLogin() .loginPage("/user/login") .defaultSuccessUrl("/") .and() .logout() .logoutRequestMatcher(new AntPathRequestMatcher("/user/logout")) .logoutSuccessUrl("/") .invalidateHttpSession(true) ; return http.build(); } @Bean PasswordEncoder passwordEncoder() { return new BCryptPasswordEncoder(); } @Bean AuthenticationManager authenticationManager(AuthenticationConfiguration authenticationConfiguration) throws Exception { return authenticationConfiguration.getAuthenticationManager(); } } ``` ㅤ --- ### ✔ 게시판 페이지 - notice ![img](https://i.imgur.com/KWjJXLw.png) ![img](https://i.imgur.com/RBEowwx.png) - address ![img](https://i.imgur.com/wg8KToe.png) - vote, delete ![img](https://i.imgur.com/J14g4sr.png) ![img](https://i.imgur.com/qpoadD6.png) - inquiry ![img](https://i.imgur.com/gvdk0ET.png) ![img](https://i.imgur.com/D2wvXru.png) ![img](https://i.imgur.com/L0gXMzY.png) ㅤ #### 게시판 Controller ```java @Controller @RequestMapping("/board") @RequiredArgsConstructor public class BoardController { private final BoardService boardService; private final UserService userService; // QnA보기 페이지 @GetMapping("/qna") public String getQnaList(@RequestParam(defaultValue = "latest") String order, @RequestParam(defaultValue = "0") int page, Model model) { Page boardPage = boardService.getBoardListByCategory("qna", order, page); model.addAttribute("paging", boardPage); model.addAttribute("boardcategory", "qna"); return "qna_list"; } // 공지사항 보기 페이지 @GetMapping("/notice") public String getNoticeList(@RequestParam(defaultValue = "latest") String order, @RequestParam(defaultValue = "0") int page, Model model) { Page boardPage = boardService.getBoardListByCategory("notice", order, page); model.addAttribute("paging", boardPage); model.addAttribute("boardcategory", "notice"); return "board_list"; } // QnA 게시글 등록 페이지 @PreAuthorize("isAuthenticated()") @GetMapping("/qna/create") public String getCreateQnaForm(Model model, BoardForm boardForm) { model.addAttribute("boardCategory", "qna"); return "board_form"; } // 공지사항 게시글 등록 페이지 @PreAuthorize("principal.username.matches('^admin.*$')") @GetMapping("/notice/create") public String getCreateNoticeForm(Model model, BoardForm boardForm) { model.addAttribute("boardCategory", "notice"); return "board_form"; } // 게시글 등록 @PreAuthorize("isAuthenticated()") @PostMapping("/{boardCategory}/create") public String createBoard(@PathVariable("boardCategory") String boardCategory, @Valid BoardForm boardForm, BindingResult bindingResult, Principal principal) { if (bindingResult.hasErrors()) { return "board_form"; } SiteUser siteUser = this.userService.getUser(principal.getName()); boardService.create(boardForm.getCategory(), boardForm.getSubject(), boardForm.getContent(), siteUser); return "redirect:/board/" + boardCategory; } // 게시글 상세보기 페이지 @GetMapping("/{boardCategory}/detail/{id}") public String getBoardDetail(@PathVariable("boardCategory") String boardCategory, @PathVariable("id") Integer id, Model model) { boardService.Views(id); Board board = boardService.getBoard(id); model.addAttribute("board", board); model.addAttribute("answerForm", new AnswerForm()); if (boardCategory.equals("event")) { return "event_detail"; } else if (boardCategory.equals("qna")){ return "qna_detail"; } else { return "board_detail"; } } // 게시글 답변 추가 @PreAuthorize("principal.username.matches('^admin.*$')") @PostMapping("/{boardCategory}/detail/{id}") public String addAnswerToBoard(@PathVariable("boardCategory") String boardCategory, @PathVariable("id") Integer id, @ModelAttribute("answerForm") AnswerForm answerForm) { String content = answerForm.getContent(); boardService.addAnswerToBoard(id, content); return "redirect:/board/" + boardCategory + "/detail/" + id; } // 검색 @GetMapping("/search") public String searchBoard(@RequestParam("keyword") String keyword, Model model) { Page searchResult = boardService.searchByKeyword(keyword); model.addAttribute("paging", searchResult); return "board_list"; } // 게시글 수정 페이지 @PreAuthorize("isAuthenticated()") @GetMapping("/modify/{id}") public String getModifyForm(@PathVariable("id") Integer id, Principal principal, BoardForm boardForm) { Board board = boardService.getBoard(id); if (!board.getAuthor().getUsername().equals(principal.getName())) { throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "수정권한이 없습니다"); } boardForm.setSubject(board.getSubject()); boardForm.setContent(board.getContent()); return "board_form"; } //게시글 수정 @PreAuthorize("isAuthenticated()") @PostMapping("/modify/{id}") public String modifyBoard(@Valid BoardForm boardForm, BindingResult bindingResult, Principal principal, @PathVariable("id") Integer id) { if (bindingResult.hasErrors()) { return "board_form"; } Board board = this.boardService.getBoard(id); if (!board.getAuthor().getUsername().equals(principal.getName())) { throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "수정권한이 없습니다."); } this.boardService.modifyBoard(board, boardForm.getSubject(), boardForm.getContent()); return String.format("redirect:/board/%s/detail/%d", board.getBoardCategory(), id); } // 게시글 삭제 @PreAuthorize("isAuthenticated()") @PostMapping("/delete/{id}") public String deleteBoard(@PathVariable("id") Integer id) { boardService.deleteBoard(id); return "redirect:/board/notice"; } // 게시글 추천 @PreAuthorize("isAuthenticated()") @GetMapping("/vote/{id}") public String boardVote(Principal principal, @PathVariable("id") Integer id) { Board board = this.boardService.getBoard(id); SiteUser siteUser = this.userService.getUser(principal.getName()); this.boardService.vote(board, siteUser); return String.format("redirect:/board/%s/detail/%d", board.getBoardCategory(), id); } } ``` ㅤ #### 게시판 Service ```java @Service @RequiredArgsConstructor public class BoardService { private final BoardRepository boardRepository; // 게시글 생성 public Board create(String boardCategory, String subject, String content, SiteUser user) { Board board = new Board(); board.setBoardCategory(boardCategory); board.setSubject(subject); board.setContent(content); board.setAuthor(user); board.setCreateDate(LocalDateTime.now()); return boardRepository.save(board); } // id로 게시글 가져오기 public Board getBoard(Integer id) { return boardRepository.findById(id) .orElseThrow(() -> new DataNotFoundException("Board not found with id: " + id)); } // 게시판 정렬 + 페이징 public Page getBoardListByCategory(String boardCategory, String order, int page) { Sort sort; if (order.equals("views")) { sort = Sort.by(Sort.Direction.DESC, "views"); } else if (order.equals("outdated")) { sort = Sort.by(Sort.Direction.ASC, "id"); } else if (order.equals("voter")) { sort = Sort.by(Sort.Direction.DESC, "voter"); } else if (order.equals("answers")) { sort = Sort.by(Sort.Direction.DESC, "answers"); } else { sort = Sort.by(Sort.Direction.DESC, "id"); } Pageable pageable = PageRequest.of(page, 15, sort); return boardRepository.findByBoardCategory(boardCategory, pageable); } // 답변 생성 public void addAnswerToBoard(Integer boardId, String content) { Board board = boardRepository.findById(boardId) .orElseThrow(() -> new DataNotFoundException("Board not found with id: " + boardId)); Answer answer = new Answer(); answer.setContent(content); board.addAnswer(answer); boardRepository.save(board); } // 키워드로 검색 public Page searchByKeyword(String keyword) { Sort sort = Sort.by(Sort.Direction.DESC, "id"); Pageable pageable = PageRequest.of(0, 15, sort); return boardRepository.findBySubjectContainingIgnoreCase(keyword, pageable); } // 게시글 수정 public void modifyBoard(Board board, String subject, String content) { board.setSubject(subject); board.setContent(content); board.setUpdateDate(LocalDateTime.now()); boardRepository.save(board); } //게시글 삭제 public void deleteBoard(Integer id) { Board board = boardRepository.findById(id) .orElseThrow(() -> new DataNotFoundException("Board not found with id: " + id)); boardRepository.delete(board); } // 조회수 추가 public void Views(Integer id) { Board board = boardRepository.findById(id) .orElseThrow(() -> new DataNotFoundException("Board not found with id: " + id)); board.setViews(board.getViews() + 1); boardRepository.save(board); } // 게시글 추천 public void vote(Board board, SiteUser siteUser) { board.getVoter().add(siteUser); this.boardRepository.save(board); } } ``` ㅤ #### 게시판 사용자 Service ```java @Service @RequiredArgsConstructor public class UserService { public SiteUser getUser(String username) { Optional siteUser = this.userRepository.findByUsername(username); if (siteUser.isPresent()) { return siteUser.get(); } else { throw new DataNotFoundException("siteuser not found"); } } } ``` ㅤ #### 게시판 Repository ```java @Repository public interface BoardRepository extends JpaRepository { Page findByBoardCategory(String boardCategory, Pageable pageable); Page findBySubjectContainingIgnoreCase(String keyword, Pageable pageable); } ``` ㅤ #### 게시판 사용자 Repository ```java @Repository public interface UserRepository extends JpaRepository { Optional findByUsername(String username); } ``` ㅤ --- ### ✔ 학원 페이지 - academy ![img](https://i.imgur.com/vDwB3Os.png) ![img](https://i.imgur.com/YuG9FJu.png) ![img](https://i.imgur.com/eilD1vf.png) ![img](https://i.imgur.com/V2izMlE.png) ![img](https://i.imgur.com/tSabVAE.png) ![img](https://i.imgur.com/zu4Uf4d.png) ![img](https://i.imgur.com/XJSv6pw.png) ㅤ #### 학원 Controller ```java @RequestMapping("/academy") @RequiredArgsConstructor @Controller public class AcademyController { private final AcademyService academyService; private final UserService userService; private final LessonService lessonService; private final ReviewService reviewService; // 학원 list페이지 @RequestMapping("/list") public String academy(Model model, @RequestParam(value = "page", defaultValue = "0") int page, @RequestParam(value = "keyword", required = false) String keyword, @RequestParam(value = "localKey", required = false) String localKey, @RequestParam(value = "peopleCapacity", required = false) Integer pc) { // 페이지, 검색 키워드, 검색할 주소, 레슨 수용가능 인원 수 Page paging = this.academyService.getAcademyList(keyword, localKey, pc, page); model.addAttribute("paging", paging); // 검색 유지를 위한 키워드 modeling model.addAttribute("keyword", keyword); // 총 학원수 표시 long count = academyService.countAcademyIds(); model.addAttribute("academyCount", count); return "list"; } // 학원 등록 페이지 @GetMapping("/create") public String getCreateAcademyForm(AcademyForm academyForm, Model model) { model.addAttribute("academyForm", academyForm); return "academy_form"; } // 학원 등록 @PostMapping("/create") public String AcademyCreate(@Valid AcademyForm academyForm, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return "academy_form"; } this.academyService.create(academyForm); return "redirect:/academy/list"; } // 학원 추천 @PreAuthorize("isAuthenticated()") @GetMapping("/vote/{id}") public String AcademyVote(Principal principal, @PathVariable("id") Integer id) { Academy academy = this.academyService.getAcademy(id); SiteUser siteUser = this.userService.getUser(principal.getName()); this.academyService.vote(academy, siteUser); return String.format("redirect:/academy/detail/%d", id); } //테스트용 파일 등록 하지만 이게 진짜 @GetMapping("/test/{id}") public String ttt(@PathVariable("id") Integer id) { return "detail_form_practice"; } // 학원 레슨 등록 페이지 @GetMapping("/academy/lesson") public String handleSelectedData(Model model) { List dateList = new ArrayList<>(); for (Lesson lesson : lessonService.getList()) { LocalDate lessonDate = lesson.getLessonDate(); dateList.add(lessonDate); } Set uniqueDates = new HashSet<>(dateList); List uniqueDateList = new ArrayList<>(uniqueDates); Collections.sort(uniqueDateList); model.addAttribute("uniqueDateList", uniqueDateList); return "lesson"; } // 학원 디테일 페이지 @GetMapping("/academy/detail/{id}") public String detail(Model model, @PathVariable("id") Integer id, ReviewForm reviewForm, @RequestParam(value = "page", defaultValue = "0") int page) { Academy academy = this.academyService.getAcademy(id); model.addAttribute("academy", academy); Page paging = this.reviewService.getList(academy, page); model.addAttribute("paging", paging); // LessonList의 Date를 따로 뽑아서 dateList로 가공 List lessonList = lessonService.getAcLesson(id); List dateList = new ArrayList<>(); for (Lesson lesson : lessonList) { LocalDate lessonDate = lesson.getLessonDate(); dateList.add(lessonDate); } //dateList 중복을 제거한 후 Template에서 사용하기 쉽도록 모델링 Set uniqueDates = new HashSet<>(dateList); List uniqueDateList = new ArrayList<>(uniqueDates); Collections.sort(uniqueDateList); model.addAttribute("uniqueDateList", uniqueDateList); // fileList중 학원 id로 해당 하는 사진을 찾아 모델링 List fileList = academyService.getGenfileByAcademyId(Long.valueOf(id)); Collections.sort(fileList, Comparator.comparingLong(GenFile::getId)); String file1 = null; String file2 = null; String file3 = null; int fileListSize = fileList.size(); // 학원 소개 if (fileListSize >= 1) { file1 = fileList.get(0).getBaseFileUri(); } // 수업 정보 if (fileListSize >= 2) { file2 = fileList.get(1).getBaseFileUri(); } // 취소/환불 규정 if (fileListSize >= 3) { file3 = fileList.get(2).getBaseFileUri(); } model.addAttribute("file1", file1); model.addAttribute("file2", file2); model.addAttribute("file3", file3); return "academy_detail"; } // Ajax를 활용해서 날짜 선택 시 해당하는 lessonList를 템플릿에 전달 @GetMapping("/multi_box_ajax") @ResponseBody public List getLessonTimeList(@RequestParam String data) {// lessonList를 모델에서 가져옴 List lessonTimeList = lessonService.getLessonTimes(LocalDate.parse(data, DateTimeFormatter.ISO_DATE), lessonService.getList()); // lessonList를 전달하여 호출 return lessonTimeList; } } ``` ㅤ #### 학원 Service ```java @Service @RequiredArgsConstructor public class AcademyService { private final AcademyRepository academyRepository; private final GenFileRepository genFileRepository; // 정렬 + 검색 + 페이징 학원 List public Page getAcademyList(String keyword, String localKey, Integer peopleCapacity, int page) { Pageable pageable = PageRequest.of(page, 10); // 조회될 수 있는 경우의 수를 고려하여 Repository에서 조회 if (StringUtils.hasText(keyword) && StringUtils.hasText(localKey) && peopleCapacity != null) { return academyRepository.searchByKLC(keyword, localKey, peopleCapacity, pageable); } else if (StringUtils.hasText(keyword) && StringUtils.hasText(localKey)) { return academyRepository.searchByKL(keyword, localKey, null, pageable); } else if (StringUtils.hasText(keyword) && peopleCapacity != null) { return academyRepository.searchByC(keyword, null, peopleCapacity, pageable); } else if (StringUtils.hasText(localKey) && peopleCapacity != null) { return academyRepository.searchByC(null, localKey, peopleCapacity, pageable); } else if (StringUtils.hasText(keyword)) { return academyRepository.searchByKL(keyword, null, null, pageable); } else if (StringUtils.hasText(localKey)) { return academyRepository.searchByKL(null, localKey, null, pageable); } else if (peopleCapacity != null) { return academyRepository.searchByC(null, null, peopleCapacity, pageable); } return academyRepository.findAll(pageable); } // 학원 객체 가져오기 public Academy getAcademy(Integer id) { Optional academy = this.academyRepository.findById(id); if (academy.isPresent()) { return academy.get(); } else { throw new DataNotFoundException("academy not found"); } } // 등록된 학원 수 public long countAcademyIds() { return academyRepository.count(); } // 학원 생성 public void create(AcademyForm academyForm) { Academy academy = new Academy(); academy.setAcademyName(academyForm.getAcademyName()); academy.setCeoName(academyForm.getCeoName()); academy.setAcademyAddress(academyForm.getAcademyAddress()); academy.setAcademyTel(academyForm.getAcademyTel()); academy.setIntroduction(academyForm.getIntroduction()); academy.setImgLogo(academy.getImgLogo()); academy.setCorNum(academyForm.getCorNum()); academy.setCreateDate(LocalDateTime.now()); this.academyRepository.save(academy); } // 학원 추천 public void vote(Academy academy, SiteUser siteUser) { academy.getVoter().add(siteUser); academy.updateJjim(); this.academyRepository.save(academy); } // 학원에 해당하는 파일 List 가져오기 public List getGenfileByAcademyId(Long id) { return genFileRepository.findByAcademyId(id); } } ``` ㅤ #### 학원 수업 Service ```java @Service @RequiredArgsConstructor public class LessonService { private final LessonRepository lessonRepository; // 레슨 List public List getList() { return lessonRepository.findAll(); } // id로 레슨 객체 가져오기 public Lesson getLesson(Integer id) { Optional lesson = this.lessonRepository.findById(id); if (lesson.isPresent()) { return lesson.get(); } else { throw new DataNotFoundException("lesson not found"); } } // 학원에 해당하는 수업 List public List getAcLesson(Integer id){ return lessonRepository.findByAcademyId(id); } // 수업에 해당하는 TimeList public List getLessonTimes(LocalDate date, List lessonList) { List timeList = new ArrayList<>(); if (date != null && lessonList != null) { for (Lesson lesson : lessonList) { if (lesson.getLessonDate().equals(date)) { LocalTime lessonTime = lesson.getLessonTime(); timeList.add(lessonTime); } } } return timeList; } ``` ㅤ #### 학원 리뷰 Service ```java @RequiredArgsConstructor @Service public class ReviewService { private final ReviewRepository reviewRepository; // 학원에 해당하는 ReviewList + 페이징 public Page getList(Academy academy, int page) { List sorts = new ArrayList<>(); sorts.add(Sort.Order.desc("createDate")); Pageable pageable = PageRequest.of(page, 5, Sort.by(sorts)); return this.reviewRepository.findAllByAcademy(academy, pageable); } } ``` ㅤ #### 학원 Repository ```java @Repository public interface AcademyRepository extends JpaRepository { // 키워드로만 검색할 경우 @Query("SELECT DISTINCT a FROM Academy a " + "LEFT JOIN a.lessonList l " + "WHERE ((:keyword IS NULL OR a.academyName LIKE %:keyword%) " + "AND (:localKey IS NULL OR a.academyAddress LIKE %:localKey%)) " + "AND (:capacityType IS NULL OR (:capacityType = 1 AND l.peopleCapacity = 1) " + "OR (:capacityType = 2 AND (l.peopleCapacity >= 2 AND l.peopleCapacity <= 4)) " + "OR (:capacityType = 3 AND (l.peopleCapacity >= 5 AND l.peopleCapacity <= 10)) " + "OR (:capacityType = 4 AND l.peopleCapacity >= 10))") Page searchByC( @Param("keyword") String keyword, @Param("localKey") String localKey, @Param("capacityType") Integer capacityType, Pageable pageable); // 키워드 + 위치로 검색할 경우 @Query("SELECT DISTINCT a FROM Academy a " + "LEFT JOIN a.lessonList l " + "WHERE ((:keyword IS NULL OR a.academyName LIKE %:keyword%) " + "AND (:localKey IS NULL OR a.academyAddress LIKE %:localKey%)) " + "AND ((:capacityType IS NULL) " + "OR (:capacityType = 1 AND (l IS NULL OR l.peopleCapacity = 1)) " + "OR (:capacityType = 2 AND (l IS NULL OR (l.peopleCapacity >= 2 AND l.peopleCapacity <= 4))) " + "OR (:capacityType = 3 AND (l IS NULL OR (l.peopleCapacity >= 5 AND l.peopleCapacity <= 10))) " + "OR (:capacityType = 4 AND (l IS NULL OR l.peopleCapacity >= 10)))") Page searchByKL( @Param("keyword") String keyword, @Param("localKey") String localKey, @Param("capacityType") Integer capacityType, Pageable pageable); // 키워드 + 위치 + 레슨이 있는 학원 중 수업인원을 선택할 경우 @Query("SELECT DISTINCT a FROM Academy a " + "JOIN a.lessonList l " + "WHERE a.academyName LIKE %:keyword% " + "AND a.academyAddress LIKE %:localKey% " + "AND ((:capacityType IS NULL) " + "OR (:capacityType = 1 AND l.peopleCapacity = 1) " + "OR (:capacityType = 2 AND l.peopleCapacity >= 2 AND l.peopleCapacity <= 4) " + "OR (:capacityType = 3 AND l.peopleCapacity >= 5 AND l.peopleCapacity <= 10) " + "OR (:capacityType = 4 AND l.peopleCapacity >= 10))") Page searchByKLC( @Param("keyword") String keyword, @Param("localKey") String localKey, @Param("capacityType") Integer capacityType, Pageable pageable); } ``` ㅤ #### 학원 레슨 Repository ```java @Repository public interface LessonRepository extends JpaRepository { // 학원 id로 lessonList 조회 List findByAcademyId(Integer id); // 학원 Id + 레슨 날짜, 시간으로 lesson 조회하기 Optional findIdByLessonDateAndLessonTimeAndAcademyId(LocalDate lessonDate, LocalTime lessonTime, Integer id); // 레슨id로 lesson객체 조회하기 Optional findById(Integer lessonId); } ``` ㅤ #### 학원 리뷰 Repository ```java public interface ReviewRepository extends JpaRepository { Page findAllByAcademy(Academy academy, Pageable pageable); } ``` ㅤ ### ✔ 강사 페이지 - teacher ![img](https://i.imgur.com/wU64eIy.png) ㅤ #### 강사 Controller ```java @Controller @RequestMapping("/teacher") @RequiredArgsConstructor public class TeacherController { private final TeacherService teacherService; private final AcademyService academyService; private final UserService userService; // 강사 등록 페이지 @PreAuthorize("isAuthenticated()") @GetMapping("/create/{id}") public String teacherDetail(Model model, @PathVariable("id") Integer id, @Valid TeacherForm teacherForm, BindingResult bindingResult, Principal principal) { Academy academy = academyService.getAcademy(id); model.addAttribute("academy", academy); model.addAttribute("teacherForm", teacherForm); return "teacher_detail"; } // 강사 등록 @PreAuthorize("isAuthenticated()") @PostMapping("/create/{id}") public String teacherCreate(Model model, @PathVariable("id") Integer id, @Valid TeacherForm teacherForm, BindingResult bindingResult, Principal principal) { Teacher teacher = this.teacherService.getTeacher(id); SiteUser siteUser = this.userService.getUser(principal.getName()); Academy academy = academyService.getAcademy(id); teacherForm.setAcademy(academy); if (bindingResult.hasErrors()) { model.addAttribute("teacher", teacher); return "teacher_detail"; } this.teacherService.create(teacherForm.getTeacherName(), teacherForm.getIntroduction(), teacherForm.getQualifications(), teacherForm.getAwards() , teacherForm.getAcademy(), teacherForm.getImgLogo()); return String.format("redirect:/academy/detail/%d", teacherForm.getAcademy().getId()); } } ``` ㅤ #### 강사 Service ```java @Service @RequiredArgsConstructor public class TeacherService { private final TeacherRepository teacherRepository; // 강사 생성 public void create(String teacherName, String introduction, String qualifications, String awards, Academy academy, String imgLogo) { Teacher teacher = new Teacher(); teacher.setTeacherName(teacherName); teacher.setQualifications(qualifications); teacher.setAwards(awards); teacher.setIntroduction(introduction); teacher.setAcademy(academy); teacher.setImgLogo(imgLogo); this.teacherRepository.save(teacher); } // id로 강사 객체 불러오기 public Teacher getTeacher(Integer id) { Optional teacher = this.teacherRepository.findById(id); if(teacher.isPresent()) { return teacher.get(); } else { throw new DataNotFoundException("teacher not found"); } } ``` ㅤ #### 강사 학원 Service ```java @Service @RequiredArgsConstructor public class AcademyService { private final AcademyRepository academyRepository; // id로 학원 객체 불러오기 public Academy getAcademy(Integer id) { Optional academy = this.academyRepository.findById(id); if (academy.isPresent()) { return academy.get(); } else { throw new DataNotFoundException("academy not found"); } } ``` ㅤ #### 강사 Repository ```java @Repository public interface TeacherRepository extends JpaRepository { List findByAcademyId(Integer academyId); } ``` ㅤ ### ✔ 파일 - file ![img](https://i.imgur.com/rjsylfx.jpg) ㅤ #### 파일 Controller ```java @RestController @RequestMapping("/api/upload") @RequiredArgsConstructor public class GenFileController { private final GenFileService genFileService; private final AcademyRepository academyRepository; private final BoardRepository boardRepository; @RequestMapping("/{id}") @ResponseBody public ResultData upload(@RequestParam Map param, MultipartRequest multipartRequest, @PathVariable("id") Integer id) { // Board / Academy 객체를 id로 조회 // Board나 Academy 상세 등록폼을 보면 academy/board형태로 파라미터를 받아서 해당하는 곳으로 이동할 수 있도록 추가 Academy academy = academyRepository.findById(id).orElse(null); Board board = boardRepository.findById(id).orElse(null); if (academy == null && board == null) { return new ResultData("F-1", "존재하지 않는 Academy ID입니다."); } Map fileMap = multipartRequest.getFileMap(); List fileIds = new ArrayList<>(); for (String fileInputName : fileMap.keySet()) { MultipartFile multipartFile = fileMap.get(fileInputName); String[] fileInputNameBits = fileInputName.split("___", 2); if (fileInputNameBits.length == 2 && fileInputNameBits[0].equals("file")) { fileInputNameBits = fileInputNameBits[1].split("__"); int fileSize = (int) multipartFile.getSize(); if (fileSize <= 0) { continue; } String relTypeCode = fileInputNameBits[0]; int relId = Integer.parseInt(fileInputNameBits[1]); String typeCode = fileInputNameBits[2]; String type2Code = fileInputNameBits[3]; int fileNo = Integer.parseInt(fileInputNameBits[4]); String originFileName = multipartFile.getOriginalFilename(); String fileExtTypeCode = Util.getFileExtTypeCodeFromFileName(multipartFile.getOriginalFilename()); String fileExtType2Code = Util.getFileExtType2CodeFromFileName(multipartFile.getOriginalFilename()); String fileExt = Util.getFileExtFromFileName(multipartFile.getOriginalFilename()).toLowerCase(); boolean fileUpdated = false; if (relId != 0) { long oldFileId = genFileService.getGenFileId(relTypeCode, relId, typeCode, type2Code, fileNo); if (oldFileId > 0) { genFileService.updateFileOnDisk(multipartFile, oldFileId, originFileName, fileExtTypeCode, fileExtType2Code, fileExt, fileSize); fileUpdated = true; } } if (fileUpdated == false) { } // academy라면 academy객체 저장 if (relTypeCode.equals("academy")) { long fileId = genFileService.saveFileOnDisk(multipartFile, relTypeCode, relId, typeCode, type2Code, fileNo, originFileName, fileExtTypeCode, fileExtType2Code, fileExt, fileSize, academy); fileIds.add(fileId); GenFile genFile = genFileService.getGenFileById(fileId); genFile.setAcademy(academy); // board라면 board객체 저장 } else if (relTypeCode.equals("board")) { long fileId = genFileService.saveFileOnDisk(multipartFile, relTypeCode, relId, typeCode, type2Code, fileNo, originFileName, fileExtTypeCode, fileExtType2Code, fileExt, fileSize, academy); fileIds.add(fileId); GenFile genFile = genFileService.getGenFileById(fileId); board.getGenFiles().add(genFile); boardRepository.save(board); } } } int deleteCount = 0; for (String inputName : param.keySet()) { String[] inputNameBits = inputName.split("__"); if (inputNameBits[0].equals("deleteFile")) { String relTypeCode = inputNameBits[1]; int relId = Integer.parseInt(inputNameBits[2]); String typeCode = inputNameBits[3]; String type2Code = inputNameBits[4]; int fileNo = Integer.parseInt(inputNameBits[5]); long oldFileId = genFileService.getGenFileId(relTypeCode, relId, typeCode, type2Code, fileNo); boolean needToDelete = oldFileId > 0; if (needToDelete) { genFileService.deleteFile(oldFileId); deleteCount++; // academies에서 삭제 if (relTypeCode.equals("academy")) { academy.getGenFiles().remove(genFileService.getGenFileById(relId)); } } } } Map rsDataBody = new HashMap<>(); return new ResultData("S-1", String.format("%d개의 파일을 저장했습니다. %d개의 파일을 삭제했습니다.", fileIds.size(), deleteCount), rsDataBody); } } ``` ㅤ #### 파일 Service ```java @Service @RequiredArgsConstructor public class GenFileService { public static String GEN_FILE_DIR_PATH; @Value("${custom.genFileDirPath}") public void setGenFileDirPath(String genFileDirPath) { GEN_FILE_DIR_PATH = genFileDirPath; } private final GenFileRepository genFileRepository; public void updateFileOnDisk(MultipartFile multipartFile, long fileId, String originFileName, String fileExtTypeCode, String fileExtType2Code, String fileExt, int fileSize) { } private long saveFile(String relTypeCode, int relId, String typeCode, String type2Code, int fileNo, String fileDir, String originFileName, String fileExtTypeCode, String fileExtType2Code, String fileExt, int fileSize, Academy academy) { GenFile genFile = GenFile .builder() .relTypeCode(relTypeCode) .relId(relId) .typeCode(typeCode) .type2Code(type2Code) .fileNo(fileNo) .fileDir(fileDir) .originFileName(originFileName) .fileExtTypeCode(fileExtTypeCode) .fileExtType2Code(fileExtType2Code) .fileExt(fileExt) .fileSize(fileSize) .build(); genFile.setAcademy(academy); genFileRepository.save(genFile); return genFile.getId(); } public Long saveFileOnDisk(MultipartFile multipartFile, String relTypeCode, int relId, String typeCode, String type2Code, int fileNo, String originFileName, String fileExtTypeCode, String fileExtType2Code, String fileExt, int fileSize, Academy academy) { // 새 파일이 저장될 폴더명 생성(연_월) String fileDir = Util.getNowYearMonthDateStr(); // DB에 파일정보 등록(먼저 수행하는 이유는 파일을 생성할 때 파일명이 file 테이블의 주키 이기 때문에) long fileId = saveFile(relTypeCode, relId, typeCode, type2Code, fileNo, fileDir, originFileName, fileExtTypeCode, fileExtType2Code, fileExt, fileSize, academy); // 새 파일이 저장될 폴더(io파일) 객체 생성 String targetDirPath = GEN_FILE_DIR_PATH + "/" + relTypeCode + "/" + fileDir; File targetDir = new File(targetDirPath); // 새 파일이 저장될 폴더가 존재하지 않는다면 생성 if (targetDir.exists() == false) { targetDir.mkdirs(); } String targetFileName = fileId + "." + fileExt; String targetFilePath = targetDirPath + "/" + targetFileName; System.out.println("targetFilePath : " + targetFilePath); // 파일 생성(업로드된 파일을 지정된 경로롤 옮김) try { multipartFile.transferTo(new File(targetFilePath)); } catch (IllegalStateException | IOException e) { e.printStackTrace(); throw new RuntimeException(e); } return fileId; } public long getGenFileId(String relTypeCode, long relId, String typeCode, String type2Code, int fileNo) { GenFile genFile = genFileRepository.findByRelTypeCodeAndRelIdAndTypeCodeAndType2CodeAndFileNo(relTypeCode, relId, typeCode, type2Code, fileNo); if (genFile == null) { return -1; } return genFile.getId(); } public void deleteFile(long id) { // 기존 파일 정보 불러오기 GenFile oldGenFile = getGenFileById(id); // 기존 파일이 디스크에 저장되어 있다면 삭제 String filePath = oldGenFile.getFilePath(); File file = new File(filePath); if (file.exists()) { file.delete(); } genFileRepository.delete(oldGenFile); } public GenFile getGenFileById(long id) { return genFileRepository.findById(id).orElse(null); } } ``` ㅤ #### 파일 Util ```java public class Util { public static String getFileExtFromFileName(String fileName) { int pos = fileName.lastIndexOf("."); String ext = fileName.substring(pos + 1); return ext; } public static String getFileExtTypeCodeFromFileName(String fileName) { String ext = getFileExtFromFileName(fileName).toLowerCase(); switch (ext) { case "jpeg": case "jpg": case "gif": case "png": return "img"; case "mp4": case "avi": case "mov": return "video"; case "mp3": return "audio"; } return "etc"; } public static String getFileExtType2CodeFromFileName(String fileName) { String ext = getFileExtFromFileName(fileName).toLowerCase(); switch (ext) { case "jpeg": case "jpg": return "jpg"; case "gif": case "png": case "mp4": case "mov": case "avi": case "mp3": return ext; } return "etc"; } public static String getNowYearMonthDateStr() { SimpleDateFormat format1 = new SimpleDateFormat("yyyy_MM"); String dateStr = format1.format(System.currentTimeMillis()); return dateStr; } } ``` ㅤ #### 파일 Repository ```java public interface GenFileRepository extends JpaRepository { GenFile findByRelTypeCodeAndRelIdAndTypeCodeAndType2CodeAndFileNo(String relTypeCode, long relId, String typeCode, String type2Code, int fileNo); } ``` ㅤ ### ✔ 수업 예약 페이지 - reservation ![img](https://i.imgur.com/gWTsDnJ.png) ㅤ #### 수업 예약 Controller ```java @Controller @RequiredArgsConstructor public class Lesson_ResController { private final Lesson_ResService lesson_resService; private final UserRepository userRepository; private final LessonRepository lessonRepository; private final UserLessonTicketService userLessonTicketService; private final UserService userService; @PreAuthorize("isAuthenticated()") @PostMapping("/reserve/{id}") public String reserveLesson(@RequestParam String datePicker, @RequestParam String childSelectBox, @PathVariable("id") Integer id, @Valid Lesson_ResDto lessonResDto, BindingResult bindingResult, RedirectAttributes redirectAttributes, Principal principal) { // 유저 이름 필요 //string => 날짜 시간 타입으로 변경 LocalDate date = LocalDate.parse(datePicker, DateTimeFormatter.ISO_DATE); LocalTime time = LocalTime.parse(childSelectBox, DateTimeFormatter.ISO_TIME); // 콘솔 데이터 확인 System.out.println(id); System.out.println(date); System.out.println(time); SiteUser siteUser = userService.getUser(principal.getName()); String currentUsername = principal.getName(); Optional currentUser = userRepository.findByUsername(currentUsername); Integer currentUserId = currentUser.map(SiteUser::getId).orElse(null); lessonResDto.setBookedUsersId(Collections.singletonList(currentUserId)); Optional lesson = lesson_resService.findLessonId(date, time, id); Integer lessonId = lesson.get().getId(); System.out.println(lessonResDto); // 중복 체크 후 에러시 팝업 띄워주기 if (!userLessonTicketService.checkUserLessonTicket(siteUser.getId())) { System.out.println("구매필요함"); redirectAttributes.addFlashAttribute("popupMessage", "수강권 구매가 필요합니다"); return "redirect:/ticket"; } else if (lesson.get().getCurrentCapacity() >= lesson.get().getPeopleCapacity()) { System.out.println("꽉참"); redirectAttributes.addFlashAttribute("popupMessage", "수용 인원을 초과했습니다"); return "redirect:/academy/detail/{id}"; } else if (lesson_resService.findUsers(lessonId).contains(currentUserId)) { System.out.println("유저 중복으로 불가능"); redirectAttributes.addFlashAttribute("popupMessage", "이미 예약된 회원입니다"); return "redirect:/academy/detail/{id}"; } else { lesson.get().setCurrentCapacity(lesson.get().getCurrentCapacity() + 1); lessonRepository.save(lesson.get()); } //레슨 테이블에 등록인원 추가 로직 this.lesson_resService.reserve(lessonResDto, lessonId, currentUserId); System.out.println("예약됨"); return "redirect:/reserve"; } // 예약 확인 하는 부분 @PreAuthorize("isAuthenticated()") @GetMapping("/reserve") public String onlesson(Model model, Principal principal) { String currentUsername = principal.getName(); Optional currentUser = userRepository.findByUsername(currentUsername); Integer currentUserId = currentUser.map(SiteUser::getId).orElse(null); List lessonResList = lesson_resService.findUserRes(currentUserId); model.addAttribute("lessonResList", lessonResList); System.out.println(lessonResList); return "reserve"; } } ``` ㅤ #### 수업 예약 Service ```java @Service @RequiredArgsConstructor public class Lesson_ResService { private final LessonRepository lessonRepository; private final Lesson_ResRepository lessonResRepository; private final UserRepository userRepository; public Optional findLessonId(LocalDate date, LocalTime time, Integer id) { return lessonRepository.findIdByLessonDateAndLessonTimeAndAcademyId(date, time, id); } //현재 인원 증가시키는 로직 팝업 띄우는 로직 추가해야함 controller에는 다 구현 되어있음 public void increaseLessonCapacity(Integer lessonId) { Lesson lesson = lessonRepository.findById(lessonId) .orElseThrow(() -> new IllegalArgumentException("레슨 없음 id : " + lessonId)); if (lesson.getCurrentCapacity() < lesson.getPeopleCapacity()) { lesson.setCurrentCapacity(lesson.getCurrentCapacity() + 1); lessonRepository.save(lesson); } else { throw new IllegalStateException("예약 꽉참"); } } //레슨 인원 초과 확인 public boolean isLessonFullyBooked(Integer lessonId) { Lesson lesson = lessonRepository.findById(lessonId) .orElseThrow(() -> new IllegalArgumentException("레슨 없음 id : " + lessonId)); return lesson.getCurrentCapacity() >= lesson.getPeopleCapacity(); } // 예약 public void reserve(Lesson_ResDto lessonResDto, Integer lessonId, Integer siteUserId){ Optional lesson1 = lessonRepository.findById(lessonId); Lesson lesson = lessonRepository.findById(lesson1.get().getId()) .orElseThrow(() -> new DataNotFoundException("존재하지 않는 레슨ID입니다")); Lesson_Res lessonRes = new Lesson_Res(); lessonRes.setLesson(lesson); lessonRes.setBookDate(LocalDateTime.now()); List bookedUsersId = new ArrayList<>(); bookedUsersId.add(siteUserId); lessonResDto.setBookedUsersId(bookedUsersId); for (Integer userId : lessonResDto.getBookedUsersId()) { Optional userOptional = userRepository.findById(userId); SiteUser user = userOptional.orElseThrow(() -> new DataNotFoundException("존재하지 않는 사용자 ID입니다")); lessonRes.getUsers().add(user); } lessonResRepository.save(lessonRes); } // 사용자가 예약한 레슨 public List findUserRes(Integer userId){ return lessonResRepository.findByUsersId(userId, Sort.by(Sort.Direction.DESC, "lesson.lessonDate")); } // 예약한 인원 List public List findUsers(Integer lessonId){ return lessonResRepository.findUserIdsByLessonId(lessonId); } } ``` ㅤ #### 수업 예약 Repository ```java public interface Lesson_ResRepository extends JpaRepository { List findByUsersId(Integer userId, Sort sort); @Query("SELECT u.id FROM Lesson_Res lr JOIN lr.users u WHERE lr.lesson.id = :lessonId") List findUserIdsByLessonId(@Param("lessonId") Integer lessonId); } ``` ㅤ ### ✔ 수강권 페이지 - ticket ![img](https://i.imgur.com/7UIg7Ni.png) ![img](https://i.imgur.com/hdGpfQ3.png) ㅤ #### 수강권 Controller ```java @Controller @RequiredArgsConstructor public class LessonTicketController { @GetMapping("/ticket/pay") public String ticketc(){ return "ticket"; } @RequestMapping("/ticket/succsess") public String ok(@RequestParam String paymentKey, @RequestParam String orderId, @RequestParam Integer amount, Model model) throws IOException, InterruptedException { HttpRequest request = HttpRequest.newBuilder() .uri(URI.create("https://api.tosspayments.com/v1/payments/confirm")) .header("Authorization", "Basic dGVzdF9za19XZDQ2cW9wT0I4OU1LbmJKb2JkOFptTTc1eTB2Og==") .header("Content-Type", "application/json") .method("POST", HttpRequest.BodyPublishers.ofString("{\"paymentKey\":\"{PAYMENT_KEY}\",\"amount\":15000,\"orderId\":\"jSMW8URlObRFnJ4R3lpp1\"}")) .build(); HttpResponse response = HttpClient.newHttpClient().send(request, HttpResponse.BodyHandlers.ofString()); System.out.println(response.body()); return "success"; } } ``` ㅤ #### 수강권 Service ```java @Service @RequiredArgsConstructor public class LessonTicketService { private final LessonTicketRepository lessonTicketRepository; public LessonTicket getLesson(Integer id){ Optional optionalLessonTicket = lessonTicketRepository.findById(id); return optionalLessonTicket.get(); } } ``` ㅤ ### ✔ 수강권 구매 유저 페이지 - academycreate ![img](https://i.imgur.com/nDo4qUo.png) ㅤ #### 수강권 구매 유저 Controller ```java @Controller @RequiredArgsConstructor public class UserLessonTicketController { private final UserLessonTicketService userLessonTicketService; private final UserService userService; private final LessonTicketService lessonTicketService; @PostMapping("/ticket/{id}") public String addUserLessonTicket(@PathVariable("id") Integer ticketId, Principal principal, RedirectAttributes redirectAttributes) { SiteUser siteUser = userService.getUser(principal.getName()); LessonTicket lessonTicket = lessonTicketService.getLesson(ticketId); if (userLessonTicketService.checkUserPayment(siteUser.getId(), lessonTicket.getId())) { System.out.println("이미 구매"); redirectAttributes.addFlashAttribute("popupMessage", "이미 구매한 사용자 입니다"); return "redirect:/ticket"; } userLessonTicketService.addUserLessonTicket(siteUser, lessonTicket); return "redirect:/ticket/pay"; } @GetMapping("/ticket") public String showTicket() { return "ticket_home"; } } ``` ㅤ #### 수강권 구매 유저 Service ```java @Service @RequiredArgsConstructor public class UserLessonTicketService { private final UserLessonTicketRepository userLessonTicketRepository; public UserLessonTicket addUserLessonTicket(SiteUser siteUser, LessonTicket lessonTicket) { UserLessonTicket userLessonTicket = new UserLessonTicket(); userLessonTicket.setSiteUser(siteUser); userLessonTicket.setLessonTicket(lessonTicket); userLessonTicket.setUsedTicketTime(0); return userLessonTicketRepository.save(userLessonTicket); } public boolean checkUserPayment(Integer userId, Integer lessonId) { return userLessonTicketRepository.existsBySiteUser_IdAndLessonTicket_Id(userId, lessonId); } public boolean checkUserLessonTicket(Integer userId) { return userLessonTicketRepository.existsBySiteUser_Id(userId); } } ``` ㅤ #### 수강권 구매 유저 Repository ```java @Repository public interface UserLessonTicketRepository extends JpaRepository { boolean existsBySiteUser_IdAndLessonTicket_Id(Integer userId, Integer lessonId); boolean existsBySiteUser_Id(Integer userId); } ``` ㅤ # ? 기술설명 ## ?서버 구조 ![img](https://i.imgur.com/AspJjQQ.png) $$uml !theme mars frame 작업자PC { frame Windows10 { frame Chrome { } } } frame 운영서버머신 { frame CentOS7(public．phsol．site,_172．17．0．1) { circle 172．17．0．1――8081 circle 172．17．0．1――443 circle 172．17．0．1――3306 frame Docker { frame Nginx――1 { circle Nginx――1――443 } frame Mariadb――1 { circle Mariadb――1――3306 } frame 서버 { circle 서버――9000 } } } } Chrome --> "172．17．0．1――443":1． https://tesbro.yup2.dev 로 접속 "172．17．0．1――443" --> "Nginx――1――443" : 2． 외부 443 => Nginx 내부 443 "Nginx――1――443" --> "172．17．0．1――8081" : 3． Nginx Proxy Manager 에 의해 => 외부 8081 "172．17．0．1――8081" --> "서버――9000" : 4． 외부 8081 => 서버 내부 9000 "서버――9000" -[#green]-* "172．17．0．1――3306" : 5． DB 쿼리, 내부 9000 => 외부 3306 "172．17．0．1――3306" -[#green]-* "Mariadb――1――3306" : 6． 외부 3306 => Mariadb__1 내부 3306 $$ ㅤ ## ? Nginx ![Nginx](https://i.imgur.com/HhHtIOI.png) ㅤ ## ? Jenkins ![Jenkins](https://i.imgur.com/vXBwT3H.png) ㅤ ## ? Jenkins pipeline ``` js pipeline { agent any environment { timestamp = "${System.currentTimeMillis() / 1000L}" } stages { stage('Prepare') { steps { script { // Get the ID of the tesbro:latest image def oldImageId = sh(script: "docker images tesbro:latest -q", returnStdout: true).trim() env.oldImageId = oldImageId } git branch: 'main', url: 'https://github.com/yup2dev/Team_TESBRO' } post { success { sh 'echo "Successfully Cloned Repository"' } failure { sh 'echo "Fail Cloned Repository"' } } } stage('Build Gradle') { steps { dir('.') { sh """ chmod +x gradlew """ } dir('.') { sh """ ./gradlew clean build """ } } post { success { sh 'echo "Successfully Build Gradle Test"' } failure { sh 'echo "Fail Build Gradle Test"' } } } stage('Build Docker Image') { steps { script { sh "docker build -t tesbro:${timestamp} ." } } } stage('Run Docker Container') { steps { script { // Check if the container is already running def isRunning = sh(script: "docker ps -q -f name=tesbro_1", returnStdout: true).trim() if (isRunning) { sh "docker rm -f tesbro_1" } // Run the new container try { sh """ docker run \ --name=tesbro_1 \ -p 8081:9000 \ -v /docker_projects/tesbro_1/volumes/gen:/gen \ --restart unless-stopped \ -e TZ=Asia/Seoul \ -d \ tesbro:${timestamp} """ } catch (Exception e) { // If the container failed to run, remove it and the image isRunning = sh(script: "docker ps -q -f name=tesbro_1", returnStdout: true).trim() if (isRunning) { sh "docker rm -f tesbro_1" } def imageExists = sh(script: "docker images -q tesbro:${timestamp}", returnStdout: true).trim() if (imageExists) { sh "docker rmi tesbro:${timestamp}" } error("Failed to run the Docker container.") } // If there's an existing 'latest' image, remove it def latestExists = sh(script: "docker images -q tesbro:latest", returnStdout: true).trim() if (latestExists) { sh "docker rmi tesbro:latest" if(!oldImageId.isEmpty()) { sh "docker rmi ${oldImageId}" } } // Tag the new image as 'latest' sh "docker tag tesbro:${env.timestamp} tesbro:latest" } } } } } ``` ㅤ ## ?젠킨스 배포순서, 테스트 실패시 $$uml !theme toy autonumber box "작업PC" actor 개발자 entity 작업PC end box entity Github_Repository box "서버" entity Jenkins entity 테스트용_서버컨테이너 entity 실서버용_서버컨테이너 end box 개발자 -> 작업PC : Commit! 작업PC -> Github_Repository : Push! Github_Repository -> Jenkins : Webhook에 의해서 Commit Signal 전송 Jenkins -> 테스트용_서버컨테이너 : 재배포 스크립트 실행 테스트용_서버컨테이너 -> Jenkins : 테스트가 실패했습니다... Jenkins -> Jenkins : 이번 빌드는 실패로 처리하고, 작업을 종료합니다. 개발자 -> Jenkins : 해당 빌드의 콘솔기록을 확인하여 테스트가 왜 실패했는지 분석 $$ ㅤ ## ?젠킨스 배포순서, 테스트 성공시 $$uml !theme toy autonumber box "작업PC" actor 개발자 entity 작업PC end box entity Github_Repository box "서버" entity Jenkins entity 테스트용_서버컨테이너 entity 실서버용_서버컨테이너 end box 개발자 -> 작업PC : Commit! 작업PC -> Github_Repository : Push! Github_Repository -> Jenkins : Webhook에 의해서 Commit Signal 전송 Jenkins -> 테스트용_서버컨테이너 : 재배포 스크립트 실행 테스트용_서버컨테이너 -> Jenkins : All Clear Jenkins -> 실서버용_서버컨테이너 : 리빌드 후 다시 실행하세요! 개발자 -> 실서버용_서버컨테이너 : Web Brouser로 Build 되었는지 확인 $$ ㅤ --- ㅤ ??감사합니다??