Skip to content

Commit

Permalink
작성 코드 주석 추가 (#78)
Browse files Browse the repository at this point in the history
  • Loading branch information
jjoool authored Jan 6, 2025
1 parent 35bd937 commit 7b45a36
Show file tree
Hide file tree
Showing 59 changed files with 92 additions and 39 deletions.
2 changes: 1 addition & 1 deletion src/main/java/com/trace/jachuiplan/CommonUtil.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 정은
/// 김정은
package com.trace.jachuiplan;

import org.commonmark.node.Node;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/// 이재혁
package com.trace.jachuiplan.CustomAnnotation;

import jakarta.validation.Constraint;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/// 이재혁
package com.trace.jachuiplan.CustomAnnotation;

import jakarta.validation.ConstraintValidator;
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/trace/jachuiplan/answer/Answer.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/// 이화경
package com.trace.jachuiplan.answer;

import com.trace.jachuiplan.question.Question;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/// 김정은
package com.trace.jachuiplan.auth;

import com.trace.jachuiplan.user.CustomUserDetails;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/// 김정은
package com.trace.jachuiplan.auth;

import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/// 김정은
package com.trace.jachuiplan.auth;

public interface OAuth2Response {
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/trace/jachuiplan/board/Board.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/// 이화경
package com.trace.jachuiplan.board;

import com.trace.jachuiplan.likes.Likes;
Expand Down
12 changes: 9 additions & 3 deletions src/main/java/com/trace/jachuiplan/board/BoardController.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
/// 김성현, 이화경, 김정은
package com.trace.jachuiplan.board;

import com.trace.jachuiplan.board.Board;
import com.trace.jachuiplan.board.BoardService;
import com.trace.jachuiplan.board.BoardType;
import com.trace.jachuiplan.likes.LikesId;
import com.trace.jachuiplan.likes.LikesService;
import com.trace.jachuiplan.user.UserService;
Expand Down Expand Up @@ -27,6 +31,7 @@
@RequestMapping("/board")
public class BoardController {

/// 김성현
@Autowired
private final BoardService boardService;

Expand Down Expand Up @@ -185,11 +190,13 @@ public String addBoard(Board board,
board.setUsers(currentUser); // 게시판에 작성자 설정
}

// 김정은
if(type == '0' && !userDetails.getAuthorities().stream()
.anyMatch(auth -> auth.getAuthority().equals("ROLE_ADMIN"))){
throw new AccessDeniedException("관리자만 글을 등록할 수 있습니다.");
}

/// 김성현
board.setType(type);
board.setRegdate(LocalDateTime.now());
board.setViews(0);
Expand Down Expand Up @@ -250,6 +257,7 @@ public String toggleLike(@RequestParam("boardId") Long boardId,
return likesService.toggleLike(board, currentUser);
}

/// 이화경
// 게시글 삭제
@DeleteMapping("/{bno}")
public String getBoardDelete(@PathVariable("bno") Long bno,
Expand All @@ -273,6 +281,7 @@ public String getBoardDelete(@PathVariable("bno") Long bno,
}
}

/// 김정은
// 게시물 수정
@GetMapping("/modify/{id}")
public String boardModify(@PathVariable("id") Long id,
Expand Down Expand Up @@ -307,7 +316,4 @@ public String modifyBoard(

return "redirect:/board/detail/" + bno;
}



}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/// 김성현
package com.trace.jachuiplan.board;

import org.springframework.data.domain.Page;
Expand All @@ -9,4 +10,4 @@
public interface BoardRepository extends JpaRepository<Board, Long> {
// 페이징 처리를 위한 메서드
Page<Board> findByType(char type, Pageable pageable);
}
}
8 changes: 5 additions & 3 deletions src/main/java/com/trace/jachuiplan/board/BoardService.java
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
/// 김성현, 이화경
package com.trace.jachuiplan.board;

import com.trace.jachuiplan.DataNotFoundException;
import com.trace.jachuiplan.likes.LikesRepository;
import com.trace.jachuiplan.reply.Reply;
import com.trace.jachuiplan.reply.ReplyRepository;
import com.trace.jachuiplan.user.Users;
import jakarta.transaction.Transactional;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.http.ResponseEntity;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;
import java.util.Optional;

/// 김성현
@RequiredArgsConstructor
@Service
public class BoardService {
Expand Down Expand Up @@ -83,6 +82,8 @@ public Board getBoardById(Long id) {
return boardRepository.findById(id)
.orElse(null); // 게시글이 없으면 null 반환
}

/// 이화경
// 조회수 증가
@Transactional
public void addViewCount(Board board) {
Expand All @@ -109,6 +110,7 @@ public Board deleteBoard(Long bno, UserDetails userDetails) throws Exception {
return board.get();
}

/// 김정은
// 게시글 수정
public void modifyBoard(Long bno, Board board, UserDetails userDetails) {
Board existingBoard = boardRepository.findById(bno)
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/trace/jachuiplan/board/BoardType.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/// 이화경
package com.trace.jachuiplan.board;

import lombok.Getter;
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/trace/jachuiplan/building/Building.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/// 이화경
package com.trace.jachuiplan.building;

import jakarta.persistence.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/// 이재혁, 이화경
package com.trace.jachuiplan.building;

import com.trace.jachuiplan.CustomAnnotation.ExactSize;
Expand All @@ -10,6 +11,7 @@

import java.util.List;

/// 이재혁
@RequiredArgsConstructor
@RestController
@RequestMapping("/api/building")
Expand Down Expand Up @@ -69,7 +71,8 @@ public ResponseEntity<List<BuildingFilterDTO>> averageBuildings(
return ResponseEntity.ok(buildings);
}

@GetMapping("/transition")
/// 이화경
@GetMapping("/transition")
public ResponseEntity<List<BuildingTransitionDTO>> transitionBuildingCriteria(
@RequestParam(name = "sggcd") @ExactSize(5) String sggcd,
@RequestParam(name = "umdnm") String umdnm,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/// 이재혁
package com.trace.jachuiplan.building;

import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/// 이재혁, 김성현, 이화경
package com.trace.jachuiplan.building;

import org.springframework.data.jpa.repository.JpaRepository;
Expand Down Expand Up @@ -35,6 +36,7 @@ List<Building> findByCriteria(
@Param("minFloor") Integer minFloor,
@Param("maxFloor") Integer maxFloor);

/// 이재혁
// 각 동별 평균과 거래량을 알려줌
@Query("SELECT new com.trace.jachuiplan.building.BuildingFilterDTO(o.umdnm, ROUND(AVG(o.monthlyRent), 2), ROUND(AVG(o.deposit), 2), COUNT(o.umdnm)) FROM Building o WHERE "
+ "o.dealdate >= TO_DATE(:startYearMonth, 'YYYYMM') "
Expand Down Expand Up @@ -64,6 +66,7 @@ List<BuildingFilterDTO> averageByCriteria(
@Param("minFloor") Integer minFloor,
@Param("maxFloor") Integer maxFloor);

/// 이화경
// 하나의 동에 대한 월별 평균가격 추이, 거래량
@Query("SELECT new com.trace.jachuiplan.building.BuildingTransitionDTO(o.umdnm, TO_CHAR(o.dealdate, 'YYYYMM'), ROUND(AVG(o.monthlyRent), 2), ROUND(AVG(o.deposit), 2), COUNT(o.umdnm)) FROM Building o WHERE "
+ "o.dealdate >= ADD_MONTHS(TO_DATE(TO_CHAR(SYSDATE, 'YYYYMM'), 'YYYYMM'), -13) "
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
/// 이재혁, 김성현
package com.trace.jachuiplan.building;

import com.trace.jachuiplan.building.Building;
import com.trace.jachuiplan.building.BuildingRepository;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/// 이화경
package com.trace.jachuiplan.building;

import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/// 김정은
package com.trace.jachuiplan.config;

import com.trace.jachuiplan.auth.CustomOAuth2UserService;
Expand All @@ -12,9 +13,6 @@
import org.springframework.security.web.SecurityFilterChain;
import org.springframework.security.web.savedrequest.SavedRequest;
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
import org.springframework.web.filter.CorsFilter;

@Configuration
public class SecurityConfig {
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/trace/jachuiplan/config/WebConfig.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/// 김성현
package com.trace.jachuiplan.config;

import org.springframework.context.annotation.Bean;
Expand Down
11 changes: 1 addition & 10 deletions src/main/java/com/trace/jachuiplan/home/HomeController.java
Original file line number Diff line number Diff line change
@@ -1,19 +1,10 @@
/// 이재혁
package com.trace.jachuiplan.home;

import com.trace.jachuiplan.user.CustomUserDetails;
import lombok.extern.log4j.Log4j2;
import org.springframework.http.ResponseEntity;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;

import java.util.HashMap;
import java.util.Map;

@Log4j2
@Controller
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/trace/jachuiplan/likes/Likes.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/// 이재혁
package com.trace.jachuiplan.likes;

import com.trace.jachuiplan.board.Board;
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/trace/jachuiplan/likes/LikesId.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/// 이재혁
package com.trace.jachuiplan.likes;

import com.trace.jachuiplan.board.Board;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/// 김성현, 김정은
package com.trace.jachuiplan.likes;

import com.trace.jachuiplan.board.Board;
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/com/trace/jachuiplan/likes/LikesService.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/// 김성현, 김정은
package com.trace.jachuiplan.likes;

import com.trace.jachuiplan.board.Board;
Expand All @@ -8,6 +9,7 @@
@Service
public class LikesService {

/// 김성현
@Autowired
private LikesRepository likesRepository;

Expand All @@ -31,6 +33,7 @@ public void removeLike(LikesId likesId) {
}
}

/// 김정은
// 좋아요 상태 확인 및 토글
public String toggleLike(Board board, Users user){
LikesId likesId = new LikesId(board, user);
Expand All @@ -43,12 +46,14 @@ public String toggleLike(Board board, Users user){
}
}

/// 김성현
// 특정 게시글에 대해 사용자가 좋아요를 눌렀는지 확인
public boolean isLiked(Board board, Users users) {
Likes like = likesRepository.findByBoardAndUsers(board, users);
return like != null; // 좋아요가 존재하면 true 반환
}

/// 김정은
// 좋아요 수 가져오기
public long getLikesCount(Board board){
return likesRepository.countByBoard(board);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/trace/jachuiplan/map/MapController.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/// 이재혁
package com.trace.jachuiplan.map;

import groovy.util.logging.Log4j;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/// 이화경
package com.trace.jachuiplan.officeHotel;

import jakarta.persistence.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/// 이재혁, 김성현, 이화경
package com.trace.jachuiplan.officeHotel;

import com.trace.jachuiplan.CustomAnnotation.ExactSize;
import com.trace.jachuiplan.building.BuildingTransitionDTO;
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
Expand All @@ -17,6 +17,7 @@
public class OfficeHotelApiController {
private final OfficeHotelService officeHotelService;

/// 김성현
@GetMapping("/search")
public ResponseEntity<List<OfficeHotel>> searchOfficeHotels(
@RequestParam(name = "sggcds") List<@ExactSize(5) String> sggcds,
Expand Down Expand Up @@ -45,6 +46,7 @@ public ResponseEntity<List<OfficeHotel>> searchOfficeHotels(
return ResponseEntity.ok(officeHotels);
}

/// 이재혁
@GetMapping("/average")
public ResponseEntity<List<OfficeHotelFilterDTO>> averageOfficeHotels(
@RequestParam(name = "sggcds") List<@ExactSize(5) String> sggcds,
Expand Down Expand Up @@ -73,6 +75,7 @@ public ResponseEntity<List<OfficeHotelFilterDTO>> averageOfficeHotels(
return ResponseEntity.ok(officeHotels);
}

/// 이화경
@GetMapping("/transition")
public ResponseEntity<List<OfficeHotelTransitionDTO>> transitionBuildingCriteria(
@RequestParam(name = "sggcd") @ExactSize(5) String sggcd,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/// 이재혁
package com.trace.jachuiplan.officeHotel;

import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/// 이재혁, 김성현, 이화경
package com.trace.jachuiplan.officeHotel;

import org.springframework.data.jpa.repository.JpaRepository;
Expand All @@ -6,6 +7,7 @@

import java.util.List;

/// 이재혁, 김성현
public interface OfficeHotelRepository extends JpaRepository<OfficeHotel, Long> {
// 시군구코드 (5자리)와 시작년월 종료년월을 받아서 기간 내 거래 내역을 불러옴
@Query("SELECT o FROM OfficeHotel o " +
Expand Down Expand Up @@ -80,6 +82,7 @@ List<OfficeHotelFilterDTO> averageByCriteria(
@Param("minFloor") Integer minFloor,
@Param("maxFloor") Integer maxFloor);

/// 이화경
// 하나의 동에 대한 월별 평균가격 추이, 거래량
@Query("SELECT new com.trace.jachuiplan.officeHotel.OfficeHotelTransitionDTO(o.umdnm, TO_CHAR(o.dealdate, 'YYYYMM'), ROUND(AVG(o.monthlyRent), 2), ROUND(AVG(o.deposit), 2), COUNT(o.umdnm)) FROM OfficeHotel o WHERE "
+ "o.dealdate >= ADD_MONTHS(TO_DATE(TO_CHAR(SYSDATE, 'YYYYMM'), 'YYYYMM'), -13) "
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/// 이재혁, 이화경
package com.trace.jachuiplan.officeHotel;

import lombok.RequiredArgsConstructor;
Expand Down
Loading

0 comments on commit 7b45a36

Please sign in to comment.