Skip to content
Snippets Groups Projects
Commit a5c3ca25 authored by Birk Øvstetun Narvhus's avatar Birk Øvstetun Narvhus
Browse files

fixed the test for repository, and the jpa command

parent d473eb6f
No related branches found
No related tags found
No related merge requests found
......@@ -30,7 +30,7 @@ public interface ShoppingListRepository extends JpaRepository<ShoppingList, Long
* @param username the username of the user
* @return a list of shopping lists
*/
List<ShoppingList> findAllByGroupUsersUsername(String username);
List<ShoppingList> findAllByGroupUserUserUsername(String username);
}
......@@ -113,7 +113,7 @@ public class ShoppingListService {
* @return true if user is in shoppinglist, false if not
*/
public boolean isUserInShoppinglist(long id, String name) {
return shoppingListRepository.findAllByGroupUsersUsername(name).stream()
return shoppingListRepository.findAllByGroupUserUserUsername(name).stream()
.anyMatch(shoppingList -> shoppingList.getShoppingListID() == id);
}
......
......@@ -6,6 +6,9 @@ import java.util.List;
import java.util.Optional;
import ntnu.idatt2016.v233.SmartMat.entity.group.Group;
import ntnu.idatt2016.v233.SmartMat.entity.group.UserGroupAsso;
import ntnu.idatt2016.v233.SmartMat.entity.group.UserGroupId;
import ntnu.idatt2016.v233.SmartMat.entity.user.User;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
......@@ -96,4 +99,54 @@ public class ShoppingListRepositoryTest {
List<ShoppingList> shoppingLists = shoppingListRepository.findAll();
assertEquals(2, shoppingLists.size());
}
@Test
void getbyusername(){
Group group = Group.builder()
.build();
ShoppingList shoppingList1 = ShoppingList.builder()
.group(group)
.build();
Group group2 = Group.builder()
.build();
ShoppingList shoppingList2 = ShoppingList.builder()
.group(group2)
.build();
User user = User.builder()
.username("username")
.password("password")
.build();
entityManager.persist(user);
entityManager.persist(group);
group.addUser(UserGroupAsso.builder()
.id(new UserGroupId(user.getUsername(), group.getGroupId()))
.group(group)
.user(user)
.build());
shoppingListRepository.save(shoppingList1);
shoppingListRepository.save(shoppingList2);
List<ShoppingList> shoppingLists = shoppingListRepository.findAll();
assertEquals(2, shoppingLists.size());
List<ShoppingList> shoppingListsByUsername = shoppingListRepository
.findAllByGroupUserUserUsername(user.getUsername());
assertEquals(1, shoppingListsByUsername.size());
ShoppingList tempShoppingList = shoppingListsByUsername.get(0);
assertEquals(group.getGroupId(), tempShoppingList.getGroup().getGroupId());
}
}
......@@ -99,7 +99,7 @@ class ShoppingListServiceTest {
.build());
when(shoppingListRepository.findAllByGroupUsersUsername(user.getUsername()))
when(shoppingListRepository.findAllByGroupUserUserUsername(user.getUsername()))
.thenReturn(List.of(shoppingList));
boolean result = shoppingListService.isUserInShoppinglist(
......@@ -108,6 +108,6 @@ class ShoppingListServiceTest {
assertTrue(result);
verify(shoppingListRepository, times(1))
.findAllByGroupUsersUsername(user.getUsername());
.findAllByGroupUserUserUsername(user.getUsername());
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment