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.

Sign up for GitHub

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

MyPage_Error_Fixed #25

Merged
merged 3 commits into from
Nov 22, 2024
+14 −14
Merged

MyPage_Error_Fixed #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b603fe1
files modified
RudyLuvIt Nov 22, 2024
2464c46
files modified
RudyLuvIt Nov 22, 2024
d6e3b48
Merged dev
RudyLuvIt Nov 22, 2024
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 added .DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added src/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added src/main/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added src/main/java/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added src/main/java/com/.DS_Store
View file
Open in desktop
Binary file not shown.
9 changes: 0 additions & 9 deletions src/main/java/com/alom/dorundorunbe/domain/Achievement/domain/AchievementRepository.java
View file
Open in desktop

This file was deleted.

9 changes: 9 additions & 0 deletions src/main/java/com/alom/dorundorunbe/domain/Achievement/domain/UserAchievementRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package com.alom.dorundorunbe.domain.Achievement.domain;

import org.springframework.data.jpa.repository.JpaRepository;

import java.util.List;

public interface UserAchievementRepository extends JpaRepository<UserAchievement, Long> {
List<UserAchievement> findAllByUserName(String name);
}
10 changes: 5 additions & 5 deletions src/main/java/com/alom/dorundorunbe/domain/mypage/service/MyPageService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package com.alom.dorundorunbe.domain.mypage.service;

import com.alom.dorundorunbe.domain.Achievement.domain.UserAchievementRepository;
import com.alom.dorundorunbe.domain.RunningRecord.domain.RunningRecord;
import com.alom.dorundorunbe.domain.Achievement.domain.AchievementRepository;
import com.alom.dorundorunbe.domain.Achievement.domain.UserAchievement;
import com.alom.dorundorunbe.domain.RunningRecord.repository.RunningRecordRepository;
import com.alom.dorundorunbe.domain.Achievement.domain.UserAchievement;
import com.alom.dorundorunbe.domain.user.domain.User;
import com.alom.dorundorunbe.domain.user.repository.UserRepository;
import com.alom.dorundorunbe.domain.mypage.dto.AchievementResponse;
import com.alom.dorundorunbe.domain.mypage.dto.UserDeleteDTO;
import com.alom.dorundorunbe.domain.mypage.dto.UserPasswordChangeDTO;
import com.alom.dorundorunbe.domain.mypage.dto.UserUpdateDTO;
import com.alom.dorundorunbe.domain.user.repository.UserRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
Expand All @@ -29,7 +29,7 @@ public class MyPageService {
private RunningRecordRepository runningRecordRepository;

@Autowired
private AchievementRepository achievementRepository;
private UserAchievementRepository userAchievementRepository;

public List<RunningRecord> getRunningRecords(String username) {
Optional<User> userOpt = userRepository.findByName(username);
Expand All @@ -42,7 +42,7 @@ public List<RunningRecord> getRunningRecords(String username) {
else return null;
}
public List<AchievementResponse> getAchievements(String username) {
List<UserAchievement> userAchievements = achievementRepository.findAllByName(username);
List<UserAchievement> userAchievements = userAchievementRepository.findAllByUserName(username);
List<AchievementResponse> achievementResponses = userAchievements.stream()
.map(ua->new AchievementResponse(
ua.getAchievement().getId(),
Expand Down