diff --git a/src/main/java/com/codesdream/ase/repository/activity/ActivityRepository.java b/src/main/java/com/codesdream/ase/repository/activity/ActivityRepository.java index aa5ea5b..4220280 100644 --- a/src/main/java/com/codesdream/ase/repository/activity/ActivityRepository.java +++ b/src/main/java/com/codesdream/ase/repository/activity/ActivityRepository.java @@ -14,7 +14,9 @@ import java.util.Optional; @Repository public interface ActivityRepository extends JpaRepository { - Optional findByTitle(String Title); + Optional findActivityByTitleAndType(String title,String type); + + Optional findActivityByTitle(String title); Optional findByCreator(String creatorName); diff --git a/src/main/java/com/codesdream/ase/service/UserService.java b/src/main/java/com/codesdream/ase/service/UserService.java index 29b70fa..698a54e 100644 --- a/src/main/java/com/codesdream/ase/service/UserService.java +++ b/src/main/java/com/codesdream/ase/service/UserService.java @@ -20,16 +20,16 @@ import java.util.*; @Service public class UserService implements IUserService { @Resource - UserFunctionsListGenerator userFunctionsListGenerator; + private UserFunctionsListGenerator userFunctionsListGenerator; @Resource - UserRepository userRepository; + private UserRepository userRepository; @Resource - ASEPasswordEncoder passwordEncoder; + private ASEPasswordEncoder passwordEncoder; @Resource - ASEUsernameEncoder usernameEncoder; + private ASEUsernameEncoder usernameEncoder; @Override public List findAll() {