Merge pull request #1 from maexled/mysql-support

added mysql support

.github/workflows/test.yml

@@ -2,7 +2,7 @@ name: Django Tests
 
 on:
   push:
-    branches: [ "master" ]
+    branches: ["*"]
   pull_request:
     branches: [ "master" ]
   workflow_call:

Dockerfile

@@ -1,14 +1,18 @@
-FROM python:3.9-slim-buster
+FROM python:3.9-slim
 
 WORKDIR /app
 
 COPY requirements.txt ./
 
+
+RUN apt-get update && \
+    apt-get install --no-install-recommends -y gcc default-libmysqlclient-dev
+
+
 RUN pip install --no-cache-dir --upgrade pip && \
     pip install --no-cache-dir gunicorn && \
     pip install --no-cache-dir -r requirements.txt
 
 COPY . .
-RUN python manage.py makemigrations && python manage.py migrate
-CMD ["gunicorn", "--bind=0.0.0.0:8000", "pim.wsgi:application"]
+CMD python manage.py makemigrations && python manage.py migrate && gunicorn --bind=0.0.0.0:8000 pim.wsgi:application
 EXPOSE 8000/tcp

mystrom_rest/migrations/0001_initial.py

@@ -1,5 +1,6 @@
-# Generated by Django 4.0.5 on 2022-06-07 15:23
+# Generated by Django 4.0.5 on 2022-06-11 14:47
 
+import django.core.validators
 from django.db import migrations, models
 import django.db.models.deletion
 
@@ -15,9 +16,9 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='MystromDevice',
             fields=[
-                ('id', models.IntegerField(primary_key=True, serialize=False)),
+                ('id', models.AutoField(primary_key=True, serialize=False)),
                 ('name', models.CharField(max_length=16)),
-                ('ip', models.CharField(max_length=16)),
+                ('ip', models.CharField(max_length=16, validators=[django.core.validators.RegexValidator(message='Not valid IP Address', regex='^(?:(?:[0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}(?:[0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$')])),
             ],
             options={
                 'db_table': 'devices',
@@ -26,13 +27,13 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='MystromResult',
             fields=[
-                ('id', models.IntegerField(primary_key=True, serialize=False)),
+                ('id', models.AutoField(primary_key=True, serialize=False)),
                 ('power', models.FloatField()),
                 ('ws', models.FloatField()),
                 ('relay', models.IntegerField()),
                 ('temperature', models.FloatField()),
                 ('date', models.DateTimeField(auto_now_add=True)),
-                ('device_id', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='mystrom_rest.mystromdevice')),
+                ('device', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='mystrom_rest.mystromdevice')),
             ],
             options={
                 'db_table': 'results',

mystrom_rest/models.py

@@ -3,7 +3,7 @@
 
 class MystromDevice(models.Model):
 
-    id = models.IntegerField(primary_key=True)
+    id = models.AutoField(primary_key=True)
 
     name = models.CharField(max_length=16)
     ip = models.CharField(max_length=16, validators=[
@@ -22,9 +22,9 @@ class Meta:
 
 class MystromResult(models.Model):
 
-    id = models.IntegerField(primary_key=True)
+    id = models.AutoField(primary_key=True)
 
-    device_id = models.ForeignKey(MystromDevice, on_delete=models.PROTECT)
+    device = models.ForeignKey(MystromDevice, on_delete=models.PROTECT)
 
     power = models.FloatField()
     ws = models.FloatField()

mystrom_rest/views.py

@@ -59,9 +59,8 @@ def device_results(request, id):
         device = MystromDevice.objects.get(id=id) 
     except MystromDevice.DoesNotExist: 
         return JsonResponse({'message': 'The device does not exist'}, status=status.HTTP_404_NOT_FOUND) 
-    results = MystromResult.objects.filter(device_id=device.id)
+    results = MystromResult.objects.filter(device_id=device)
 
     if request.method == 'GET': 
         result_serializer = MystromResultSerializer(results, many=True) 
         return JsonResponse(result_serializer.data, safe=False) 
-

pim/settings.py

@@ -11,6 +11,7 @@
 """
 
 from pathlib import Path
+import os
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
@@ -92,12 +93,24 @@
 # Database
 # https://docs.djangoproject.com/en/4.0/ref/settings/#databases
 
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': BASE_DIR / 'db.sqlite3',
+if os.getenv("DB_NAME"):
+    DATABASES = {
+        'default': {
+            'ENGINE': 'django.db.backends.mysql', 
+            'NAME': os.environ["DB_NAME"],
+            'USER': os.environ["DB_USER"],
+            'PASSWORD': os.environ["DB_PASSWORD"],
+            'HOST': os.environ["DB_HOST"],
+            'PORT': os.environ["DB_PORT"],
+        }
+    }
+else:
+    DATABASES = {
+        'default': {
+            'ENGINE': 'django.db.backends.sqlite3',
+            'NAME': BASE_DIR / 'db.sqlite3',
+        }
     }
-}
 
 
 # Password validation

requirements.txt

@@ -1,4 +1,5 @@
 django==4.0.5
 django-widget-tweaks==1.4.12
 djangorestframework==3.13.1
-django-cors-headers==3.13.0
+django-cors-headers==3.13.0
+mysqlclient==2.1.0