Merge pull request #164 from hoomano/kroussel/background_refacto

Kroussel/background refacto

backend/app/http_routes.py

@@ -24,8 +24,6 @@
 from routes.purchase_end_stripe_webhook import PurchaseEndStripeWebHook
 from routes.check_expired_purchases import ExpiredPurchasesChecker
 from routes.device import Device
-from routes.daily_notifications import DailyNotifications
-from routes.daily_emails import DailyEmails
 from routes.event import Event
 from routes.text_type import TextType
 from routes.text_edit_action import TextEditAction
@@ -90,8 +88,6 @@ def __init__(self, api):
         api.add_resource(PurchaseEndStripeWebHook, "/subscription_end")
         api.add_resource(ExpiredPurchasesChecker, "/check_expired_purchases")
         api.add_resource(Device, "/device")
-        api.add_resource(DailyNotifications, "/send_daily_notifications")
-        api.add_resource(DailyEmails, "/send_daily_emails")
         api.add_resource(Event, "/event")
         api.add_resource(TextType, "/text_type")
         api.add_resource(TextEditAction, "/text_edit_action")

backend/app/routes/calendar_suggestion_notification.py

@@ -5,6 +5,7 @@
 from flask import request
 from flask_restful import Resource
 from app import db
+from mojodex_core.entities.user import User
 from mojodex_core.logging_handler import log_error
 from mojodex_core.entities.db_base_entities import *
 from datetime import datetime
@@ -42,8 +43,8 @@ def post(self):
         try:
 
             # Get all calendar_suggestion_pks with notification_time_utc is not none and between since_date and until_date
-            results = db.session.query(MdCalendarSuggestion, MdUser, MdTask) \
-                .join(MdUser, MdUser.user_id == MdCalendarSuggestion.user_id) \
+            results = db.session.query(MdCalendarSuggestion, User, MdTask) \
+                .join(User, User.user_id == MdCalendarSuggestion.user_id) \
                 .join(MdTask, MdTask.task_pk == MdCalendarSuggestion.proposed_task_fk) \
                 .filter(MdCalendarSuggestion.reminder_date.isnot(None)) \
                 .filter(MdCalendarSuggestion.reminder == True) \
@@ -57,7 +58,7 @@ def post(self):
                                   "suggestion_text": calendar_suggestion.suggestion_text,
                                   "task_pk": calendar_suggestion.proposed_task_fk,
                                   "task_name": task.name_for_system,
-                                  "user_timezone_offset": user.timezone_offset,
+                                  "datetime_context": user.datetime_context,
                                   "user_name": user.name,
                                   "user_company_description": user.company_description,
                                   "user_goal": user.goal

backend/app/routes/todo_daily_emails.py

@@ -6,6 +6,7 @@
 from flask import request
 from flask_restful import Resource
 from app import db
+from mojodex_core.entities.user import User
 from mojodex_core.logging_handler import log_error
 from mojodex_core.entities.db_base_entities import *
 from sqlalchemy import func, text, extract, and_
@@ -159,14 +160,14 @@ def post(self):
             deleted_todos_today = [deleted_todo_today._asdict() for deleted_todo_today in deleted_todos_today]
 
             # Users whose timezone is not null and whose hour is between 8 and 9 am and who are not on weekends
-            base_user_query = db.session.query(MdUser) \
-                .filter(MdUser.timezone_offset != None) \
+            base_user_query = db.session.query(User) \
+                .filter(User.timezone_offset != None) \
                 .filter(extract("hour", text('NOW() - md_user.timezone_offset * interval \'1 minute\'')) >= int(os.environ.get('DAILY_TODO_EMAIL_TIME', 8))) \
                 .filter(extract("hour", text('NOW() - md_user.timezone_offset * interval \'1 minute\'')) < int(os.environ.get('DAILY_TODO_EMAIL_TIME', 8))+1) \
                 .filter(extract("dow", text('NOW() - md_user.timezone_offset * interval \'1 minute\'')) != int(0)) \
                 .filter(extract("dow", text('NOW() - md_user.timezone_offset * interval \'1 minute\'')) != int(6)) \
-                .filter(MdUser.todo_email_reception == True) \
-                .order_by(MdUser.user_id) \
+                .filter(User.todo_email_reception == True) \
+                .order_by(User.user_id) \
                 .offset(offset).limit(n_emails) \
                 .all()
 
@@ -189,7 +190,7 @@ def post(self):
                         "user_id": user.user_id,
                         "email": user.email,
                         "username": user.name,
-                        "user_timezone_offset": user.timezone_offset,
+                        "datetime_context": user.datetime_context,
                         "company_description": user.company_description,
                         "goal": user.goal,
                         "language": user.language_code,

background/app/app.py

@@ -1,6 +1,4 @@
 from gevent import monkey
-
-
 monkey.patch_all()
 
 
@@ -32,20 +30,9 @@
 db = SQLAlchemy(app)
 api = Api(app)
 
-from background_logger import BackgroundLogger
-
-main_logger = BackgroundLogger("main_logger")
-
 from models.documents.document_manager import DocumentManager
 document_manager = DocumentManager()
 
-from language_retriever import LanguageRetriever
-language_retriever = LanguageRetriever()
-
-from conversation_retriever import ConversationRetriever
-conversation_retriever = ConversationRetriever()
-
-
 from http_routes import HttpRouteManager
 HttpRouteManager(api)