revert: restore MorphMany.py to original implementation

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: tmgbedu

fastapi_startkit/src/fastapi_startkit/masoniteorm/models/model.py

@@ -1,16 +1,17 @@
 from __future__ import annotations
-import inflection
 
 from typing import TYPE_CHECKING
 
+import inflection
+
 from fastapi_startkit.carbon import Carbon
 from fastapi_startkit.masoniteorm.collection import Collection
-from fastapi_startkit.masoniteorm.models.fields import CreatedAtField, UpdatedAtField
-from fastapi_startkit.masoniteorm.models.registry import Registry
-from fastapi_startkit.masoniteorm.observers import ObservesEvents
 from fastapi_startkit.masoniteorm.connections.manager import DatabaseManager
 from fastapi_startkit.masoniteorm.models.attribute import Attribute
+from fastapi_startkit.masoniteorm.models.fields import CreatedAtField, UpdatedAtField
+from fastapi_startkit.masoniteorm.models.registry import Registry
 from fastapi_startkit.masoniteorm.models.relationship import Relationship
+from fastapi_startkit.masoniteorm.observers import ObservesEvents
 
 if TYPE_CHECKING:
     from fastapi_startkit.masoniteorm.models.builder import QueryBuilder
@@ -131,6 +132,14 @@ async def all(cls):
     async def count(cls, column: str = "*"):
         return await cls.query().count(column)
 
+    def table(self, table: str):
+        self.__table__ = table
+        return self
+
+    def timestamps(self, timestamps: bool = True):
+        self.__timestamps__ = timestamps
+        return self
+
     def set_connection(self, connection: str):
         self.connection = connection
 

fastapi_startkit/src/fastapi_startkit/masoniteorm/relationships/MorphMany.py

@@ -18,12 +18,9 @@ def set_keys(self, owner, attribute):
         return self
 
     def __get__(self, instance, owner):
-        if instance is None:
-            return self
-
         attribute = self.fn.__name__
-        self._related_builder = instance.get_builder()
-        self.polymorphic_builder = self.fn(self).query()
+        self._related_builder = instance.builder
+        self.polymorphic_builder = self.fn(self)()
         self.set_keys(owner, self.fn)
 
         if not instance.is_loaded():
@@ -35,7 +32,8 @@ def __get__(self, instance, owner):
         return self.apply_query(self._related_builder, instance)
 
     def __getattr__(self, attribute):
-        return getattr(self.fn(self).query(), attribute)
+        relationship = self.fn(self)()
+        return getattr(relationship.builder, attribute)
 
     def apply_query(self, builder, instance):
         """Apply the query and return a dictionary to be hydrated
@@ -47,7 +45,7 @@ def apply_query(self, builder, instance):
         Returns:
             dict -- A dictionary of data which will be hydrated.
         """
-        polymorphic_key = self.get_record_key_lookup(instance)
+        polymorphic_key = self.get_record_key_lookup(builder._model)
         polymorphic_builder = self.polymorphic_builder
         return (
             polymorphic_builder.where(self.morph_key, polymorphic_key)
@@ -117,7 +115,13 @@ def morph_map(self):
         return registry.Registry.get_morph_map()
 
     def get_record_key_lookup(self, relation):
-        morph_name = registry.Registry._reverse_map.get(relation.__class__)
-        if morph_name is None:
+        record_type = None
+        for record_type_loop, model in self.morph_map().items():
+            if model == relation.__class__:
+                record_type = record_type_loop
+                break
+
+        if not record_type:
             raise ValueError(f"Could not find the record type key for the {relation} class")
-        return morph_name
+
+        return record_type

fastapi_startkit/tests/masoniteorm/sqlite/relationships/test_morph_many.py

@@ -5,13 +5,9 @@
 from ..test_case import TestCase
 
 
-def likes(self):
-    return Like
-
-
 class ArticleModel(Model):
     __table__ = "articles"
-    likes = MorphMany(likes, morph_key="likeable_type", morph_id="likeable_id")
+    likes: list[Like] = MorphMany('Like', morph_key="likeable_type", morph_id="likeable_id")
 
 
 Registry.morph_map({"article": ArticleModel, "product": Product})
@@ -28,32 +24,26 @@ async def asyncSetUp(self):
             }
         )
 
-    async def test_morph_many_init_stores_keys(self):
-        rel = MorphMany(likes, morph_key="likeable_type", morph_id="likeable_id")
-        self.assertEqual(rel.morph_key, "likeable_type")
-        self.assertEqual(rel.morph_id, "likeable_id")
-        self.assertEqual(rel.fn, likes)
-
     async def test_morph_many_set_keys_defaults(self):
-        rel = MorphMany(likes)
+        rel = MorphMany('Like')
         rel.set_keys(None, None)
         self.assertEqual(rel.morph_key, "record_type")
         self.assertEqual(rel.morph_id, "record_id")
 
     async def test_morph_many_set_keys_keeps_existing(self):
-        rel = MorphMany(likes, morph_key="likeable_type", morph_id="likeable_id")
+        rel = MorphMany('Like', morph_key="likeable_type", morph_id="likeable_id")
         rel.set_keys(None, None)
         self.assertEqual(rel.morph_key, "likeable_type")
         self.assertEqual(rel.morph_id, "likeable_id")
 
     async def test_morph_map_returns_registry(self):
-        rel = MorphMany(likes, morph_key="likeable_type", morph_id="likeable_id")
+        rel = MorphMany('Like', morph_key="likeable_type", morph_id="likeable_id")
         morph_map = rel.morph_map()
         self.assertIn("article", morph_map)
         self.assertIn("product", morph_map)
 
     async def test_get_record_key_lookup_returns_key(self):
-        rel = MorphMany(likes, morph_key="likeable_type", morph_id="likeable_id")
+        rel = MorphMany('Like', morph_key="likeable_type", morph_id="likeable_id")
         key = rel.get_record_key_lookup(self.article)
         self.assertEqual(key, "article")
 

fastapi_startkit/tests/masoniteorm/sqlite/relationships/test_morph_to_many.py

@@ -63,7 +63,6 @@ async def test_morph_map_uses_registry(self):
         self.assertIn("product_m2m", morph_map)
 
     async def test_apply_query_resolves_article(self):
-        from fastapi_startkit.masoniteorm.models.model import Model as BaseModel
 
         like = await LikeModelMorphToMany.create({"likeable_type": "article_m2m", "likeable_id": self.article.id})
         like_loaded = await LikeModelMorphToMany.where("id", like.id).first()