0.0.2

openAI requests for categories and questions

QuestionsApp/admin.py

@@ -1,9 +1,18 @@
 from django.contrib import admin
-from BaseModels.admin_utils import Admin_BaseIconModel
+from BaseModels.admin_utils import *
 from .models import *
 
-class Admin_Question(Admin_BaseIconModel):
+class Admin_QuestionCategory(Admin_BaseIconModel):
     pass
+admin.site.register(QuestionCategory, Admin_QuestionCategory)
+
+class Admin_AnswerTabularInline(Admin_BaseIconTabularModel):
+    fields = ['name', 'right_answer', 'order']
+    model = Answer
+    extra = 0
+
+class Admin_Question(Admin_BaseIconModel):
+    inlines = [Admin_AnswerTabularInline]
 admin.site.register(Question, Admin_Question)
 
 class Admin_Answer(Admin_BaseIconModel):

QuestionsApp/migrations/0002_questioncategory_question_category.py

@@ -0,0 +1,38 @@
+# Generated by Django 4.2.1 on 2023-05-19 12:37
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('QuestionsApp', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='QuestionCategory',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.TextField(blank=True, help_text='Название', null=True, verbose_name='Название')),
+                ('name_plural', models.TextField(blank=True, null=True, verbose_name='Название (множественное число)')),
+                ('order', models.IntegerField(blank=True, null=True, verbose_name='Очередность отображения')),
+                ('createDT', models.DateTimeField(auto_now_add=True, verbose_name='Дата и время создания')),
+                ('modifiedDT', models.DateTimeField(blank=True, null=True, verbose_name='Дата и время последнего изменения')),
+                ('enable', models.BooleanField(db_index=True, default=True, verbose_name='Включено')),
+                ('json_data', models.JSONField(blank=True, default=dict, verbose_name='Дополнительные данные')),
+                ('parsed', models.BooleanField(default=False, verbose_name='Использован')),
+                ('parent_category', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='categories_for_parentCategory', to='QuestionsApp.questioncategory', verbose_name='Родительская категория')),
+            ],
+            options={
+                'verbose_name': 'Категория вопроса',
+                'verbose_name_plural': 'Категории вопросов',
+            },
+        ),
+        migrations.AddField(
+            model_name='question',
+            name='category',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='rel_questions_for_category', to='QuestionsApp.questioncategory', verbose_name='Категория'),
+        ),
+    ]

QuestionsApp/migrations/0003_alter_questioncategory_parent_category.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.2.1 on 2023-05-19 13:44
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('QuestionsApp', '0002_questioncategory_question_category'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='questioncategory',
+            name='parent_category',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='categories_for_parentCategory', to='QuestionsApp.questioncategory', verbose_name='Родительская категория'),
+        ),
+    ]

QuestionsApp/models.py

@@ -2,8 +2,33 @@ from django.db import models
 from BaseModels.base_models import BaseModel
 from django.utils.translation import gettext_lazy as _
 
+class QuestionCategory(BaseModel):
+    parent_category = models.ForeignKey(
+        'QuestionCategory', verbose_name=_('Родительская категория'), related_name='categories_for_parentCategory',
+        on_delete=models.CASCADE, null=True, blank=True
+    )
+    parsed = models.BooleanField(verbose_name='Использован', default=False)
+
+    def __str__(self):
+        if self.name:
+            return f'{self.name}'
+        else:
+            return str(self.id)
+
+
+    class Meta:
+        verbose_name = _('Категория вопроса')
+        verbose_name_plural = _('Категории вопросов')
+
+
 class Question(BaseModel):
 
+    category = models.ForeignKey(
+        QuestionCategory, verbose_name='Категория', related_name='rel_questions_for_category',
+        on_delete=models.SET_NULL, null=True
+
+    )
+
     game_level = models.IntegerField(verbose_name=_('Уровень игры'), default=1)
     time_for_answer = models.IntegerField(verbose_name=_('Время на ответ (сек)'), default=7)
     used_count = models.IntegerField(verbose_name=_('Количество использования'), default=0)

QuestionsApp/urls.py

@@ -0,0 +1,7 @@
+from django.contrib import admin
+from django.urls import path, include
+from .views import *
+
+urlpatterns = [
+    path('test_code', test_code, name='test_code')
+]

QuestionsApp/views.py

@@ -1,3 +1,9 @@
 from django.shortcuts import render
+from django.http import HttpResponse
 
-# Create your views here.
+def test_code(request):
+    from GPTgeneratorAPI.views import get_subcategories, get_questions
+    # res = get_subcategories()
+    res = get_questions()
+
+    return HttpResponse(str(res))