Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: purge turtle files by fdkID #118

Merged
merged 3 commits into from
Aug 21, 2024
Merged

feat: purge turtle files by fdkID #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
84d9f4f
chore: set method for updating events as removed to POST
NilsOveTen Aug 21, 2024
616a928
chore: rename duplicates endpoint
NilsOveTen Aug 21, 2024
8118c96
feat: purge turtle files by fdkID
NilsOveTen Aug 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions src/main/kotlin/no/fdk/fdk_event_harvester/controller/EventController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,17 +52,27 @@ open class EventsController(
else ResponseEntity(eventService.getAllEvents(returnType ?: Lang.TURTLE, catalogRecords), HttpStatus.OK)
}

@DeleteMapping("/{id}")
@PostMapping("/{id}/remove")
fun removeInformationModelById(
@AuthenticationPrincipal jwt: Jwt,
@PathVariable id: String
): ResponseEntity<Void> =
if (endpointPermissions.hasAdminPermission(jwt)) {
eventService.removeEvent(id)
ResponseEntity(HttpStatus.OK)
} else ResponseEntity(HttpStatus.FORBIDDEN)

@DeleteMapping("/{id}")
fun purgeEventById(
@AuthenticationPrincipal jwt: Jwt,
@PathVariable id: String
): ResponseEntity<Void> =
if (endpointPermissions.hasAdminPermission(jwt)) {
eventService.purgeByFdkId(id)
ResponseEntity(HttpStatus.NO_CONTENT)
} else ResponseEntity(HttpStatus.FORBIDDEN)

@PostMapping("/duplicates")
@PostMapping("/remove-duplicates")
fun removeDuplicates(
@AuthenticationPrincipal jwt: Jwt,
@RequestBody duplicates: List<DuplicateIRI>
Expand Down
9 changes: 9 additions & 0 deletions src/main/kotlin/no/fdk/fdk_event_harvester/service/EventService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,4 +117,13 @@ class EventService(
}
}

// Purges everything associated with a removed fdkID
fun purgeByFdkId(fdkId: String) {
eventMetaRepository.findAllByFdkId(fdkId)
.also { events -> if (events.any { !it.removed }) throw ResponseStatusException(HttpStatus.BAD_REQUEST, "Unable to purge files, event with id $fdkId has not been removed") }
.run { eventMetaRepository.deleteAll(this) }

turtleService.deleteEventFiles(fdkId)
}

}
5 changes: 5 additions & 0 deletions src/main/kotlin/no/fdk/fdk_event_harvester/service/TurtleService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,11 @@ class TurtleService(
?.turtle
?.let { ungzip(it) }

fun deleteEventFiles(fdkId: String) {
eventRepository.deleteById(fdkId)
fdkEventRepository.deleteById(fdkId)
}

}

private fun Model.createEventTurtleDBO(id: String): EventTurtle =
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ logging:
level.org.apache.jena: ERROR
server:
port: 8080
error.include-message: always
spring:
security.oauth2.resourceserver.jwt:
jwk-set-uri: ${SSO_HOST:https://sso.staging.fellesdatakatalog.digdir.no}/auth/realms/fdk/protocol/openid-connect/certs
Expand Down
76 changes: 63 additions & 13 deletions src/test/kotlin/no/fdk/fdk_event_harvester/contract/EventServicesTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,9 @@ class EventServicesTest : ApiTestContext() {
fun unauthorizedForNoToken() {
val response = authorizedRequest(
port,
"/events/$EVENT_ID_0",
"/events/$EVENT_ID_0/remove",
null,
HttpMethod.DELETE
HttpMethod.POST
)
assertEquals(HttpStatus.UNAUTHORIZED.value(), response["status"])
}
Expand All @@ -122,9 +122,9 @@ class EventServicesTest : ApiTestContext() {
fun forbiddenWithNonSysAdminRole() {
val response = authorizedRequest(
port,
"/events/$EVENT_ID_0",
"/events/$EVENT_ID_0/remove",
JwtToken(Access.ORG_WRITE).toString(),
HttpMethod.DELETE
HttpMethod.POST
)
assertEquals(HttpStatus.FORBIDDEN.value(), response["status"])
}
Expand All @@ -133,9 +133,9 @@ class EventServicesTest : ApiTestContext() {
fun notFoundWhenIdNotInDB() {
val response = authorizedRequest(
port,
"/events/123",
"/events/123/remove",
JwtToken(Access.ROOT).toString(),
HttpMethod.DELETE
HttpMethod.POST
)
assertEquals(HttpStatus.NOT_FOUND.value(), response["status"])
}
Expand All @@ -144,11 +144,11 @@ class EventServicesTest : ApiTestContext() {
fun okWithSysAdminRole() {
val response = authorizedRequest(
port,
"/events/$EVENT_ID_0",
"/events/$EVENT_ID_0/remove",
JwtToken(Access.ROOT).toString(),
HttpMethod.DELETE
HttpMethod.POST
)
assertEquals(HttpStatus.NO_CONTENT.value(), response["status"])
assertEquals(HttpStatus.OK.value(), response["status"])
}
}

Expand All @@ -160,7 +160,7 @@ class EventServicesTest : ApiTestContext() {
val body = listOf(DuplicateIRI(iriToRemove = EVENT_META_0.uri, iriToRetain = EVENT_META_1.uri))
val response = authorizedRequest(
port,
"/events/duplicates",
"/events/remove-duplicates",
null,
HttpMethod.POST,
mapper.writeValueAsString(body)
Expand All @@ -173,7 +173,7 @@ class EventServicesTest : ApiTestContext() {
val body = listOf(DuplicateIRI(iriToRemove = EVENT_META_0.uri, iriToRetain = EVENT_META_0.uri))
val response = authorizedRequest(
port,
"/events/duplicates",
"/events/remove-duplicates",
JwtToken(Access.ORG_WRITE).toString(),
HttpMethod.POST,
mapper.writeValueAsString(body)
Expand All @@ -187,7 +187,7 @@ class EventServicesTest : ApiTestContext() {
val response =
authorizedRequest(
port,
"/events/duplicates",
"/events/remove-duplicates",
JwtToken(Access.ROOT).toString(),
HttpMethod.POST,
mapper.writeValueAsString(body)
Expand All @@ -200,7 +200,7 @@ class EventServicesTest : ApiTestContext() {
val body = listOf(DuplicateIRI(iriToRemove = EVENT_META_0.uri, iriToRetain = EVENT_META_0.uri))
val response = authorizedRequest(
port,
"/events/duplicates",
"/events/remove-duplicates",
JwtToken(Access.ROOT).toString(),
HttpMethod.POST,
mapper.writeValueAsString(body)
Expand All @@ -209,4 +209,54 @@ class EventServicesTest : ApiTestContext() {
}
}

@Nested
internal inner class PurgeById {

@Test
fun unauthorizedForNoToken() {
val response = authorizedRequest(port, "/events/removed", null, HttpMethod.DELETE)
assertEquals(HttpStatus.UNAUTHORIZED.value(), response["status"])
}

@Test
fun forbiddenWithNonSysAdminRole() {
val response = authorizedRequest(
port,
"/events/removed",
JwtToken(Access.ORG_WRITE).toString(),
HttpMethod.DELETE
)
assertEquals(HttpStatus.FORBIDDEN.value(), response["status"])
}

@Test
fun badRequestWhenNotAlreadyRemoved() {
val response = authorizedRequest(
port,
"/events/$EVENT_ID_1",
JwtToken(Access.ROOT).toString(),
HttpMethod.DELETE
)
assertEquals(HttpStatus.BAD_REQUEST.value(), response["status"])
}

@Test
fun purgingStopsDeepLinking() {
val pre = apiGet(port, "/events/removed", "text/turtle")
assertEquals(HttpStatus.OK.value(), pre["status"])

val response = authorizedRequest(
port,
"/events/removed",
JwtToken(Access.ROOT).toString(),
HttpMethod.DELETE
)
assertEquals(HttpStatus.NO_CONTENT.value(), response["status"])

val post = apiGet(port, "/events/removed", "text/turtle")
assertEquals(HttpStatus.NOT_FOUND.value(), post["status"])
}

}

}
26 changes: 23 additions & 3 deletions src/test/kotlin/no/fdk/fdk_event_harvester/utils/DatabaseData.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,25 @@ val EVENT_TURTLE_1_NO_RECORDS = EventTurtle(
turtle = gzip(responseReader.readFile("no_records_event_1.ttl"))
)

val REMOVED_EVENT_META = EventMeta(
uri = "http://testdirektoratet.no/events/removed",
fdkId = "removed",
isPartOf = "http://localhost:5050/events/catalogs/$CATALOG_ID_0",
removed = true,
issued = TEST_HARVEST_DATE.timeInMillis,
modified = TEST_HARVEST_DATE.timeInMillis
)

val REMOVED_EVENT_TURTLE = FDKEventTurtle(
id = "removed",
turtle = gzip(responseReader.readFile("event_1.ttl"))
)

val REMOVED_EVENT_TURTLE_NO_RECORDS = EventTurtle(
id = "removed",
turtle = gzip(responseReader.readFile("no_records_event_1.ttl"))
)

val EVENT_META_2 = EventMeta(
uri = "http://testdirektoratet.no/events/2",
fdkId = EVENT_ID_2,
Expand Down Expand Up @@ -179,16 +198,16 @@ fun harvestSourceTurtlePopulation(): List<Document> =
listOf(HARVESTED_DBO).map { it.mapDBO() }

fun fdkEventTurtlePopulation(): List<Document> =
listOf(EVENT_UNION_DATA, EVENT_TURTLE_0, EVENT_TURTLE_1, EVENT_TURTLE_2, EVENT_TURTLE_3, EVENT_TURTLE_4)
listOf(EVENT_UNION_DATA, EVENT_TURTLE_0, EVENT_TURTLE_1, EVENT_TURTLE_2, EVENT_TURTLE_3, EVENT_TURTLE_4, REMOVED_EVENT_TURTLE)
.map { it.mapDBO() }

fun eventTurtlePopulation(): List<Document> =
listOf(EVENT_TURTLE_0_NO_RECORDS, EVENT_TURTLE_1_NO_RECORDS, EVENT_UNION_DATA_NO_RECORDS,
EVENT_TURTLE_2_NO_RECORDS, EVENT_TURTLE_3_NO_RECORDS, EVENT_TURTLE_4_NO_RECORDS)
EVENT_TURTLE_2_NO_RECORDS, EVENT_TURTLE_3_NO_RECORDS, EVENT_TURTLE_4_NO_RECORDS, REMOVED_EVENT_TURTLE_NO_RECORDS)
.map { it.mapDBO() }

fun eventMetaPopulation(): List<Document> =
listOf(EVENT_META_0, EVENT_META_1, EVENT_META_2, EVENT_META_3, EVENT_META_4)
listOf(EVENT_META_0, EVENT_META_1, EVENT_META_2, EVENT_META_3, EVENT_META_4, REMOVED_EVENT_META)
.map { it.mapDBO() }

fun fdkCatalogTurtlePopulation(): List<Document> =
Expand Down Expand Up @@ -216,6 +235,7 @@ private fun EventMeta.mapDBO(): Document =
.append("_id", uri)
.append("fdkId", fdkId)
.append("isPartOf", isPartOf)
.append("removed", removed)
.append("issued", issued)
.append("modified", modified)

Expand Down
Loading