Merge pull request #185 from BIDMCDigitalPsychiatry/issue-467-new

_schema removed, help_contents-> description, script_contents -> exec…
BIDMCDigitalPsychiatry · Mar 3, 2022 · d56bdde · d56bdde
2 parents b736156 + c46a2f8
commit d56bdde
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 33 deletions.
diff --git a/src/model/ActivitySpec.ts b/src/model/ActivitySpec.ts
@@ -3,11 +3,10 @@ type JSONSchema = any
 type Tab = 'learn' | 'assess' | 'manage' | 'prevent'
 export class ActivitySpec {
   public name?: string
-  public help_contents?: string
-  public script_contents?: string
-  public static_data_schema?: JSONSchema
-  public temporal_slice_schema?: JSONSchema
-  public settings_schema?: JSONSchema
+  public description?: string
+  public executable?: string
+  public static_data?: JSONSchema
+  public temporal_slices?: JSONSchema
+  public settings?: JSONSchema
   public category?: Tab[] | null
-  public executable?: string | null
 }
diff --git a/src/repository/couch/ActivitySpecRepository.ts b/src/repository/couch/ActivitySpecRepository.ts
@@ -17,13 +17,12 @@ export class ActivitySpecRepository implements ActivitySpecInterface {
     try {
       await Database.use("activity_spec").insert({
         _id: object.name,
-        help_contents: object.help_contents ?? null,
-        script_contents: object.script_contents ?? null,
-        static_data_schema: object.static_data_schema ?? {},
-        temporal_slice_schema: object.temporal_slice_schema ?? {},
-        settings_schema: object.settings_schema ?? {},
+        description: object.description ?? null,
+        executable: object.executable ?? null,
+        static_data: object.static_data ?? {},
+        temporal_slices: object.temporal_slices ?? {},
+        settings: object.settings ?? {},
         category: object.category ?? null,
-        executable: object.executable ?? null
       } as any)
       return {}
     } catch (error) {
@@ -36,13 +35,12 @@ export class ActivitySpecRepository implements ActivitySpecInterface {
       docs: [
         {
           ...orig,
-          help_contents: object.help_contents ?? orig.help_contents,
-          script_contents: object.script_contents ?? orig.script_contents,
-          static_data_schema: object.static_data_schema ?? orig.static_data_schema,
-          temporal_slice_schema: object.temporal_slice_schema ?? orig.temporal_slice_schema,
-          settings_schema: object.settings_schema ?? orig.settings_schema,
+          description: object.description ?? orig.description,
+          executable: object.executable ?? orig.executable,
+          static_data: object.static_data ?? orig.static_data,
+          temporal_slices: object.temporal_slices ?? orig.temporal_slices,
+          settings: object.settings ?? orig.settings,
           category: object.category ?? orig.category,
-          executable:object.executable ?? orig.executable
         },
       ],
     })

diff --git a/src/repository/mongo/ActivitySpecRepository.ts b/src/repository/mongo/ActivitySpecRepository.ts
@@ -22,13 +22,12 @@ export class ActivitySpecRepository implements ActivitySpecInterface {
     try {
       await MongoClientDB.collection("activity_spec").insertOne({
         _id: object.name,
-        help_contents: object.help_contents ?? null,
-        script_contents: object.script_contents ?? null,
-        static_data_schema: object.static_data_schema ?? {},
-        temporal_slice_schema: object.temporal_slice_schema ?? {},
-        settings_schema: object.settings_schema ?? {},
-        category: object.category ?? null,
+        description: object.description ?? null,
         executable: object.executable ?? null,
+        static_data: object.static_data ?? {},
+        temporal_slices: object.temporal_slices ?? {},
+        settings: object.settings ?? {},
+        category: object.category ?? null,
         _deleted: false,
       } as any)
       return {}
@@ -42,13 +41,12 @@ export class ActivitySpecRepository implements ActivitySpecInterface {
       { _id: orig._id },
       {
         $set: {
-          help_contents: object.help_contents ?? orig.help_contents,
-          script_contents: object.script_contents ?? orig.script_contents,          
-          static_data_schema: object.static_data_schema ?? orig.static_data_schema,
-          temporal_slice_schema: object.temporal_slice_schema ?? orig.temporal_slice_schema,
-          settings_schema: object.settings_schema ?? orig.settings_schema,
+          description: object.description ?? orig.description,
+          executable: object.executable ?? orig.executable,          
+          static_data: object.static_data ?? orig.static_data,
+          temporal_slices: object.temporal_slices ?? orig.temporal_slices,
+          settings: object.settings ?? orig.settings,
           category: object.category ?? orig.category,
-          executable: object.executable ?? orig.executable
         },
       }
     )

diff --git a/src/utils/OpenAPISchema.json b/src/utils/OpenAPISchema.json
@@ -6647,7 +6647,7 @@
             "type": "string",
             "description": "The WebView-compatible script that provides this Activity on mobile or desktop (IFrame) clients."
           },
-          "static_data_schema": {
+          "static_data": {
             "allOf": [
               {
                 "$ref": "#/components/schemas/JSONSchema"
@@ -6674,7 +6674,7 @@
               }
             ]
           },
-          "temporal_event_schema": {
+          "temporal_slices": {
             "allOf": [
               {
                 "$ref": "#/components/schemas/JSONSchema"
@@ -6723,7 +6723,7 @@
               }
             ]
           },
-          "settings_schema": {
+          "settings": {
             "allOf": [
               {
                 "$ref": "#/components/schemas/JSONSchema"