fix merge conflict

src/template_project/adapters/data_gateways/tables.py

@@ -70,6 +70,34 @@ class StringArrayType(TypeDecorator[list[str]]):
         return []
 
 
+class ExperienceTypeType(TypeDecorator[ExperienceType]):
+    impl: Any = String
+    cache_ok: bool | None = True
+
+    @override
+    def process_bind_param(self, value: Any, dialect: Any) -> Any:
+        if value is None:
+            return None
+        if isinstance(value, ExperienceType):
+            return value.value
+        if isinstance(value, str):
+            return value
+        return None
+
+    @override
+    def process_result_value(self, value: Any, dialect: Any) -> ExperienceType:
+        if value is None:
+            raise ValueError("experience_type cannot be None")
+        if isinstance(value, ExperienceType):
+            return value
+        if isinstance(value, str):
+            try:
+                return ExperienceType(value)
+            except ValueError:
+                raise ValueError(f"Invalid experience_type value: {value}")
+        raise ValueError(f"Cannot convert {type(value)} to ExperienceType")
+
+
 user_table: Final = Table(
     "users",
     meta_data,
@@ -138,7 +166,7 @@ resume_table: Final = Table(
     Column("location", String, nullable=False),
     Column("about_me", String, nullable=False),
     Column("key_skills", StringArrayType(), nullable=False, server_default=text("'[]'::jsonb")),
-    Column("experience_type", String, nullable=False),
+    Column("experience_type", ExperienceTypeType(), nullable=False),
     Column("down_resume_id", UUID, ForeignKey("resume.id", ondelete="CASCADE"), nullable=True, default=None),
     Column("up_resume_id", UUID, ForeignKey("resume.id", ondelete="CASCADE"), nullable=True, default=None),
 )
@@ -241,6 +269,7 @@ mapper_registry.map_imperatively(
     resume_table,
     properties={
         "key_skills": resume_table.c.key_skills,
+        "experience_type": resume_table.c.experience_type,
     },
 )
 mapper_registry.map_imperatively(ResumeEmbedding, resume_embedding_table)