Merge branch 'develop'

.eslintrc.cjs

@@ -44,7 +44,7 @@ const oldRestrictedImports = [
   },
 ];
 
-/** @type import('@seedcompany/eslint-plugin').ImportRestriction[] */
+/** @type {import('@seedcompany/eslint-plugin').ImportRestriction[]} */
 const restrictedImports = [
   // Guard against ts hints trying to insert "src/" paths.
   // It does that with basePath configured which is required for path aliases, even though it's never what we want.
@@ -72,6 +72,22 @@ const restrictedImports = [
     path: ['..', '../..', '../../..'],
     message: 'Not specific enough',
   },
+  {
+    importNames: 'IntersectionType',
+    path: '@nestjs/graphql',
+    replacement: { importName: 'IntersectTypes', path: '~/common' },
+    message: 'Use our wrapper that allows for varargs & provides members array',
+  },
+  {
+    importNames: 'HttpAdapterHost',
+    path: '@nestjs/core',
+    replacement: { path: '~/core/http' },
+  },
+  {
+    importNames: 'NestMiddleware',
+    path: '@nestjs/common',
+    replacement: { importName: 'HttpMiddleware', path: '~/core/http' },
+  },
 ];
 
 const namingConvention = [

dbschema/engagement.esdl

@@ -1,5 +1,5 @@
 module default {
-  abstract type Engagement extending Project::Child {
+  abstract type Engagement extending Project::Child, Comments::Aware {
     required status: Engagement::Status {
       default := Engagement::Status.InDevelopment;
     }
@@ -24,7 +24,7 @@ module default {
       .<engagement[is Engagement::Ceremony]
     ));
 
-    completedDate: cal::local_date {
+    completeDate: cal::local_date {
       annotation description := "Translation / Growth Plan complete date";
     }
     disbursementCompleteDate: cal::local_date;
@@ -51,7 +51,20 @@ module default {
     property firstScripture := (
       exists .language.firstScriptureEngagement
     );
-
+
+    trigger denyDuplicateFirstScriptureBasedOnExternal after insert, update for each do ( 
+      assert(
+        not __new__.firstScripture or not exists __new__.language.hasExternalFirstScripture,
+        message := "First scripture has already been marked as having been done externally"
+      )
+    );
+    trigger denyDuplicateFirstScriptureBasedOnOtherEngagement after insert, update for each do (
+      assert( 
+        not exists (select __new__.language.engagements filter .firstScripture),
+        message := "Another engagement has already been marked as having done the first scripture"
+      )
+    );
+
     required lukePartnership: bool {
       default := false;
     };

dbschema/language.esdl

@@ -1,5 +1,13 @@
 module default {
-  type Language extending Mixin::Postable, Resource, Project::ContextAware, Mixin::Named, Mixin::Pinnable, Mixin::Taggable {
+  type Language extending
+    Mixin::Postable,
+    Comments::Aware,
+    Resource,
+    Project::ContextAware,
+    Mixin::Named,
+    Mixin::Pinnable,
+    Mixin::Taggable
+  {
     required displayName: str {
       default := .name;
     }