NN API Route

src/meshapi/migrations/0018_rename_network_number_building_primary_nn_and_more.py

@@ -0,0 +1,39 @@
+# Generated by Django 4.2.5 on 2023-12-23 03:01
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("meshapi", "0017_building_node_name_building_secondary_nn_and_more"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="building",
+            old_name="network_number",
+            new_name="primary_nn",
+        ),
+        migrations.RemoveField(
+            model_name="building",
+            name="secondary_nn",
+        ),
+        migrations.RemoveField(
+            model_name="install",
+            name="id",
+        ),
+        migrations.RemoveField(
+            model_name="install",
+            name="referral",
+        ),
+        migrations.AddField(
+            model_name="install",
+            name="network_number",
+            field=models.IntegerField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name="install",
+            name="install_number",
+            field=models.IntegerField(primary_key=True, serialize=False),
+        ),
+    ]

src/meshapi/migrations/0019_alter_install_install_number.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.5 on 2023-12-23 03:19
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("meshapi", "0018_rename_network_number_building_primary_nn_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="install",
+            name="install_number",
+            field=models.AutoField(db_column="install_number", primary_key=True, serialize=False),
+        ),
+    ]

src/meshapi/migrations/0020_alter_install_install_number.py

@@ -0,0 +1,26 @@
+# Generated by Django 4.2.5 on 2023-12-23 03:25
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("meshapi", "0019_alter_install_install_number"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="install",
+            name="install_number",
+            field=models.AutoField(
+                db_column="install_number",
+                primary_key=True,
+                serialize=False,
+                validators=[
+                    django.core.validators.MinValueValidator(101),
+                    django.core.validators.MaxValueValidator(8192),
+                ],
+            ),
+        ),
+    ]

src/meshapi/migrations/0021_alter_install_install_number_and_more.py

@@ -0,0 +1,30 @@
+# Generated by Django 4.2.5 on 2023-12-23 03:37
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("meshapi", "0020_alter_install_install_number"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="install",
+            name="install_number",
+            field=models.AutoField(db_column="install_number", primary_key=True, serialize=False),
+        ),
+        migrations.AlterField(
+            model_name="install",
+            name="network_number",
+            field=models.IntegerField(
+                blank=True,
+                null=True,
+                validators=[
+                    django.core.validators.MinValueValidator(101),
+                    django.core.validators.MaxValueValidator(8192),
+                ],
+            ),
+        ),
+    ]

src/meshapi/models.py

@@ -1,11 +1,12 @@
+from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
 from django.contrib.postgres.fields import ArrayField
 
 from django.contrib.auth.models import Group
-from django.db.models.aggregates import IntegerField
 from django.db.models.fields import EmailField
 
-NETWORK_NUMBER_MAX = 8000
+NETWORK_NUMBER_MIN = 101
+NETWORK_NUMBER_MAX = 8192
 
 
 class Installer(Group):
@@ -29,8 +30,7 @@ class BuildingStatus(models.IntegerChoices):
     latitude = models.FloatField()
     longitude = models.FloatField()
     altitude = models.FloatField()
-    network_number = models.IntegerField(blank=True, null=True)
-    secondary_nn = ArrayField(IntegerField(blank=True, null=True), null=True)
+    primary_nn = models.IntegerField(blank=True, null=True)
     node_name = models.TextField(default=None, blank=True, null=True)
     install_date = models.DateField(default=None, blank=True, null=True)
     abandon_date = models.DateField(default=None, blank=True, null=True)
@@ -54,12 +54,23 @@ class InstallStatus(models.IntegerChoices):
         INACTIVE = 4
         CLOSED = 5
 
+    # Install Number (generated when form is submitted)
+    install_number = models.AutoField(
+        primary_key=True,
+        db_column="install_number",
+    )
+
+    # The NN this install is associated with.
+    # Through this, a building can have multiple NNs
+    network_number = models.IntegerField(
+        blank=True,
+        null=True,
+        validators=[MinValueValidator(NETWORK_NUMBER_MIN), MaxValueValidator(NETWORK_NUMBER_MAX)],
+    )
+
     # Summary status of install
     install_status = models.IntegerField(choices=InstallStatus.choices)
 
-    # Install Number (generated when form is submitted)
-    install_number = models.IntegerField()
-
     # OSTicket ID
     ticket_id = models.IntegerField(blank=True, null=True)
 
@@ -75,6 +86,4 @@ class InstallStatus(models.IntegerChoices):
 
     # Relation to Member
     member_id = models.ForeignKey(Member, on_delete=models.PROTECT)
-    referral = models.TextField(default=None, blank=True, null=True)
-
     notes = models.TextField(default=None, blank=True, null=True)

src/meshapi/tests/sample_data.py

@@ -18,14 +18,14 @@
     "latitude": 0.0,
     "longitude": 0.0,
     "altitude": 0.0,
-    "network_number": 9001,
+    "primary_nn": 2000,
     "install_date": "2222-02-02",
     "abandon_date": "",
 }
 
 sample_install = {
+    "network_number": 2000,
     "install_status": Install.InstallStatus.ACTIVE,
-    "install_number": 420,
     "ticket_id": 69,
     "request_date": "2022-02-27",
     "install_date": "2022-03-01",
@@ -34,6 +34,5 @@
     "unit": 3,
     "roof_access": True,
     "member_id": 1,
-    "referral": "Read about it on the internet",
-    "notes": "",
+    "notes": "Referral: Read about it on the internet",
 }

src/meshapi/tests/test_join_form.py

@@ -43,8 +43,8 @@ def validate_successful_join_form_submission(test_case, test_name, s, response):
     )
 
     # Check that a install was created
-    install_id = json.loads(response.content.decode("utf-8"))["install_id"]
-    join_form_installs = Install.objects.filter(pk=install_id)
+    install_number = json.loads(response.content.decode("utf-8"))["install_number"]
+    join_form_installs = Install.objects.filter(pk=install_number)
 
     length = 1
     test_case.assertEqual(