Offline first

src/climbingAPI/app/models/ascent/ascent_model.py

@@ -1,15 +1,12 @@
 from datetime import date, datetime
 from pydantic import BaseModel, Field
-from bson import ObjectId
 from typing import List
 
-from app.models.py_object_id import PyObjectId
-
 
 class AscentModel(BaseModel):
     updated: datetime
     media_ids: List[str] = []
-    ascent_id: PyObjectId = Field(default_factory=PyObjectId, alias="_id")
+    ascent_id: str = Field(default_factory=str, alias="_id")
     user_id: str = Field(...)
 
     comment: str = Field(...)
@@ -20,7 +17,6 @@ class AscentModel(BaseModel):
     class Config:
         allow_population_by_field_name = True
         arbitrary_types_allowed = True
-        json_encoders = {ObjectId: str}
         schema_extra = {
             "example": {
                 "updated": "2022-10-06T20:13:16.816000",

src/climbingAPI/app/models/ascent/create_ascent_model.py

@@ -1,10 +1,7 @@
 from datetime import date
 from pydantic import BaseModel, Field
-from bson import ObjectId
 from typing import List, Optional
 
-from app.models.py_object_id import PyObjectId
-
 
 class CreateAscentModel(BaseModel):
     comment: Optional[str]
@@ -15,7 +12,6 @@ class CreateAscentModel(BaseModel):
     class Config:
         allow_population_by_field_name = True
         arbitrary_types_allowed = True
-        json_encoders = {ObjectId: str}
         schema_extra = {
             "example": {
                 "comment": "Great ascent",

src/climbingAPI/app/models/ascent/update_ascent_model.py

@@ -1,7 +1,5 @@
-from datetime import date
 from pydantic import BaseModel
-from bson import ObjectId
-from typing import Optional, List
+from typing import Optional
 
 
 class UpdateAscentModel(BaseModel):
@@ -13,7 +11,6 @@ class UpdateAscentModel(BaseModel):
 
     class Config:
         arbitrary_types_allowed = True
-        json_encoders = {ObjectId: str}
         schema_extra = {
             "example": {
                 "media_ids": [],

src/climbingAPI/app/models/grade.py

@@ -1,8 +1,4 @@
-from bson import ObjectId
-from datetime import date
 from pydantic import BaseModel, Field
-from typing import List
-
 from .grading_system import GradingSystem
 
 
@@ -13,7 +9,6 @@ class Grade(BaseModel):
     class Config:
         allow_population_by_field_name = True
         arbitrary_types_allowed = True
-        json_encoders = {ObjectId: str}
         schema_extra = {
             "example": {
                 "grade": "5a",

src/climbingAPI/app/models/id_with_datetime.py

@@ -1,18 +1,14 @@
 from datetime import datetime
 from pydantic import BaseModel, Field
-from bson import ObjectId
-
-from app.models.py_object_id import PyObjectId
 
 
 class IdWithDatetime(BaseModel):
     updated: datetime
-    a_id: PyObjectId = Field(default_factory=PyObjectId, alias="_id")
+    a_id: str = Field(default_factory=str, alias="_id")
 
     class Config:
         allow_population_by_field_name = True
         arbitrary_types_allowed = True
-        json_encoders = {ObjectId: str}
         schema_extra = {
             "example": {
                 "updated": "2022-10-06T20:13:16.816000",

src/climbingAPI/app/models/medium/medium_model.py

@@ -0,0 +1,24 @@
+from datetime import datetime
+from pydantic import BaseModel, Field
+from typing import List
+
+
+class MediumModel(BaseModel):
+    created_at: datetime
+    medium_id: str = Field(default_factory=str, alias="_id")
+    user_id: str = Field(...)
+    title: str = Field(...)
+    image: List[int] = []
+
+    class Config:
+        allow_population_by_field_name = True
+        arbitrary_types_allowed = True
+        schema_extra = {
+            "example": {
+                "created_at": "2022-10-06T20:13:16.816000",
+                "_id": "",
+                "user_id": "",
+                "title": "trip.jpg",
+                "image": [],
+            }
+        }

src/climbingAPI/app/models/medium/small_medium_model.py

@@ -0,0 +1,22 @@
+from datetime import datetime
+from pydantic import BaseModel, Field
+from typing import List
+
+
+class SmallMediumModel(BaseModel):
+    created_at: datetime
+    medium_id: str = Field(default_factory=str, alias="_id")
+    user_id: str = Field(...)
+    title: str = Field(...)
+
+    class Config:
+        allow_population_by_field_name = True
+        arbitrary_types_allowed = True
+        schema_extra = {
+            "example": {
+                "created_at": "2022-10-06T20:13:16.816000",
+                "_id": "",
+                "user_id": "",
+                "title": "trip.jpg",
+            }
+        }

src/climbingAPI/app/models/multi_pitch_route/create_multi_pitch_route_model.py

@@ -1,17 +1,10 @@
-from datetime import date
-from pydantic import BaseModel, Field
-from bson import ObjectId
-from typing import List, Optional
-
-from app.models.py_object_id import PyObjectId
 from app.models.route.create_route_model import CreateRouteModel
 
 
 class CreateMultiPitchRouteModel(CreateRouteModel):
     class Config:
         allow_population_by_field_name = True
         arbitrary_types_allowed = True
-        json_encoders = {ObjectId: str}
         schema_extra = {
             "example": {
                 "comment": "Top Route",

src/climbingAPI/app/models/multi_pitch_route/multi_pitch_route_model.py

@@ -1,18 +1,13 @@
-from pydantic import Field
-from bson import ObjectId
 from typing import List
-
-from app.models.py_object_id import PyObjectId
 from app.models.route.route_model import RouteModel
 
 
 class MultiPitchRouteModel(RouteModel):
-    pitch_ids: List[PyObjectId] = []
+    pitch_ids: List[str] = []
 
     class Config:
         allow_population_by_field_name = True
         arbitrary_types_allowed = True
-        json_encoders = {ObjectId: str}
         schema_extra = {
             "example": {
                 "updated": "2022-10-06T20:13:16.816000",

src/climbingAPI/app/models/multi_pitch_route/update_multi_pitch_route_model.py

@@ -1,8 +1,4 @@
-from datetime import date
-from pydantic import BaseModel
-from bson import ObjectId
-from typing import Optional, List
-
+from typing import Optional
 from app.models.route.update_route_model import UpdateRouteModel
 
 
@@ -11,7 +7,6 @@ class UpdateMultiPitchRouteModel(UpdateRouteModel):
 
     class Config:
         arbitrary_types_allowed = True
-        json_encoders = {ObjectId: str}
         schema_extra = {
             "example": {
                 "media_ids": [],

src/climbingAPI/app/models/pitch/create_pitch_model.py

@@ -1,10 +1,5 @@
-from bson import ObjectId
-from datetime import date
 from pydantic import BaseModel, Field
-from typing import List, Optional
-
-from app.models.py_object_id import PyObjectId
-
+from typing import Optional
 from ..grade import Grade
 
 
@@ -19,7 +14,6 @@ class CreatePitchModel(BaseModel):
     class Config:
         allow_population_by_field_name = True
         arbitrary_types_allowed = True
-        json_encoders = {ObjectId: str}
         schema_extra = {
             "example": {
                 "comment": "Top Pitch",