Merge branch 'main' into #45-Booking_Expiry_Logic_and_Reviews_Model

Author: cj-ballesteros

.DS_Store

@@ -28,6 +28,12 @@ jobs:
           sudo service redis-server start
           sudo service redis-server status
 
+      - name: Install Flake8 and Run Linter
+        run: |
+          pip install flake8
+          flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+          flake8 . --count --exit-zero --max-complexity=10 --max-line-length=88 --statistics
+
       - name: Install Dependencies
         run: |
           python -m pip install --upgrade pip
@@ -59,3 +65,4 @@ jobs:
         with:
           name: coverage-report-html
           path: backend/htmlcov/  # Upload the entire 'htmlcov' directory
+

.github/workflows/django_ci_cd.yml

@@ -0,0 +1,31 @@
+name: ReactJS CI/CD
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  lint:
+    name: Run ESLint
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - name: Install root dependencies
+        run: npm install  # This will install the dependencies from the root `package.json`
+
+      - name: Install frontend dependencies
+        run: |
+          cd frontend  # Navigate to the frontend directory
+          npm install  # Install the frontend dependencies from `frontend/package.json`
+
+      - name: Run ESLint # Finds syntax/style errors
+        run: npx eslint --config ./frontend/eslint.config.js frontend

.github/workflows/reactjs_ci_cd.yml

@@ -1,3 +1,5 @@
 from django.contrib import admin
+from .models import Chat, Message
 
-# Register your models here.
+admin.site.register(Chat)
+admin.site.register(Message)

README.md

@@ -0,0 +1,8 @@
+from django import forms
+from .models import Message
+
+# https://docs.djangoproject.com/en/5.1/topics/forms/modelforms/
+class MessageForm(forms.ModelForm):
+  class Meta:
+    model = Message
+    fields = ['content']

backend/apps/chat/admin.py

@@ -0,0 +1,31 @@
+# Generated by Django 5.1.6 on 2025-03-06 19:53
+
+import django.db.models.deletion
+import django.utils.timezone
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Message',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('content', models.TextField()),
+                ('timestamp', models.DateTimeField(default=django.utils.timezone.now)),
+                ('receiver', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='received_messages', to=settings.AUTH_USER_MODEL)),
+                ('sender', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='sent_messages', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'ordering': ['-timestamp'],
+            },
+        ),
+    ]

backend/apps/chat/forms.py

@@ -0,0 +1,43 @@
+# Generated by Django 5.1.6 on 2025-03-06 20:46
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('chat', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='message',
+            options={'ordering': ['timestamp']},
+        ),
+        migrations.RemoveField(
+            model_name='message',
+            name='receiver',
+        ),
+        migrations.CreateModel(
+            name='Chat',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('createdAt', models.DateTimeField(auto_now_add=True)),
+                ('updatedAt', models.DateTimeField(auto_now=True)),
+                ('user1', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='chats_initiated', to=settings.AUTH_USER_MODEL)),
+                ('user2', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='chats_received', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'ordering': ['-updatedAt'],
+                'unique_together': {('user1', 'user2')},
+            },
+        ),
+        migrations.AddField(
+            model_name='message',
+            name='chat',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='messages', to='chat.chat'),
+        ),
+    ]

backend/apps/chat/migrations/0001_initial.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.6 on 2025-03-06 21:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('chat', '0002_alter_message_options_remove_message_receiver_chat_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='message',
+            name='id',
+            field=models.AutoField(primary_key=True, serialize=False),
+        ),
+    ]

backend/apps/chat/migrations/0002_alter_message_options_remove_message_receiver_chat_and_more.py

@@ -0,0 +1,24 @@
+# Generated by Django 5.1.6 on 2025-03-06 23:38
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('chat', '0003_alter_message_id'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='message',
+            name='chat',
+            field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.CASCADE, related_name='messages', to='chat.chat'),
+        ),
+        migrations.AlterField(
+            model_name='message',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+    ]