mirror of
https://github.com/pds-nest/nest.git
synced 2024-11-25 14:34:19 +00:00
Add 2 columns to Tweet model
This commit is contained in:
parent
3a8df55178
commit
a155beed4b
2 changed files with 8 additions and 4 deletions
|
@ -84,8 +84,10 @@ class TweetSchema(Schema):
|
||||||
content = fields.String(description="The content of the tweet.")
|
content = fields.String(description="The content of the tweet.")
|
||||||
location = fields.String(description="The location (coordinates) from which the tweet was tweeted.")
|
location = fields.String(description="The location (coordinates) from which the tweet was tweeted.")
|
||||||
place = fields.String(description="The place from which the tweet was tweeted.")
|
place = fields.String(description="The place from which the tweet was tweeted.")
|
||||||
poster = fields.String(default="The one that created the tweet.")
|
poster = fields.String(description="The one that created the tweet.")
|
||||||
insert_time = fields.DateTime(default="The time on which the tweet was captured.")
|
insert_time = fields.DateTime(description="The time on which the tweet was captured.")
|
||||||
|
post_time = fields.DateTime(description="The time on which the tweet was posted.")
|
||||||
|
image_url = fields.String(descritpion="The embedded image urls, separated by |. If there are no images, its None.")
|
||||||
conditions = fields.Nested(ConditionSchema, many=True)
|
conditions = fields.Nested(ConditionSchema, many=True)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -13,11 +13,13 @@ class Tweet(ext.Model):
|
||||||
place = ext.Column(ext.String)
|
place = ext.Column(ext.String)
|
||||||
poster = ext.Column(ext.String)
|
poster = ext.Column(ext.String)
|
||||||
insert_time = ext.Column(ext.DateTime, nullable=False)
|
insert_time = ext.Column(ext.DateTime, nullable=False)
|
||||||
|
post_time = ext.Column(ext.DateTime, nullable=True)
|
||||||
|
image_url = ext.Column(ext.String, nullable=True)
|
||||||
# Relationships
|
# Relationships
|
||||||
repositories = ext.relationship("Composed", back_populates="tweet", cascade="all, delete")
|
repositories = ext.relationship("Composed", back_populates="tweet", cascade="all, delete")
|
||||||
conditions = ext.relationship("Contains", back_populates="tweet", cascade="all, delete")
|
conditions = ext.relationship("Contains", back_populates="tweet", cascade="all, delete")
|
||||||
|
|
||||||
def to_json(self):
|
def to_json(self):
|
||||||
return {"snowflake": self.snowflake, "content": self.content, "location": self.location, "poster": self.poster,
|
return {"snowflake": self.snowflake, "content": self.content, "location": self.location, "poster": self.poster,
|
||||||
"place": self.place, "insert_time": self.insert_time.isoformat(),
|
"place": self.place, "insert_time": self.insert_time.isoformat(), "post_time": self.post_time,
|
||||||
"conditions": [c.condition.to_json() for c in self.conditions]}
|
"image_url": self.image_url, "conditions": [c.condition.to_json() for c in self.conditions]}
|
||||||
|
|
Loading…
Reference in a new issue