Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,13 @@ public ResponseEntity<ResponseSuccessDto<MemberInfoResponseDto>> getMemberInfo(@
return ResponseEntity.ok(memberService.getMemberInfo(email));
}

/* 경험치 상승 */
@ApiOperation(value = "경험치 상승", notes = "회원 경험치를 갱신한다.")
@PatchMapping("/update/exp")
public ResponseEntity<ResponseSuccessDto<ExpUpdateResponseDto>> updateExp(@RequestBody ExpUpdateRequestDto expUpdateRequestDto) {
return ResponseEntity.ok(memberService.updateExp(expUpdateRequestDto));
}

/* 증명 승인/미승인 목록 조회(기관) */
// @ApiOperation(value = "증명 승인/미승인 목록 조회(기관)", notes = "기관의 승인/미승인 상태의 제출 기록을 조회한다.")
// @GetMapping("{agency_id}/{status}")
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package com.ssafy.hereauth.dto.member;

import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;

import java.util.UUID;

@Getter
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class ExpUpdateRequestDto {
private UUID memberId;
private int exp;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.ssafy.hereauth.dto.member;

import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;

@Getter
@NoArgsConstructor
@AllArgsConstructor
public class ExpUpdateResponseDto {
private int level;
private String message;
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.ssafy.hereauth.entity;

//import com.ssafy.hereauth.dto.member.ExpUpdateRequestDto;
import com.ssafy.hereauth.dto.member.SignupRequestDto;
import com.ssafy.hereauth.enumeration.member.EnumMemberRole;
import lombok.AllArgsConstructor;
Expand Down Expand Up @@ -65,4 +66,11 @@ public void createMember(SignupRequestDto signupRequestDto) {
this.nickname = signupRequestDto.getNickname();
this.email = signupRequestDto.getEmail();
}

public void updateMemberExp(int curExp, int goalExp, int level) {
this.curExp = curExp;
this.goalExp = goalExp;
this.level = level;

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@

public interface BdHistoryRepository extends JpaRepository<BdHistory, Long> {
// @Query("select bdh from BdHistory bdh where bdh.member.id= member_id")
List<BdHistory> findAllByMemberId(UUID memberId);
List<BdHistory> findAllByMemberIdOrderByIssuedDate(UUID memberId);
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
import java.util.List;

public interface CharacterRepository extends JpaRepository<Character, Long> {
@Query("select c from Character c where c.level= 0")
@Query("select c from Character c where c.level= 1")
List<Character> findCharacterStarting(int level);
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.ssafy.hereauth.entity.Character;
import com.ssafy.hereauth.repository.*;
import com.ssafy.hereauth.util.ResponseUtil;
import io.swagger.models.Response;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
Expand Down Expand Up @@ -70,19 +71,18 @@ public ResponseSuccessDto<SignupResponseDto> signup(SignupRequestDto signupReque
public ResponseSuccessDto<MemberProfileResponseDto> getProfile(String memberId) {
Member member = memberRepository.findById(UUID.fromString(memberId))
.orElseThrow(() -> new RuntimeException("존재하지 않는 회원입니다."));
System.out.println("멤버 셀렉트" + member);

// 캐릭터 imgUrl 가져오기 위해 멤버_캐릭터 테이블에서 멤버 id에 해당하는 캐릭터 id 가져오기
MemberCharacter memberCharacter = memberCharacterRepository.findByMemberId(UUID.fromString(memberId))
.orElseThrow(() -> new RuntimeException("존재하지 않는 멤버의 캐릭터 정보입니다."));
Character character = characterRepository.findById(memberCharacter.getCharacter().getId())
.orElseThrow(() -> new RuntimeException("존재하지 않는 캐릭터ID입니다."));

Character character = memberCharacter.getCharacter();

String characterImgUrl = character.getImgUrl();

// 헌혈기록 리스트 뽑기
List<BdHistory> bdHistoryList = bdHistoryRepository.findAllByMemberId(UUID.fromString(memberId));
System.out.println("확인" + bdHistoryList);
List<BdHistory> bdHistoryList = bdHistoryRepository.findAllByMemberIdOrderByIssuedDate(UUID.fromString(memberId));

// 헌혈 카운트
Integer bdHistoryCnt = bdHistoryList.size();
// 최근 헌혈일
Expand Down Expand Up @@ -187,6 +187,32 @@ public Boolean isEmailDuplicate(String email) {
return memberRepository.existsByEmail(email);
}

/**
* 경험치 상승
*/
public ResponseSuccessDto<ExpUpdateResponseDto> updateExp(ExpUpdateRequestDto expUpdateRequestDto) {
Member member = memberRepository.findById(expUpdateRequestDto.getMemberId())
.orElseThrow(() -> new RuntimeException("올바르지 않은 멤버ID입니다."));

int curExp = member.getCurExp() + expUpdateRequestDto.getExp();
System.out.println("멤버" + member);
System.out.println("현재 경험지" + curExp);

int goalExp = member.getGoalExp();
int level = member.getLevel();

if (curExp >= member.getGoalExp()) {
goalExp += 50;
level += 1;
}

member.updateMemberExp(curExp, goalExp, level);

ExpUpdateResponseDto expUpdateResponseDto = new ExpUpdateResponseDto(level, "경험치가 상승하였습니다.");
ResponseSuccessDto<ExpUpdateResponseDto> res = responseUtil.successResponse(expUpdateResponseDto);
return res;
}

/**
* 증명 승인/미승인 목록 조회(기관)
*/
Expand Down
37 changes: 0 additions & 37 deletions here-back/here-board/.gitignore

This file was deleted.

35 changes: 0 additions & 35 deletions here-back/here-board/build.gradle

This file was deleted.

Binary file not shown.
5 changes: 0 additions & 5 deletions here-back/here-board/gradle/wrapper/gradle-wrapper.properties

This file was deleted.

Loading