Merge branch 'refs/heads/feature/ISSUE-100' into staging

# Conflicts:
#	Pipfile.lock

Pipfile

@@ -21,7 +21,6 @@ schedule = "*"
 feedparser = "*"
 numpy = "*"
 pandas = "*"
-lightfm = "*"
 langchain = "*"
 chromadb = "*"
 langchain-community = "*"
@@ -31,6 +30,7 @@ tiktoken = "*"
 langchain-openai = "*"
 langchain-google-community = "*"
 wikipedia-api = "*"
+plotly = "*"
 
 [dev-packages]
 flake8 = "*"

app/model/article_model.py

@@ -4,3 +4,5 @@
 class ArticleResponse(BaseModel):
     title: str
     content: str
+    pub_date: str
+    image_url: str

app/model/crawled_article.py

@@ -22,6 +22,8 @@ class Articles(Base):
     phrase = Column(JSONB, nullable=True)
     comment = Column(Text, nullable=True)
     category = Column(CHAR(255), nullable=True)
+    published_at = Column(DateTime, nullable=True)
+    image_url = Column(String, nullable=True)
     probability_issue_finder = Column(Integer, nullable=True)
     probability_lifestyle_consumer = Column(Integer, nullable=True)
     probability_entertainer = Column(Integer, nullable=True)

app/model/user_type.py

@@ -7,6 +7,7 @@
 
 class UserType(Base):
     __tablename__ = "user_type"
+    __table_args__ = {"schema": "gyeongdan"}
 
     user_id = Column(BigInteger, primary_key=True, index=True)
     user_type_issue_finder = Column(Integer, nullable=True)
@@ -17,9 +18,9 @@ class UserType(Base):
 
 
 class UserTypes(Enum):
-    NONE: -1
-    ISSUE_FINDER: 0
-    LIFESTYLE_CONSUMER: 1
-    ENTERTAINER: 2
-    TECH_SEPCIALIST: 3
-    PROFESSIONALS: 4
+    NONE= -1
+    ISSUE_FINDER= 0
+    LIFESTYLE_CONSUMER= 1
+    ENTERTAINER= 2
+    TECH_SEPCIALIST= 3
+    PROFESSIONALS= 4