[18조 BE] 10주차 코드 리뷰 신청

.github/workflows/deploy.yml

@@ -21,6 +21,9 @@ jobs:
           java-version: '21'
           distribution: 'adopt'
 
+      - name : Override APPLICATION PROPERTIES
+        run : echo "${{ secrets.APPLICATION_PROPERTIES }}" > ./src/main/resources/application.properties
+
       - name: Configure Production Properties
         run: |
           touch ./src/main/resources/application-prod.properties
@@ -47,7 +50,7 @@ jobs:
         with:
           name: team18-be-jar
           path: build/libs/team18-be-0.0.1-SNAPSHOT.jar
-
+          
   deploy:
     runs-on: ubuntu-latest
     needs: build
@@ -58,21 +61,62 @@ jobs:
         with:
           name: team18-be-jar
 
-      - name: Deploy to GCP
+      - name: Authenticate with GCP
+        uses: google-github-actions/auth@v1
+        with:
+          credentials_json: "${{ secrets.GCP_SERVICE_ACCOUNT_KEY }}"
+
+      - name: Set up Google Cloud SDK
+        uses: google-github-actions/setup-gcloud@v1
+        with:
+          project_id: ${{ secrets.GCP_PROJECT_ID }}
+
+      - name: Get GitHub Actions Runner IP
+        id: get_ip
         run: |
-          # 필요한 패키지 설치
-          sudo apt-get update
-          sudo apt-get install -y google-cloud-cli
+          echo $(curl -s https://api64.ipify.org) > RUNNER_IP.txt
 
-          # GCP 인증
-          echo "${{ secrets.HIREHIGHER_GCP_KEY }}" | base64 --decode > ${HOME}/gcp-key.json
-          gcloud auth activate-service-account --key-file=${HOME}/gcp-key.json
+      - name: Add GitHub Actions IP to GCP Firewall
+        run: |
+          RUNNER_IP=$(cat RUNNER_IP.txt)
+
+          # 기존의 source-ranges 값 가져오기
+          EXCLUDE_IPS=$(gcloud compute firewall-rules describe default-allow-ssh --format="get(sourceRanges)" || echo "")
+
+          # 세미콜론 제거
+          EXCLUDE_IPS=$(echo $EXCLUDE_IPS | sed 's/;/,/g')
+
+          # GitHub Actions IP를 추가
+          gcloud compute firewall-rules update default-allow-ssh \
+            --allow tcp:22 \
+            --source-ranges="${EXCLUDE_IPS},${RUNNER_IP}/32"
+
+      - name: Configure SSH private key
+        run: |
+          touch ./key-hirehigher
+          echo "${{ secrets.HIREHIGHER_GCP_SSH_KEY }}" > ./key-hirehigher
+          chmod 600 ./key-hirehigher
 
-          # GCP 프로젝트 설정
-          gcloud config set project fleet-point-420405
+      - name: Add GCP VM to known_hosts
+        run: |
+          mkdir -p ~/.ssh
+          ssh-keyscan -H "${{ secrets.GCP_VM_IP }}" >> ~/.ssh/known_hosts
 
-          # GCP VM 인스턴스에 JAR 파일 전송
-          gcloud compute scp ./build/libs/team18-be-0.0.1-SNAPSHOT.jar hirehigher-api:/home/hirehigher/repository --zone asia-northeast3-a
+      - name: Deploy to GCP
+        run: |
+          # scp로 VM에 jar 파일 전송
+          scp -o StrictHostKeyChecking=no -i ./key-hirehigher ./team18-be-0.0.1-SNAPSHOT.jar hirehigher@${{ secrets.GCP_VM_IP }}:/home/hirehigher/repository
 
-          # GCP VM에서 배포 쉘 스크립트 실행
-          gcloud compute ssh hirehigher-api --zone asia-northeast3-a --command 'bash /home/hirehigher/repository/deploy.sh'
+      - name: Remove GitHub Actions IP from GCP Firewall
+        run: |
+          RUNNER_IP=$(cat RUNNER_IP.txt)
+
+          # 기존 firewall 규칙 가져오기
+          EXCLUDE_IPS=$(gcloud compute firewall-rules describe default-allow-ssh --format="get(sourceRanges)" || echo "")
+
+          # GitHub Actions IP를 제외한 source ranges 설정
+          NEW_SOURCE_RANGES=$(echo $EXCLUDE_IPS | sed "s/$RUNNER_IP\/32//g" | sed 's/;/,/g')
+
+          # 업데이트된 firewall 규칙 적용
+          gcloud compute firewall-rules update default-allow-ssh \
+            --source-ranges=$NEW_SOURCE_RANGES

build.gradle

@@ -30,7 +30,6 @@ dependencies {
 	runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.12.6'
 	runtimeOnly 'com.h2database:h2'
 	implementation 'jakarta.validation:jakarta.validation-api:3.0.2'
-	implementation group: 'io.springfox', name: 'springfox-boot-starter', version: '3.0.0'
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 	implementation group: 'com.itextpdf', name: 'itextpdf', version: '5.5.13.2'
 	implementation group: 'org.apache.pdfbox', name: 'pdfbox', version: '2.0.13'

src/main/generated/team18/team18_be/recruitment/mapper/RecruitmentMapperImpl.java

@@ -11,7 +11,7 @@
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2024-11-03T19:16:36+0900",
+    date = "2024-11-10T20:46:08+0900",
     comments = "version: 1.5.3.Final, compiler: javac, environment: Java 21.0.3 (Eclipse Adoptium)"
 )
 @Component
@@ -60,7 +60,7 @@ public RecruitmentResponse toRecruitmentResponse(Recruitment recruitment, Recrui
         String vietnameseTitle = null;
         String companySize = null;
         String area = null;
-        String salary = null;
+        Long salary = null;
         String workDuration = null;
         String workDays = null;
         String workType = null;

src/main/generated/team18/team18_be/resume/mapper/ResumeMapperImpl.java

@@ -10,7 +10,7 @@
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2024-11-03T19:16:36+0900",
+    date = "2024-11-10T20:46:08+0900",
     comments = "version: 1.5.3.Final, compiler: javac, environment: Java 21.0.3 (Eclipse Adoptium)"
 )
 @Component

src/main/java/team18/team18_be/apply/controller/ApplyController.java

@@ -12,13 +12,15 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import team18.team18_be.apply.dto.request.ApplicationFormRequest;
+import team18.team18_be.apply.dto.response.ApplicationFormResponse;
 import team18.team18_be.apply.dto.response.ApplierPerRecruitmentResponse;
 import team18.team18_be.apply.dto.response.MandatoryResponse;
 import team18.team18_be.apply.dto.response.RecruitmentsOfApplierResponse;
 import team18.team18_be.apply.service.ApplyService;
 import team18.team18_be.auth.entity.User;
 import team18.team18_be.config.resolver.LoginUser;
 
+
 @RestController
 @RequestMapping("/api/application")
 @Tag(name = "지원 API")
@@ -42,6 +44,14 @@ public ResponseEntity<Void> createApplicationForm(
     return ResponseEntity.created(location).build();
   }
 
+  @Operation(summary = "특정 지원서 조회")
+  @GetMapping("/form/{applyId}")
+  public ResponseEntity<ApplicationFormResponse> findApplicationForm(@PathVariable Long applyId,
+      @LoginUser User user) {
+    ApplicationFormResponse applicationFormResponse = applyService.findApplicationForm(applyId);
+    return ResponseEntity.ok(applicationFormResponse);
+  }
+
   @Operation(summary = "구인글에 지원한 지원자 확인", description = "고용주가 자신이 올린 구인글에 누가 지원했는지 보여준다.")
   @GetMapping("/{recruitmentId}")
   public ResponseEntity<List<ApplierPerRecruitmentResponse>> searchApplicant(

src/main/java/team18/team18_be/apply/dto/request/ApplicationFormRequest.java

@@ -1,5 +1,8 @@
 package team18.team18_be.apply.dto.request;
 
-public record ApplicationFormRequest(String name, String address, String applyMotivation) {
+public record ApplicationFormRequest(String name,
+                                     String address,
+                                     String phoneNumber,
+                                     String motivation) {
 
 }

src/main/java/team18/team18_be/apply/dto/response/ApplicationFormResponse.java

@@ -0,0 +1,11 @@
+package team18.team18_be.apply.dto.response;
+
+public record ApplicationFormResponse(
+    String name,
+    String address,
+    String phoneNumber,
+
+    String motivation
+) {
+
+}

src/main/java/team18/team18_be/apply/dto/response/MandatoryResponse.java

@@ -1,6 +1,6 @@
 package team18.team18_be.apply.dto.response;
 
 public record MandatoryResponse(boolean resumeExistence, boolean visaExistence,
-                                boolean foreignerIdNumberExistence) {
+                                boolean foreignerIdNumberExistence, boolean signExistence) {
 
 }

src/main/java/team18/team18_be/apply/entity/Apply.java

@@ -40,6 +40,13 @@ public Apply(String status, User user, Recruitment recruitment) {
     this.recruitment = recruitment;
   }
 
+  public Apply(Long id, String status, User user, Recruitment recruitment) {
+    this.id = id;
+    this.status = status;
+    this.user = user;
+    this.recruitment = recruitment;
+  }
+
   public Long getId() {
     return id;
   }

src/main/java/team18/team18_be/apply/repository/ApplicationFormRepository.java

@@ -1,11 +1,12 @@
 package team18.team18_be.apply.repository;
 
 
+import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
 import team18.team18_be.apply.entity.ApplicationForm;
 import team18.team18_be.apply.entity.Apply;
 
 public interface ApplicationFormRepository extends JpaRepository<ApplicationForm, Long> {
 
-  ApplicationForm findByApply(Apply apply);
+  Optional<ApplicationForm> findByApply(Apply apply);
 }

src/main/java/team18/team18_be/apply/repository/ApplyRepository.java

@@ -1,14 +1,15 @@
 package team18.team18_be.apply.repository;
 
 import java.util.List;
+import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
 import team18.team18_be.apply.entity.Apply;
 import team18.team18_be.auth.entity.User;
 import team18.team18_be.recruitment.entity.Recruitment;
 
 public interface ApplyRepository extends JpaRepository<Apply, Long> {
 
-  List<Apply> findByRecruitment(Recruitment recruitment);
+  Optional<List<Apply>> findByRecruitment(Recruitment recruitment);
 
-  List<Apply> findByUser(User user);
+  Optional<List<Apply>> findByUser(User user);
 }

src/main/java/team18/team18_be/apply/service/ApplyService.java

@@ -6,6 +6,7 @@
 import org.springframework.stereotype.Service;
 import team18.team18_be.apply.ApplyStatusEnum.ApplyStatus;
 import team18.team18_be.apply.dto.request.ApplicationFormRequest;
+import team18.team18_be.apply.dto.response.ApplicationFormResponse;
 import team18.team18_be.apply.dto.response.ApplierPerRecruitmentResponse;
 import team18.team18_be.apply.dto.response.MandatoryResponse;
 import team18.team18_be.apply.dto.response.RecruitmentsOfApplierResponse;
@@ -19,9 +20,9 @@
 import team18.team18_be.resume.entity.Resume;
 import team18.team18_be.resume.repository.ResumeRepository;
 import team18.team18_be.userInformation.entity.Company;
-import team18.team18_be.userInformation.entity.ForeignerInformation;
 import team18.team18_be.userInformation.repository.CompanyRepository;
 import team18.team18_be.userInformation.repository.ForeignerInformationRepository;
+import team18.team18_be.userInformation.repository.SignRepository;
 
 @Service
 public class ApplyService {
@@ -32,18 +33,21 @@ public class ApplyService {
   private final ResumeRepository resumeRepository;
   private final CompanyRepository companyRepository;
   private final ForeignerInformationRepository foreignerInformationRepository;
+  private final SignRepository signRepository;
 
 
   public ApplyService(ApplicationFormRepository applicationFormRepository,
       ApplyRepository applyRepository, RecruitmentRepository recruitmentRepository,
       ResumeRepository resumeRepository, CompanyRepository companyRepository,
-      ForeignerInformationRepository foreignerInformationRepository) {
+      ForeignerInformationRepository foreignerInformationRepository,
+      SignRepository signRepository) {
     this.applicationFormRepository = applicationFormRepository;
     this.applyRepository = applyRepository;
     this.recruitmentRepository = recruitmentRepository;
     this.resumeRepository = resumeRepository;
     this.companyRepository = companyRepository;
     this.foreignerInformationRepository = foreignerInformationRepository;
+    this.signRepository = signRepository;
   }
 
   public Long createApplicationForm(ApplicationFormRequest applicationFormRequest,
@@ -53,17 +57,30 @@ public Long createApplicationForm(ApplicationFormRequest applicationFormRequest,
     Apply apply = new Apply(status.getKoreanName(), user, recruitment);
     Apply savedApply = applyRepository.save(apply);
     ApplicationForm applicationForm = new ApplicationForm(applicationFormRequest.name(),
-        applicationFormRequest.address(), applicationFormRequest.address(),
-        applicationFormRequest.applyMotivation(), savedApply);
+        applicationFormRequest.address(), applicationFormRequest.phoneNumber(),
+        applicationFormRequest.motivation(), savedApply);
     applicationFormRepository.save(applicationForm);
     return savedApply.getId();
   }
 
+  public ApplicationFormResponse findApplicationForm(Long applyId) {
+    Apply apply = applyRepository.findById(applyId)
+        .orElseThrow(() -> new NoSuchElementException("해당 지원서가 없습니다"));
+    ApplicationForm applicationForm = applicationFormRepository.findByApply(apply)
+        .orElseThrow(() -> new NoSuchElementException("해당 지원서가 없습니다."));
+    ApplicationFormResponse applicationFormResponse = new ApplicationFormResponse(
+        applicationForm.getName(), applicationForm.getAddress(), applicationForm.getPhoneNumber(),
+        applicationForm.getMotivation());
+    return applicationFormResponse;
+  }
+
 
   public List<ApplierPerRecruitmentResponse> searchApplicant(Long recruitmentId, User user) {
     Recruitment recruitment = findRecruitment(recruitmentId);
 
-    return applyRepository.findByRecruitment(recruitment).stream()
+    return applyRepository.findByRecruitment(recruitment)
+        .orElseThrow(() -> new NoSuchElementException("해당하는 지원이 없습니다."))
+        .stream()
         .map(this::createApplierPerRecruitmentResponse)
         .collect(Collectors.toList());
   }
@@ -78,7 +95,9 @@ private ApplierPerRecruitmentResponse createApplierPerRecruitmentResponse(Apply
   }
 
   public List<RecruitmentsOfApplierResponse> searchMyAppliedRecruitments(User user) {
-    return applyRepository.findByUser(user).stream()
+    return applyRepository.findByUser(user)
+        .orElseThrow(() -> new NoSuchElementException("해당하는 지원이 없습니다."))
+        .stream()
         .map(this::createMyAppliedRecruitments)
         .collect(Collectors.toList());
   }
@@ -96,13 +115,17 @@ private RecruitmentsOfApplierResponse createMyAppliedRecruitments(Apply apply) {
   }
 
   public MandatoryResponse checkMandatory(User user) {
-    ForeignerInformation foreignerInformation = foreignerInformationRepository.findByUser(user);
-    Resume resume = resumeRepository.findByUser(user);
-    boolean visaExistence = checkNull(foreignerInformation.getForeignerIdNumber());
-    boolean resumeExistence = checkNull(foreignerInformation.getVisaGenerateDate());
-    boolean foreignerIdNumberExistence = checkNull(resume);
+    boolean visaExistence = foreignerInformationRepository.findByUser(user)
+        .map(info -> info.getVisaGenerateDate() != null)
+        .orElse(false);
+    boolean foreignerIdNumberExistence = foreignerInformationRepository.findByUser(user)
+        .map(info -> info.getForeignerIdNumber() != null)
+        .orElse(false);
+    boolean resumeExistence = resumeRepository.findByUser(user) != null;
+    boolean signExistence = signRepository.findByUser(user).isPresent();
+
     MandatoryResponse mandatoryResponse = new MandatoryResponse(resumeExistence, visaExistence,
-        foreignerIdNumberExistence);
+        foreignerIdNumberExistence, signExistence);
     return mandatoryResponse;
   }
 
@@ -111,8 +134,4 @@ private Recruitment findRecruitment(Long recruitmentId) {
         .orElseThrow(() -> new NoSuchElementException("해당되는 구인글이 없습니다."));
     return recruitment;
   }
-
-  private boolean checkNull(Object object) {
-    return object != null;
-  }
 }

src/main/java/team18/team18_be/auth/controller/AuthController.java

@@ -5,6 +5,7 @@
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
@@ -47,17 +48,20 @@ public AuthController(AuthService authService) {
       @ApiResponse(responseCode = "500", description = "서버 내부 에러", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionResponse.class)))
   })
   @PostMapping("/oauth")
-  public ResponseEntity<UserTypeResponse> login(@RequestBody CodeRequest codeRequest) {
+  public ResponseEntity<UserTypeResponse> login(@RequestBody CodeRequest codeRequest,
+      HttpServletRequest request) {
+    String referer = request.getHeader("Referer");
+
     OAuthJwtResponse oAuthJwtResponse = authService.getOAuthToken(codeRequest,
-        GOOGLE_TOKEN_URI);
+        GOOGLE_TOKEN_URI, referer);
     LoginResponse loginResponse = authService.registerOAuth(oAuthJwtResponse,
         GOOGLE_USER_INFO_URI);
 
     HttpHeaders headers = new HttpHeaders();
     headers.setBearerAuth(loginResponse.accessToken());
 
     UserTypeResponse userTypeResponse = new UserTypeResponse(loginResponse.type(),
-        loginResponse.profileImage());
+        loginResponse.profileImage(), loginResponse.name());
 
     return new ResponseEntity<>(userTypeResponse, headers, HttpStatus.OK);
   }