diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/repository/ShoppingListRepository.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/repository/ShoppingListRepository.java
index dcc5f416bcdf706f01539469b1c678f12c3d66b4..b4dfbe259e81c36e2a8bfbd9170f9b7945d6d9d6 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/repository/ShoppingListRepository.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/repository/ShoppingListRepository.java
@@ -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);
 
 
 }
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/service/ShoppingListService.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/service/ShoppingListService.java
index 6f1f69f39d2c953e1e84c2c4bd994a52ee1f6a51..d77c53a8398e9d2689cad058678032d38595c7a0 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/service/ShoppingListService.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/service/ShoppingListService.java
@@ -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);
 
     }
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/ShoppingListRepositoryTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/ShoppingListRepositoryTest.java
index 0a9c74ca48672e56d6bdbbac4382ca2af4b1fe7a..a379523dff34f9c5189f923f6b0b70b601babf19 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/ShoppingListRepositoryTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/ShoppingListRepositoryTest.java
@@ -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());
+
+
+
+    }
 }
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/service/ShoppingListServiceTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/service/ShoppingListServiceTest.java
index 6ff1845b4a1c90bd5edb58a2c2633391e3069a49..954761ab742f9c055b1540fa3a154d2b5e3f33cb 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/service/ShoppingListServiceTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/service/ShoppingListServiceTest.java
@@ -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());
     }
 }