aggregate1

app/coordinates.py

@@ -2,7 +2,7 @@
 
 
 class Coordinates:
-    """
+     """
     A position on earth using decimal coordinates (latitude and longitude).
     """
 
@@ -13,11 +13,11 @@ def __init__(self, latitude, longitude):
     def serialize(self):
         """
         Serializes the coordinates into a dict.
-
         :returns: The serialized coordinates.
         :rtype: dict
         """
         return {"latitude": self.latitude, "longitude": self.longitude}
 
     def __str__(self):
         return "lat: %s, long: %s" % (self.latitude, self.longitude)
+© 2021 GitHub, Inc.

app/models.py

@@ -22,40 +22,35 @@ class LatestResponse(BaseModel):
     latest: Latest
 
 
-class Timeline(BaseModel):
-    """
-    Timeline model.
-    """
+class Timeline(basemodel):  
 
-    timeline: Dict[str, int] = {}
+  def __init__(self, timeline):  
 
-    @validator("timeline")
-    @classmethod
-    def sort_timeline(cls, value):
-        """Sort the timeline history before inserting into the model"""
-        return dict(sorted(value.items()))
+   self.timeline = timeline  
 
-    @property
-    def latest(self):
-        """Get latest available history value."""
-        return list(self.timeline.values())[-1] if self.timeline else 0
+
 
-    def serialize(self):
-        """
-        Serialize the model into dict
-        TODO: override dict() instead of using serialize
-        """
-        return {**self.dict(), "latest": self.latest}
+class Timelines(basemodel):  
 
+  def __init__(self, confirmed, deaths, recovered):  
 
-class Timelines(BaseModel):
-    """
-    Timelines model.
-    """
+   self.confirmed = confirmed  
+
+   self.deaths = deaths  
+
+   self.recovered = recovered  
+
+
+
+  if __name__ == "__main__":  
+
+   confirm = Timeline({'Sat':10, 'Wed':20})  
+
+   death = Timeline({'Sat':10, 'Wed':20}) 
+
+   recovered = Timeline({'Sat':10, 'Wed':20})  
 
-    confirmed: Timeline
-    deaths: Timeline
-    recovered: Timeline
+   timelines_1 = Timelines(confirm, death, recovered) 
 
 
 class Location(BaseModel):