Queue management

.env.example

@@ -0,0 +1,2 @@
+FRONTEND_URL=""
+TOKEN_LIFETIME_HOURS=""

.gitignore

@@ -7,4 +7,10 @@ runner.py
 env/
 .env
 
+[0-9]*.txt
+
+# *png
+# *jpg
+# *jpeg
+# *webp
 tempCodeRunnerFile.py

Backend/settings.py

@@ -9,28 +9,28 @@
 For the full list of settings and their values, see
 https://docs.djangoproject.com/en/4.1/ref/settings/
 """
-from datetime import timedelta
 import os
+from datetime import timedelta
 from pathlib import Path
-import environ
+from decouple import config 
 
-env = environ.Env(
-    # set casting, default value
-    DEBUG=(bool, False),
-    ALLOWED_HOSTS=(list, []),
-)
+# env = environ.Env(
+#     # set casting, default value
+#     DEBUG=(bool, False),
+#     ALLOWED_HOSTS=(list, []),
+# )
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
 
-environ.Env.read_env(os.path.join(BASE_DIR, ".env"))
+# environ.Env.read_env(os.path.join(BASE_DIR, ".env"))
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/4.1/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = env("SECRET_KEY")
-
+SECRET_KEY = 'django-insecure-7fk!^ke_z%97-at2-fff=%v+mk!7)&0(!bvku5)v#&*olpu#gp'
+FRONEND_URL = config('FRONTEND_URL')
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
@@ -41,6 +41,10 @@
 CORS_ALLOWED_ORIGINS = [
     "http://localhost:3000",
     "http://localhost:3001",
+    "http://192.168.216.250:3000",
+    "http://192.168.0.2:3000",
+    "http://192.168.0.5:3000",
+    FRONEND_URL
 ]
 
 CORS_ALLOW_METHODS = [
@@ -165,4 +169,4 @@
     'ACCESS_TOKEN_LIFETIME': timedelta(minutes=5),
     'REFRESH_TOKEN_LIFETIME': timedelta(days=1),
     'AUTH_HEADER_TYPES': ('Bearer',),
-}
+}

Backend/urls.py

@@ -19,10 +19,15 @@
     TokenObtainPairView,
     TokenRefreshView,
 )
+from django.conf import settings
+from django.conf.urls.static import static
+
 
 urlpatterns = [
     path('admin/', admin.site.urls),
     path('api/', include('api.urls')),
     path('api/token/', TokenObtainPairView.as_view(), name='token_obtain_pair'),
     path('api/token/refresh/', TokenRefreshView.as_view(), name='token_refresh'),
 ]
+
+urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

api/migrations/0016_alter_topic_description_alter_topic_image_url.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.1.2 on 2023-02-23 18:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0015_remove_topic_image_topic_image_url'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='topic',
+            name='description',
+            field=models.CharField(blank=True, max_length=1000, null=True),
+        ),
+        migrations.AlterField(
+            model_name='topic',
+            name='image_url',
+            field=models.ImageField(blank=True, null=True, upload_to='topic/'),
+        ),
+    ]

api/migrations/0017_alter_topic_is_active_alter_topic_is_private.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.1.2 on 2023-02-24 12:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0016_alter_topic_description_alter_topic_image_url'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='topic',
+            name='is_active',
+            field=models.BooleanField(blank=True, default=False),
+        ),
+        migrations.AlterField(
+            model_name='topic',
+            name='is_private',
+            field=models.BooleanField(blank=True, default=True),
+        ),
+    ]

api/migrations/0018_alter_topic_description_alter_topic_image_url.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.1.2 on 2023-02-24 12:17
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0017_alter_topic_is_active_alter_topic_is_private'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='topic',
+            name='description',
+            field=models.CharField(blank=True, default=None, max_length=1000, null=True),
+        ),
+        migrations.AlterField(
+            model_name='topic',
+            name='image_url',
+            field=models.ImageField(blank=True, default=None, null=True, upload_to='topic/'),
+        ),
+    ]

api/migrations/0019_collection_topiccollection_collectionproblem.py

@@ -0,0 +1,40 @@
+# Generated by Django 4.1.2 on 2023-04-22 14:12
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0018_alter_topic_description_alter_topic_image_url'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Collection',
+            fields=[
+                ('collection_id', models.AutoField(primary_key=True, serialize=False)),
+                ('name', models.CharField(max_length=100)),
+                ('description', models.CharField(blank=True, default=None, max_length=1000, null=True)),
+                ('is_active', models.BooleanField(blank=True, default=False)),
+                ('is_private', models.BooleanField(blank=True, default=True)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='TopicCollection',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('collection', models.ForeignKey(db_column='collection_id', on_delete=django.db.models.deletion.CASCADE, to='api.collection')),
+                ('topic', models.ForeignKey(db_column='topic_id', on_delete=django.db.models.deletion.CASCADE, to='api.topic')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='CollectionProblem',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('collection', models.ForeignKey(db_column='collection_id', on_delete=django.db.models.deletion.CASCADE, to='api.collection')),
+                ('problem', models.ForeignKey(db_column='problem_id', on_delete=django.db.models.deletion.CASCADE, to='api.problem')),
+            ],
+        ),
+    ]

api/migrations/0020_collection_owner.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.1.2 on 2023-04-22 14:32
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0019_collection_topiccollection_collectionproblem'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='collection',
+            name='owner',
+            field=models.ForeignKey(db_column='owner_id', default=4, on_delete=django.db.models.deletion.CASCADE, to='api.account'),
+            preserve_default=False,
+        ),
+    ]

api/migrations/0021_collectionproblem_order_topiccollection_order_and_more.py

@@ -0,0 +1,53 @@
+# Generated by Django 4.1.2 on 2023-04-23 11:01
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0020_collection_owner'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='collectionproblem',
+            name='order',
+            field=models.IntegerField(blank=True, default=0),
+        ),
+        migrations.AddField(
+            model_name='topiccollection',
+            name='order',
+            field=models.IntegerField(blank=True, default=0),
+        ),
+        migrations.AlterField(
+            model_name='collection',
+            name='is_active',
+            field=models.BooleanField(blank=True, default=True),
+        ),
+        migrations.AlterField(
+            model_name='collection',
+            name='is_private',
+            field=models.BooleanField(blank=True, default=False),
+        ),
+        migrations.AlterField(
+            model_name='problem',
+            name='is_active',
+            field=models.BooleanField(blank=True, default=True),
+        ),
+        migrations.AlterField(
+            model_name='problem',
+            name='is_private',
+            field=models.BooleanField(blank=True, default=False),
+        ),
+        migrations.AlterField(
+            model_name='topic',
+            name='is_active',
+            field=models.BooleanField(blank=True, default=True),
+        ),
+        migrations.AlterField(
+            model_name='topic',
+            name='is_private',
+            field=models.BooleanField(blank=True, default=False),
+        ),
+    ]

api/models.py

@@ -33,8 +33,8 @@ class Problem(models.Model):
     description = models.CharField(max_length=10000)
     solution = models.CharField(max_length=20000)
     time_limit = models.FloatField(default=1.5,blank=True)
-    is_active = models.BooleanField(default=True)
-    is_private = models.BooleanField(default=True)
+    is_active = models.BooleanField(default=True,blank=True)
+    is_private = models.BooleanField(default=False,blank=True)
 
 class Testcase(models.Model):
     testcase_id = models.AutoField(primary_key=True)
@@ -51,15 +51,34 @@ class Submission(models.Model):
     is_passed = models.BooleanField()
     date = models.DateTimeField(default=timezone.now)
 
+class Collection(models.Model):
+    collection_id = models.AutoField(primary_key=True)
+    owner = models.ForeignKey(Account,on_delete=models.CASCADE,db_column="owner_id")
+    name = models.CharField(max_length=100)
+    description = models.CharField(max_length=1000,null=True,blank=True,default=None)
+    is_active = models.BooleanField(default=True,blank=True)
+    is_private = models.BooleanField(default=False,blank=True)
+
 class Topic(models.Model):
     topic_id = models.AutoField(primary_key=True)
     account_id = models.ForeignKey(Account,on_delete=models.CASCADE,db_column="account_id")
     name = models.CharField(max_length=100)
-    description = models.CharField(max_length=1000)
-    image_url = models.CharField(max_length=1000,default="",blank=True)
-    is_active = models.BooleanField(default=False)
-    is_private = models.BooleanField(default=True)
+    description = models.CharField(max_length=1000,null=True,blank=True,default=None)
+    image_url = models.ImageField(upload_to='topic/',null=True,blank=True,default=None)
+    is_active = models.BooleanField(default=True,blank=True)
+    is_private = models.BooleanField(default=False,blank=True)
+
+class TopicCollection(models.Model):
+    topic = models.ForeignKey(Topic,on_delete=models.CASCADE,db_column="topic_id")
+    collection = models.ForeignKey(Collection,on_delete=models.CASCADE,db_column="collection_id")
+    order = models.IntegerField(blank=True,default=0)
+
+class CollectionProblem(models.Model):
+    collection = models.ForeignKey(Collection,on_delete=models.CASCADE,db_column="collection_id")
+    problem = models.ForeignKey(Problem,on_delete=models.CASCADE,db_column="problem_id")
+    order = models.IntegerField(blank=True,default=0)
 
+# Doesn't use anymore
 class TopicProblem(models.Model):
     topic_id = models.ForeignKey(Topic,on_delete=models.CASCADE,db_column="topic_id")
     problem_id = models.ForeignKey(Problem,on_delete=models.CASCADE,db_column="problem_id")

api/sandbox/grader.py

@@ -1,19 +1,19 @@
 import subprocess
 
-def checker(code:str,testcases:list,timeout=1.5)->dict:
+def checker(section:int,code:str,testcases:list,timeout=1.5)->dict:
     result = []
     hasError = False
     hasTimeout = False
     for i in range(len(testcases)):
-        with open(f'./api/sandbox/testcases/{i}.txt','w') as f:
+        with open(f'./api/sandbox/section{section}/testcases/{i}.txt','w') as f:
             f.write(testcases[i])
 
-    with open('./api/sandbox/runner.py','w') as f:
+    with open(f'./api/sandbox/section{section}/runner.py','w') as f:
         f.write(code)
 
     for i in range(len(testcases)):
         try:
-            runner = subprocess.check_output(['python','./api/sandbox/runner.py'],stdin=open(f'./api/sandbox/testcases/{i}.txt','r'),stderr=subprocess.DEVNULL,timeout=float(timeout))
+            runner = subprocess.check_output(['python',f'./api/sandbox/section{section}/runner.py'],stdin=open(f'./api/sandbox/section{section}/testcases/{i}.txt','r'),stderr=subprocess.DEVNULL,timeout=float(timeout))
             result.append({'input':testcases[i],'output':runner.decode(),'runtime_status':'OK'})
         except subprocess.CalledProcessError:
             hasError = True
@@ -25,9 +25,9 @@ def checker(code:str,testcases:list,timeout=1.5)->dict:
     return {'result':result,'has_error':hasError,'has_timeout':hasTimeout}
 
 
-def grading(code:str,input:list,output:list,timeout=1.5)->str:
+def grading(section:int,code:str,input:list,output:list,timeout=1.5)->str:
     score = ''
-    graded = checker(code,input,timeout)
+    graded = checker(section,code,input,timeout)
     graded_result = graded['result']
 
     for i in range(len(output)):

api/sandbox/queue.py

@@ -0,0 +1,16 @@
+class Queue():
+    def __init__(self,SIZE) -> None:
+        self.memory = [0 for i in range(SIZE)]
+        self.size = SIZE
+
+    def isAvaliable(self) -> int:
+        for i in range(self.size):
+            if self.memory[i] == 0:
+                return i
+        return -1
+
+    def reserve(self,index:int) -> None:
+        self.memory[index] = 1
+
+    def free(self,index:int) -> None:
+        self.memory[index] = 0