Feature/HebrewView

app/database/models.py

@@ -385,6 +385,33 @@ def __repr__(self):
         )
 
 
+class HebrewView(Base):
+    """Each year the Json file will need to be re-updated
+        according to this API in this way:
+        def relevent_details(hebrew_date):
+            hebrew_dates_dict = {
+            'date_gregorian': hebrew_date['date'],
+            'date_hebrew': hebrew_date['hebrew']}
+        return hebrew_dates_dict
+
+
+        def get_all_hebrew_dates():
+            request = requests.get(
+            'https://www.hebcal.com/hebcal?v=1&cfg=json&maj=on&
+            min=on&mod=on&nx=on&year=now&month=x&ss=on&mf=on&
+            c=on&geo=geoname&geonameid=293397&m=50&s=on&d=on&D=on')
+            items = request.json()['items']
+            return[
+            relevent_details(hebrew_date) for hebrew_date in items
+            if 'hebdate' in hebrew_date['category]]
+        """
+    __tablename__ = "hebrewView"
+
+    id = Column(Integer, primary_key=True, index=True)
+    date = Column(DateTime, nullable=False)
+    hebrew_date = Column(String, nullable=False)
+
+
 class Joke(Base):
     __tablename__ = "jokes"
 
@@ -396,6 +423,8 @@ class Joke(Base):
 
 # Credit to adrihanu   https://stackoverflow.com/users/9127249/adrihanu
 # https://stackoverflow.com/questions/17461251
+
+
 def insert_data(target, session: Session, **kw):
     session.execute(
         target.insert(),

app/internal/hebrew_date_view.py

@@ -0,0 +1,34 @@
+from datetime import datetime
+from typing import Dict, Optional
+
+from app.database.models import HebrewView
+from sqlalchemy.orm import Session
+
+
+def create_hebrew_dates_object(
+        hebrew_dates_fields: Dict[str, Optional[str]])\
+        -> HebrewView:
+    """This function create a hebrew date object
+    from given fields dictionary.
+    It is used for adding the data from the json into the db"""
+    return HebrewView(
+        date=datetime.strptime(
+            hebrew_dates_fields['date_gregorian'],
+            '%Y-%m-%d').date(),
+        hebrew_date=hebrew_dates_fields['date_hebrew']
+    )
+
+
+def get_hebrew_date_object(session: Session, date: datetime) -> HebrewView:
+    """Returns the HebrewView object for the specific day.
+
+    Args:
+        session: The database connection.
+        date: The requested date.
+
+    Returns:
+        A HebrewView object.
+    """
+    for hebrew in session.query(HebrewView).all():
+        if hebrew.date == date:
+            return hebrew

app/internal/json_data_loader.py

@@ -5,18 +5,23 @@
 from loguru import logger
 from sqlalchemy.orm import Session
 
-from app.database.models import Base, Joke, Quote, Zodiac
-from app.internal import daily_quotes, jokes, zodiac
+
+from app.database.models import Base, HebrewView, Joke, Quote, Zodiac
+from app.internal import daily_quotes, hebrew_date_view, jokes, zodiac
 
 
 def load_to_database(session: Session) -> None:
     """Loads data from JSON data files into the database.
 
     On startup, data from the JSON files should be added to the database and
     not be accessed from a network call for each request as it is costly.
-
     The quotes JSON file content is copied from the free API:
     'https://type.fit/api/quotes'.
+    The parashot and hebrew_view JSON files content is copied
+    from the free API:
+    'https://www.hebcal.com/hebcal?v=1&cfg=json&maj=on&min=on&
+    mod=on&nx=on&year=now&month=x&ss=on&mf=on&c=on&geo=geoname
+    &geonameid=293397&m=50&s=on&d=on&D=on'.
 
     Args:
         session: The database connection.
@@ -35,6 +40,13 @@ def load_to_database(session: Session) -> None:
         daily_quotes.get_quote,
     )
 
+    _insert_into_database(
+        session,
+        'app/resources/hebrew_view.json',
+        HebrewView,
+        hebrew_date_view.create_hebrew_dates_object,
+    )
+
     _insert_into_database(
         session,
         'app/resources/jokes.json',
@@ -97,7 +109,7 @@ def _get_data_from_json(path: str) -> List[Dict[str, Any]]:
         A list of dictionary objects.
     """
     try:
-        with open(path, 'r') as json_file:
+        with open(path, 'r', encoding='utf-8-sig') as json_file:
             json_content = json.load(json_file)
     except (IOError, ValueError):
         file_name = os.path.basename(path)

app/main.py

@@ -40,10 +40,11 @@ def create_tables(engine, psql_environment):
 set_ui_language()
 
 from app.routers import (  # noqa: E402
-    about_us, agenda, calendar, categories, celebrity, credits,
-    currency, dayview, email, event, export, four_o_four, friendview,
-    google_connect, invitation, joke, login, logout, profile,
-    register, search, telegram, user, weekview, weight, whatsapp,
+    about_us, agenda, calendar, categories, celebrity,
+    credits, currency, dayview, email, event, export,
+    four_o_four, friendview, google_connect, invitation,
+    joke, login, logout, profile, register, search, telegram,
+    user, weekview, weight, whatsapp,
 )
 
 json_data_loader.load_to_database(next(get_db()))