Merge pull request #220 from Scanerr-io/dev

adding small patch for account_usage_reset()

Author: lrodden

.github/workflows/dev-deploy.yaml

@@ -30,4 +30,5 @@ jobs:
           cd ~/app
           git pull origin dev
           docker compose -f docker-compose.dev.yml down
+          docker volume rm app_app app_beat app_celery
           docker compose -f docker-compose.dev.yml up -d --build

app/api/tasks.py

@@ -1517,7 +1517,7 @@ def reset_usage(account):
                     reset_usage(account)
 
             # udpate account.meta.last_usage_reset
-            account.meta['last_usage_reset'] = today.strftime(f)
+            account.meta = {'last_usage_reset': today.strftime(f)}
             account.save()
 
     return None

app/api/v1/ops/services.py

@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import datetime, timedelta
 from django.contrib.auth.models import User
 from django_celery_beat.models import CrontabSchedule, PeriodicTask
 from django.db.models import Q
@@ -5758,9 +5758,13 @@ def get_site_metrics(request: object) -> object:
     # get last reset day 
     f = '%Y-%m-%d %H:%M:%S.%f'
     last_usage_date_str = account.meta.get('last_usage_reset')
-    last_usage_date_str = last_usage_date_str.replace('T', ' ').replace('Z', '')
-    last_usage_date = datetime.strptime(last_usage_date_str, f)
-    
+    last_usage_date = None
+    if last_usage_date_str:  
+        last_usage_date_str = last_usage_date_str.replace('T', ' ').replace('Z', '')
+        last_usage_date = datetime.strptime(last_usage_date_str, f)
+    else:
+        last_usage_date = datetime.now() - datetime.timedelta(30)
+
     # get scans
     scans = Scan.objects.filter(
         site=site,

commands.txt

@@ -1,3 +1,6 @@
+### easy local script ###
+source ./setup/scripts/local.sh
+
 ### spins up container on localhost ###
 docker compose -f docker-compose.local.yml up --build
 
@@ -23,7 +26,7 @@ docker compose -f docker-compose.dev.yml down
 
 
 ### spins up the container for staging migrations ###
-docker compose -f docker-compose.stage.yml up -d --build
+docker compose -f docker-compose.stage.yml up --build
 
 ### spins down the container ###
 docker compose -f docker-compose.stage.yml down

docker-compose.prod.yml

@@ -17,7 +17,7 @@ services:
     env_file:
       - ./env/.env.prod
     volumes:
-      - ./app:/app
+      - app:/app
       - static_volume:/app/static
     depends_on:
       - db
@@ -55,7 +55,7 @@ services:
     env_file:
       - ./env/.env.prod
     volumes:
-      - ./app:/scanerr
+      - celery:/app
     depends_on:
       - redis
       - app
@@ -72,7 +72,7 @@ services:
       dockerfile: Dockerfile
     entrypoint: ["/entrypoint.sh", "beat"]
     volumes:
-      - ./app:/scanerr
+      - beat:/app
     env_file:
       - ./env/.env.prod
     depends_on:
@@ -133,6 +133,9 @@ services:
 
 
 volumes:
+  app:
+  celery:
+  beat:
   static_volume:
   letsencrypt-acme:
   pgdata:

docker-compose.stage.yml

@@ -13,7 +13,7 @@ services:
       dockerfile: Dockerfile
     ports:
       - "8000:8000"
-    entrypoint: ["/entrypoint.sh", "app", "local"]
+    entrypoint: ["/entrypoint.sh", "app", "stage"]
     env_file:
       - ./env/.env.stage
     volumes:

setup/scripts/entrypoint.sh

@@ -19,6 +19,12 @@ if [[ $1 == *"app"* ]]
         python3 manage.py driver_test &&
         gunicorn --timeout 1000 --graceful-timeout 1000 --keep-alive 3 --log-level debug scanerr.wsgi:application --bind 0.0.0.0:8000
     fi
+    if [[ $2 == *"stage"* ]]
+    then
+      python3 manage.py wait_for_db && 
+      python3 manage.py makemigrations --no-input &&
+      python3 manage.py migrate --no-input
+    fi
 fi
 
 # spin up celery

setup/scripts/local.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+cd $HOME/documents/coding/scanerr/server &&
+{
+    docker volume rm server_app server_beat server_celery &&
+    docker compose -f docker-compose.local.yml up --build
+} || {
+    docker compose -f docker-compose.local.yml up --build
+}