3주차 과제(황대선)

src/main/java/com/econovation/third_project/ThirdStudyApplication.java

@@ -1,12 +1,8 @@
 package com.econovation.third_project;
 
-import com.econovation.second_project.HellStudyApplication;
-import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
 public class ThirdStudyApplication {
-    public static void main(String[] args) {
-        SpringApplication.run(ThirdStudyApplication.class, args);
-    }
+    public static void main(String[] args) {}
 }

src/main/java/com/econovation/third_project/controller/AdminQueryController.java

@@ -1,28 +1,79 @@
 package com.econovation.third_project.controller;
 
+import com.econovation.third_project.dto.*;
+import com.econovation.third_project.service.*;
 import com.econovation.third_project.database.Database;
 import com.econovation.third_project.database.Registration;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 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.RequestBody;
 
+import java.time.LocalDate;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+
 @Controller
 @RequiredArgsConstructor
 public class AdminQueryController {
     private final Database database;
+    private final ApplicantQueryService applicantQueryService;
+    private final MajorQueryService majorQueryService;
+    private final SupportPathQueryService supportPathQueryService;
+    private final HopeFieldQueryService hopeFieldQueryService;
+    private final DesiredTimeQueryService desiredTimeQueryService;
 
     // 예시 코드
     @PostMapping("/registration")
     public ResponseEntity<Object> postRegistrate(@RequestBody Registration registration) {
         database.register(registration);
         return ResponseEntity.ok().build();
     }
-    @GetMapping("/registration")
-    public ResponseEntity<Registration> getRegistration(String userId) {
-        return ResponseEntity.ok().body(database.getRegistration(userId));
+
+
+    @GetMapping("/admin/{applicants}/{majors}/{programmers}/{path}/{desiredTime}")
+    public ResponseEntity<AdminQueryResponse> getAdmin(
+            @PathVariable(required = false) String applicants,
+            @PathVariable(required = false) String majors,
+            @PathVariable(required = false) String programmers,
+            @PathVariable(required = false) String path,
+            @PathVariable(required = false) String desiredTime) throws ExecutionException, InterruptedException {
+
+        CompletableFuture<List<ApplicantDTO>> applicantFuture = applicants.isEmpty()
+                ? null
+                : CompletableFuture.supplyAsync(() -> applicantQueryService.execute());
+
+        CompletableFuture<List<MajorDTO>> majorFuture = majors.isEmpty()
+                ? null
+                : CompletableFuture.supplyAsync(() -> majorQueryService.execute());
+
+        CompletableFuture<List<ProgrammerFieldDTO>> programmerFuture = programmers.isEmpty()
+                ? null
+                : CompletableFuture.supplyAsync(() -> hopeFieldQueryService.execute());
+
+        CompletableFuture<List<PathDTO>> pathFuture = path.isEmpty()
+                ? null
+                : CompletableFuture.supplyAsync(() -> supportPathQueryService.execute());
+
+        CompletableFuture<List<DesiredTimeDTO>> desiredTimeFuture = desiredTime.isEmpty()
+                ? null
+                : CompletableFuture.supplyAsync(() -> desiredTimeQueryService.execute());
+
+        CompletableFuture<AdminQueryResponse> completableFuture = CompletableFuture.allOf(applicantFuture, majorFuture, programmerFuture, pathFuture, desiredTimeFuture)
+                .thenApply(Void -> AdminQueryResponse.builder()
+                        .applicants(applicantFuture.join())
+                        .majors(majorFuture.join())
+                        .programmers(programmerFuture.join())
+                        .path(pathFuture.join())
+                        .desiredTime(desiredTimeFuture.join())
+                        .build());
+
+        return ResponseEntity.ok().body(completableFuture.get());
     }
 
+
 }

src/main/java/com/econovation/third_project/database/Database.java

@@ -1,8 +1,7 @@
 package com.econovation.third_project.database;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
+
 import org.springframework.stereotype.Component;
 
 /**
@@ -25,4 +24,33 @@ public void register(Registration registrationRequest) {
     public Registration getRegistration(String userId) {
         return registration.get(userId);
     }
+
+    public List<Registration> getAllRegistration(){
+        return registration.keySet().stream().map(
+                key -> registration.get(key)
+        ).toList();
+    }
+
+    public List<PersonalInformation> getAllPersonalInformation(){
+        return personalInformation.keySet().stream().map(
+                key -> personalInformation.get(key)
+        ).toList();
+    }
+
+    public List<PersonalInformation> getPersonalInformation(List<String> keys){
+        return keys.stream().map(key -> personalInformation.get(key)).toList();
+    }
+
+    public List<Path> getAllPath(){
+        return path.keySet().stream().map(
+                key -> path.get(key)
+        ).toList();
+    }
+
+    public List<DesiredTime> getAllDesiredTime(){
+        return desiredTime.keySet().stream().map(
+                key -> desiredTime.get(key)
+        ).toList();
+    }
+
 }

src/main/java/com/econovation/third_project/database/DesiredTime.java

@@ -1,13 +1,17 @@
 package com.econovation.third_project.database;
 
 import java.util.List;
+
+import com.econovation.third_project.domain.Table;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @AllArgsConstructor
 @Getter
 public class DesiredTime {
     String registrationId;
+    private String personalInfoId;
     // 희망 시간 (11 * 3)의 테이블 형태를 준수합니다.
-    private List<int[]> desiredTime;
+    private List<Table> desiredTime;
+
 }

src/main/java/com/econovation/third_project/database/Path.java

@@ -1,5 +1,6 @@
 package com.econovation.third_project.database;
 
+import com.econovation.third_project.domain.SupportPath;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -8,5 +9,5 @@
 public class Path {
     String registrationId;
     // 지원 경로
-    private String supportPath;
+    private SupportPath supportPath;
 }

src/main/java/com/econovation/third_project/database/PersonalInformation.java

@@ -1,5 +1,6 @@
 package com.econovation.third_project.database;
 
+import com.econovation.third_project.domain.Major;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -24,12 +25,12 @@ public class PersonalInformation {
     private Integer semester;
 
     // 전공
-    private String major;
+    private Major major;
 
     // 복수전공
-    private String doubleMajor;
+    private Major doubleMajor;
     // 부전공
-    private String minor;
+    private Major minor;
 
 
 

src/main/java/com/econovation/third_project/database/Registration.java

@@ -1,21 +1,25 @@
 package com.econovation.third_project.database;
 
+import com.econovation.third_project.domain.HopeField;
+import com.econovation.third_project.domain.ProgrammerField;
 import lombok.Getter;
 
 @Getter
 public class Registration {
+
+    private Long registrationId;
     // 희망분야
-    private String hopeField;
+    private HopeField hopeField;
 
     // 1지망
-    private String firstPriority;
+    private ProgrammerField firstPriority;
 
     // 2지망
-    private String secondPriority;
+    private ProgrammerField secondPriority;
 
     public Registration(String hopeField, String firstPriority, String secondPriority) {
-        this.hopeField = hopeField;
-        this.firstPriority = firstPriority;
-        this.secondPriority = secondPriority;
+        this.hopeField = HopeField.valueOf(hopeField);
+        this.firstPriority = ProgrammerField.valueOf(firstPriority);
+        this.secondPriority = ProgrammerField.valueOf(secondPriority);
     }
 }

src/main/java/com/econovation/third_project/domain/HopeField.java

@@ -0,0 +1,10 @@
+package com.econovation.third_project.domain;
+
+public enum HopeField {
+
+    개발자,기획자,디자이너;
+
+    public Boolean isProgrammer(HopeField hopeField){
+        return hopeField.name().equals(HopeField.개발자);
+    }
+}

src/main/java/com/econovation/third_project/domain/Major.java

@@ -0,0 +1,5 @@
+package com.econovation.third_project.domain;
+
+public enum Major {
+    산업공학과,소프트웨어공학과,컴퓨터정보통신공학과,Iot인공지능융합전공,디자인학과
+}

src/main/java/com/econovation/third_project/domain/ProgrammerField.java

@@ -0,0 +1,5 @@
+package com.econovation.third_project.domain;
+
+public enum ProgrammerField {
+    WEB,APP,AI,GAME,IoT,AR_VR
+}

src/main/java/com/econovation/third_project/domain/SupportPath.java

@@ -0,0 +1,5 @@
+package com.econovation.third_project.domain;
+
+public enum SupportPath {
+    홍보_포스터,학교_공지사항,지인소개,인스타그램,에브리타임
+}

src/main/java/com/econovation/third_project/domain/Table.java

@@ -0,0 +1,24 @@
+package com.econovation.third_project.domain;
+
+import lombok.Getter;
+
+@Getter
+public enum Table {
+    zerozero(0,0),zeroone(0,1),zerotwo(0,2),zerothree(0,3),zerofour(0,4),zerofive(0,5),zerosix(0,6),zeroseven(0,7),zeroeight(0,8),zeronine(0,9),zeroten(0,10),
+    onezero(1,0),oneone(1,1),onetwo(1,2),onethree(1,3),onefour(1,4),onefive(1,5),onesix(1,6),oneseven(1,7),oneeight(1,8),onenine(1,9),oneten(1,10),
+    twozero(2,0),twoone(2,1),twotwo(2,2),twothree(2,3),twofour(2,4),twofive(2,5),twosix(2,6),twoseven(2,7),twoeight(2,8),twonine(2,9),twoten(10,10),
+    ;
+
+    private Integer row;
+    private Integer column;
+
+
+    Table(Integer row, Integer column) {
+        this.row = row;
+        this.column = column;
+    }
+
+    public int[] toArray(){
+        return new int[]{this.getRow(), this.getColumn()};
+    }
+}

src/main/java/com/econovation/third_project/dto/AdminQueryResponse.java

@@ -0,0 +1,20 @@
+package com.econovation.third_project.dto;
+
+import lombok.Builder;
+
+import java.util.List;
+
+public record AdminQueryResponse(
+        List<ApplicantDTO> applicants,
+        List<MajorDTO> majors,
+        List<ProgrammerFieldDTO> programmers,
+        List<PathDTO> path,
+        List<DesiredTimeDTO> desiredTime
+) {
+
+    @Builder
+    public AdminQueryResponse {
+    }
+
+
+}

src/main/java/com/econovation/third_project/dto/ApplicantDTO.java

@@ -0,0 +1,19 @@
+package com.econovation.third_project.dto;
+
+import lombok.Builder;
+
+public record ApplicantDTO(
+        String hopeField,
+        Integer count
+) {
+    @Builder
+    public ApplicantDTO {
+    }
+
+    public static ApplicantDTO of(String type, Integer count){
+        return ApplicantDTO.builder()
+                .hopeField(type)
+                .count(count)
+                .build();
+    }
+}

src/main/java/com/econovation/third_project/dto/DesiredTimeDTO.java

@@ -0,0 +1,24 @@
+package com.econovation.third_project.dto;
+
+import com.econovation.third_project.database.PersonalInformation;
+import com.econovation.third_project.domain.Table;
+import lombok.Builder;
+import java.util.List;
+
+public record DesiredTimeDTO(
+        int[] table,
+        Integer countOfTime,
+        List<PersonalInformation> personalInformations
+) {
+    @Builder
+    public DesiredTimeDTO {
+    }
+
+    public static DesiredTimeDTO of(Table table, Integer countOfTime, List<PersonalInformation> personalInformations){
+        return DesiredTimeDTO.builder()
+                .table(table.toArray())
+                .countOfTime(countOfTime)
+                .personalInformations(personalInformations)
+                .build();
+    }
+}

src/main/java/com/econovation/third_project/dto/MajorDTO.java

@@ -0,0 +1,19 @@
+package com.econovation.third_project.dto;
+
+import lombok.Builder;
+
+public record MajorDTO(
+        String major,
+        Integer count
+) {
+    @Builder
+    public MajorDTO {
+    }
+
+    public static MajorDTO of(String major, Integer count){
+        return MajorDTO.builder()
+                .count(count)
+                .major(major)
+                .build();
+    }
+}

src/main/java/com/econovation/third_project/dto/PathDTO.java

@@ -0,0 +1,20 @@
+package com.econovation.third_project.dto;
+
+import lombok.Builder;
+
+public record PathDTO(
+        String pathName,
+        Integer count
+) {
+
+    @Builder
+    public PathDTO {
+    }
+
+    public static PathDTO of(String pathName, Integer count){
+        return PathDTO.builder()
+                .pathName(pathName)
+                .count(count)
+                .build();
+    }
+}