member-api many commit

src/main/java/io/codechobo/member/application/MemberService.java

@@ -2,74 +2,108 @@
 
 import io.codechobo.member.domain.Member;
 import io.codechobo.member.domain.PointPerLevel;
+import io.codechobo.member.domain.Social;
 import io.codechobo.member.domain.repository.MemberRepository;
 import io.codechobo.member.domain.support.MemberDto;
+import io.codechobo.member.domain.util.EntityDtoConverter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import javax.persistence.EntityNotFoundException;
 import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
-import java.util.stream.Collectors;
+import java.util.Objects;
 
 /**
  * @author loustler
  * @since 10/02/2016 10:12
  */
 @Service
+@Transactional
 public class MemberService {
     @Autowired
     private MemberRepository memberRepository;
 
+    /**
+     * Get mebmer list.
+     *
+     * @return MemberDto list
+     */
     public List<MemberDto> getMembers() {
         List<Member> member = memberRepository.findAll();
 
-        return member.stream()
-                .map(m -> new MemberDto(m.getSeq(), m.getId(), m.getPassword(), m.getEmail(), m.getNickName(), m.getRegistrationDate(), m.getPoint()))
-                .collect(Collectors.toList());
+        return EntityDtoConverter.memberListConvertToDtoList(member);
     }
 
+    /**
+     * Get one Member using member's sequence.
+     *
+     * @param sequence
+     * @return Null | MemberDto
+     */
     public MemberDto getMember(final Long sequence) {
-        Member member = memberRepository.findOne(sequence);
+        Member member = memberRepository.findOne(Objects.requireNonNull(sequence));
 
-        if(member == null) return null;
+        if(Objects.isNull(member)) return null;
 
-        return new MemberDto(member.getSeq(), member.getId(), member.getPassword(), member.getEmail(), member.getNickName(), member.getRegistrationDate(), member.getPoint());
+        return EntityDtoConverter.memberConvertToDto(member);
     }
 
+    /**
+     * Create member using memberDTO.
+     *
+     * @param memberDto
+     * @return MemberDto
+     */
     public MemberDto createMember(final MemberDto memberDto) {
-        Member member = new Member(memberDto);
+        Member member = new Member(Objects.requireNonNull(memberDto));
 
-        if(member.getPoint() == null)
+        if(Objects.isNull(member.getPoint()))
             member.setPoint(new Integer(0));
 
-        if(member.getRegistrationDate() == null)
+        if(Objects.isNull(member.getRegistrationDate()))
             member.setRegistrationDate(Calendar.getInstance().getTime());
 
         member.setLevel(PointPerLevel.valueOf(member.getPoint()));
 
-        member = memberRepository.save(member);
+        member.setSocials(new ArrayList<Social>());
 
-        return new MemberDto(member.getSeq(), member.getId(), member.getPassword(), member.getEmail(), member.getNickName(), member.getRegistrationDate(), member.getPoint());
+        Member createdMember = memberRepository.save(member);
+
+        return EntityDtoConverter.memberConvertToDto(createdMember);
     }
 
+    /**
+     * Update member using memberDTO.
+     *
+     * @param memberDto
+     * @return MemberDto
+     * @throws EntityNotFoundException member is not exist.
+     * @throws NullPointerException in case member sequence is null/
+     */
     public MemberDto updateMember(MemberDto memberDto) {
-        if(memberDto.getSequence() == null || !memberRepository.exists(memberDto.getSequence())) {
-            throw new IllegalArgumentException();
+
+        if(!memberRepository.exists(Objects.requireNonNull(memberDto.getSequence()))) {
+            throw new EntityNotFoundException();
         }
 
         memberDto.setLevel(PointPerLevel.valueOf(memberDto.getPoint()));
 
         Member member = memberRepository.save(new Member(memberDto));
 
-        return new MemberDto(member.getSeq(), member.getId(), member.getPassword(), member.getEmail(), member.getNickName(), member.getRegistrationDate(), member.getPoint());
+        return EntityDtoConverter.memberConvertToDto(member);
     }
 
+    /**
+     * Delete member using member sequence.
+     *
+     * @param memberSequence
+     * @throws NullPointerException in case member sequence is null.
+     */
     public void deleteMember(@NotNull final Long memberSequence) {
-        if(memberSequence == null) {
-            throw new IllegalArgumentException();
-        }
-
-        memberRepository.delete(memberSequence);
+        memberRepository.delete(Objects.requireNonNull(memberSequence));
     }
 }

src/main/java/io/codechobo/member/application/SocialService.java

@@ -0,0 +1,113 @@
+package io.codechobo.member.application;
+
+import io.codechobo.member.domain.Member;
+import io.codechobo.member.domain.Social;
+import io.codechobo.member.domain.repository.MemberRepository;
+import io.codechobo.member.domain.repository.SocialRepository;
+import io.codechobo.member.domain.support.SocialDto;
+import io.codechobo.member.domain.util.EntityDtoConverter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.persistence.EntityNotFoundException;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @author loustler
+ * @since 10/24/2016 23:42
+ */
+@Service
+@Transactional
+public class SocialService {
+    @Autowired
+    private SocialRepository socialRepository;
+    @Autowired
+    private MemberRepository memberRepository;
+
+    public List<SocialDto> all() {
+        List<Social> socialList = socialRepository.findAll();
+
+        return EntityDtoConverter.socialListConvertToDtoList(socialList);
+    }
+
+    /**
+     * Get multi social using member sequence.
+     *
+     * @param memberSequence
+     * @return List if not found return empty size
+     * @throws NullPointerException in case not found any social
+     */
+    public List<SocialDto> getSocials(final Long memberSequence) {
+        List<Social> socialList = socialRepository.findByMemberSeq(Objects.requireNonNull(memberSequence));
+
+        if(Objects.isNull(socialList)) return null;
+
+        return EntityDtoConverter.socialListConvertToDtoList(socialList);
+    }
+
+    /**
+     * Get single social using social sequence.
+     *
+     * @param socialSequence
+     * @return SocialDto
+     */
+    public SocialDto getSocial(final Long socialSequence) {
+        Social foundSocial = socialRepository.findOne(Objects.requireNonNull(socialSequence));
+
+        return EntityDtoConverter.socialConvertToDto(foundSocial);
+    }
+
+    /**
+     * Create SocialDto using member sequence in socialDto.
+     *
+     * @param socialDto
+     * @return SocialDto
+     * @throws NullPointerException in case socialDto's member sequence is null
+     */
+    public SocialDto createSocial(final SocialDto socialDto) {
+        Member foundMember = memberRepository.findOne(Objects.requireNonNull(socialDto.getMemberSequence()));
+
+        Social social = EntityDtoConverter.socialDtoConvertToEntity(socialDto);
+
+        social.setMember(foundMember);
+
+        Social created = socialRepository.save(social);
+
+        return EntityDtoConverter.socialConvertToDto(created);
+    }
+
+    /**
+     * Update Social using Social Sequence.
+     *
+     * @param socialDto
+     * @return SocialDto
+     * @throws EntityNotFoundException in case social sequence is null or not exist.
+     * @throws NullPointerException in case social sequence is null.
+     */
+    public SocialDto updateSocial(final SocialDto socialDto) {
+        if (!socialRepository.exists(Objects.requireNonNull(socialDto.getSequence())))
+            throw new EntityNotFoundException(socialDto.getSequence()+" is not exist.");
+
+        Member foundMember = memberRepository.findOne(Objects.requireNonNull(socialDto.getMemberSequence()));
+
+        Social updateSocial = new Social(socialDto);
+
+        updateSocial.setMember(foundMember);
+
+        Social updated = socialRepository.save(updateSocial);
+
+        return EntityDtoConverter.socialConvertToDto(updated);
+    }
+
+    /**
+     * Delete social using social sequence.
+     *
+     * @param socialSequence NotNull
+     * @throws NullPointerException in case social sequence is null.
+     */
+    public void deleteSocial(final Long socialSequence) {
+        socialRepository.delete(Objects.requireNonNull(socialSequence));
+    }
+}

src/main/java/io/codechobo/member/domain/Member.java

@@ -2,6 +2,7 @@
 
 
 import io.codechobo.member.domain.support.MemberDto;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -21,12 +22,13 @@
 import java.util.List;
 
 /**
- * Created by Loustler on 8/7/16.
+ * @author loustler
+ * @since  08/07/2016
  */
 @Entity
 @Setter
 @Getter
-@NoArgsConstructor
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class Member {
 
     @Id
@@ -65,7 +67,7 @@ public class Member {
     /*
      * social은 member에 종속적이므로 cascade
      */
-    @OneToMany(fetch = FetchType.EAGER, mappedBy = "seq")
+    @OneToMany(fetch = FetchType.EAGER, mappedBy = "member")
     private List<Social> socials;
 
     public Member(final MemberDto memberDto) {
@@ -78,5 +80,4 @@ public Member(final MemberDto memberDto) {
         this.level = memberDto.getLevel();
         this.registrationDate = memberDto.getRegiDate();
     }
-
 }

src/main/java/io/codechobo/member/domain/PointPerLevel.java

@@ -3,7 +3,8 @@
 import lombok.Getter;
 
 /**
- * Created by Loustler on 8/16/16.
+ * @author loustler
+ * @since 08/16/2016
  */
 @Getter
 public enum PointPerLevel {

src/main/java/io/codechobo/member/domain/Social.java

@@ -2,24 +2,25 @@
 
 
 import io.codechobo.member.domain.support.SocialDto;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
+import java.util.List;
 
 /**
  * Created by Loustler on 8/7/16.
  */
 @Entity
-@NoArgsConstructor
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Setter
 @Getter
 public class Social {
@@ -35,8 +36,15 @@ public class Social {
     @Column(name = "SOCIAL_ACCESS_TOKEN")
     private String token; // accessToken 등 token정보
 
-    @ManyToOne(optional = false, fetch = FetchType.LAZY)
-    @JoinColumn(name = "MEMBER_SEQ")
+    /**
+     * Transactional 범위밖에서 벗어나서 LAZY에서 EAGER(default)로 수정
+     * Why? List일 때 proxy initialize fail
+     * @see io.codechobo.member.domain.util.EntityDtoConverter#socialListConvertToDtoList(List)
+     *
+     * FK update 못하게 false 처리
+     */
+    @ManyToOne
+    @JoinColumn(name = "MEMBER_SEQ", updatable = false)
     private Member member;
 
     public Social(final SocialDto socialDto) {

src/main/java/io/codechobo/member/domain/repository/MemberRepository.java

@@ -6,10 +6,11 @@
 
 
 /**
- * Created by Loustler on 8/21/16.
+ * @author loustler
+ * @since 08/21/2016
  */
 @Repository
 public interface MemberRepository extends JpaRepository<Member, Long> {
-    Member findByNickName(String nickname);
-    Member findByEmail(String email);
+    Member findByNickName(final String nickname);
+    Member findByEmail(final String email);
 }

src/main/java/io/codechobo/member/domain/repository/SocialRepository.java

@@ -2,9 +2,15 @@
 
 import io.codechobo.member.domain.Social;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
 
 /**
- * Created by Loustler on 8/21/16.
+ * @author loustler
+ * @since 08/21/2016
  */
+@Repository
 public interface SocialRepository extends JpaRepository<Social, Long> {
+    List<Social> findByMemberSeq(Long memberSeq);
 }