Move to YaDisk from Google Drive

.devcontainer/Dockerfile

@@ -1,13 +1,13 @@
 # Base Python image
-FROM python:3.9.1-buster
+FROM python:3.10-bullseye
 
 # Update system and install backup utilities
 COPY back-end/docker/image/install-postgres-client.sh /
 RUN sh install-postgres-client.sh
 
-# Install node 14
-RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
-RUN apt -y install nodejs
+# Install node 16
+RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash
+RUN . ~/.nvm/nvm.sh && nvm install 16
 
 # Setup fish
 RUN apt -y install fish; chsh -s /usr/bin/fish; mkdir /root/.config; mkdir /root/.config/fish

.devcontainer/docker-compose.yml

@@ -18,7 +18,8 @@ services:
       - ../back-end/.env
     volumes:
       # Forwards the local Docker socket to the container.
-      - /var/run/docker.sock:/var/run/docker-host.sock 
+      - ~/.ssh:/root/.ssh
+      - /var/run/docker.sock:/var/run/docker.sock 
       # Update this to wherever you want VS Code to mount the folder of your project
       - ..:/workspace:cached
 

.github/workflows/back-end.yaml

@@ -12,15 +12,15 @@ jobs:
       - run:  cp back-end/.env.example back-end/.env
       - run:  cp tgbot/.env.example tgbot/.env
       - run:  cp watchdoc/.env.example watchdoc/.env
-      - name: "Build back-end container"
-        run:  docker-compose build back-end
       - name: "Run Postgres in background"
-        run:  docker-compose up -d postgres
+        run:  docker compose up -d postgres
+      - name: "Build back-end container"
+        run:  docker compose build back-end
       - name: "Run tests"
-        run:  docker-compose run back-end scripts/test.sh
+        run:  docker compose run back-end scripts/test.sh
       - name: "Check code style"
-        run:  docker-compose run back-end scripts/format.sh --check
+        run:  docker compose run back-end scripts/format.sh --check
       # - name: "Lint code"
       #   run:  docker-compose run back-end scripts/lint.sh
       - name: "Stop all containers"
-        run:  docker-compose down
+        run:  docker compose down

.github/workflows/deploy.yml

@@ -55,7 +55,7 @@ jobs:
           sudo chmod 777 vpn.log
           sudo killall openvpn
       - name: Upload VPN logs
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         if: always()
         with:
           name: VPN logs

.github/workflows/front-end.yaml

@@ -20,4 +20,4 @@ jobs:
       - name: "Check code style"
         run: cd front-end && npm run lint .
       - name: "Build front end container"
-        run:  docker-compose build front-end
+        run:  docker compose build front-end

back-end/docker/image/dev.dockerfile

@@ -1,5 +1,5 @@
 # Base Python image
-FROM python:3.10-buster
+FROM python:3.10-bullseye
 
 # Update system and install backup utilities
 COPY back-end/docker/image/install-postgres-client.sh /

back-end/docker/image/prod.dockerfile

@@ -1,5 +1,5 @@
 # Base Python image
-FROM python:3.10-buster
+FROM python:3.10-bullseye
 
 # Update system and install backup utilities
 COPY back-end/docker/image/install-postgres-client.sh /

back-end/src/ams/utils/common.py

@@ -3,6 +3,6 @@
 
 def get_current_admission_year():
     now = datetime.now()
-    if (now.month, now.day) > (9, 1):
+    if (now.month, now.day) >= (9, 1):
         return now.year + 1
     return now.year

back-end/src/ams/views/applicants.py

@@ -32,6 +32,8 @@
 
 from ams.models.applicants import Applicant
 
+from common.models.universities import Program
+
 from ams.serializers.applicants import (
     ApplicantSerializer,
     ApplicantMutateSerializer,
@@ -147,6 +149,15 @@ def create(self, request, *args, **kwargs):
         request.data["user"] = self.request.user.id
         serializer = self.get_serializer(data=request.data)
         serializer.is_valid(raise_exception=True)
+        if not self.milspecialty_is_selectable(
+            request.data["milspecialty"], request.data["university_info"]["program"]
+        ):
+            return Response(
+                {
+                    "detail": "You can't select this milspecialty with your educational program"
+                },
+                status=status.HTTP_400_BAD_REQUEST,
+            )
         self.request.user.campuses = [self.request.data["university_info"]["campus"]]
         self.request.user.save()
         if self.is_creation_allowed_by_scope(request.data):
@@ -177,6 +188,15 @@ def update(self, request, *args, **kwargs):
                 {"detail": "Bad request"},
                 status=status.HTTP_400_BAD_REQUEST,
             )
+        if not self.milspecialty_is_selectable(
+            request.data["milspecialty"], request.data["university_info"]["program"]
+        ):
+            return Response(
+                {
+                    "detail": "You can't select this milspecialty with your educational program"
+                },
+                status=status.HTTP_400_BAD_REQUEST,
+            )
         result = super(ApplicantViewSet, self).update(request, **kwargs)
         applicant.user.campuses = [request.data["university_info"]["campus"]]
         applicant.user.save()
@@ -187,6 +207,10 @@ def update(self, request, *args, **kwargs):
             generate_documents_for_applicant(updated_applicant)
         return result
 
+    def milspecialty_is_selectable(self, milspecialty_id: int, program_id: int):
+        milspecialty = Milspecialty.objects.filter(pk=milspecialty_id).first()
+        return milspecialty.is_selectable_by_program(program_id)
+
     @transaction.atomic
     def perform_create(self, serializer):
         return serializer.save()

back-end/src/common/admin.py

@@ -30,5 +30,5 @@
 admin.site.register(Program)
 admin.site.register(Faculty)
 
-# Milspeciality
+# Milspecialty
 admin.site.register(Milspecialty)

back-end/src/common/management/commands/populate.py

@@ -20,6 +20,9 @@
     create_faculties,
     create_programs,
 )
+from common.populate.milspecialities_selectable_by_programs import (
+    create_milspecialities_selectable_by_programs,
+)
 
 from common.utils.date import get_date_range
 
@@ -169,6 +172,9 @@ def handle(self, *args, **options):
         subjects = create_subjects(milspecialties)
         faculties = create_faculties()
         programs = create_programs(faculties)
+        create_milspecialities_selectable_by_programs(
+            milspecialties=milspecialties, programs=programs
+        )
 
         print(" OK")
 

back-end/src/common/migrations/0005_add_selectable_by_to_milspecs.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.20 on 2024-10-12 16:39
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('common', '0004_add_personal_documents_info'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='milspecialty',
+            name='selectable_by',
+            field=models.ManyToManyField(to='common.Program'),
+        ),
+        migrations.AddField(
+            model_name='milspecialty',
+            name='selectable_by_every_program',
+            field=models.BooleanField(default=True),
+        ),
+    ]

back-end/src/common/models/milspecialties.py

@@ -1,8 +1,12 @@
+from typing import Union
+
 from django.db import models
 from django.contrib.postgres.fields import ArrayField
 
-
-from common.models.universities import Campus
+from common.models.universities import Campus, Program
+from rest_framework.exceptions import ValidationError
+from django.db.models.signals import m2m_changed
+from django.dispatch import receiver
 
 
 class Milspecialty(models.Model):
@@ -18,9 +22,41 @@ class Milspecialty(models.Model):
         )
     )
 
+    selectable_by = models.ManyToManyField(to=Program, blank=True)
+
+    selectable_by_every_program = models.BooleanField(default=True)
+
     class Meta:
         verbose_name = "Military Specialty"
         verbose_name_plural = "Military Specialties"
 
     def __str__(self) -> str:
         return self.title
+
+    def is_selectable_by_program(self, program_: Union[Program, int]):
+        if isinstance(program_, Program):
+            program = program_.pk
+        else:
+            program = program_
+        return (
+            self.selectable_by.filter(pk=program).exists()
+            or self.selectable_by_every_program
+        )
+
+
+@receiver(m2m_changed, sender=Milspecialty.selectable_by.through)
+def validate_b_titles(
+    sender, instance: Milspecialty, action, reverse, model, pk_set, **kwargs
+):
+    if action in ["post_add", "post_remove", "post_clear"]:
+        mismatched_progs = instance.selectable_by.exclude(
+            faculty__campus__in=instance.available_for
+        )
+        if mismatched_progs.exists():
+            program: Program = mismatched_progs.first()
+            raise ValidationError(
+                {
+                    "selectable_by": f"Can't make milspecialty {instance} be selectable by program {program}: "
+                    f"program's campus ({program.faculty.campus}) is not available for this program"
+                }
+            )

back-end/src/common/populate/milspecialities_selectable_by_programs.py

@@ -0,0 +1,20 @@
+from common.models.milspecialties import Milspecialty
+
+from common.models.universities import (
+    Program,
+)
+
+
+def create_milspecialities_selectable_by_programs(
+    milspecialties: dict[str, Milspecialty], programs: dict[str, Milspecialty]
+):
+    milspecialties["453000"].selectable_by.add(
+        programs["Информационная безопасность"],
+        programs["Информатика и вычислительная техника"],
+        programs["Программная инженерия"],
+    )
+    milspecialties["453100"].selectable_by.add(
+        programs["Информационная безопасность"],
+        programs["Информатика и вычислительная техника"],
+        programs["Программная инженерия"],
+    )

back-end/src/common/populate/milspecialties.py

@@ -10,11 +10,13 @@ def create_milspecialties() -> dict[str, Milspecialty]:
             "code": "453000",
             "title": "Организация эксплуатации и ремонта автоматизированных систем управления и вычислительных комплексов ракетно-космической обороны",
             "available_for": [Campus.MOSCOW.value],
+            "selectable_by_every_program": False,
         },
         {
             "code": "453100",
             "title": "Математическое и программное обеспечение функционирования вычислительных комплексов ракетно-космической обороны",
             "available_for": [Campus.MOSCOW.value],
+            "selectable_by_every_program": False,
         },
         {
             "code": "461300",

back-end/src/common/serializers/milspecialties.py

@@ -6,4 +6,15 @@
 class MilspecialtySerializer(serializers.ModelSerializer):
     class Meta:
         model = Milspecialty
-        fields = "__all__"
+        exclude = ["selectable_by", "selectable_by_every_program"]
+
+
+class WithSelectableByProgramMilspecialtySerializer(MilspecialtySerializer):
+    selectable_by_program = serializers.SerializerMethodField()
+
+    def get_selectable_by_program(self, milspecialty: Milspecialty):
+        request = self.context["request"]
+        program = request.query_params.get("program")
+        if program is not None:
+            return milspecialty.is_selectable_by_program(program)
+        return False

back-end/src/common/tests/conftest.py

@@ -3,19 +3,27 @@
 from auth.models import User
 from common.models.milspecialties import Milspecialty
 from common.models.subjects import Subject
+from common.models.universities import Program, Faculty
+from typing import Optional
 
 
 @pytest.fixture
-def create_milspeciality():
-    def call_me(title: str, code: str, available_for=None):
+def create_milspecialty():
+    def call_me(
+        title: str,
+        code: str,
+        available_for: Optional[list[str]] = None,
+        selectable_by_every_program: bool = True,
+    ):
         if available_for is None:
             available_for = ["MO"]
-        milspeciality, _ = Milspecialty.objects.get_or_create(
+        milspecialty, _ = Milspecialty.objects.get_or_create(
             title=title,
             code=code,
             available_for=available_for,
+            selectable_by_every_program=selectable_by_every_program,
         )
-        return milspeciality
+        return milspecialty
 
     return call_me
 
@@ -71,3 +79,35 @@ def call_me(
         return data
 
     return call_me
+
+
+@pytest.fixture
+def create_faculty():
+    def call_me(title: str, abbreviation: str, campus: str = "MO"):
+        faculty, _ = Faculty.objects.get_or_create(
+            title=title,
+            abbreviation=abbreviation,
+            campus=campus,
+        )
+        return faculty
+
+    return call_me
+
+
+@pytest.fixture
+def create_program():
+    def call_me(
+        title: str,
+        code: str,
+        faculty: Faculty,
+        available_to_choose_for_applicants: bool = True,
+    ):
+        program, _ = Program.objects.get_or_create(
+            title=title,
+            code=code,
+            faculty=faculty,
+            available_to_choose_for_applicants=available_to_choose_for_applicants,
+        )
+        return program
+
+    return call_me