Merge pull request #78 from pitangainnovare/impl/content_type

Adiciona content_type e click_timestamps em ItemAccess

Author: pitangainnovare

.gitignore

@@ -1,3 +1,6 @@
+# VSCode
+.vscode/
+
 # Solr
 index/data/usage
 index/data/log_manager/data

VERSION

@@ -1 +1 @@
-1.4.0
+1.5.0

compose/local/django/Dockerfile

@@ -74,10 +74,6 @@ COPY ./compose/local/django/celery/beat/start /start-celerybeat
 RUN sed -i 's/\r$//g' /start-celerybeat
 RUN chmod +x /start-celerybeat
 
-COPY ./compose/local/django/celery/flower/start /start-flower
-RUN sed -i 's/\r$//g' /start-flower
-RUN chmod +x /start-flower
-
 
 # copy application code to WORKDIR
 COPY . ${APP_HOME}

compose/local/django/celery/flower/start

@@ -4,4 +4,4 @@ set -o errexit
 set -o nounset
 
 
-watchgod celery.__main__.main --args -A config.celery_app worker -l INFO
+watchgod celery.__main__.main --args -A config.celery_app worker -l INFO --concurrency=4

compose/local/django/celery/worker/start

@@ -80,11 +80,6 @@ RUN sed -i 's/\r$//g' /start-celerybeat
 RUN chmod +x /start-celerybeat
 
 
-COPY ./compose/production/django/celery/flower/start /start-flower
-RUN sed -i 's/\r$//g' /start-flower
-RUN chmod +x /start-flower
-
-
 # copy application code to WORKDIR
 COPY --chown=django:django . ${APP_HOME}
 

compose/production/django/Dockerfile

@@ -5,4 +5,4 @@ set -o pipefail
 set -o nounset
 
 
-exec celery -A config.celery_app worker -l INFO
+exec celery -A config.celery_app worker -l INFO --concurrency=4

compose/production/django/celery/flower/start

@@ -2,7 +2,11 @@
 
 from django.test import TestCase
 
-from core.utils.date_utils import get_date_range_str
+from core.utils.date_utils import (
+    extract_minute_second_key,
+    get_date_range_str,
+    truncate_datetime_to_hour,
+)
 
 
 class DateUtilsTests(TestCase):
@@ -76,3 +80,13 @@ def test_get_date_range_with_only_until_date(self):
             '2025-02-08',
         )
         self.assertEqual(result, expected)
+
+    def test_extract_minute_second_key(self):
+        dt = datetime(2023, 3, 15, 14, 30, 45)
+        key = extract_minute_second_key(dt)
+        self.assertEqual(key, '30:45')
+
+    def test_truncate_datetime_to_hour(self):
+        dt = datetime(2023, 3, 15, 14, 30, 45)
+        truncated = truncate_datetime_to_hour(dt)
+        self.assertEqual(truncated, datetime(2023, 3, 15, 14, 0, 0))

compose/production/django/celery/worker/start

@@ -82,4 +82,43 @@ def get_date_objs_from_date_range(from_date, until_date, format='%Y-%m-%d'):
         visible_dates.append(current)
         current += timedelta(days=1)
 
-    return visible_dates
+    return visible_dates
+
+
+def truncate_datetime_to_hour(dt):
+    """
+    Truncates a datetime object to the hour.
+    Parameters:
+    dt (datetime or str): The datetime object or string to be truncated.
+
+    Returns:
+    datetime: The truncated datetime object.
+    """
+    if isinstance(dt, str):
+        try:
+            dt = datetime.strptime(dt, "%Y-%m-%d %H:%M:%S")
+        except ValueError:
+            logging.error("Invalid datetime string format. Expected '%Y-%m-%d %H:%M:%S'.")
+            return None
+
+    return dt.replace(minute=0, second=0, microsecond=0)
+
+
+def extract_minute_second_key(dt):
+    """
+    Extracts a tuple based on the minute and second of a datetime object.
+
+    Parameters:
+    dt (datetime or str): The datetime object or string.
+
+    Returns:
+    str: A string in the format "MM:SS" representing the minute and second.
+    """
+    if isinstance(dt, str):
+        try:
+            dt = datetime.strptime(dt, "%Y-%m-%d %H:%M:%S")
+        except ValueError:
+            logging.error("Invalid datetime string format. Expected '%Y-%m-%d %H:%M:%S'.")
+            return None
+
+    return f"{dt.minute:02}:{dt.second:02}"