Revert "Merge branch 'master' into 'vegetarian_meal'"
This reverts commit b3eeffdb32aa058f9f1aa6b9cbec3d05e2d07b8f
This commit is contained in:
@@ -1,12 +1,10 @@
|
||||
package greenify.server.data.repository;
|
||||
|
||||
import greenify.server.data.model.User;
|
||||
import org.springframework.data.repository.CrudRepository;
|
||||
import org.springframework.data.repository.query.Param;
|
||||
import greenify.server.data.model.User;
|
||||
|
||||
public interface UserRepository extends CrudRepository<User, Integer> {
|
||||
User findByName(@Param("name") String name);
|
||||
// User findByName(String name);
|
||||
User findByName(String name);
|
||||
<T extends User> T save(T user);
|
||||
}
|
||||
|
||||
|
||||
@@ -32,7 +32,6 @@ public class UserService {
|
||||
return new UserDTO(user.getId(), user.getName());
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* logs the user in.
|
||||
* @param name the username of the user
|
||||
|
||||
Reference in New Issue
Block a user