Merge pull request #251 from MasoniteFramework/fix/248

Fix/248

Author: josephmancuso

src/masoniteorm/relationships/BelongsTo.py

@@ -35,7 +35,7 @@ def get_related(self, relation, eagers=()):
         if isinstance(relation, Collection):
             return builder.where_in(
                 f"{builder.get_table_name()}.{self.foreign_key}",
-                relation.pluck(self.local_key),
+                relation.pluck(self.local_key).unique(),
             ).get()
         else:
             return builder.where(
@@ -45,7 +45,7 @@ def get_related(self, relation, eagers=()):
 
     def register_related(self, key, model, collection):
         related = collection.where(
-            self.foreign_key, model.get_primary_key_value()
+            self.foreign_key, getattr(model, self.local_key)
         ).first()
 
         model.add_relation({key: related or None})

src/masoniteorm/relationships/HasMany.py

@@ -26,7 +26,7 @@ def get_related(self, relation, eagers=[]):
         if isinstance(relation, Collection):
             return builder.where_in(
                 f"{builder.get_table_name()}.{self.foreign_key}",
-                relation.pluck(self.local_key),
+                relation.pluck(self.local_key).unique(),
             ).get()
         else:
             return builder.where(

tests/collection/test_collection.py

@@ -298,6 +298,8 @@ def test_unique(self):
             ],
         )
 
+        self.assertEqual(collection.pluck('name').unique().all(), ["Corentin All"])
+
     def test_transform(self):
         collection = Collection([1, 1, 2, 3, 4])
         collection.transform(lambda x: x * 2)