Merge branch 'develop' of https://github.com/PythonFreeCourse/calendar into oron_exercise

Author: orontamir

.gitignore

@@ -147,6 +147,7 @@ dmypy.json
 .pyre/
 
 # mac env
+.DS_Store
 bin
 
 # register stuff

AUTHORS.md

@@ -33,6 +33,7 @@
          * PureDreamer - Developer
          * ShiZinDle - Developer
          * YairEn - Developer
+         * LiranCaduri - Developer
          * IdanPelled - Developer
 
 # Special thanks to

app/config.py.example

@@ -67,6 +67,7 @@ email_conf = ConnectionConfig(
 JWT_KEY = "JWT_KEY_PLACEHOLDER"
 JWT_ALGORITHM = "HS256"
 JWT_MIN_EXP = 60 * 24 * 7
+
 templates = Jinja2Templates(directory=os.path.join("app", "templates"))
 
 # application name

app/database/models.py

@@ -9,6 +9,7 @@
     JSON,
     Boolean,
     Column,
+    Date,
     DateTime,
     Enum,
     Float,
@@ -34,6 +35,16 @@
 Base: DeclarativeMeta = declarative_base()
 
 
+class UserFeature(Base):
+    __tablename__ = "user_feature"
+
+    id = Column(Integer, primary_key=True, index=True)
+    feature_id = Column('feature_id', Integer, ForeignKey('features.id'))
+    user_id = Column('user_id', Integer, ForeignKey('users.id'))
+
+    is_enable = Column(Boolean, default=False)
+
+
 class User(Base):
     __tablename__ = "users"
 
@@ -69,7 +80,10 @@ class User(Base):
         back_populates="user",
     )
     comments = relationship("Comment", back_populates="user")
+    tasks = relationship(
+        "Task", cascade="all, delete", back_populates="owner")
 
+    features = relationship("Feature", secondary=UserFeature.__tablename__)
     oauth_credentials = relationship(
         "OAuthCredentials",
         cascade="all, delete",
@@ -86,6 +100,7 @@ async def get_by_username(db: Session, username: str) -> User:
         return db.query(User).filter(User.username == username).first()
 
 
+
 class UserExercise(Base):
     """
     Table name user exercise
@@ -97,6 +112,18 @@ class UserExercise(Base):
     user_id = Column(Integer, ForeignKey("users.id"))
     start_date = Column(DateTime, nullable=False)
 
+class Feature(Base):
+    __tablename__ = "features"
+
+    id = Column(Integer, primary_key=True, index=True)
+    name = Column(String, nullable=False)
+    route = Column(String, nullable=False)
+    creator = Column(String, nullable=True)
+    description = Column(String, nullable=False)
+
+    users = relationship("User", secondary=UserFeature.__tablename__)
+
+
 
 class Event(Base):
     __tablename__ = "events"
@@ -455,6 +482,20 @@ class WikipediaEvents(Base):
     date_inserted = Column(DateTime, default=datetime.utcnow)
 
 
+class CoronaStats(Base):
+    __tablename__ = "corona_stats"
+
+    id = Column(Integer, primary_key=True, index=True)
+    date_ = Column(DateTime, nullable=False)
+    date_inserted = Column(DateTime, default=datetime.utcnow)
+    vaccinated = Column(Integer, nullable=False)
+    vaccinated_total = Column(Integer, nullable=False)
+    vaccinated_population_perc = Column(Integer, nullable=False)
+    vaccinated_second_dose = Column(Integer, nullable=False)
+    vaccinated_second_dose_total = Column(Integer, nullable=False)
+    vaccinated_second_dose_perc = Column(Float, nullable=False)
+
+
 class Quote(Base):
     __tablename__ = "quotes"
 
@@ -463,6 +504,14 @@ class Quote(Base):
     author = Column(String)
 
 
+class Country(Base):
+    __tablename__ = "countries"
+
+    id = Column(Integer, primary_key=True, index=True)
+    name = Column(String, nullable=False, unique=True)
+    timezone = Column(String, nullable=False)
+
+
 class Comment(Base):
     __tablename__ = "comments"
 
@@ -549,6 +598,21 @@ class InternationalDays(Base):
     international_day = Column(String, nullable=False)
 
 
+class Task(Base):
+    __tablename__ = "tasks"
+
+    id = Column(Integer, primary_key=True, index=True)
+    title = Column(String, nullable=False)
+    description = Column(String, nullable=False)
+    is_done = Column(Boolean, default=False)
+    is_important = Column(Boolean, nullable=False)
+    date = Column(Date, nullable=False)
+    time = Column(Time, nullable=False)
+    owner_id = Column(Integer, ForeignKey("users.id"))
+
+    owner = relationship("User", back_populates="tasks")
+
+
 # insert language data
 
 

app/database/schemas.py

@@ -75,6 +75,8 @@ def username_length(cls, username: str) -> Union[ValueError, str]:
         """Validating username length is legal"""
         if not (MIN_FIELD_LENGTH < len(username) < MAX_FIELD_LENGTH):
             raise ValueError("must contain between 3 to 20 charactars")
+        if username.startswith("@"):
+            raise ValueError("username can not start with '@'")
         return username
 
     @validator("password")

app/dependencies.py

@@ -17,6 +17,7 @@
 templates = Jinja2Templates(directory=TEMPLATES_PATH)
 templates.env.add_extension("jinja2.ext.i18n")
 
+
 # Configure logger
 logger = LoggerCustomizer.make_logger(
     config.LOG_PATH,

app/internal/corona_stats.py

@@ -0,0 +1,153 @@
+import json
+import random
+from datetime import date, datetime
+from typing import Any, Dict
+
+import httpx
+from fastapi import Depends
+from loguru import logger
+from sqlalchemy import desc, func
+from sqlalchemy.exc import SQLAlchemyError
+from sqlalchemy.orm import Session
+from sqlalchemy.orm.exc import NoResultFound
+
+from app.database.models import CoronaStats
+from app.dependencies import get_db
+
+DATETIME_FORMAT = "%Y-%m-%dT%H:%M:%S.%fZ"
+CORONA_API_URL = (
+    "https://datadashboardapi.health.gov.il/api/queries/vaccinated"
+)
+USER_AGENT_OPTIONS = [
+    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_5)"
+    " AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.1.1 Safari/605.1.15",
+    "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:77.0)"
+    " Gecko/20100101 Firefox/77.0",
+    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_5) "
+    "AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.97 Safari/537.36",
+    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:77.0) "
+    "Gecko/20100101 Firefox/77.0",
+    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) "
+    "AppleWebKit/537.36 (KHTML, like Gecko)"
+    " Chrome/83.0.4103.97 Safari/537.36",
+]
+
+
+def create_stats_object(corona_stats_data: Dict[str, Any]) -> CoronaStats:
+    """Dict -> DB Object"""
+    return CoronaStats(
+        date_=datetime.strptime(
+            corona_stats_data.get("Day_Date"),
+            DATETIME_FORMAT,
+        ),
+        vaccinated=corona_stats_data.get("vaccinated"),
+        vaccinated_total=corona_stats_data.get("vaccinated_cum"),
+        vaccinated_population_perc=corona_stats_data.get(
+            "vaccinated_population_perc",
+        ),
+        vaccinated_second_dose=corona_stats_data.get(
+            "vaccinated_seconde_dose",
+        ),
+        vaccinated_second_dose_total=corona_stats_data.get(
+            "vaccinated_seconde_dose_cum",
+        ),
+        vaccinated_second_dose_perc=corona_stats_data.get(
+            "vaccinated_seconde_dose_population_perc",
+        ),
+    )
+
+
+def serialize_stats(stats_object: CoronaStats) -> Dict[str, Any]:
+    """ DB Object -> Dict """
+    return {
+        "vaccinated_second_dose_perc": (
+            stats_object.vaccinated_second_dose_perc
+        ),
+        "vaccinated_second_dose_total": (
+            stats_object.vaccinated_second_dose_total
+        ),
+    }
+
+
+def serialize_dict_stats(stats_dict: Dict[str, Any]) -> Dict[str, Any]:
+    """ api Dict -> pylender Dict """
+    return {
+        "vaccinated_second_dose_perc": (
+            stats_dict.get("vaccinated_seconde_dose_population_perc")
+        ),
+        "vaccinated_second_dose_total": (
+            stats_dict.get("vaccinated_seconde_dose_cum")
+        ),
+    }
+
+
+def save_corona_stats(
+    corona_stats_data: Dict[str, Any],
+    db: Session = Depends(get_db),
+) -> None:
+    db.add(create_stats_object(corona_stats_data))
+    db.commit()
+
+
+def insert_to_db_if_needed(
+    corona_stats_data: Dict[str, Any],
+    db: Session = Depends(get_db),
+) -> Dict[str, Any]:
+    """ gets the latest data inserted to gov database """
+    latest_date = datetime.strptime(
+        corona_stats_data.get("Day_Date"),
+        DATETIME_FORMAT,
+    )
+    latest_saved = None
+    try:
+        latest_saved = (
+            db.query(CoronaStats).order_by(desc(CoronaStats.date_)).one()
+        )
+    except NoResultFound:
+        # on first system load, the table is empty
+        save_corona_stats(corona_stats_data, db)
+        return corona_stats_data
+
+    if latest_saved is not None:
+        # on more recent data arrival, we update the database
+        if latest_saved.date_ < latest_date:
+            save_corona_stats(corona_stats_data, db)
+            return corona_stats_data
+        else:
+            return serialize_stats(latest_saved)
+
+
+async def get_vacinated_data() -> Dict[str, Any]:
+    async with httpx.AsyncClient() as client:
+        headers = {"User-Agent": random.choice(USER_AGENT_OPTIONS)}
+        res = await client.get(CORONA_API_URL, headers=headers)
+        return json.loads(res.text)[-1]
+
+
+def get_vacinated_data_from_db(db: Session = Depends(get_db)) -> CoronaStats:
+    # pulls once a day, it won't be the most updated data
+    # but we dont want to be blocked for too many requests
+    return (
+        db.query(CoronaStats)
+        .filter(func.date(CoronaStats.date_inserted) == date.today())
+        .one()
+    )
+
+
+async def get_corona_stats(db: Session = Depends(get_db)) -> Dict[str, Any]:
+    try:
+        db_data = get_vacinated_data_from_db(db)
+        corona_stats_data = serialize_stats(db_data)
+
+    except NoResultFound:
+        try:
+            response_data = await get_vacinated_data()
+            insert_to_db_if_needed(response_data, db)
+            corona_stats_data = serialize_dict_stats(response_data)
+        except json.decoder.JSONDecodeError:
+            corona_stats_data = {"error": "No data"}
+
+    except (SQLAlchemyError, AttributeError) as e:
+        logger.exception(f"corona stats failed with error: {e}")
+        corona_stats_data = {"error": "No data"}
+    return corona_stats_data