updating openapi spec to try and improve template dto type

Author: alexnuttall

infrastructure/terraform/modules/backend-api/spec.tmpl.json

@@ -781,50 +781,143 @@
       "TemplateDto": {
         "type": "object",
         "oneOf": [
-          
-        ],
-        "allOf": [
           {
-            "$ref": "#/components/schemas/BaseTemplate"
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BaseTemplate"
+              },
+              {
+                "type": "object",
+                "required": [
+                  "id",
+                  "templateStatus",
+                  "createdAt",
+                  "updatedAt"
+                ],
+                "properties": {
+                  "id": {
+                    "type": "string"
+                  },
+                  "templateStatus": {
+                    "$ref": "#/components/schemas/TemplateStatus"
+                  },
+                  "createdAt": {
+                    "type": "string",
+                    "format": "date-time"
+                  },
+                  "updatedAt": {
+                    "type": "string",
+                    "format": "date-time"
+                  }
+                }
+              },
+              {
+                "$ref": "#/components/schemas/LetterProperties"
+              }
+            ]
           },
           {
-            "type": "object",
-            "required": [
-              "id",
-              "templateStatus",
-              "createdAt",
-              "updatedAt"
-            ],
-            "properties": {
-              "id": {
-                "type": "string"
-              },
-              "templateStatus": {
-                "$ref": "#/components/schemas/TemplateStatus"
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BaseTemplate"
               },
-              "createdAt": {
-                "type": "string",
-                "format": "date-time"
+              {
+                "type": "object",
+                "required": [
+                  "id",
+                  "templateStatus",
+                  "createdAt",
+                  "updatedAt"
+                ],
+                "properties": {
+                  "id": {
+                    "type": "string"
+                  },
+                  "templateStatus": {
+                    "$ref": "#/components/schemas/TemplateStatus"
+                  },
+                  "createdAt": {
+                    "type": "string",
+                    "format": "date-time"
+                  },
+                  "updatedAt": {
+                    "type": "string",
+                    "format": "date-time"
+                  }
+                }
               },
-              "updatedAt": {
-                "type": "string",
-                "format": "date-time"
+              {
+                "$ref": "#/components/schemas/NhsAppProperties"
               }
-            }
+            ]
           },
           {
-            "oneOf": [
+            "allOf": [
               {
-                "$ref": "#/components/schemas/NhsAppProperties"
+                "$ref": "#/components/schemas/BaseTemplate"
               },
               {
-                "$ref": "#/components/schemas/EmailProperties"
+                "type": "object",
+                "required": [
+                  "id",
+                  "templateStatus",
+                  "createdAt",
+                  "updatedAt"
+                ],
+                "properties": {
+                  "id": {
+                    "type": "string"
+                  },
+                  "templateStatus": {
+                    "$ref": "#/components/schemas/TemplateStatus"
+                  },
+                  "createdAt": {
+                    "type": "string",
+                    "format": "date-time"
+                  },
+                  "updatedAt": {
+                    "type": "string",
+                    "format": "date-time"
+                  }
+                }
               },
               {
                 "$ref": "#/components/schemas/SmsProperties"
+              }
+            ]
+          },
+          {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BaseTemplate"
               },
               {
-                "$ref": "#/components/schemas/LetterProperties"
+                "type": "object",
+                "required": [
+                  "id",
+                  "templateStatus",
+                  "createdAt",
+                  "updatedAt"
+                ],
+                "properties": {
+                  "id": {
+                    "type": "string"
+                  },
+                  "templateStatus": {
+                    "$ref": "#/components/schemas/TemplateStatus"
+                  },
+                  "createdAt": {
+                    "type": "string",
+                    "format": "date-time"
+                  },
+                  "updatedAt": {
+                    "type": "string",
+                    "format": "date-time"
+                  }
+                }
+              },
+              {
+                "$ref": "#/components/schemas/EmailProperties"
               }
             ]
           }

lambdas/backend-client/src/types/generated/types.gen.ts

@@ -94,12 +94,31 @@ export type CreateUpdateTemplate = BaseTemplate &
     | CreateUpdateLetterProperties
   );
 
-export type TemplateDto = BaseTemplate & {
-  id: string;
-  templateStatus: TemplateStatus;
-  createdAt: string;
-  updatedAt: string;
-} & (NhsAppProperties | EmailProperties | SmsProperties | LetterProperties);
+export type TemplateDto =
+  | (BaseTemplate & {
+      id: string;
+      templateStatus: TemplateStatus;
+      createdAt: string;
+      updatedAt: string;
+    } & LetterProperties)
+  | (BaseTemplate & {
+      id: string;
+      templateStatus: TemplateStatus;
+      createdAt: string;
+      updatedAt: string;
+    } & NhsAppProperties)
+  | (BaseTemplate & {
+      id: string;
+      templateStatus: TemplateStatus;
+      createdAt: string;
+      updatedAt: string;
+    } & SmsProperties)
+  | (BaseTemplate & {
+      id: string;
+      templateStatus: TemplateStatus;
+      createdAt: string;
+      updatedAt: string;
+    } & EmailProperties);
 
 export type Success = {
   template: TemplateDto;