fixup! fix(dav): Make current ooo info time-dependent

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
nextcloud · Dec 1, 2023 · becee17 · becee17
1 parent f6a1fbd
commit becee17
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 36 deletions.
diff --git a/apps/dav/lib/Controller/OutOfOfficeController.php b/apps/dav/lib/Controller/OutOfOfficeController.php
@@ -42,7 +42,7 @@
 
 /**
  * @psalm-import-type DAVOutOfOfficeData from ResponseDefinitions
- * @psalm-import-type DAVOutOfOfficeData2 from ResponseDefinitions
+ * @psalm-import-type DAVCurentOutOfOfficeData from ResponseDefinitions
  */
 class OutOfOfficeController extends OCSController {
 
@@ -61,7 +61,7 @@ public function __construct(
 	 * Get the currently configured out-of-office data of a user.
 	 *
 	 * @param string $userId The user id to get out-of-office data for.
-	 * @return DataResponse<Http::STATUS_OK, DAVOutOfOfficeData2, array{}>|DataResponse<Http::STATUS_NOT_FOUND, null, array{}>
+	 * @return DataResponse<Http::STATUS_OK, DAVCurentOutOfOfficeData, array{}>|DataResponse<Http::STATUS_NOT_FOUND, null, array{}>
 	 *
 	 * 200: Out-of-office data
 	 * 404: No out-of-office data was found

diff --git a/apps/dav/lib/ResponseDefinitions.php b/apps/dav/lib/ResponseDefinitions.php
@@ -40,7 +40,7 @@
  * }
  *
  * @todo this is a copy of \OCP\User\IOutOfOfficeData
- * @psalm-type DAVOutOfOfficeData2 = DAVOutOfOfficeDataCommon&array{
+ * @psalm-type DAVCurentOutOfOfficeData = DAVOutOfOfficeDataCommon&array{
  *     id: string,
  *     startDate: int,
  *     endDate: int,

diff --git a/apps/dav/openapi.json b/apps/dav/openapi.json
@@ -42,6 +42,38 @@
                     }
                 }
             },
+            "CurentOutOfOfficeData": {
+                "allOf": [
+                    {
+                        "$ref": "#/components/schemas/OutOfOfficeDataCommon"
+                    },
+                    {
+                        "type": "object",
+                        "required": [
+                            "id",
+                            "startDate",
+                            "endDate",
+                            "shortMessage"
+                        ],
+                        "properties": {
+                            "id": {
+                                "type": "string"
+                            },
+                            "startDate": {
+                                "type": "integer",
+                                "format": "int64"
+                            },
+                            "endDate": {
+                                "type": "integer",
+                                "format": "int64"
+                            },
+                            "shortMessage": {
+                                "type": "string"
+                            }
+                        }
+                    }
+                ]
+            },
             "OCSMeta": {
                 "type": "object",
                 "required": [
@@ -97,38 +129,6 @@
                     }
                 ]
             },
-            "OutOfOfficeData2": {
-                "allOf": [
-                    {
-                        "$ref": "#/components/schemas/OutOfOfficeDataCommon"
-                    },
-                    {
-                        "type": "object",
-                        "required": [
-                            "id",
-                            "startDate",
-                            "endDate",
-                            "shortMessage"
-                        ],
-                        "properties": {
-                            "id": {
-                                "type": "string"
-                            },
-                            "startDate": {
-                                "type": "integer",
-                                "format": "int64"
-                            },
-                            "endDate": {
-                                "type": "integer",
-                                "format": "int64"
-                            },
-                            "shortMessage": {
-                                "type": "string"
-                            }
-                        }
-                    }
-                ]
-            },
             "OutOfOfficeDataCommon": {
                 "type": "object",
                 "required": [
@@ -323,7 +323,7 @@
                                                     "$ref": "#/components/schemas/OCSMeta"
                                                 },
                                                 "data": {
-                                                    "$ref": "#/components/schemas/OutOfOfficeData2"
+                                                    "$ref": "#/components/schemas/CurentOutOfOfficeData"
                                                 }
                                             }
                                         }