overflow_backup_2018_0455/overflow_server
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
geek 2018-03-14 20:17:39 +09:00
commit b7954f5a2d
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/loafle/overflow/module/domain/dao/DomainMemberDAO.java
View File

@ -16,8 +16,8 @@ import java.util.List;
@Repository @Repository
public interface DomainMemberDAO extends JpaRepository<DomainMember, Long> { public interface DomainMemberDAO extends JpaRepository<DomainMember, Long> {
@Query("SELECT dm from DomainMember dm where dm.member.id = (:id)") @Query("SELECT dm from DomainMember dm where dm.member.email = (:email)")
DomainMember findByMemberID(@Param("id") long id); DomainMember findByMemberEmail(@Param("email") String email);
@Query("SELECT dm.domain from DomainMember dm where dm.member = (:member)") @Query("SELECT dm.domain from DomainMember dm where dm.member = (:member)")
Domain findDomainByMember(@Param("member") Member member); Domain findDomainByMember(@Param("member") Member member);

4
src/main/java/com/loafle/overflow/module/domain/service/DomainMemberService.java
View File

@ -31,8 +31,8 @@ public class DomainMemberService {
return this.domainMemberDAO.findDomainByMember(member); return this.domainMemberDAO.findDomainByMember(member);
} }
public DomainMember readByMemberID(long id) { public DomainMember readByMemberEmail(String email) {
return this.domainMemberDAO.findByMemberID(id); return this.domainMemberDAO.findByMemberEmail(email);
} }
public List<Member> readAllMemberByDomain(Domain domain) { public List<Member> readAllMemberByDomain(Domain domain) {

2
src/main/java/com/loafle/overflow/module/member/service/MemberService.java
View File

@ -76,7 +76,7 @@ public class MemberService {
m.setSigninFailCount(0); m.setSigninFailCount(0);
this.modify(m); this.modify(m);
DomainMember dm = domainMemberService.readByMemberID(m.getId()); DomainMember dm = domainMemberService.readByMemberEmail(m.getEmail());
// Todo Signin History // Todo Signin History
return dm; return dm;