feat: add on this day from wiki (#121)

* feat: add on this day from wiki

Author: ellenc345

app/database/models.py

@@ -3,14 +3,15 @@
 from datetime import datetime
 from typing import Dict, Any
 
+
+from app.config import PSQL_ENVIRONMENT
+from app.database.database import Base
 from sqlalchemy import (DDL, Boolean, Column, DateTime, ForeignKey, Index,
-                        Integer, String, event, UniqueConstraint)
+                        Integer, String, event, UniqueConstraint, JSON)
 from sqlalchemy.dialects.postgresql import TSVECTOR
 from sqlalchemy.exc import IntegrityError, SQLAlchemyError
 from sqlalchemy.orm import relationship, Session
 
-from app.config import PSQL_ENVIRONMENT
-from app.database.database import Base
 from app.dependencies import logger
 
 
@@ -151,6 +152,16 @@ def __repr__(self):
         )
 
 
+class WikipediaEvents(Base):
+    __tablename__ = "wikipedia_events"
+
+    id = Column(Integer, primary_key=True, index=True)
+    date_ = Column(String, nullable=False)
+    wikipedia = Column(String, nullable=False)
+    events = Column(JSON, nullable=True)
+    date_inserted = Column(DateTime, default=datetime.utcnow)
+
+
 class Quote(Base):
     __tablename__ = "quotes"
 

app/internal/on_this_day_events.py

@@ -0,0 +1,48 @@
+import json
+from datetime import date, datetime
+from typing import Any, Dict
+import requests
+from fastapi import Depends
+from loguru import logger
+from sqlalchemy import func
+from sqlalchemy.exc import SQLAlchemyError
+from sqlalchemy.orm import Session
+from sqlalchemy.orm.exc import NoResultFound
+
+from app.database.database import get_db
+from app.database.models import WikipediaEvents
+
+
+def insert_on_this_day_data(
+    db: Session = Depends(get_db)
+) -> Dict[str, Any]:
+    now = datetime.now()
+    day, month = now.day, now.month
+
+    res = requests.get(
+        f'https://byabbe.se/on-this-day/{month}/{day}/events.json')
+    text = json.loads(res.text)
+    res_events = text.get('events')
+    res_date = text.get('date')
+    res_wiki = text.get('wikipedia')
+    db.add(WikipediaEvents(events=res_events,
+                           date_=res_date, wikipedia=res_wiki))
+    db.commit()
+    return text
+
+
+def get_on_this_day_events(
+    db: Session = Depends(get_db)
+) -> Dict[str, Any]:
+    try:
+        data = (db.query(WikipediaEvents).
+                filter(
+                    func.date(WikipediaEvents.date_inserted) == date.today()).
+                one())
+
+    except NoResultFound:
+        data = insert_on_this_day_data(db)
+    except (SQLAlchemyError, AttributeError) as e:
+        logger.error(f'on this day failed with error: {e}')
+        data = {'events': [], 'wikipedia': 'https://en.wikipedia.org/'}
+    return data

app/routers/profile.py

@@ -1,14 +1,15 @@
 import io
 
-from fastapi import APIRouter, Depends, File, Request, UploadFile
-from starlette.responses import RedirectResponse
-from starlette.status import HTTP_302_FOUND
-from PIL import Image
-
 from app import config
 from app.database.database import get_db
 from app.database.models import User
 from app.dependencies import MEDIA_PATH, templates
+from app.internal.on_this_day_events import get_on_this_day_events
+
+from fastapi import APIRouter, Depends, File, Request, UploadFile
+from PIL import Image
+from starlette.responses import RedirectResponse
+from starlette.status import HTTP_302_FOUND
 
 PICTURE_EXTENSION = config.PICTURE_EXTENSION
 PICTURE_SIZE = config.AVATAR_SIZE
@@ -45,10 +46,14 @@ async def profile(
         session.commit()
         user = session.query(User).filter_by(id=1).first()
 
+    # Get on this day data from wiki
+    on_this_day_data = get_on_this_day_events(session)
+
     return templates.TemplateResponse("profile.html", {
         "request": request,
         "user": user,
         "events": upcoming_events,
+        "on_this_day_data": on_this_day_data
     })
 
 

app/static/style.css

@@ -1,7 +1,7 @@
 body {
-  background: #A1FFCE;
-  background: -webkit-linear-gradient(to right, #FAFFD1, #A1FFCE);
-  background: linear-gradient(to right, #FAFFD1, #A1FFCE);
+  background: #a1ffce;
+  background: -webkit-linear-gradient(to right, #faffd1, #a1ffce);
+  background: linear-gradient(to right, #faffd1, #a1ffce);
 }
 
 .profile-image {
@@ -25,38 +25,42 @@ body {
 }
 
 .no-border {
-    border: none;
+  border: none;
 }
 
 .profile-modal-fadeIn {
-    -webkit-animation-name: profile-modal-fadeIn;
-    animation-name: profile-modal-fadeIn;
+  -webkit-animation-name: profile-modal-fadeIn;
+  animation-name: profile-modal-fadeIn;
 
-    -webkit-animation-duration: 1s;
-    animation-duration: 1s;
-    -webkit-animation-fill-mode: both;
-    animation-fill-mode: both;
+  -webkit-animation-duration: 1s;
+  animation-duration: 1s;
+  -webkit-animation-fill-mode: both;
+  animation-fill-mode: both;
+}
+
+@keyframes profile-modal-fadeIn {
+  from {
+    opacity: 0;
+    -webkit-transform: translate3d(-100%, 0, 0);
+    transform: translate3d(-100%, 0, 0);
   }
 
-  @keyframes profile-modal-fadeIn {
-    from {
-      opacity: 0;
-      -webkit-transform: translate3d(-100%, 0, 0);
-      transform: translate3d(-100%, 0, 0);
-    }
-
-    to {
-      opacity: 1;
-      -webkit-transform: translate3d(0, 0, 0);
-      transform: translate3d(0, 0, 0);
-    }
+  to {
+    opacity: 1;
+    -webkit-transform: translate3d(0, 0, 0);
+    transform: translate3d(0, 0, 0);
   }
+}
 
 .profile-modal-dialog {
-    margin: 0;
+  margin: 0;
+}
+
+.card-body {
+  overflow: auto;
 }
 
 .profile-modal-header {
-    border: none;
-    background-color:whitesmoke;
-}
+  border: none;
+  background-color: whitesmoke;
+}

app/templates/on_this_day.html

@@ -0,0 +1,12 @@
+<div class="container">
+  <p class="card-title">On This Day</p>
+  <ul>
+    {% for event in on_this_day_data.events[1::-1] %}
+    <li>
+      ({{event.year}}) {{ event.description}}
+      <a href="{{event.wikipedia[0].wikipedia }}"  target="_blank" >></a>
+    </li>
+    {% endfor %}
+  </ul>
+  <a href="{{ on_this_day_data.wikipedia }} "  target="_blank" >Explore More ...</a>
+</div>

app/templates/profile.html

@@ -273,9 +273,7 @@ <h6 class="card-title text-center mb-1">{{ user.full_name }}</h6>
                 <!-- Card -->
                 <div class="card card-profile mb-3" style="height: 18em;">
                     <div class="card-body">
-                        <p class="card-title">
-                            Your Card
-                        </p>
+                        {% include "on_this_day.html" %}
                     </div>
                 </div>
             </div>

tests/test_on_this_day_events.py

@@ -0,0 +1,29 @@
+from app.database.models import WikipediaEvents
+from app.internal.on_this_day_events import (get_on_this_day_events,
+                                             insert_on_this_day_data)
+
+
+def test_insert_on_this_day_data(session):
+    is_exists_data = session.query(WikipediaEvents).all()
+    assert not is_exists_data
+    insert_on_this_day_data(session)
+    is_exists_data = session.query(WikipediaEvents).all()
+    assert is_exists_data is not None
+
+
+def test_get_on_this_day_events(session):
+    data = get_on_this_day_events(session)
+    assert isinstance(data, dict)
+    assert isinstance(data.get('events'), list)
+    assert isinstance(data.get('wikipedia'), str)
+
+
+def test_get_on_this_day_events_exists(session):
+    fake_object = WikipediaEvents(
+        events=['fake'], wikipedia="www.fake.com", date_="not a date string")
+    session.add(fake_object)
+    session.commit()
+    fake_data = get_on_this_day_events(session)
+    assert fake_data.events[0] == 'fake'
+    assert fake_data.wikipedia == 'www.fake.com'
+    assert fake_data.date_ == 'not a date string'

tests/test_profile.py

@@ -36,6 +36,7 @@ def test_profile_page(profile_test_client):
     assert b'profile.png' in data
     assert b'FakeName' in data
     assert b'Happy new user!' in data
+    assert b'On This Day' in data
 
 
 def test_update_user_fullname(profile_test_client):