Skip to content

Commit

Permalink
Merge pull request #331 from TEAM-LIAISON/develop
Browse files Browse the repository at this point in the history
add : search page And browse fix prod server
  • Loading branch information
oznchex authored Jul 23, 2024
2 parents 1d90ce1 + fda8ea6 commit c9e270a
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import liaison.linkit.auth.Auth;
import liaison.linkit.auth.MemberOnly;
import liaison.linkit.auth.domain.Accessor;
import liaison.linkit.profile.browse.CheckBrowseToPrivateProfileAccess;
import liaison.linkit.profile.dto.response.ProfileIntroductionResponse;
import liaison.linkit.profile.dto.response.antecedents.AntecedentsResponse;
import liaison.linkit.profile.dto.response.attach.AttachResponse;
Expand All @@ -16,7 +17,6 @@
import liaison.linkit.profile.dto.response.profileRegion.ProfileRegionResponse;
import liaison.linkit.profile.dto.response.teamBuilding.ProfileTeamBuildingFieldResponse;
import liaison.linkit.profile.service.*;
import liaison.linkit.search.dto.response.browseAfterLogin.BrowseMiniProfileResponse;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.ResponseEntity;
Expand Down Expand Up @@ -50,6 +50,7 @@ public class BrowsePrivateProfileController {
// 타겟 이력서 열람 컨트롤러
@GetMapping("/browse/private/profile/{miniProfileId}")
@MemberOnly
@CheckBrowseToPrivateProfileAccess
public ResponseEntity<?> getBrowsePrivateProfile(
@Auth final Accessor accessor,
@PathVariable final Long miniProfileId
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public class SearchController {
// 팀원 찾기 구현부
@GetMapping("/search/private/profile")
public ResponseEntity<Page<MiniProfileResponse>> findPrivateMiniProfile(
@PageableDefault(size = 100) Pageable pageable,
@PageableDefault(size = 1000) Pageable pageable,
// 필터링 항목 1. 팀빌딩 분야
@RequestParam(required = false) final List<String> teamBuildingFieldName,
// 필터링 항목 2. 희망 역할
Expand Down Expand Up @@ -63,7 +63,7 @@ public ResponseEntity<Page<MiniProfileResponse>> findPrivateMiniProfile(
@MemberOnly
public ResponseEntity<Page<BrowseMiniProfileResponse>> findPrivateMiniProfileLogin(
@Auth final Accessor accessor,
@PageableDefault(size = 100) Pageable pageable,
@PageableDefault(size = 1000) Pageable pageable,
@RequestParam(required = false) final List<String> teamBuildingFieldName,
@RequestParam(required = false) final List<String> jobRoleName,
@RequestParam(required = false) final List<String> skillName,
Expand All @@ -87,7 +87,7 @@ public ResponseEntity<Page<BrowseMiniProfileResponse>> findPrivateMiniProfileLog
// 팀 찾기 컨트롤러
@GetMapping("/search/team/profile")
public ResponseEntity<Page<SearchTeamProfileResponse>> findSearchTeamProfile(
@PageableDefault(size = 10) final Pageable pageable,
@PageableDefault(size = 1000) final Pageable pageable,
// 필터링 항목 1. 희망 팀빌딩 분야
@RequestParam(required = false) final List<String> teamBuildingFieldName,
// 필터링 항목 2. 직무 및 역할
Expand Down Expand Up @@ -119,7 +119,7 @@ public ResponseEntity<Page<SearchTeamProfileResponse>> findSearchTeamProfile(
@MemberOnly
public ResponseEntity<Page<SearchBrowseTeamProfileResponse>> findSearchTeamProfileAfterLogin(
@Auth final Accessor accessor,
@PageableDefault(size = 10) final Pageable pageable,
@PageableDefault(size = 1000) final Pageable pageable,
@RequestParam(required = false) final List<String> teamBuildingFieldName,
@RequestParam(required = false) final List<String> jobRoleName,
@RequestParam(required = false) final List<String> skillName,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import liaison.linkit.auth.Auth;
import liaison.linkit.auth.MemberOnly;
import liaison.linkit.auth.domain.Accessor;
import liaison.linkit.profile.browse.CheckBrowseToTeamProfileAccess;
import liaison.linkit.team.dto.response.TeamMemberIntroductionResponse;
import liaison.linkit.team.dto.response.TeamProfileIntroductionResponse;
import liaison.linkit.team.dto.response.TeamProfileIsValueResponse;
Expand Down Expand Up @@ -55,6 +56,7 @@ public class BrowseTeamProfileController {

@GetMapping("/browse/team/profile/{teamMiniProfileId}")
@MemberOnly
@CheckBrowseToTeamProfileAccess
public ResponseEntity<?> getBrowseTeamProfile(
@Auth final Accessor accessor,
@PathVariable final Long teamMiniProfileId
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/application-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@ spring:
format_sql: true
use_sql_comments: true
hibernate:
ddl-auto: create
ddl-auto: validate

sql:
init:
mode: always
mode: never

batch:
jdbc:
initialize-schema: always
initialize-schema: never
job:
enabled: true
enabled: false

datasource:
url: ${database.url}
Expand Down

0 comments on commit c9e270a

Please sign in to comment.