From c79b03ef41353d383db7e02d22d5d61c8b54c443 Mon Sep 17 00:00:00 2001
From: Pl217 <pl_217@live.com>
Date: Tue, 19 Nov 2024 17:28:19 +0100
Subject: [PATCH 1/2] Make `planId` a required column in `attachment` table

---
 src/db/models/attachment.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/db/models/attachment.ts b/src/db/models/attachment.ts
index 5034e985..24757b69 100644
--- a/src/db/models/attachment.ts
+++ b/src/db/models/attachment.ts
@@ -37,10 +37,6 @@ export default defineLegacyVersionedModel({
         kind: 'branded-integer',
         brand: ATTACHMENT_PROTOTYPE_ID,
       },
-      planId: {
-        kind: 'branded-integer',
-        brand: PLAN_ID,
-      },
     },
     required: {
       objectId: {
@@ -51,6 +47,10 @@ export default defineLegacyVersionedModel({
         kind: 'checked',
         type: ATTACHMENT_OBJECT_TYPE,
       },
+      planId: {
+        kind: 'branded-integer',
+        brand: PLAN_ID,
+      },
       type: {
         kind: 'checked',
         type: ATTACHMENT_TYPE,

From 4ac6d3ea6c398810189b594a478f01abe91f63bd Mon Sep 17 00:00:00 2001
From: Pl217 <pl_217@live.com>
Date: Tue, 19 Nov 2024 17:44:59 +0100
Subject: [PATCH 2/2] Make `abbreviation` a required column in `organization`
 table

---
 src/db/models/organization.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/db/models/organization.ts b/src/db/models/organization.ts
index 2fde994e..57a0193a 100644
--- a/src/db/models/organization.ts
+++ b/src/db/models/organization.ts
@@ -33,8 +33,6 @@ export default defineIDModel({
     },
     required: {
       name: { kind: 'checked', type: t.string },
-    },
-    accidentallyOptional: {
       abbreviation: { kind: 'checked', type: t.string },
     },
   },