비즈니스팀 계좌번호 기능 프로덕션 배포

.github/workflows/pick-reviewer.yml

@@ -0,0 +1,69 @@
+name: "Pick Reviewer"
+
+on:
+  pull_request:
+    types: opened
+
+jobs:
+  pick-random-reviewer:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Pick random reviewer
+        id: pick_random_reviewer
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const fs = require('fs');
+
+            const developers = JSON.parse(fs.readFileSync(`${{ github.workspace }}/.github/workflows/reviewer.json`));
+            const prCreator = context.payload.pull_request.user.login;
+            const prUrl = context.payload.pull_request.html_url;
+            const prCreatorJson = developers.reviewers.find(person => person.githubName === prCreator);
+
+            //PrCreator가 reviewer에 등록되지 않은 사람인 경우
+            if (!prCreatorJson) {
+              const reviewerArr = developers.reviewers;
+              const randomReviewer1 = getRandomReviewer(reviewerArr);
+              const randomReviewer2 = getRandomReviewer(reviewerArr.filter(reviewer => reviewer.name !== randomReviewer1.name));
+              setOutput(prCreator, prUrl, randomReviewer1, randomReviewer2);
+            } else {
+              const candidateInternalReviewers = developers.reviewers.filter(person => person.team === prCreatorJson.team && person.githubName !== prCreator);
+              const candidateExternalReviewers = developers.reviewers.filter(person => person.team !== prCreatorJson.team);
+              const randomReviewer1 = getRandomReviewer(candidateInternalReviewers);
+              const randomReviewer2 = getRandomReviewer(candidateExternalReviewers);
+              setOutput(prCreatorJson.name, prUrl, randomReviewer1, randomReviewer2);
+            }
+
+            function getRandomReviewer(reviewers) {
+              return reviewers[Math.floor(Math.random() * reviewers.length)];
+            }
+
+            function setOutput(prCreator, prUrl, reviewer1, reviewer2) {
+              core.setOutput('writer', JSON.stringify(prCreator));
+              core.setOutput('pullRequestLink', JSON.stringify(prUrl));
+              core.setOutput('reviewer1Name', JSON.stringify(reviewer1.name));
+              core.setOutput('reviewer2Name', JSON.stringify(reviewer2.name));
+              core.setOutput('reviewer1GithubName', reviewer1.githubName);
+              core.setOutput('reviewer2GithubName', reviewer2.githubName);
+            }
+
+      - name: Add Reviewers
+        uses: madrapps/add-reviewers@v1
+        with:
+          reviewers: ${{ steps.pick_random_reviewer.outputs.reviewer1GithubName }},${{ steps.pick_random_reviewer.outputs.reviewer2GithubName }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+
+      - name: Send Slack Trigger
+        run: |
+          curl -X POST https://api-slack.internal.bcsdlab.com/api/review-request/backend \
+          -H 'Content-Type: application/json' \
+          -d '{
+                "pullRequestLink": ${{ steps.pick_random_reviewer.outputs.pullRequestLink }},
+                "writer": ${{ steps.pick_random_reviewer.outputs.writer }},
+                "reviewers": [${{ steps.pick_random_reviewer.outputs.reviewer1Name }}, ${{ steps.pick_random_reviewer.outputs.reviewer2Name }}]
+              }'

.github/workflows/pr-merged.yml

@@ -0,0 +1,27 @@
+on:
+  pull_request:
+    types: closed
+
+jobs:
+  check_pr_merged:
+    if: github.event.pull_request.merged == true
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Check PR Merged
+        id: check_pr_merged
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const prUrl = context.payload.pull_request.html_url ?? context.payload.pull_request._links.html.href;
+            core.setOutput('pullRequestLink', JSON.stringify(prUrl));
+
+      - name: Send Slack Trigger
+        run: |
+          curl -X POST https://api-slack.internal.bcsdlab.com/api/pr-merged/backend \
+          -H 'Content-Type: application/json' \
+          -d '{
+                "pullRequestLink": ${{ steps.check_pr_merged.outputs.pullRequestLink }}
+              }'

.github/workflows/reviewer.json

@@ -0,0 +1,64 @@
+{
+  "reviewers": [
+    {
+      "name": "박다희",
+      "githubName": "daheeParkk",
+      "team": "user"
+    },
+    {
+      "name": "김성재",
+      "githubName": "seongjae6751",
+      "team": "user"
+    },
+    {
+      "name": "김원경",
+      "githubName": "kwoo28",
+      "team": "user"
+    },
+    {
+      "name": "서정빈",
+      "githubName": "duehee",
+      "team": "user"
+    },
+    {
+      "name": "이현수",
+      "githubName": "20HyeonsuLee",
+      "team": "business"
+    },
+    {
+      "name": "최준호",
+      "githubName": "Choi-JJunho",
+      "team": "business"
+    },
+    {
+      "name": "윤용운",
+      "githubName": "YunYongWoon",
+      "team": "business"
+    },
+    {
+      "name": "장준영",
+      "githubName": "johnny19991006",
+      "team": "business"
+    },
+    {
+      "name": "허준기",
+      "githubName": "dradnats1012",
+      "team": "campus"
+    },
+    {
+      "name": "황현식",
+      "githubName": "Choon0414",
+      "team": "campus"
+    },
+    {
+      "name": "박성빈",
+      "githubName": "ImTotem",
+      "team": "campus"
+    },
+    {
+      "name": "송선권",
+      "githubName": "songsunkook",
+      "team": "campus"
+    }
+  ]
+}

src/main/java/in/koreatech/koin/admin/land/controller/AdminLandApi.java

@@ -3,12 +3,16 @@
 import static in.koreatech.koin.domain.user.model.UserType.ADMIN;
 
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import in.koreatech.koin.admin.land.dto.AdminLandsRequest;
+import in.koreatech.koin.admin.land.dto.AdminLandResponse;
+import in.koreatech.koin.admin.land.dto.AdminLandRequest;
 import in.koreatech.koin.admin.land.dto.AdminLandsResponse;
 
 import in.koreatech.koin.global.auth.Auth;
@@ -53,8 +57,72 @@ ResponseEntity<AdminLandsResponse> getLands(
     @SecurityRequirement(name = "Jwt Authentication")
     @PostMapping("/admin/lands")
     ResponseEntity<AdminLandsResponse> postLands(
-        @RequestBody @Valid AdminLandsRequest adminLandsRequest,
+        @RequestBody @Valid AdminLandRequest adminLandRequest,
         @Auth(permit = {ADMIN}) Integer adminId
     );
 
+    @ApiResponses(
+        value = {
+            @ApiResponse(responseCode = "201"),
+            @ApiResponse(responseCode = "401", content = @Content(schema = @Schema(hidden = true))),
+            @ApiResponse(responseCode = "403", content = @Content(schema = @Schema(hidden = true))),
+            @ApiResponse(responseCode = "404", content = @Content(schema = @Schema(hidden = true))),
+        }
+    )
+    @Operation(summary = "복덕방 삭제")
+    @SecurityRequirement(name = "Jwt Authentication")
+    @DeleteMapping("/admin/lands/{id}")
+    ResponseEntity<Void> deleteLand(
+        @PathVariable("id") Integer id,
+        @Auth(permit = {ADMIN}) Integer adminId
+    );
+
+    @ApiResponses(
+        value = {
+            @ApiResponse(responseCode = "200"),
+            @ApiResponse(responseCode = "401", content = @Content(schema = @Schema(hidden = true))),
+            @ApiResponse(responseCode = "403", content = @Content(schema = @Schema(hidden = true))),
+            @ApiResponse(responseCode = "404", content = @Content(schema = @Schema(hidden = true))),
+        }
+    )
+    @Operation(summary = "복덕방 조회")
+    @SecurityRequirement(name = "Jwt Authentication")
+    @GetMapping("/admin/lands/{id}")
+    ResponseEntity<AdminLandResponse> getLand(
+        @PathVariable("id") Integer id,
+        @Auth(permit = {ADMIN}) Integer adminId
+    );
+
+    @ApiResponses(
+        value = {
+            @ApiResponse(responseCode = "200"),
+            @ApiResponse(responseCode = "401", content = @Content(schema = @Schema(hidden = true))),
+            @ApiResponse(responseCode = "403", content = @Content(schema = @Schema(hidden = true))),
+            @ApiResponse(responseCode = "404", content = @Content(schema = @Schema(hidden = true))),
+        }
+    )
+    @Operation(summary = "복덕방 수정")
+    @SecurityRequirement(name = "Jwt Authentication")
+    @PutMapping("/admin/lands/{id}")
+    ResponseEntity<Void> updateLand(
+        @PathVariable("id") Integer id,
+        @RequestBody @Valid AdminLandRequest request,
+        @Auth(permit = {ADMIN}) Integer adminId
+    );
+
+    @ApiResponses(
+        value = {
+            @ApiResponse(responseCode = "200"),
+            @ApiResponse(responseCode = "401", content = @Content(schema = @Schema(hidden = true))),
+            @ApiResponse(responseCode = "403", content = @Content(schema = @Schema(hidden = true))),
+            @ApiResponse(responseCode = "404", content = @Content(schema = @Schema(hidden = true))),
+        }
+    )
+    @Operation(summary = "복덕방 삭제 취소")
+    @SecurityRequirement(name = "Jwt Authentication")
+    @PostMapping("/admin/lands/{id}/undelete")
+    ResponseEntity<Void> undeleteLand(
+        @PathVariable("id") Integer id,
+        @Auth(permit = {ADMIN}) Integer adminId
+    );
 }

src/main/java/in/koreatech/koin/admin/land/controller/AdminLandController.java

@@ -4,13 +4,17 @@
 
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import in.koreatech.koin.admin.land.dto.AdminLandsRequest;
+import in.koreatech.koin.admin.land.dto.AdminLandResponse;
+import in.koreatech.koin.admin.land.dto.AdminLandRequest;
 import in.koreatech.koin.admin.land.dto.AdminLandsResponse;
 import in.koreatech.koin.admin.land.service.AdminLandService;
 import in.koreatech.koin.global.auth.Auth;
@@ -35,11 +39,47 @@ public ResponseEntity<AdminLandsResponse> getLands(
 
     @PostMapping("/admin/lands")
     public ResponseEntity<AdminLandsResponse> postLands(
-        @RequestBody @Valid AdminLandsRequest adminLandsRequest,
+        @RequestBody @Valid AdminLandRequest adminLandRequest,
         @Auth(permit = {ADMIN}) Integer adminId
     ) {
-        adminLandService.createLands(adminLandsRequest);
+        adminLandService.createLands(adminLandRequest);
         return ResponseEntity.status(HttpStatus.CREATED).build();
     }
 
+    @DeleteMapping("/admin/lands/{id}")
+    public ResponseEntity<Void> deleteLand(
+        @PathVariable("id") Integer id,
+        @Auth(permit = {ADMIN}) Integer adminId
+    ) {
+        adminLandService.deleteLand(id);
+        return null;
+    }
+
+    @GetMapping("/admin/lands/{id}")
+    public ResponseEntity<AdminLandResponse> getLand(
+        @PathVariable("id") Integer id,
+        @Auth(permit = {ADMIN}) Integer adminId
+    ) {
+        return ResponseEntity.ok().body(adminLandService.getLand(id));
+    }
+
+    @PutMapping("/admin/lands/{id}")
+    public ResponseEntity<Void> updateLand(
+        @PathVariable("id") Integer id,
+        @RequestBody @Valid AdminLandRequest request,
+        @Auth(permit = {ADMIN}) Integer adminId
+    ) {
+        adminLandService.updateLand(id, request);
+        return ResponseEntity.ok().build();
+    }
+
+    @PostMapping("/admin/lands/{id}/undelete")
+    public ResponseEntity<Void> undeleteLand(
+        @PathVariable("id") Integer id,
+        @Auth(permit = {ADMIN}) Integer adminId
+    ) {
+        adminLandService.undeleteLand(id);
+        return ResponseEntity.ok().build();
+    }
+
 }