10주차 미션_조이

조이/JavaExam/src/DialogReader.java

@@ -0,0 +1,43 @@
+package chapters.ch10.exceptions;
+
+import javax.swing.*;
+
+public class DialogReader {
+    public String readString(String prompt) {
+        return JOptionPane.showInputDialog(prompt);
+    }
+
+    public int readInt(String prompt) {
+        int n;
+        String input = readString(prompt);
+        try {
+            n = Integer.parseInt(input.trim());
+        } catch (NumberFormatException e) {
+            JOptionPane.showMessageDialog(null, e.getMessage() + " 정수가 아닙니다.");
+            n = readInt(prompt);    // 재시도
+        }
+        return n;
+    }
+
+    public double readDouble(String prompt) {
+        double n;
+        String input = readString(prompt);
+        try {
+            n = Double.parseDouble(input.trim());
+        } catch (NumberFormatException e) {
+            JOptionPane.showMessageDialog(null, e.getMessage() + " 실수가 아닙니다.");
+            n = readDouble(prompt); // 재시도
+        }
+        return n;
+    }
+
+    public static void main(String[] args) {
+        int n = new DialogReader().readInt("정수를 주세요. 100에서 나누어 드립니다.");
+        try {
+            String answer = "100에서 나누기 " + Integer.toString(n) + " = " + (100 / n);
+            JOptionPane.showMessageDialog(null, answer);
+        } catch (java.lang.ArithmeticException e) {
+            JOptionPane.showMessageDialog(null, e.getMessage() + " : 0으로 나눌 수 없습니다.");
+        }
+    }
+}

조이/server/src/main/java/umc/server/domain/member/controller/MemberController.java

@@ -28,7 +28,7 @@ public ApiResponse<MemberResDTO.JoinDTO> signUp(
         }
 
         // 회원 로그인
-        @GetMapping("/{memberId}/login")
+        @PostMapping("/{memberId}/login")
         public ApiResponse<MemberResDTO.LoginDTO> login(
                 @RequestBody MemberReqDTO.LoginDTO dto) {
             return ApiResponse.onSuccess(MemberSuccessCode.FOUND, memberService.login(dto));

조이/server/src/main/java/umc/server/domain/member/converter/MemberConverter.java

@@ -5,6 +5,7 @@
 import umc.server.domain.member.dto.req.MemberReqDTO;
 import umc.server.domain.member.dto.res.MemberResDTO;
 import umc.server.domain.member.entity.Member;
+import umc.server.domain.member.enums.Role;
 
 public class MemberConverter {
 
@@ -20,10 +21,15 @@ public static MemberResDTO.JoinDTO toJoinDTO(
 
     // DTO -> Entity
     public static Member toMember(
-            MemberReqDTO.JoinDTO dto
+            MemberReqDTO.JoinDTO dto,
+            String password,
+            Role role
     ){
         return Member.builder()
                 .name(dto.name())
+                .email(dto.email())
+                .password(password)
+                .role(role)
                 .birth(dto.birth())
                 .address(dto.address())
                 .gender(dto.gender())

조이/server/src/main/java/umc/server/domain/member/dto/req/MemberReqDTO.java

@@ -1,5 +1,7 @@
 package umc.server.domain.member.dto.req;
 
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Builder;
 import lombok.Getter;
 import org.springframework.cglib.core.Local;
@@ -12,7 +14,12 @@
 public class MemberReqDTO {
     @Builder
     public record JoinDTO(
+            @NotBlank
             String name,
+            @Email
+            String email,
+            @NotBlank
+            String password,
             Gender gender,
             LocalDate birth,
             String address,
@@ -22,6 +29,8 @@ public record JoinDTO(
     ){}
     @Builder
     public record LoginDTO(
-            String memberId
+            String memberId,
+            String email,
+            String password
     ){}
 }

조이/server/src/main/java/umc/server/domain/member/entity/Member.java

@@ -6,6 +6,7 @@
 import umc.server.domain.mapping.mapping.entity.MemberMission;
 import umc.server.domain.mapping.mapping.entity.MemberTerm;
 import umc.server.domain.member.enums.Gender;
+import umc.server.domain.member.enums.Role;
 import umc.server.domain.review.entity.Review;
 import umc.server.global.BaseEntity;
 
@@ -42,24 +43,36 @@ public class Member extends BaseEntity {
     @Column(name = "point",length=100)
     private Integer point;
 
-    @Column(name = "email")
+    @Column(name = "email", nullable=false, unique=true)
     private String email;
 
+    @Column(nullable = false)
+    private String password;
+
+    @Enumerated(EnumType.STRING)
+    private Role role;
+
     @Column(name = "tel", length=11)
     private String tel;
 
-    @OneToMany(mappedBy = "member" ,cascade = CascadeType.REMOVE) //member은 memberfood 엔티티 안의 필드이름
+    @OneToMany(mappedBy = "member" ,cascade = CascadeType.REMOVE)
+    @Builder.Default//member은 memberfood 엔티티 안의 필드이름
     private List<MemberFood> memberFoods= new ArrayList<>();
 
-    @OneToMany(mappedBy = "member" ,cascade = CascadeType.REMOVE) //member은 memberfood 엔티티 안의 필드이름
+    @OneToMany(mappedBy = "member" ,cascade = CascadeType.REMOVE)
+    @Builder.Default//member은 memberfood 엔티티 안의 필드이름
     private List<MemberTerm> memberTerms= new ArrayList<>();//arraylist로 초기화해서 널 값 아니고 빈 리스트로 존재 []
 
     @OneToMany(mappedBy = "member" )
+    @Builder.Default  // 빌더때매 패스워드 notnull무시되면서 로그인이안됏슨
     private List<MemberMission> membermission= new ArrayList<>();
 
+
     @OneToMany(mappedBy = "member", fetch = FetchType.LAZY)
+    @Builder.Default
     private List<Review> reviews = new ArrayList<>();
 
     @OneToMany(mappedBy = "member", fetch = FetchType.LAZY)
+    @Builder.Default
     private List<Question> questions = new ArrayList<>();
 }

조이/server/src/main/java/umc/server/domain/member/enums/Role.java

@@ -0,0 +1,5 @@
+package umc.server.domain.member.enums;
+
+public enum Role {
+    ROLE_ADMIN,ROLE_USER;
+}

조이/server/src/main/java/umc/server/domain/member/repository/MemberRepository.java

@@ -5,9 +5,10 @@
 import umc.server.domain.member.entity.Member;
 import org.springframework.data.jpa.repository.JpaRepository;
 import java.util.List;
+import java.util.Optional;
 
 
 public interface MemberRepository extends JpaRepository<Member, Long> {
     List<Member> findByName(@Param("name") String name);
-
+    Optional<Member> findByEmail(String email);
 }

조이/server/src/main/java/umc/server/domain/member/service/MemberServiceImpl.java

@@ -2,6 +2,7 @@
 
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import umc.server.domain.mapping.mapping.entity.MemberFood;
 import umc.server.domain.mapping.mapping.repository.MemberFoodRepository;
@@ -10,6 +11,7 @@
 import umc.server.domain.member.dto.res.MemberResDTO;
 import umc.server.domain.member.entity.Food;
 import umc.server.domain.member.entity.Member;
+import umc.server.domain.member.enums.Role;
 import umc.server.domain.member.exception.FoodException;
 import umc.server.domain.member.exception.code.FoodErrorCode;
 import umc.server.domain.member.repository.FoodRepository;
@@ -27,13 +29,16 @@ public class MemberServiceImpl implements MemberService{
     private final MemberRepository memberRepository;
     private final MemberFoodRepository memberFoodRepository;
     private final FoodRepository foodRepository;
+    private final PasswordEncoder passwordEncoder;
     // 회원가입
     @Override
     public MemberResDTO.JoinDTO signup(
             MemberReqDTO.JoinDTO dto
     ) {
+        //솔트된 비밀번호생성
+        String salt= passwordEncoder.encode(dto.password());
         // 사용자 생성
-        Member member = MemberConverter.toMember(dto);
+        Member member = MemberConverter.toMember(dto,salt, Role.ROLE_USER);
         // DB 적용
         memberRepository.save(member);
         // 선호 음식 존재 여부 확인

조이/server/src/main/java/umc/server/global/auth/CustomUserDetailsService.java

@@ -0,0 +1,32 @@
+package umc.server.global.config;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.stereotype.Service;
+import umc.server.domain.member.entity.Member;
+import umc.server.domain.member.repository.MemberRepository;
+
+@Service
+@RequiredArgsConstructor
+public class CustomUserDetailsService implements UserDetailsService {
+
+    private final MemberRepository memberRepository;
+
+    @Override
+    public UserDetails loadUserByUsername(String email)
+            throws UsernameNotFoundException {
+
+        Member member = memberRepository.findByEmail(email)
+                .orElseThrow(() ->
+                        new UsernameNotFoundException("존재하지 않는 회원입니다: " + email)
+                );
+
+        return org.springframework.security.core.userdetails.User.builder()
+                .username(member.getEmail())
+                .password(member.getPassword())
+                .roles(member.getRole().name()) // Role.USER / Role.ADMIN
+                .build();
+    }
+}

조이/server/src/main/java/umc/server/global/auth/JwtAuthFilter.java

@@ -0,0 +1,4 @@
+package umc.server.global.auth;
+
+public class JwtAuthFilter {
+}

조이/server/src/main/java/umc/server/global/auth/JwtUtil.java

@@ -0,0 +1,4 @@
+package umc.server.global.auth;
+
+public class JwtUtil {
+}

조이/server/src/main/java/umc/server/global/config/AuthenticationEntryPoint.java

@@ -0,0 +1,4 @@
+package umc.server.global.config;
+
+public class AuthenticationEntryPoint {
+}

조이/server/src/main/java/umc/server/global/config/SecurityConfig.java

@@ -0,0 +1,49 @@
+package umc.server.global.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.security.web.SecurityFilterChain;
+
+@EnableWebSecurity
+@Configuration
+public class SecurityConfig {
+
+    private final String[] allowUris = {
+            "/sign-up",
+            "/swagger-ui/**",
+            "/swagger-resources/**",
+            "/v3/api-docs/**",
+    };
+
+    @Bean
+    public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
+        http
+                .authorizeHttpRequests(requests -> requests
+                        .requestMatchers(allowUris).permitAll()
+                        .requestMatchers("/admin/**").hasRole("ADMIN")
+                        .anyRequest().authenticated()
+                )
+                .formLogin(form -> form
+                        .defaultSuccessUrl("/swagger-ui/index.html", true)
+                        .permitAll()
+                )
+                .csrf(AbstractHttpConfigurer::disable)
+                .logout(logout -> logout
+                        .logoutUrl("/logout")
+                        .logoutSuccessUrl("/login?logout")
+                        .permitAll()
+                );
+
+        return http.build();
+    }
+
+    @Bean
+    public PasswordEncoder passwordEncoder() {
+        return new BCryptPasswordEncoder();
+    }
+}