환경변수추가

build.gradle

@@ -20,6 +20,8 @@ repositories {
 
 dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-data-jdbc'
+	implementation 'mysql:mysql-connector-java'
+	runtimeOnly 'mysql:mysql-connector-java'
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 	implementation 'org.springframework.boot:spring-boot-starter-jdbc'
 	implementation 'org.springframework.boot:spring-boot-starter-validation'

src/main/java/pj/circles/controller/CircleController.java

@@ -93,7 +93,7 @@ public Result circleCategoryAndDivision(
     public Result circleNameOrIntroduce(
             @PathVariable("name") String name
     ) {
-        List<Circle> circles = circleService.findByNameOrIntroduce(name,name);
+        List<Circle> circles = circleService.findByNameOrIntroduce(name,name,name);
         List<CirclesDTO> collect = circles.stream()
                 .map(o -> new CirclesDTO(o)).collect(Collectors.toList());
         return new Result(collect);
@@ -105,10 +105,14 @@ public Result circleNameOrIntroduce(
     @PostMapping("/circle")
     public ReturnCircleIdResponse saveCircle(@RequestBody @Valid CreateCircleRequest request, HttpServletRequest request2){
         long userPk = Long.parseLong(jwtTokenProvider.getUserPk(request2.getHeader("X-AUTH-TOKEN")));
-        return new ReturnCircleIdResponse(
-                circleService.join(request.getName(), request.getOneLineIntroduce(), request.getIntroduce(),
-                        request.getCircleCategory(),request.getCircleDivision(),request.getRecruit(),request.getOpenKakao()
-                ,memberService.findById(userPk)));
+        if(memberService.findById(userPk).getCircle()==null) {
+            return new ReturnCircleIdResponse(
+                    circleService.join(request.getName(), request.getOneLineIntroduce(), request.getIntroduce(),
+                            request.getCircleCategory(), request.getCircleDivision(), request.getRecruit(), request.getOpenKakao()
+                            , memberService.findById(userPk)));
+        }
+        else
+            throw new IllegalArgumentException("이미 등록한 동아리가 있습니다");
     }
     /**
      * 수정

src/main/java/pj/circles/controller/MemberController.java

@@ -86,7 +86,7 @@ public ReturnMemberIdResponse saveMember(@RequestBody @Valid CreateMemberRequest
     @PatchMapping("/admin/member/{id}")
     public ReturnMemberIdResponse updateMemberRoot(
             @PathVariable("id") Long id, @RequestBody @Valid UpdateMemberRequest request) {
-        memberService.findById(id).updatePassWord(passwordEncoder.encode(request.getPassword()));
+        memberService.updateMember(id,passwordEncoder.encode(request.getPassword()), request.getNickName());
         return new ReturnMemberIdResponse(id);
     }
 
@@ -110,7 +110,7 @@ public ReturnMemberIdResponse updateMember(
             HttpServletRequest request2, @RequestBody @Valid UpdateMemberRequest request) {
         long userPk = Long.parseLong(jwtTokenProvider.getUserPk(request2.getHeader("X-AUTH-TOKEN")));
 
-        memberService.updateMember(userPk,passwordEncoder.encode(request.getPassword()));
+        memberService.updateMember(userPk,passwordEncoder.encode(request.getPassword()), request.getNickName());
         return new ReturnMemberIdResponse(userPk);
     }
 

src/main/java/pj/circles/domain/Circle.java

@@ -41,7 +41,7 @@ public class Circle {
     //동아리모집포스터
 
     //수정기능
-    @OneToOne
+    @OneToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "member_id")
     private Member member;
 

src/main/java/pj/circles/domain/Member.java

@@ -39,7 +39,9 @@ public Member(String nickName, String passWord, String email){
     public void updatePassWord(String passWord){
         this.password =passWord;
     }
-
+    public void updateNickName(String nickName){
+        this.nickName =nickName;
+    }
     @Override
     public Collection<? extends GrantedAuthority> getAuthorities() {
         return this.roles.stream()

src/main/java/pj/circles/dto/CircleDTO.java

@@ -84,6 +84,7 @@ public static class UpdateCircleRequest{
         private String address;//동호수
         private String cafeLink;//동아리카페링크
         private String phoneNumber;//전화번호
+
     }
     @Data
     public static class CreateCircleRequest {

src/main/java/pj/circles/dto/MemberDTO.java

@@ -7,6 +7,7 @@
 import pj.circles.domain.Member;
 
 import javax.validation.constraints.NotEmpty;
+import java.util.Optional;
 
 public class MemberDTO {
 
@@ -21,8 +22,11 @@ public MemberOneDTO(Member member){
             id= member.getId();;
             nickName= member.getNickName();
             email= member.getEmail();;
-            circleId=member.getCircle().getId();
-            circleName=member.getCircle().getName();
+            Optional<Circle> circle=Optional.ofNullable(member.getCircle());
+            if (!circle.isEmpty()) {
+                circleId = circle.get().getId();
+                circleName = circle.get().getName();
+            }
         }
     }
 
@@ -37,6 +41,7 @@ public ReturnMemberIdResponse(Long id) {
     @Data
     public static class UpdateMemberRequest {
         private String password;
+        private String nickName;
 
 
     }

src/main/java/pj/circles/repository/CircleRepository.java

@@ -12,7 +12,7 @@ public interface CircleRepository extends JpaRepository<Circle,Long> {
     List<Circle> findByCircleCategory(CircleCategory circleCategory);
     List<Circle> findByCircleDivision(CircleDivision circleDivision);
     List<Circle> findByCircleCategoryAndCircleDivision(CircleCategory circleCategory,CircleDivision circleDivision);
-    List<Circle> findByNameContainsOrIntroduceContains(String name,String introduce);
+    List<Circle> findByNameContainsOrIntroduceContainsOrOneLineIntroduceContains(String name, String introduce,String oneLineIntroduce);
 
 
 }

src/main/java/pj/circles/service/CircleService.java

@@ -39,8 +39,8 @@ public List<Circle> findAll(){
     public List<Circle> findByCircleCategory(CircleCategory circleCategory){
         return circleRepository.findByCircleCategory(circleCategory);
     }
-    public List<Circle> findByNameOrIntroduce(String name,String introduce){
-        return circleRepository.findByNameContainsOrIntroduceContains(name,introduce);
+    public List<Circle> findByNameOrIntroduce(String name,String introduce,String oneLineIntroduce){
+        return circleRepository.findByNameContainsOrIntroduceContainsOrOneLineIntroduceContains(name,introduce,oneLineIntroduce);
     }
     public List<Circle> findByCircleDivision(CircleDivision circleDivision){
         return circleRepository.findByCircleDivision(circleDivision);

src/main/java/pj/circles/service/MemberService.java

@@ -32,9 +32,10 @@ public void deleteMember(Long memberId){
     }
 
     @Transactional
-    public void updateMember(Long memberId,String password){
+    public void updateMember(Long memberId,String password,String nickName){
         Member member = memberRepository.findById(memberId).get();
         member.updatePassWord(password);
+        member.updateNickName(nickName);
 
     }
 }

src/main/resources/application.yml

@@ -1,9 +1,9 @@
 spring: #띄어쓰기 없음
   datasource: #띄어쓰기 2칸
-    url: jdbc:h2:tcp://localhost/~/demo #4칸
-    username: sa
-    password:
-    driver-class-name: org.h2.Driver
+    url: ${dburl} #4칸
+    username: root
+    password: ${dbpassword}
+    driver-class-name: com.mysql.cj.jdbc.Driver
 
   jpa: #띄어쓰기 2칸
     hibernate: #띄어쓰기 4칸

src/main/resources/email.properties

@@ -0,0 +1,11 @@
+mail.smtp.auth=true
+mail.smtp.starttls.required=true
+mail.smtp.starttls.enable=true
+mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
+mail.smtp.socketFactory.fallback=false
+mail.smtp.port=465
+mail.smtp.socketFactory.port=465
+
+#admin ?? ??? ?? id,password
+AdminMail.id=[email protected]
+AdminMail.password=${email.AdminMail.password}