remove unnecessary apis

ReVanced · Oct 23, 2024 · 9da37f1 · 9da37f1
1 parent aac0bfe
commit 9da37f1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 93 deletions.
diff --git a/src/main/kotlin/app/revanced/api/configuration/repository/AnnouncementRepository.kt b/src/main/kotlin/app/revanced/api/configuration/repository/AnnouncementRepository.kt
@@ -167,21 +167,6 @@ internal class AnnouncementRepository {
         }
     }
 
-    suspend fun archive(
-        id: Int,
-        archivedAt: LocalDateTime?,
-    ) = transaction {
-        Announcement.findByIdAndUpdate(id) {
-            it.archivedAt = archivedAt ?: java.time.LocalDateTime.now().toKotlinLocalDateTime()
-        }?.let(::updateLatestAnnouncement)
-    }
-
-    suspend fun unarchive(id: Int) = transaction {
-        Announcement.findByIdAndUpdate(id) {
-            it.archivedAt = null
-        }?.let(::updateLatestAnnouncement) ?: Unit
-    }
-
     suspend fun tags() = transaction {
         Tag.all().toList().toApiTag()
     }

diff --git a/src/main/kotlin/app/revanced/api/configuration/routes/Announcements.kt b/src/main/kotlin/app/revanced/api/configuration/routes/Announcements.kt
@@ -5,7 +5,6 @@ import app.revanced.api.configuration.installCache
 import app.revanced.api.configuration.installNotarizedRoute
 import app.revanced.api.configuration.respondOrNotFound
 import app.revanced.api.configuration.schema.ApiAnnouncement
-import app.revanced.api.configuration.schema.ApiAnnouncementArchivedAt
 import app.revanced.api.configuration.schema.ApiResponseAnnouncement
 import app.revanced.api.configuration.schema.ApiResponseAnnouncementId
 import app.revanced.api.configuration.services.AnnouncementService
@@ -105,27 +104,6 @@ internal fun Route.announcementsRoute() = route("announcements") {
             }
         }
 
-        route("archive") {
-            installAnnouncementsArchiveRouteDocumentation()
-
-            post {
-                val id: Int by call.parameters
-                val archivedAt = call.receiveNullable<ApiAnnouncementArchivedAt>()?.archivedAt
-
-                announcementService.archive(id, archivedAt)
-
-                call.respond(HttpStatusCode.OK)
-            }
-
-            delete {
-                val id: Int by call.parameters
-
-                announcementService.unarchive(id)
-
-                call.respond(HttpStatusCode.OK)
-            }
-        }
-
         route("tags") {
             installAnnouncementsTagsRouteDocumentation()
 
@@ -324,52 +302,6 @@ private fun Route.installAnnouncementsIdRouteDocumentation() = installNotarizedR
     }
 }
 
-private fun Route.installAnnouncementsArchiveRouteDocumentation() = installNotarizedRoute {
-    tags = setOf("Announcements")
-
-    parameters = listOf(
-        Parameter(
-            name = "id",
-            `in` = Parameter.Location.path,
-            schema = TypeDefinition.INT,
-            description = "The ID of the announcement to archive",
-            required = true,
-        ),
-        authHeaderParameter,
-    )
-
-    post = PostInfo.builder {
-        description("Archive an announcement")
-        summary("Archive announcement")
-        parameters(
-            Parameter(
-                name = "archivedAt",
-                `in` = Parameter.Location.query,
-                schema = TypeDefinition.STRING,
-                description = "The date and time the announcement to be archived",
-                required = false,
-            ),
-        )
-        response {
-            description("The announcement is archived")
-            responseCode(HttpStatusCode.OK)
-            responseType<Unit>()
-        }
-        canRespondUnauthorized()
-    }
-
-    delete = DeleteInfo.builder {
-        description("Unarchive an announcement")
-        summary("Unarchive announcement")
-        response {
-            description("The announcement is unarchived")
-            responseCode(HttpStatusCode.OK)
-            responseType<Unit>()
-        }
-        canRespondUnauthorized()
-    }
-}
-
 private fun Route.installAnnouncementsTagsRouteDocumentation() = installNotarizedRoute {
     tags = setOf("Announcements")
 

diff --git a/src/main/kotlin/app/revanced/api/configuration/services/AnnouncementService.kt b/src/main/kotlin/app/revanced/api/configuration/services/AnnouncementService.kt
@@ -2,7 +2,6 @@ package app.revanced.api.configuration.services
 
 import app.revanced.api.configuration.repository.AnnouncementRepository
 import app.revanced.api.configuration.schema.ApiAnnouncement
-import kotlinx.datetime.LocalDateTime
 
 internal class AnnouncementService(
     private val announcementRepository: AnnouncementRepository,
@@ -25,9 +24,5 @@ internal class AnnouncementService(
 
     suspend fun new(new: ApiAnnouncement) = announcementRepository.new(new)
 
-    suspend fun archive(id: Int, archivedAt: LocalDateTime?) = announcementRepository.archive(id, archivedAt)
-
-    suspend fun unarchive(id: Int) = announcementRepository.unarchive(id)
-
     suspend fun tags() = announcementRepository.tags()
 }
diff --git a/src/test/kotlin/app/revanced/api/configuration/services/AnnouncementServiceTest.kt b/src/test/kotlin/app/revanced/api/configuration/services/AnnouncementServiceTest.kt
@@ -51,13 +51,19 @@ private object AnnouncementServiceTest {
     @Test
     fun `archiving works properly`() = runBlocking {
         announcementService.new(ApiAnnouncement(title = "title"))
-        val latestId = announcementService.latestId()!!.id
 
-        announcementService.archive(latestId, LocalDateTime.now().toKotlinLocalDateTime())
-        assertNotNull(announcementService.get(latestId)?.archivedAt)
+        val latest = announcementService.latest()!!
+        assertNull(announcementService.get(latest.id)?.archivedAt)
+
+        val updated = ApiAnnouncement(
+            title = latest.title,
+            archivedAt = LocalDateTime.now().toKotlinLocalDateTime(),
+        )
+
+        announcementService.update(latest.id, updated)
+        assertNotNull(announcementService.get(latest.id)?.archivedAt)
 
-        announcementService.unarchive(latestId)
-        assertNull(announcementService.get(latestId)?.archivedAt)
+        return@runBlocking
     }
 
     @Test