From d82340bcb1e6960a09f730d18b409fa098659115 Mon Sep 17 00:00:00 2001
From: collerek <collerek@gmail.com>
Date: Tue, 11 Aug 2020 18:11:34 +0200
Subject: [PATCH] refactors in foreign key

---
 .coverage                 | Bin 53248 -> 53248 bytes
 orm/__init__.py           |   2 +-
 orm/fields/foreign_key.py |  51 ++++++++++++++++++++++++--------------
 3 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/.coverage b/.coverage
index 52c345a480d2a4921903b810f9d261a68e88c907..105fceb53d64948024e1f0c6aae03edf3748d6b8 100644
GIT binary patch
delta 914
zcmYjOZAepL6ux)wy_<Kt_kHh0`?A86vb0cfn%aj!e`A|J1b<|%RVtx#(JZm8&3+X`
z5#AzVZSzl1K@^N!+O+;eL99ViW^21aq-42kNiLn+?OkOEFPw9p^E~G~hqrG4^bLRq
z`f_#ct_u7Db>;8*HM1}T&qFh;hFUJp-RA7vE>6e34hZ~hmaY*1aY}q@TrEB^=|qzu
zkKzGgSq7lhcC5A2UUs6l2Cd`;F%JU5y37-24Lr$-q_Ij>%8Cu9b$FVZv$uA4AMa|<
z%1d<ph7x+477$HXlP@+J^|U_c?}S1Tnh;&70YnGx6^i$ah*XOs#_i%p(~tGv;Rw6{
z55t{Mhu&}!y2ah$y1CsP%Z}j-?y#U1oDvJoYySDqrGzqISq8ZO{`r-(pdpt+RlvGT
z!}bvg`&+8<4JLDb);znyJS!^ArIfA&G-1Jdv9YBJ{1q2vol`k_(19C8*f^v#JHVlA
zK^?K!TLby#=}pA~Y$nhGnnrOnhF+im8bFs(BcfmePQrKaKD-9)uo)jy3Eis%iez>O
z!=4&B)EjZsD}LLo(<^V{F}$BoOokn<%pNHyJA0;rv8dA%iP&5VpFJ|U7GXvu8h)un
zlwUXJq{+!T$Naa6z!cgFai;+$!k%QPcgpLZnsZC9lyr3It9N&D-lxRs6z@{3H|1nG
z%1tu)T)f&AuN$(cS*(MsHcy9Rsm}Fm$vPx`Nt=6=Gs@r=qn0L_a~rg(kE2Vb`qaow
z{Ql|o17{Pdvrla9hjQYlERRXHXgW0WIGNUuXWn=}nH8Vxm|pCeP@*wu)Rl-h+?fxt
z(NyEY=cBNe!COwc8JBe3w($L6=8~i|`@&s`=+(7-a!0`-sU}*SloP=&Ihb6WnK!+S
z&yVkorIW5yJ)eW6MLB~XI(K@)ZGnl-E<uBl&6@Ym{NLO?$-#rqFB@~!7}}=3`zTeN
z8uvx_%A<<Elc6z~M?)gxW~gjhMzyuIskH#-tAUzGD+Qbi=NnYR;n2Q)l1$Si#V}B%
iB?v-57e&pL0t)q`i}>>_2xeE1g77EseBg$^z2Y}gx@Ext

delta 627
zcmYk1KWGzC9LHboy?b|;d++@&CbZB{HJO?;T-9rgcIx2hU6(>F*!+{E*is`6Me3lz
zMbV}9O%cH^1sxP6;1ER-aZzzlx;SVz?N}#Wtna8Coxb1q;meQr>1^Q627c;|(b7cm
z_(ZXHdhDw+_*1+PH$_Dh`5u4I@A5j&vA^tdFX237T0SAS{ZZmzG%Mc(LoydIy#yGo
zsMmmeJ!Q+^XH!IAREt2>*R8gDd9}n3&Z>TjFpQR>S=V=njZrHCpL|CjiDNXQ$dH^4
zJne)jUj-g9Fq%^=!|JtmLml?${+*0`9Dp32`jvhuZiyXH6(`vqY_Tt}DG>j_*ZBpW
zR~nC){605I5_vo;GnI7cK%7%}MLh=pD<lcHxE2AWV1^3f;Hv5;2_MHx(W>hMVMW}E
zfHEL<4$ml%meb{N?BPY#v(RiUH!jX!sw_5E)m2mOmJ7t#Ka~w7dc&0;N3#G62>!q>
z?7%nJg17JlHsL<3!)>?$S78|zl*}2pPJzTM0evdM6fWgq@;+r@GMCz6+GR7Y@=#pc
z7KWvoV_mBlW?0O7IBBRdV&t#Hnz2dLseN?N8gZzCS^E5ZVc^cY`m=Kd*U-bgu1#7*
pl@w_<oAfZnstZi17N*wMW5iM!M+gCQrLlHI{j&|d?t}Sb{{RA(rUd{1

diff --git a/orm/__init__.py b/orm/__init__.py
index bcc1d9c..2cf9401 100644
--- a/orm/__init__.py
+++ b/orm/__init__.py
@@ -6,13 +6,13 @@ from orm.fields import (
     DateTime,
     Decimal,
     Float,
+    ForeignKey,
     Integer,
     JSON,
     String,
     Text,
     Time,
 )
-from orm.fields.foreign_key import ForeignKey
 from orm.models import Model
 
 __version__ = "0.0.1"
diff --git a/orm/fields/foreign_key.py b/orm/fields/foreign_key.py
index 506a9ac..b5659b4 100644
--- a/orm/fields/foreign_key.py
+++ b/orm/fields/foreign_key.py
@@ -1,4 +1,4 @@
-from typing import Any, List, Optional, TYPE_CHECKING, Type, Union
+from typing import Any, List, Optional, TYPE_CHECKING, Tuple, Type, Union
 
 import sqlalchemy
 from pydantic import BaseModel
@@ -49,6 +49,28 @@ class ForeignKey(BaseField):
         to_column = self.to.__model_fields__[self.to.__pkname__]
         return to_column.get_column_type()
 
+    def extract_model_from_sequence(
+        self, value: Any, child: "Model"
+    ) -> Tuple[Union["Model", List["Model"]], bool]:
+        if isinstance(value, list) and not isinstance(value, self.to):
+            model = [self.expand_relationship(val, child) for val in value]
+            return model, True
+
+        if isinstance(value, self.to):
+            model = value
+        else:
+            model = self.to(**value)
+        return model, False
+
+    def construct_model_from_pk(self, value: Any) -> "Model":
+        if not isinstance(value, self.to.pk_type()):
+            raise RelationshipInstanceError(
+                f"Relationship error - ForeignKey {self.to.__name__} "
+                f"is of type {self.to.pk_type()} "
+                f"while {type(value)} passed as a parameter."
+            )
+        return create_dummy_instance(fk=self.to, pk=value)
+
     def expand_relationship(
         self, value: Any, child: "Model"
     ) -> Optional[Union["Model", List["Model"]]]:
@@ -56,31 +78,22 @@ class ForeignKey(BaseField):
         if value is None:
             return None
 
+        is_sequence = False
+
         if isinstance(value, orm.models.Model) and not isinstance(value, self.to):
             raise RelationshipInstanceError(
                 f"Relationship error - expecting: {self.to.__name__}, "
                 f"but {value.__class__.__name__} encountered."
             )
 
-        if isinstance(value, list) and not isinstance(value, self.to):
-            model = [self.expand_relationship(val, child) for val in value]
-            return model
-
-        if isinstance(value, self.to):
-            model = value
-        elif isinstance(value, dict):
-            model = self.to(**value)
+        if isinstance(value, (dict, list, self.to)):
+            model, is_sequence = self.extract_model_from_sequence(value, child)
         else:
-            if not isinstance(value, self.to.pk_type()):
-                raise RelationshipInstanceError(
-                    f"Relationship error - ForeignKey {self.to.__name__} "
-                    f"is of type {self.to.pk_type()} "
-                    f"while {type(value)} passed as a parameter."
-                )
-            model = create_dummy_instance(fk=self.to, pk=value)
+            model = self.construct_model_from_pk(value)
 
-        model._orm_relationship_manager.add_relation(
-            model, child, virtual=self.virtual,
-        )
+        if not is_sequence:
+            model._orm_relationship_manager.add_relation(
+                model, child, virtual=self.virtual
+            )
 
         return model