Feature/parasha

app/database/models.py

@@ -191,17 +191,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
@@ -533,6 +533,15 @@ def __repr__(self):
         )
 
 
+class Parasha(Base):
+    __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)
+
+
 class SharedListItem(Base):
     __tablename__ = "shared_list_item"
 
@@ -600,8 +609,8 @@ class Task(Base):
 
 
 # insert language data
-
-
+# Credit to adrihanu   https://stackoverflow.com/users/9127249/adrihanu
+# https://stackoverflow.com/questions/17461251
 def insert_data(target, session: Session, **kw):
     """insert language data
     Credit to adrihanu   https://stackoverflow.com/users/9127249/adrihanu

app/internal/json_data_loader.py

@@ -5,46 +5,64 @@
 from loguru import logger
 from sqlalchemy.orm import Session
 
-from app.database.models import Base, InternationalDays, Joke, Quote, Zodiac
-from app.internal import daily_quotes, international_days, jokes, zodiac
+
+from app.database.models import (
+    Base, InternationalDays, Joke, Quote, Parasha, Zodiac,
+)
+from app.config import RESOURCES_DIR
+from app.internal import (
+    daily_quotes, international_days, jokes, weekly_parasha, 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.
-
+    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.
     """
     _insert_into_database(
         session,
-        'app/resources/zodiac.json',
+        RESOURCES_DIR / "zodiac.json",
         Zodiac,
         zodiac.get_zodiac,
     )
 
     _insert_into_database(
         session,
-        'app/resources/quotes.json',
+        RESOURCES_DIR / "quotes.json",
         Quote,
         daily_quotes.get_quote,
     )
 
     _insert_into_database(
         session,
-        'app/resources/international_days.json',
+        RESOURCES_DIR / "parashot.json",
+        Parasha,
+        weekly_parasha.create_parasha_object,
+    )
+
+    _insert_into_database(
+        session,
+        RESOURCES_DIR / "international_days.json",
         InternationalDays,
         international_days.get_international_day,
     )
 
     _insert_into_database(
         session,
-        'app/resources/jokes.json',
+        RESOURCES_DIR / "jokes.json",
         Joke,
         jokes.get_joke,
     )
@@ -57,13 +75,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.
     """
@@ -104,7 +120,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') as json_file:
             json_content = json.load(json_file)
     except (IOError, ValueError):
         file_name = os.path.basename(path)

app/internal/weekly_parasha.py

@@ -0,0 +1,51 @@
+from datetime import datetime
+from typing import Dict, Optional
+
+from pyluach import dates, parshios
+from sqlalchemy.orm import Session
+
+from app.database.models import Parasha
+
+
+def create_parasha_object(parashot_fields: Dict[str, 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"],
+    )
+
+
+def get_parasha_only_to_saturday(date: datetime) -> Optional[str]:
+    """Returns the parasha name if the date is Saturday.
+
+     Args:
+         date: The requested date.
+
+     Returns:
+         If the date is Saturday, return the parasha name,
+         else return None.
+    """
+    date_split = str(date).split("-")
+    new_date_format = [int(x) for x in date_split]
+    gregorian_date = dates.GregorianDate(*new_date_format)
+    if gregorian_date == gregorian_date.shabbos():
+        return parshios.getparsha_string(gregorian_date)
+
+
+def get_parasha_object(session: Session, date: datetime) -> Optional[Parasha]:
+    """Returns the parasha object for the specific day.
+
+    Args:
+        session: The database connection.
+        date: The requested date.
+
+    Returns:
+        A HebrewView object.
+        IF the specific day in not Saturday, it return None.
+    """
+    parasha_name = get_parasha_only_to_saturday(date)
+    if parasha_name is None:
+        return None
+    return session.query(Parasha).filter_by(name=parasha_name).first()

app/main.py

@@ -92,6 +92,7 @@ def create_tables(engine, psql_environment):
     whatsapp,
 )
 
+
 json_data_loader.load_to_database(next(get_db()))