Feature/parasha

app/database/models.py

@@ -152,17 +152,17 @@ class Category(Base):
 
     @staticmethod
     def create(
-        db_session: Session,
+        session: Session,
         name: str,
         color: str,
         user_id: int,
     ) -> Category:
         try:
             category = Category(name=name, color=color, user_id=user_id)
-            db_session.add(category)
-            db_session.flush()
-            db_session.commit()
-            db_session.refresh(category)
+            session.add(category)
+            session.flush()
+            session.commit()
+            session.refresh(category)
         except (SQLAlchemyError, IntegrityError) as e:
             logger.error(f"Failed to create category: {e}")
             raise e
@@ -382,8 +382,39 @@ def __repr__(self):
         )
 
 
-# insert language data
+class Parasha(Base):
+    """
+    Each year the Json file will need to be re-updated
+    according to this API in this way:
+
+    def relevent_details(parasha):
+        parashot_dict = {
+        'name': parasha['title'],
+        'hebrew': parasha['hebrew'],
+        'link': parasha['link'],
+        'date': parasha['date']}
+        return parashot_dict
+
 
+    def get_all_parashot():
+        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']
+        [relevent_details(p) for parasha in items
+        if 'Parashat' in parasha['title]]
+    """
+    __tablename__ = "parashot"
+
+    id = Column(Integer, primary_key=True, index=True)
+    name = Column(String, nullable=False)
+    hebrew_name = Column(String, nullable=False)
+    link = Column(String, nullable=False)
+    date = Column(DateTime, nullable=False)
+
+
+# insert language data
 # Credit to adrihanu   https://stackoverflow.com/users/9127249/adrihanu
 # https://stackoverflow.com/questions/17461251
 def insert_data(target, session: Session, **kw):

app/internal/json_data_loader.py

@@ -5,19 +5,22 @@
 from loguru import logger
 from sqlalchemy.orm import Session
 
-from app.database.models import Base, Quote, Zodiac
-from app.internal import daily_quotes, zodiac
+from app.database.models import Base, Quote, Zodiac, Parasha
+from app.internal import daily_quotes, zodiac, weekly_parasha
 
 
 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.
-
+    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 +38,13 @@ def load_to_database(session: Session) -> None:
         daily_quotes.get_quote,
     )
 
+    _insert_into_database(
+        session,
+        'app/resources/parashot.json',
+        Parasha,
+        weekly_parasha.create_parasha_object,
+    )
+
 
 def _insert_into_database(
         session: Session,
@@ -43,13 +53,11 @@ def _insert_into_database(
         model_creator: Callable
 ) -> bool:
     """Inserts the extracted JSON data into the database.
-
     Args:
         session: The database connection.
         path: The file path.
         table: A model entity table.
         model_creator: A model creation function.
-
     Returns:
         True if the save was successful, otherwise returns False.
     """
@@ -66,11 +74,9 @@ def _insert_into_database(
 
 def _is_table_empty(session: Session, table: Base) -> bool:
     """Returns True if the table is empty.
-
     Args:
         session: The database connection.
         table: A model entity table.
-
     Returns:
         True if the table is empty, otherwise returns False.
     """
@@ -79,13 +85,10 @@ def _is_table_empty(session: Session, table: Base) -> bool:
 
 def _get_data_from_json(path: str) -> List[Dict[str, Any]]:
     """Returns a list of dictionary objects.
-
     Reads the data from a specific JSON file and converts the data into
     a list of dictionary items.
-
     Args:
         path: The file path.
-
     Returns:
         A list of dictionary objects.
     """

app/internal/weekly_parasha.py

@@ -0,0 +1,23 @@
+from datetime import datetime
+from typing import Dict, Optional, List
+
+from app.database.models import Parasha
+from sqlalchemy.orm import Session
+
+
+def create_parasha_object(parashot_fields: Dict[str, Optional[str]])\
+        -> Parasha:
+    """This function create a parasha object from given fields dictionary.
+    It is used for adding the data from the json into the db"""
+    return Parasha(
+        name=parashot_fields['name'],
+        hebrew_name=parashot_fields['hebrew'],
+        link=parashot_fields['link'],
+        date=datetime.strptime(parashot_fields['date'], '%Y-%m-%d').date()
+    )
+
+
+def get_all_parahot_list(session: Session) \
+        -> List[Dict[str, Optional[str]]]:
+    """This function return all parashot object in list"""
+    return session.query(Parasha).all()

app/main.py

@@ -40,12 +40,14 @@ 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, login, logout, profile,
-    register, search, telegram, user, weekview, whatsapp,
+    about_us, agenda, calendar, categories, celebrity,
+    credits, currency, dayview, email, event, export,
+    four_o_four, friendview, google_connect, invitation,
+    login, logout, profile, register, search, telegram,
+    user, weekview, whatsapp,
 )
 
+
 json_data_loader.load_to_database(next(get_db()))