Develop

.github/workflows/docker-image.yml

@@ -9,7 +9,7 @@ jobs:
     name: build docker
     steps:
       ##########   CHECK OUT REPO AND PRINT REPO INFO #######
-      - name: Checkout
+      - name: Checkout repo
         uses: actions/checkout@v3
       - name: Intro to job runner
         run: |
@@ -41,7 +41,7 @@ jobs:
     name: test docker
     steps:
       ##########   CHECK OUT REPO AND PRINT REPO INFO #######
-      - name: Checkout
+      - name: Checkout repo
         uses: actions/checkout@v3
       ######### DOCKER LOGIN AND PULL CUSTOM ACTION #############
       - name: Docker Login and Pull
@@ -57,5 +57,5 @@ jobs:
             ${{ github.repository }}
           tag:
             ${{ github.ref_name }}
-      - name: Run tests
-        run: docker run ghcr.io/${{ github.repository }}:${{ github.ref_name }} /bin/bash -c "coverage run manage.py test apps && coverage xml --data-file=.coverage && codecov --token=${{ secrets.codecov_token }} "
+      - name: Run tests in container
+        run: docker run ghcr.io/${{ github.repository }}:${{ github.ref_name }} /bin/bash -c "coverage run manage.py test apps "

.github/workflows/native-cicd.yml → .github/workflows/native-runner.yml

@@ -9,7 +9,7 @@ jobs:
     name: test native
     steps:
       ##########   CHECK OUT REPO AND PRINT REPO INFO #######
-      - name: Checkout
+      - name: Checkout repo
         uses: actions/checkout@v3
       - name: Intro to job runner
         run: |
@@ -22,10 +22,10 @@ jobs:
         run: |
           pip install pyfiglet
           pip install -r requirements.txt
-          pyfiglet TEST LOCAL
-      - name: Run test local
+          pyfiglet Packges Downloaded
+      - name: Run coverage test local
         run: coverage run manage.py test apps && coverage xml --data-file=.coverage
-      - name: codecov
+      - name: Upload to CodeCov
         uses: codecov/codecov-action@v3
         with:
           token: ${{ secrets.codecov_token }} # not required for public repos

.gitignore

@@ -14,7 +14,7 @@ media
 
 # If your build process includes running collectstatic, then you probably don't need or want to include staticfiles/
 # in your Git repository. Update and uncomment the following line accordingly.
-# <django-project-name>/staticfiles/
+staticfiles/
 
 ### Django.Python Stack ###
 # Byte-compiled / optimized / DLL files
@@ -172,4 +172,11 @@ cython_debug/
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
 
-# End of https://www.toptal.com/developers/gitignore/api/django
+# End of https://www.toptal.com/developers/gitignore/api/django
+
+#PyCharm
+.idea/
+
+
+#Mac
+.DS_Store

apps/speedtester/utils/abstract_speedtest.py

@@ -6,6 +6,7 @@
 from loguru import logger
 
 # Setup django to be able to access the settings file
+import os
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'refresher_config.settings')
 django.setup()
 

apps/speedtester/utils/abstract_tweepy.py

@@ -0,0 +1,37 @@
+import tweepy
+import os
+
+import django
+import speedtest
+from django.db.utils import IntegrityError
+from loguru import logger
+import pytz
+from django.db.models import Avg, Max, Min, Sum
+
+# Setup django to be able to access the settings file
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'refresher_config.settings')
+django.setup()
+
+from apps.speedtester.models import ServersModel, SpeedtesterModel
+
+# auth = tweepy.Client(
+#         bearer_token="",
+#         consumer_key="",
+#         consumer_secret="",
+#         access_token="",
+#         access_token_secret="")
+#
+# auth.create_tweet(text="First automated tweet via refresher")
+
+from datetime import datetime, timedelta, time
+
+today = datetime.now()
+tomorrow = today + timedelta(1)
+today_start = datetime.combine(today, time())
+today_end = datetime.combine(tomorrow, time())
+
+objs = SpeedtesterModel.objects.filter(created__lte=today_end, created__gte=today_start)
+print(objs.aggregate(Avg('download'), Avg('upload')))
+print(objs.aggregate(Max('download'), Max('upload')))
+print(objs.aggregate(Min('download'), Min('upload')))
+

apps/speedtester/utils/function_methods.py

@@ -21,3 +21,4 @@ def process_speedtest_test():
     client = refresher_speedtest.get_client()
 
     return speedtest_res, best, servers, client
+

pyproject.toml

@@ -25,6 +25,7 @@ dj-database-url = "^0.5.0"
 psycopg2-binary = "^2.9.3"
 codecov = "^2.1.12"
 whitenoise = "^6.2.0"
+tweepy = "^4.10.0"
 
 [tool.poetry.dev-dependencies]
 

refresher_config/settings.py

@@ -59,8 +59,7 @@
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [os.path.join(BASE_DIR, 'templates')]
-        ,
+        'DIRS': [os.path.join(BASE_DIR, 'templates')],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [