add v1 api (dce1121e) · Commits · e / os / Nextcloud Android Library

library/src/androidTest/java/com/owncloud/android/lib/resources/assistant/v1/AssistantITV1.kt

0 → 100644

+72 −0

Original line number	Diff line number	Diff line
		/*
		* Nextcloud Android Library
		*
		* SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
		* SPDX-FileCopyrightText: 2024 Alper Ozturk <alper.ozturk@nextcloud.com>
		* SPDX-License-Identifier: MIT
		*/

		package com.owncloud.android.lib.resources.assistant.v1

		import com.owncloud.android.AbstractIT
		import com.owncloud.android.lib.resources.status.NextcloudVersion
		import junit.framework.TestCase.assertEquals
		import junit.framework.TestCase.assertTrue
		import org.junit.Before
		import org.junit.Test

		class AssistantITV1 : AbstractIT() {
		@Before
		fun before() {
		testOnlyOnServer(NextcloudVersion.nextcloud_28)
		}

		@Test
		fun testGetTaskTypes() {
		val result = GetTaskTypesRemoteOperationV1().execute(nextcloudClient)
		assertTrue(result.isSuccess)

		val taskTypes = result.resultData.types
		assertTrue(taskTypes.isNotEmpty())
		}

		@Test
		fun testGetTaskList() {
		var result = GetTaskListRemoteOperationV1("assistant").execute(nextcloudClient)
		assertTrue(result.isSuccess)
		assertTrue(result.resultData.tasks.isEmpty())

		// create one task
		val input = "Give me some random output for test purpose"
		val type = "OCP\\TextProcessing\\FreePromptTaskType"
		assertTrue(CreateTaskRemoteOperationV1(input, type).execute(nextcloudClient).isSuccess)

		result = GetTaskListRemoteOperationV1("assistant").execute(nextcloudClient)
		assertTrue(result.isSuccess)

		val taskList = result.resultData.tasks
		assertTrue(taskList.isNotEmpty())
		}

		@Test
		fun testDeleteTask() {
		// create one task
		val input = "Give me some random output for test purpose"
		val type = "OCP\\TextProcessing\\FreePromptTaskType"
		assertTrue(CreateTaskRemoteOperationV1(input, type).execute(nextcloudClient).isSuccess)

		var result = GetTaskListRemoteOperationV1("assistant").execute(nextcloudClient)
		assertTrue(result.isSuccess)

		val tasks = result.resultData.tasks
		val countBefore = tasks.size

		// delete
		assertTrue(DeleteTaskRemoteOperationV1(tasks.first().id).execute(nextcloudClient).isSuccess)

		result = GetTaskListRemoteOperationV1("assistant").execute(nextcloudClient)
		assertTrue(result.isSuccess)

		assertEquals(countBefore - 1, result.resultData.tasks.size)
		}
		}

library/src/androidTest/java/com/owncloud/android/lib/resources/assistant/AssistantIT.kt→library/src/androidTest/java/com/owncloud/android/lib/resources/assistant/v2/AssistantITV2.kt

+14 −14

Original line number	Diff line number	Diff line
		@@ -2,23 +2,23 @@
		* Nextcloud Android Library
		*
		* SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
		* SPDX-FileCopyrightText: 2024 Tobias Kaminsky <tobias@kaminsky.me>
		* SPDX-FileCopyrightText: 2024 Alper Ozturk <alper.ozturk@nextcloud.com>
		* SPDX-License-Identifier: MIT
		*/

		package com.owncloud.android.lib.resources.assistant
		package com.owncloud.android.lib.resources.assistant.v2

		import com.owncloud.android.AbstractIT
		import com.owncloud.android.lib.resources.assistant.model.TaskInputShape
		import com.owncloud.android.lib.resources.assistant.model.TaskOutputShape
		import com.owncloud.android.lib.resources.assistant.model.TaskTypeData
		import com.owncloud.android.lib.resources.assistant.v2.model.TaskInputShape
		import com.owncloud.android.lib.resources.assistant.v2.model.TaskOutputShape
		import com.owncloud.android.lib.resources.assistant.v2.model.TaskTypeData
		import com.owncloud.android.lib.resources.status.NextcloudVersion
		import junit.framework.TestCase.assertEquals
		import junit.framework.TestCase.assertTrue
		import org.junit.Before
		import org.junit.Test

		class AssistantIT : AbstractIT() {
		class AssistantITV2 : AbstractIT() {
		@Before
		fun before() {
		testOnlyOnServer(NextcloudVersion.nextcloud_30)
		@@ -50,7 +50,7 @@ class AssistantIT : AbstractIT() {

		@Test
		fun testGetTaskTypes() {
		val result = GetTaskTypesRemoteOperation().execute(nextcloudClient)
		val result = GetTaskTypesRemoteOperationV2().execute(nextcloudClient)
		assertTrue(result.isSuccess)
		}

		@@ -59,15 +59,15 @@ class AssistantIT : AbstractIT() {
		val taskType = getTaskType()
		val selectedTaskType = getSelectedTaskType()

		var result = GetTaskListRemoteOperation(selectedTaskType).execute(nextcloudClient)
		var result = GetTaskListRemoteOperationV2(selectedTaskType).execute(nextcloudClient)
		assertTrue(result.isSuccess)
		assertTrue(result.resultData.tasks.isEmpty())

		// create one task
		val input = "Give me some random output for test purpose"
		assertTrue(CreateTaskRemoteOperation(input, taskType).execute(nextcloudClient).isSuccess)
		assertTrue(CreateTaskRemoteOperationV2(input, taskType).execute(nextcloudClient).isSuccess)

		result = GetTaskListRemoteOperation(selectedTaskType).execute(nextcloudClient)
		result = GetTaskListRemoteOperationV2(selectedTaskType).execute(nextcloudClient)
		assertTrue(result.isSuccess)

		val taskList = result.resultData.tasks
		@@ -81,18 +81,18 @@ class AssistantIT : AbstractIT() {
		val taskType = getTaskType()
		val selectedTaskType = getSelectedTaskType()

		assertTrue(CreateTaskRemoteOperation(input, taskType).execute(nextcloudClient).isSuccess)
		assertTrue(CreateTaskRemoteOperationV2(input, taskType).execute(nextcloudClient).isSuccess)

		var result = GetTaskListRemoteOperation(selectedTaskType).execute(nextcloudClient)
		var result = GetTaskListRemoteOperationV2(selectedTaskType).execute(nextcloudClient)
		assertTrue(result.isSuccess)

		val tasks = result.resultData.tasks
		val countBefore = tasks.size

		// delete
		assertTrue(DeleteTaskRemoteOperation(tasks.first().id).execute(nextcloudClient).isSuccess)
		assertTrue(DeleteTaskRemoteOperationV2(tasks.first().id).execute(nextcloudClient).isSuccess)

		result = GetTaskListRemoteOperation(selectedTaskType).execute(nextcloudClient)
		result = GetTaskListRemoteOperationV2(selectedTaskType).execute(nextcloudClient)
		assertTrue(result.isSuccess)

		assertEquals(countBefore - 1, result.resultData.tasks.size)

library/src/main/java/com/owncloud/android/lib/resources/assistant/v1/CreateTaskRemoteOperationV1.kt

0 → 100644

+48 −0

Original line number	Diff line number	Diff line
		/*
		* Nextcloud Android Library
		*
		* SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
		* SPDX-FileCopyrightText: 2024 Alper Ozturk <alper.ozturk@nextcloud.com>
		* SPDX-License-Identifier: MIT
		*/

		package com.owncloud.android.lib.resources.assistant.v1

		import com.nextcloud.common.NextcloudClient
		import com.nextcloud.operations.PostMethod
		import com.owncloud.android.lib.common.operations.RemoteOperation
		import com.owncloud.android.lib.common.operations.RemoteOperationResult
		import okhttp3.MediaType.Companion.toMediaTypeOrNull
		import okhttp3.RequestBody.Companion.toRequestBody
		import org.apache.commons.httpclient.HttpStatus

		class CreateTaskRemoteOperationV1(private val input: String, private val type: String) :
		RemoteOperation<Void>() {
		override fun run(client: NextcloudClient): RemoteOperationResult<Void> {
		val requestBody =
		hashMapOf(
		"input" to input,
		"type" to type,
		"appId" to "assistant",
		"identifier" to ""
		)

		val json = gson.toJson(requestBody)

		val request = json.toRequestBody("application/json".toMediaTypeOrNull())

		val postMethod = PostMethod(client.baseUri.toString() + TAG_URL, true, request)

		val status = postMethod.execute(client)

		return if (status == HttpStatus.SC_OK) {
		RemoteOperationResult<Void>(true, postMethod)
		} else {
		RemoteOperationResult<Void>(false, postMethod)
		}
		}

		companion object {
		const val TAG_URL = "/ocs/v2.php/textprocessing/schedule"
		}
		}

library/src/main/java/com/owncloud/android/lib/resources/assistant/DeleteTaskRemoteOperation.kt→library/src/main/java/com/owncloud/android/lib/resources/assistant/v1/DeleteTaskRemoteOperationV1.kt

+4 −3

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@
		* SPDX-License-Identifier: MIT
		*/

		package com.owncloud.android.lib.resources.assistant
		package com.owncloud.android.lib.resources.assistant.v1

		import com.nextcloud.common.NextcloudClient
		import com.nextcloud.operations.DeleteMethod
		@@ -17,7 +17,7 @@ import com.owncloud.android.lib.resources.users.DeletePrivateKeyRemoteOperation
		import java.io.IOException
		import java.net.HttpURLConnection

		class DeleteTaskRemoteOperation(private val appId: Long) : RemoteOperation<Void>() {
		class DeleteTaskRemoteOperationV1(private val appId: Long) : RemoteOperation<Void>() {
		override fun run(client: NextcloudClient): RemoteOperationResult<Void> {
		var postMethod: DeleteMethod? = null
		var result: RemoteOperationResult<Void>
		@@ -41,6 +41,7 @@ class DeleteTaskRemoteOperation(private val appId: Long) : RemoteOperation<Void>

		companion object {
		private val TAG = DeletePrivateKeyRemoteOperation::class.java.simpleName
		private const val DIRECT_ENDPOINT = "/ocs/v2.php/taskprocessing/task/"
		private const val DIRECT_ENDPOINT =
		"/ocs/v2.php/textprocessing/task/"
		}
		}

library/src/main/java/com/owncloud/android/lib/resources/assistant/v1/GetTaskListRemoteOperationV1.kt

0 → 100644

+58 −0

Original line number	Diff line number	Diff line
		/*
		* Nextcloud Android Library
		*
		* SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
		* SPDX-FileCopyrightText: 2024 Alper Ozturk <alper.ozturk@nextcloud.com>
		* SPDX-License-Identifier: MIT
		*/

		package com.owncloud.android.lib.resources.assistant.v1

		import com.google.gson.reflect.TypeToken
		import com.nextcloud.common.NextcloudClient
		import com.nextcloud.operations.GetMethod
		import com.owncloud.android.lib.common.operations.RemoteOperationResult
		import com.owncloud.android.lib.common.utils.Log_OC
		import com.owncloud.android.lib.ocs.ServerResponse
		import com.owncloud.android.lib.resources.OCSRemoteOperation
		import com.owncloud.android.lib.resources.assistant.v1.model.TaskList
		import org.apache.commons.httpclient.HttpStatus

		class GetTaskListRemoteOperationV1(private val appId: String) : OCSRemoteOperation<TaskList>() {
		@Suppress("TooGenericExceptionCaught")
		override fun run(client: NextcloudClient): RemoteOperationResult<TaskList> {
		var result: RemoteOperationResult<TaskList>
		var getMethod: GetMethod? = null
		try {
		getMethod =
		GetMethod(client.baseUri.toString() + DIRECT_ENDPOINT + appId + JSON_FORMAT, true)
		val status = client.execute(getMethod)
		if (status == HttpStatus.SC_OK) {
		val taskTypes: TaskList? =
		getServerResponse(
		getMethod,
		object : TypeToken<ServerResponse<TaskList>>() {}
		)?.ocs?.data
		result = RemoteOperationResult(true, getMethod)
		result.setResultData(taskTypes)
		} else {
		result = RemoteOperationResult(false, getMethod)
		}
		} catch (e: Exception) {
		result = RemoteOperationResult(e)
		Log_OC.e(
		TAG,
		"Get task list for user " + " failed: " + result.logMessage,
		result.exception
		)
		} finally {
		getMethod?.releaseConnection()
		}
		return result
		}

		companion object {
		private val TAG = GetTaskListRemoteOperationV1::class.java.simpleName
		private const val DIRECT_ENDPOINT = "/ocs/v2.php/textprocessing/tasks/app/"
		}
		}