Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: 멤버 스피드 조회 및 수정 로직 추가 #23

Closed
wants to merge 6 commits into from
Closed
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
Binary file modified .gradle/8.10/checksums/checksums.lock
Binary file not shown.
Binary file modified .gradle/8.10/checksums/md5-checksums.bin
Binary file not shown.
Binary file modified .gradle/8.10/checksums/sha1-checksums.bin
Binary file not shown.
2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified out/production/classes/com/knu/daeguhackathon/member/Member.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 2 additions & 0 deletions out/production/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ spring.jpa.hibernate.ddl-auto=update
spring.sql.init.mode=always
spring.jpa.defer-datasource-initialization=true
spring.profiles.include=dev
csv.file.path=/home/ubuntu/repository/daegu-hackathon-be/src/main/resources/csvfile.csv
#csv.file.path=src/main/resources/csvfile.csv
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.knu.daeguhackathon.global.utils.course.Course;
import com.knu.daeguhackathon.global.utils.course.repository.CourseRepository;
import com.opencsv.CSVReader;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.CommandLineRunner;
import org.springframework.stereotype.Component;

Expand All @@ -17,9 +18,13 @@ public DataLoader(CourseRepository courseRepository) {
this.courseRepository = courseRepository;
}

@Value("${csv.file.path}")
private String csvFilePath;


@Override
public void run(String... args) {
importCsv("csvfile.csv"); // CSV 파일 경로
importCsv(csvFilePath); // CSV 파일 경로
}

private void importCsv(String filePath) {
Expand All @@ -43,4 +48,4 @@ private void importCsv(String filePath) {
e.printStackTrace();
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.knu.daeguhackathon.kakaotoken.repository;

import com.knu.daeguhackathon.kakaotoken.KakaoToken;
import com.knu.daeguhackathon.member.Member;
import java.util.Optional;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
Expand All @@ -11,4 +12,6 @@ public interface KakaoTokenRepository extends JpaRepository<KakaoToken, Long> {
Optional<KakaoToken> findByAccessToken(String accessToken);

Optional<KakaoToken> findByMemberId(Long memberId);

KakaoToken findByMember(Member member);
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,23 @@ public class KakaoTokenService {
private final MemberRepository memberRepository;

@Transactional
public KakaoToken saveKakaoToken(String email, KakaoTokenResponse tokenInfo) {
public void saveKakaoToken(String email, KakaoTokenResponse tokenInfo) {

Member member = memberRepository.findByEmail(email).orElseThrow(
() -> new RuntimeException("이메일에 해당하는 Member가 없습니다")
);

KakaoToken kakaoToken = KakaoToken.builder()
.member(member)
.accessToken(tokenInfo.accessToken())
.refreshToken(tokenInfo.refreshToken())
.expires_in(tokenInfo.expiresIn())
.issuedAt(LocalDateTime.now())
.updated_at(LocalDateTime.now())
.build();

return kakaoTokenRepository.save(kakaoToken);
KakaoToken savedToken = kakaoTokenRepository.save(kakaoToken);

member.setKakaoToken(savedToken);
}

@Transactional
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/knu/daeguhackathon/member/Member.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,16 @@ public class Member extends BaseTimeEntity {
private String name;
@NotNull
private LocalDateTime createdTime;
private int speed;
private Double speed;
private String nickName;
@OneToOne
@OneToOne(cascade = CascadeType.PERSIST)
private KakaoToken kakaoToken;
@OneToMany(mappedBy = "member", cascade = CascadeType.REMOVE)
private List<Subject> subjects = new ArrayList<>();
@OneToMany(mappedBy = "member", cascade = CascadeType.REMOVE)
private List<SearchLog> searchLogs = new ArrayList<>();

public void setDetail(String name, int speed, String nickName) {
public void setDetail(String name, Double speed, String nickName) {
this.name = name;
this.speed = speed;
this.nickName = nickName;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
import com.knu.daeguhackathon.kakaotoken.dto.KakaoTokenResponse;
import com.knu.daeguhackathon.kakaotoken.service.KakaoApiService;
import com.knu.daeguhackathon.kakaotoken.service.KakaoTokenService;
import com.knu.daeguhackathon.member.dto.MemberNickName;
import com.knu.daeguhackathon.member.dto.MemberRequest;
import com.knu.daeguhackathon.member.dto.MemberResponse;
import com.knu.daeguhackathon.member.dto.MemberSpeed;
import com.knu.daeguhackathon.member.service.MemberService;
import com.knu.daeguhackathon.member.service.TokenService;
import java.net.URI;
Expand Down Expand Up @@ -74,10 +74,22 @@ public ResponseEntity<MemberResponse> getMemberInfo(@LoginMember Long memberId)
return ResponseEntity.ok().body(response);
}

@PatchMapping("/api/member/nickname")
public ResponseEntity<Void> changeMemberNickName(@LoginMember Long memberId, @RequestBody
MemberNickName memberNickName) {
memberService.changeMemberNickName(memberId, memberNickName.nickName());
@PatchMapping("/member/nickname")
public ResponseEntity<Void> changeMemberNickName(@LoginMember Long memberId, @RequestParam("nickname")
String memberNickName) {
memberService.changeMemberNickName(memberId, memberNickName);
return ResponseEntity.ok().build();
}

@GetMapping("/member/speed")
public ResponseEntity<MemberSpeed> getMemberSpeed(@LoginMember Long memberId) {
MemberSpeed response = memberService.getMemberSpeed(memberId);
return ResponseEntity.ok().body(response);
}

@PatchMapping("/member/speed")
public ResponseEntity<Void> changeMemberSpeed(@LoginMember Long memberId, @RequestParam("speed") Double memberSpeed) {
memberService.changeMemberSpeed(memberId, memberSpeed);
return ResponseEntity.ok().build();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
public class MemberRequest {

private String name;
private int speed;
private Double speed;
private String nickName;

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package com.knu.daeguhackathon.member.dto;

public record MemberSpeed(Double speed) {

}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.knu.daeguhackathon.member.Member;
import com.knu.daeguhackathon.member.dto.MemberResponse;
import com.knu.daeguhackathon.member.dto.MemberSpeed;
import com.knu.daeguhackathon.member.repository.MemberRepository;
import jakarta.transaction.Transactional;
import java.time.LocalDateTime;
Expand Down Expand Up @@ -33,7 +34,7 @@ public void registerMember(String email) {
}

@Transactional
public void addMemberInfo(Long memberId, String name, int speed, String nickname) {
public void addMemberInfo(Long memberId, String name, Double speed, String nickname) {
Member member = memberRepository.findById(memberId)
.orElseThrow(() -> new RuntimeException("id에 해당하는 member가 없습니다."));
member.setDetail(name, speed, nickname);
Expand Down Expand Up @@ -64,4 +65,19 @@ public void changeMemberNickName(Long memberId, String nickName) {
member.setNickName(nickName);
}

@Transactional
public void changeMemberSpeed(Long memberId, Double speed) {
Member member = memberRepository.findById(memberId).orElseThrow(
() -> new RuntimeException("id에 해당하는 멤버가 없습니다.")
);
member.setSpeed(speed);
}

public MemberSpeed getMemberSpeed(Long memberId) {
Member member = memberRepository.findById(memberId).orElseThrow(
() -> new RuntimeException("id에 해당하는 멤버가 없습니다.")
);
return new MemberSpeed(member.getSpeed());
}

}
2 changes: 2 additions & 0 deletions src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ spring.jpa.hibernate.ddl-auto=update
spring.sql.init.mode=always
spring.jpa.defer-datasource-initialization=true
spring.profiles.include=dev
csv.file.path=/home/ubuntu/repository/daegu-hackathon-be/src/main/resources/csvfile.csv
#csv.file.path=src/main/resources/csvfile.csv
File renamed without changes.