Add GeoKrety-Type

Author: kumy

geokrety_api_models/__init__.py

@@ -2,6 +2,7 @@
 
 from .badge import Badge
 from .geokret import Geokret
+from .geokrety_type import GeokretyType
 from .move import Move
 from .move_comment import MoveComment
 from .news import News
@@ -12,6 +13,7 @@
 __all__ = [
     "Badge",
     "Geokret",
+    "GeokretyType",
     "Move",
     "MoveComment",
     "News",

geokrety_api_models/geokret.py

@@ -47,12 +47,18 @@ class Geokret(Base):
         nullable=False,
         default='',
     )
-    type = Column(
+    type_id = Column(
         'typ',
         Enum('0', '1', '2', '3', '4'),
+        ForeignKey('gk-geokrety-types.id'),
         key='type',
         nullable=False,
     )
+    type = relationship(
+        "GeokretyType",
+        foreign_keys=[type_id],
+    )
+
     missing = Column(
         'missing',
         Boolean,

geokrety_api_models/geokrety_type.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+
+from .base import Base
+from sqlalchemy import (Column, String)
+
+
+class GeokretyType(Base):
+    __tablename__ = 'gk-geokrety-types'
+
+    id = Column(
+        'id',
+        String(1),
+        primary_key=True,
+        key='id',
+    )
+
+    name = Column(
+        'name',
+        String(75),
+        key='name',
+        nullable=False,
+    )

tests/__init__.py

@@ -7,6 +7,8 @@
 
 from geokrety_api_models.base import Base
 from .mixins.responses_mixin import ResponsesMixin
+from geokrety_api_models.utilities.const import GEOKRET_TYPES_TEXT
+from geokrety_api_models import GeokretyType
 
 
 def setup_module():
@@ -33,6 +35,9 @@ def setUp(self):
         super(DatabaseTest, self).setUp()
         self.__transaction = connection.begin_nested()
         self.session = Session(connection)
+        for (key, val) in GEOKRET_TYPES_TEXT.iteritems():
+            geokret = GeokretyType(id=key, name=val)
+            self.session.add(geokret)
 
         self.mixer = Mixer(session=self.session, commit=True)
 

tests/test_move.py

@@ -13,7 +13,7 @@ class TestMove(DatabaseTest):
     def test_create(self):
         user = User(name="username", password="password", email="[email protected]")
         geokret = Geokret(name="My GeoKret",
-                          type=GEOKRET_TYPE_TRADITIONAL,
+                          type_id=GEOKRET_TYPE_TRADITIONAL,
                           created_on_datetime="2019-01-19T22:46:44")
         move1 = Move(geokret=geokret,
                      moved_on_datetime="2019-01-19T22:46:44",

tests/utilities/test_move_tasks.py

@@ -28,7 +28,7 @@ def _blend(self):
         self.user3 = self.mixer.blend(User)
         self.user4 = self.mixer.blend(User)
 
-        self.geokret1 = self.mixer.blend(Geokret, type=GEOKRET_TYPE_TRADITIONAL,
+        self.geokret1 = self.mixer.blend(Geokret, type_id=GEOKRET_TYPE_TRADITIONAL,
                                          owner=self.user1, holder=self.user1, tracking_code="ABC123",
                                          created_on_datetime="2017-12-01T14:18:22")