#15 findByCompany 메소드 추가 with QueryDSL

build.gradle

@@ -104,6 +104,7 @@ dependencies {
 			"com.querydsl:querydsl-apt:${queryDslVersion}:jpa")
 }
 
+
 // QueryDSL
 sourceSets {
 	main {
@@ -117,3 +118,4 @@ sourceSets {
 tasks.named('test') {
 	useJUnitPlatform()
 }
+

src/main/java/com/example/interviewPrep/quiz/company/domain/Company.java

@@ -6,28 +6,28 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
 import java.util.Objects;
 
 @Entity
 @Getter
-@Builder
 @NoArgsConstructor
 public class Company extends BaseTimeEntity {
 
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "COMPANY_ID")
     private Long id;
     private String name;
 
-    public Company(Long id, String name){
+    @Builder
+    public Company(String name) {
 
-        Objects.requireNonNull(id, "id가 null입니다.");
         Objects.requireNonNull(name, "name이 null입니다.");
 
-        this.id = id;
         this.name = name;
     }
 

src/main/java/com/example/interviewPrep/quiz/company/repository/CompanyRepository.java

@@ -0,0 +1,11 @@
+package com.example.interviewPrep.quiz.company.repository;
+
+import com.example.interviewPrep.quiz.company.domain.Company;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.Optional;
+
+public interface CompanyRepository extends JpaRepository<Company, Long> {
+
+    Optional<Company> findByName(String companyName);
+}

src/main/java/com/example/interviewPrep/quiz/exception/advice/ErrorCode.java

@@ -8,6 +8,7 @@ public enum ErrorCode {
 
     NOT_FOUND_ANSWER("not_found_answer", "answer를 찾을 수 없습니다."),
     NOT_FOUND_QUESTION("not_found_question", "Question with ID not found."),
+    NOT_FOUND_COMPANY("not_found_company", "Company with ID not found."),
     NOT_FOUND_MEMBER("not_found_member", "member를 찾을 수 없습니다."),
     NOT_FOUND_COMMENT("not_found_comment", "comment를 찾을 수 없습니다."),
     NOT_FOUND_EXAM("not_found_exam", "해당 모의고사를 찾을 수 없습니다."),

src/main/java/com/example/interviewPrep/quiz/filter/JwtAuthenticationFilter.java

@@ -14,7 +14,8 @@
 import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
 
-import javax.servlet.*;
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -34,7 +35,7 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
         String header = request.getHeader(HttpHeaders.AUTHORIZATION);
 
-        if (header != null && header.startsWith("Bearer")) {
+        if (header != null && header.startsWith("Bearer") && !header.endsWith("null")) {
             try {
 
                 String accessToken = header.substring(7);

src/main/java/com/example/interviewPrep/quiz/member/domain/Member.java

@@ -2,7 +2,9 @@
 
 import com.example.interviewPrep.quiz.domain.BaseTimeEntity;
 import com.example.interviewPrep.quiz.member.dto.Role;
-import lombok.*;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
 import java.util.Objects;
@@ -15,6 +17,7 @@ public class Member extends BaseTimeEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "MEMBER_ID")
     private Long id;
 
     private String email;
@@ -47,14 +50,6 @@ public Member(Long id, String email, String password, String type, String nickNa
         this.isPaid = isPaid;
     }
 
-    public static Member createMemberEntity(String email, String password, String nickName) {
-        return Member.builder()
-                .email(email)
-                .password(password)
-                .nickName(nickName)
-                .isPaid(false)
-                .build();
-    }
 
     public void setEmail(String email) {
         Objects.requireNonNull(email, "email이 없습니다.");

src/main/java/com/example/interviewPrep/quiz/member/dto/request/MemberRequest.java

@@ -1,5 +1,8 @@
 package com.example.interviewPrep.quiz.member.dto.request;
 
+import com.example.interviewPrep.quiz.member.domain.Member;
+import com.example.interviewPrep.quiz.member.dto.Role;
+import com.example.interviewPrep.quiz.utils.SHA256Util;
 import lombok.Builder;
 import lombok.Getter;
 
@@ -8,25 +11,50 @@
 @Getter
 public class MemberRequest {
 
+    private final String name;
+    private final String nickName;
     private final String email;
     private final String password;
     private final String passwordConfirm;
-    private final String nickName;
     private final String type;
+    private final String role;
     private String newPassword;
 
     @Builder
-    public MemberRequest(String email, String password, String passwordConfirm, String nickName, String type) {
+    public MemberRequest(String name, String nickName, String email, String password, String passwordConfirm, String type, String role) {
+        Objects.requireNonNull(name, "name이 null입니다.");
+        Objects.requireNonNull(nickName, "nickName이 null입니다.");
         Objects.requireNonNull(email, "email이 null입니다.");
         Objects.requireNonNull(password, "password가 null입니다.");
         Objects.requireNonNull(passwordConfirm, "passwordConfirm이 null입니다.");
-        Objects.requireNonNull(nickName, "nickName이 null입니다.");
         Objects.requireNonNull(type, "type이 null입니다.");
+        Objects.requireNonNull(role, "role이 null입니다.");
 
+        this.name = name;
+        this.nickName = nickName;
         this.email = email;
         this.password = password;
         this.passwordConfirm = passwordConfirm;
-        this.nickName = nickName;
         this.type = type;
+        this.role = role;
+    }
+
+    public static Member createMember(MemberRequest memberRequest) {
+        String password = SHA256Util.encryptSHA256(memberRequest.password);
+
+        Role memberRole = Role.USER;
+        if (memberRequest.role.equals("MENTOR")) {
+            memberRole = Role.MENTOR;
+        }
+
+        return Member.builder()
+                .name(memberRequest.name)
+                .nickName(memberRequest.nickName)
+                .email(memberRequest.email)
+                .password(password)
+                .type(memberRequest.type)
+                .role(memberRole)
+                .isPaid(false)
+                .build();
     }
 }

src/main/java/com/example/interviewPrep/quiz/member/service/MemberService.java

@@ -13,9 +13,10 @@
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Service;
 
+import java.util.Optional;
+
 import static com.example.interviewPrep.quiz.exception.advice.ErrorCode.DUPLICATE_EMAIL;
 import static com.example.interviewPrep.quiz.exception.advice.ErrorCode.NOT_FOUND_MEMBER;
-import static com.example.interviewPrep.quiz.member.domain.Member.createMemberEntity;
 import static com.example.interviewPrep.quiz.member.dto.response.MemberResponse.createMemberResponse;
 
 @Service
@@ -33,20 +34,20 @@ public void createMember(MemberRequest memberRequest) {
 
         AES256 aes256 = new AES256();
         String email = memberRequest.getEmail();
-        String password = SHA256Util.encryptSHA256(memberRequest.getPassword());
-        String nickName = memberRequest.getNickName();
 
         if (isDuplicatedEmail(email)) {
             throw new CommonException(DUPLICATE_EMAIL);
         }
 
-        Member member = createMemberEntity(email, password, nickName);
+        Member member = MemberRequest.createMember(memberRequest);
+
         memberRepository.save(member);
 
     }
 
     public boolean isDuplicatedEmail(String email) {
-        return memberRepository.existsByEmail(email);
+        Optional<Member> member = memberRepository.findByEmail(email);
+        return member.isPresent();
     }
 
     public boolean isDuplicatedNickName(String nickName) {

src/main/java/com/example/interviewPrep/quiz/question/controller/QuestionController.java

@@ -41,6 +41,12 @@ public ResponseEntity<Page<QuestionResponse>> getQuestionsByType(@PathVariable(r
         return ResponseEntity.ok(questionService.findByType(type, pageable));
     }
 
+
+    @GetMapping("/by-company/{companyName}")
+    public ResponseEntity<List<QuestionResponse>> getQuestionsByCompany(@PathVariable String companyName) {
+        return ResponseEntity.ok(questionService.findByCompany(companyName));
+    }
+
     @PutMapping("/{id}")
     public ResponseEntity<Void> update(@PathVariable Long id, @RequestBody @Valid QuestionRequest questionRequest) {
         questionService.updateQuestion(id, questionRequest);

src/main/java/com/example/interviewPrep/quiz/question/domain/Question.java

@@ -16,24 +16,38 @@ public class Question extends BaseTimeEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "QUESTION_ID")
     private Long id;
     private String title;
     private String type;
     private String difficulty;
     private boolean freeOfCharge;
 
     @Builder
-    public Question(String title, String type, String difficulty, boolean freeOfCharge) {
+    public Question(Long id, String title, String type, String difficulty, boolean freeOfCharge) {
+        Objects.requireNonNull(id, "id가 null입니다.");
         Objects.requireNonNull(title, "title이 null입니다.");
         Objects.requireNonNull(type, "type이 null입니다.");
         Objects.requireNonNull(difficulty, "difficulty가 null입니다.");
 
+        this.id = id;
         this.title = title;
         this.type = type;
         this.difficulty = difficulty;
         this.freeOfCharge = freeOfCharge;
     }
 
+    @Builder
+    public Question(String title, String type, String difficulty, boolean freeOfCharge) {
+        Objects.requireNonNull(title, "title이 null입니다.");
+        Objects.requireNonNull(type, "type이 null입니다.");
+        Objects.requireNonNull(difficulty, "difficulty가 null입니다.");
+
+        this.title = title;
+        this.type = type;
+        this.difficulty = difficulty;
+        this.freeOfCharge = freeOfCharge;
+    }
 
     public void changeTitleOrType(String title, String type) {
         this.title = title;

src/main/java/com/example/interviewPrep/quiz/question/dto/QuestionResponse.java

@@ -12,25 +12,28 @@ public class QuestionResponse {
     private final Long id;
     private final String title;
     private final String type;
-    private final boolean status;
+    private final String difficulty;
+    private final boolean freeOfCharge;
 
     @Builder
-    public QuestionResponse(Long id, String title, String type, boolean status){
-        Objects.requireNonNull(id, "id가 null입니다.");
+    public QuestionResponse(Long id, String title, String type, String difficulty, boolean freeOfCharge) {
         Objects.requireNonNull(title, "title이 null입니다.");
         Objects.requireNonNull(type, "type이 null입니다.");
 
         this.id = id;
         this.title = title;
         this.type = type;
-        this.status = status;
+        this.difficulty = difficulty;
+        this.freeOfCharge = freeOfCharge;
     }
 
-    public static QuestionResponse createQuestionResponse(Question question){
+    public static QuestionResponse createQuestionResponse(Question question) {
         return QuestionResponse.builder()
                 .id(question.getId())
                 .title(question.getTitle())
                 .type(question.getType())
+                .difficulty(question.getDifficulty())
+                .freeOfCharge(question.isFreeOfCharge())
                 .build();
     }
 }

src/main/java/com/example/interviewPrep/quiz/question/repository/QuestionRepository.java

@@ -15,7 +15,7 @@
 @Primary
 public interface QuestionRepository extends JpaRepository<Question, Long> {
 
-    Optional<Question> findById(Long id);
+    Optional<Question> findById(Long questionId);
 
     Optional<Question> findByTitle(String title);