Revert "Merge branch 'master' into 'vegetarian_meal'"

This reverts commit b3eeffdb32aa058f9f1aa6b9cbec3d05e2d07b8f
This commit is contained in:
Ceren Ugurlu
2019-03-17 13:24:32 +00:00
parent fb6dfcdd20
commit c23344e8ef
70 changed files with 10 additions and 4437 deletions

View File

@@ -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);
}

View File

@@ -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