issue-1 added support fo holiday calendar

Author: Sergey Chernyak

Pipfile.lock

@@ -46,7 +46,7 @@ def _update_gspread(self, query):
         rows = list(self._get_rows_from_query(query))
         new_rows_count = len(rows)
         logging.info('Going to upload %s rows into %s report', new_rows_count, class_name)
-        work_sheet.append_rows(
+        work_sheet.insert_rows(
             rows,
         )
         logging.info('Upload data to %s completed', class_name)

src/explicitdev/analyse/abstract.py

@@ -6,6 +6,7 @@
 from explicitdev.fetch.jira import FetchJiraData
 from explicitdev.storage.model.base import Base
 from explicitdev.storage.update import UpdateJira
+from explicitdev.storage.update.holiday import UpdateHolidayCSV
 
 
 def drop_and_create_all():
@@ -47,6 +48,15 @@ def sync(drop_db):
         drop_and_create_all()
     UpdateJira(Config).sync()
 
+@main.command()
+@click.option('--drop_db', is_flag=True)
+def sync_holiday(drop_db):
+    updater = UpdateHolidayCSV(Config)
+    # todo delete copypaste and merge it with load
+    if drop_db:
+        updater.drop_create_tables()
+    updater.sync()
+
 
 def _analyze():
     analyzer = Config.JiraAnalyzer(Config)

src/explicitdev/cli.py

@@ -5,22 +5,25 @@
 
 import gspread
 import pytz
+from sqlalchemy import create_engine
+from sqlalchemy.orm import sessionmaker
+
 from explicitdev.analyse.jira import JiraAnalyzer
 from explicitdev.storage.factory import (
     FactoryIssue,
     FactoryStatus,
     FactoryHistory,
     FactoryUser,
+    FactoryHoliday,
 )
 from explicitdev.storage.model import (
     Issue as AlchemyIssue,
     User as AlchemyUser,
     Status as AlchemyStatus,
+    Holiday as AlchemyHoliday,
 )
 from explicitdev.storage.session import session_scope
 from explicitdev.utils.const import ReportSaveModes
-from sqlalchemy import create_engine
-from sqlalchemy.orm import sessionmaker
 
 if TYPE_CHECKING:
     from explicitdev.storage.model.base import ModelContainerTypeTuple
@@ -37,6 +40,7 @@ class DataFiles:
         PATH: Path = None
         """Folder to store different data files as source and target for dump"""
         ISSUE_DUMPS: str = "issue_dumps.json"
+        HOLIDAYS: str = "holidays.csv"
 
     class Models:
         class Issue:
@@ -51,6 +55,10 @@ class User:
             Class = AlchemyUser
             Factory = FactoryUser
 
+        class Holiday:
+            Class = AlchemyHoliday
+            Factory = FactoryHoliday
+
         FactoryHistory = FactoryHistory
         models_with_containers: 'ModelContainerTypeTuple' = (Issue.Class, Status.Class)
 

src/explicitdev/config.py

@@ -0,0 +1,9 @@
+from explicitdev.config import Config
+from explicitdev.fetch.abstract_csv import FetchCSV
+
+
+class FetchHolidayCSV(FetchCSV):
+
+    def __init__(self, c: Config):
+        super().__init__(c)
+        self.file_name = c.DataFiles.HOLIDAYS

src/explicitdev/fetch/holiday_csv.py

@@ -2,3 +2,4 @@
 from .status import FactoryStatus
 from .history import FactoryHistory
 from .user import FactoryUser
+from .holiday import FactoryHoliday

src/explicitdev/storage/factory/__init__.py

@@ -0,0 +1,69 @@
+from datetime import date
+
+from sqlalchemy.orm import Session
+
+from explicitdev.storage.factory.abstract import FactoryAbstract
+from explicitdev.storage.model import HolidayAttrs
+from explicitdev.storage.model.holiday import HolidayType
+
+HA = HolidayAttrs
+
+
+class FactoryHoliday(FactoryAbstract):
+    YEAR_FIELD_NAME = 'Год/Месяц'
+
+    SKIP_SYMBOL = '*'
+    """A symbol from calenders on witch we skip days."""
+
+    def __init__(self, c):
+        super().__init__(c)
+        self.Holiday = c.Models.Holiday.Class
+
+    def fill_dict_from_raw_dict(self, raw_json_dict, data, result_dict: dict = None) -> dict:
+        """
+
+        :param raw_json_dict:
+        :param data:
+        :param result_dict: Actually passing this will not work, because result_dict generated internally.
+        :return:
+        """
+        if not result_dict:
+            result_dict = dict()
+
+        rjd = raw_json_dict
+        year = int(rjd.pop(self.YEAR_FIELD_NAME))
+        for month, month_days in enumerate(rjd.values(), start=1):
+            if month > 12:
+                break
+            for day in month_days.split(','):
+                try:
+                    day = int(day)
+                except ValueError:
+                    symbol = day[-1:]
+                    if symbol == self.SKIP_SYMBOL:
+                        continue
+                    day = int(day[:-1])
+
+                result_dict = {
+                    HA.date: date(year, month, day),
+                    HA.type: HolidayType.government,
+                }
+
+                self.solve_update_or_insert(
+                    data[self.Holiday.__name__],
+                    result_dict,
+                    result_dict[HA.date],
+                )
+
+        return result_dict
+
+    def get_existed_entities(self, session: Session, **kwargs) -> dict:
+        # noinspection PyTypeChecker
+        result = super().get_existed_entities(
+            session=session,
+            model=self.Holiday,
+            columns=(
+                HA.date,
+            ),
+        )
+        return result

src/explicitdev/storage/factory/holiday.py

@@ -1,3 +1,4 @@
 from .issue import Issue, IssueAttrs
 from .user import User, UserAttrs
 from .status import Status, StatusAttrs
+from .holiday import Holiday, HolidayAttrs

src/explicitdev/storage/model/__init__.py

@@ -0,0 +1,32 @@
+from sqlalchemy import (
+    Column,
+    String,
+    Integer,
+    Date,
+)
+
+from .base import Base
+from ...utils.auto_name_attrs import AutoNamedModelAttrs
+
+
+class HolidayType:
+    government = 'government'
+    corporate = 'corporate'
+
+
+class Holiday(Base):
+    id = Column(Integer, primary_key=True)
+    type = Column(
+        String,
+        comment='User types. Look at enum.',
+        index=True,
+    )
+    date = Column(
+        Date,
+        comment='Date of a day',
+        unique=True,
+    )
+
+
+class HolidayAttrs(Holiday, metaclass=AutoNamedModelAttrs):
+    pass

src/explicitdev/storage/model/holiday.py

@@ -0,0 +1,23 @@
+from explicitdev.config import Config
+from explicitdev.fetch.holiday_csv import FetchHolidayCSV
+from explicitdev.storage.factory import FactoryHoliday
+from explicitdev.storage.update.abstract import AbstractUpdate
+
+
+class UpdateHolidayCSV(AbstractUpdate):
+
+    def __init__(self, c: Config, *args, **kwargs):
+        super().__init__(c, *args, **kwargs)
+        self.models_with_containers = (c.Models.Holiday.Class,)
+
+    def sync(self):
+        fetcher = FetchHolidayCSV(self.c)
+        factory = FactoryHoliday(self.c)
+        containers = self._create_data_containers_dict()
+        with self.c.session_context() as session:
+            factory.get_existed_entities(session)
+            for row in fetcher.get_data():
+                factory.fill_dict_from_raw_dict(row, containers)
+            self._bulk_update_insert_mappings(session, containers)
+            # Todo write verification for a working and non-working day for a row
+            session.commit()