MLT-0082 Remove Owner from Order and Item

docker/mongo/mongo-init.js

@@ -22,7 +22,6 @@ db.items.insertOne({
     "itemCategory": "PAPER",
     "preferredEnvironment": "NONE",
     "packaging": "NONE",
-    "owner": "NB",
     "callbackUrl": "https://callback-wls.no/item",
     "location": "SYNQ_WAREHOUSE",
     "quantity": 1,
@@ -35,7 +34,6 @@ db.items.insertOne({
     "itemCategory": "PAPER",
     "preferredEnvironment": "NONE",
     "packaging": "NONE",
-    "owner": "NB",
     "callbackUrl": "https://callback-wls.no/item",
     "location": "SYNQ_WAREHOUSE",
     "quantity": 1,
@@ -55,7 +53,6 @@ db.orders.insertOne({
         }
       ],
       "orderType": "LOAN",
-      "owner": "NB",
       "contactPerson": "Dr. Heinz Doofenshmirtz",
       "address": {
         "recipient": "Doug Dimmadome",

src/main/kotlin/no/nb/mlt/wls/application/hostapi/item/ApiItemPayload.kt

@@ -6,7 +6,6 @@ import no.nb.mlt.wls.domain.model.Environment
 import no.nb.mlt.wls.domain.model.HostName
 import no.nb.mlt.wls.domain.model.Item
 import no.nb.mlt.wls.domain.model.ItemCategory
-import no.nb.mlt.wls.domain.model.Owner
 import no.nb.mlt.wls.domain.model.Packaging
 import no.nb.mlt.wls.domain.ports.inbound.ItemMetadata
 import no.nb.mlt.wls.domain.ports.inbound.ValidationException
@@ -22,7 +21,6 @@ import org.apache.commons.validator.routines.UrlValidator
       "itemCategory": "PAPER",
       "preferredEnvironment": "NONE",
       "packaging": "NONE",
-      "owner": "NB",
       "callbackUrl": "https://callback-wls.no/item"
     }
     """
@@ -66,11 +64,6 @@ data class ApiItemPayload(
         examples = ["NONE", "BOX", "ABOX", "CRATE"]
     )
     val packaging: Packaging,
-    @Schema(
-        description = """Who owns the item. Usually the National Library of Norway ("NB") or the National Archives of Norway ("ARKIVVERKET").""",
-        examples = ["NB", "ARKIVVERKET"]
-    )
-    val owner: Owner,
     @Schema(
         description = """Callback URL to use for sending item updates to the host system.
             For example when item moves or changes quantity in storage.""",
@@ -101,7 +94,6 @@ data class ApiItemPayload(
             itemCategory = itemCategory,
             preferredEnvironment = preferredEnvironment,
             packaging = packaging,
-            owner = owner,
             callbackUrl = callbackUrl,
             location = location,
             quantity = quantity
@@ -115,7 +107,6 @@ data class ApiItemPayload(
             itemCategory = itemCategory,
             preferredEnvironment = preferredEnvironment,
             packaging = packaging,
-            owner = owner,
             callbackUrl = callbackUrl
         )
 
@@ -159,7 +150,6 @@ fun Item.toApiPayload() =
         itemCategory = itemCategory,
         preferredEnvironment = preferredEnvironment,
         packaging = packaging,
-        owner = owner,
         callbackUrl = callbackUrl,
         location = location,
         quantity = quantity

src/main/kotlin/no/nb/mlt/wls/application/hostapi/order/ApiOrderPayload.kt

@@ -4,7 +4,6 @@ import io.swagger.v3.oas.annotations.media.Schema
 import io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY
 import no.nb.mlt.wls.domain.model.HostName
 import no.nb.mlt.wls.domain.model.Order
-import no.nb.mlt.wls.domain.model.Owner
 import no.nb.mlt.wls.domain.ports.inbound.CreateOrderDTO
 import no.nb.mlt.wls.domain.ports.inbound.ValidationException
 import org.apache.commons.validator.routines.UrlValidator
@@ -23,7 +22,6 @@ import org.apache.commons.validator.routines.UrlValidator
         }
       ],
       "orderType": "LOAN",
-      "owner": "NB",
       "contactPerson": "Dr. Heinz Doofenshmirtz",
       "address": {
         "recipient": "Doug Dimmadome",
@@ -93,13 +91,12 @@ data class ApiOrderPayload(
     )
     val callbackUrl: String
 ) {
-    fun toCreateOrderDTO(owner: Owner) =
+    fun toCreateOrderDTO() =
         CreateOrderDTO(
             hostName = hostName,
             hostOrderId = hostOrderId,
             orderLine = orderLine.map { it.toCreateOrderItem() },
             orderType = orderType,
-            owner = owner,
             address = address,
             contactPerson = contactPerson,
             note = note,

src/main/kotlin/no/nb/mlt/wls/application/hostapi/order/OrderController.kt

@@ -12,7 +12,6 @@ import io.swagger.v3.oas.annotations.tags.Tag
 import no.nb.mlt.wls.application.hostapi.ErrorMessage
 import no.nb.mlt.wls.application.hostapi.config.checkIfAuthorized
 import no.nb.mlt.wls.domain.model.HostName
-import no.nb.mlt.wls.domain.model.Owner
 import no.nb.mlt.wls.domain.ports.inbound.CreateOrder
 import no.nb.mlt.wls.domain.ports.inbound.DeleteOrder
 import no.nb.mlt.wls.domain.ports.inbound.GetOrder
@@ -126,14 +125,6 @@ class OrderController(
     ): ResponseEntity<ApiOrderPayload> {
         jwt.checkIfAuthorized(payload.hostName)
 
-        // Special handling for Arkivverket is required for the storage systems
-        val owner =
-            if (payload.hostName == HostName.ASTA) {
-                Owner.ARKIVVERKET
-            } else {
-                Owner.NB
-            }
-
         payload.validate()
 
         // Return 200 OK and existing order if it exists
@@ -143,7 +134,7 @@ class OrderController(
                 .body(it.toApiOrderPayload())
         }
 
-        val createdOrder = createOrder.createOrder(payload.toCreateOrderDTO(owner))
+        val createdOrder = createOrder.createOrder(payload.toCreateOrderDTO())
 
         return ResponseEntity
             .status(HttpStatus.CREATED)

src/main/kotlin/no/nb/mlt/wls/application/synqapi/synq/SynqController.kt

@@ -7,11 +7,11 @@ import io.swagger.v3.oas.annotations.media.Schema
 import io.swagger.v3.oas.annotations.responses.ApiResponse
 import io.swagger.v3.oas.annotations.responses.ApiResponses
 import io.swagger.v3.oas.annotations.tags.Tag
-import no.nb.mlt.wls.domain.model.Owner
 import no.nb.mlt.wls.domain.ports.inbound.MoveItem
 import no.nb.mlt.wls.domain.ports.inbound.OrderStatusUpdate
 import no.nb.mlt.wls.domain.ports.inbound.PickItems
 import no.nb.mlt.wls.domain.ports.inbound.PickOrderItems
+import no.nb.mlt.wls.infrastructure.synq.SynqOwner
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.bind.annotation.PutMapping
@@ -93,7 +93,7 @@ class SynqController(
     @PutMapping("/pick-update/{owner}/{orderId}")
     suspend fun pickOrder(
         @Parameter(description = "Owner of the order items")
-        @PathVariable owner: Owner,
+        @PathVariable owner: SynqOwner,
         @Parameter(description = "Order ID in the storage system")
         @PathVariable orderId: String,
         @RequestBody payload: SynqOrderPickingConfirmationPayload
@@ -152,7 +152,7 @@ class SynqController(
     suspend fun updateOrder(
         @RequestBody orderUpdatePayload: SynqOrderStatusUpdatePayload,
         @Parameter(description = "Owner of the order items")
-        @PathVariable owner: Owner,
+        @PathVariable owner: SynqOwner,
         @Parameter(description = "Order ID in the storage system")
         @PathVariable orderId: String
     ): ResponseEntity<String> {

src/main/kotlin/no/nb/mlt/wls/domain/model/Item.kt

@@ -11,7 +11,6 @@ data class Item(
     val itemCategory: ItemCategory,
     val preferredEnvironment: Environment,
     val packaging: Packaging,
-    val owner: Owner,
     val callbackUrl: String?,
     val location: String?,
     val quantity: Int?

src/main/kotlin/no/nb/mlt/wls/domain/model/Order.kt

@@ -13,7 +13,6 @@ data class Order(
     val status: Status,
     val orderLine: List<OrderItem>,
     val orderType: Type,
-    val owner: Owner,
     val address: Address?,
     val contactPerson: String,
     val note: String?,

src/main/kotlin/no/nb/mlt/wls/domain/ports/inbound/AddNewItem.kt

@@ -4,7 +4,6 @@ import no.nb.mlt.wls.domain.model.Environment
 import no.nb.mlt.wls.domain.model.HostName
 import no.nb.mlt.wls.domain.model.Item
 import no.nb.mlt.wls.domain.model.ItemCategory
-import no.nb.mlt.wls.domain.model.Owner
 import no.nb.mlt.wls.domain.model.Packaging
 
 fun interface AddNewItem {
@@ -18,7 +17,6 @@ data class ItemMetadata(
     val itemCategory: ItemCategory,
     val preferredEnvironment: Environment,
     val packaging: Packaging,
-    val owner: Owner,
     val callbackUrl: String?
 )
 
@@ -37,7 +35,6 @@ fun ItemMetadata.toItem(
     this.itemCategory,
     this.preferredEnvironment,
     this.packaging,
-    this.owner,
     this.callbackUrl,
     location,
     quantity

src/main/kotlin/no/nb/mlt/wls/domain/ports/inbound/CreateOrder.kt

@@ -2,7 +2,6 @@ package no.nb.mlt.wls.domain.ports.inbound
 
 import no.nb.mlt.wls.domain.model.HostName
 import no.nb.mlt.wls.domain.model.Order
-import no.nb.mlt.wls.domain.model.Owner
 
 fun interface CreateOrder {
     suspend fun createOrder(orderDTO: CreateOrderDTO): Order
@@ -13,7 +12,6 @@ data class CreateOrderDTO(
     val hostOrderId: String,
     val orderLine: List<OrderItem>,
     val orderType: Order.Type,
-    val owner: Owner,
     val contactPerson: String,
     val address: Order.Address?,
     val note: String?,
@@ -34,7 +32,6 @@ fun CreateOrderDTO.toOrder(): Order {
                 Order.OrderItem(it.hostId, Order.OrderItem.Status.NOT_STARTED)
             },
         orderType = orderType,
-        owner = owner,
         contactPerson = contactPerson,
         address = address,
         note = note,

src/main/kotlin/no/nb/mlt/wls/infrastructure/callbacks/NotificationItemPayload.kt

@@ -6,7 +6,6 @@ import no.nb.mlt.wls.domain.model.Environment
 import no.nb.mlt.wls.domain.model.HostName
 import no.nb.mlt.wls.domain.model.Item
 import no.nb.mlt.wls.domain.model.ItemCategory
-import no.nb.mlt.wls.domain.model.Owner
 import no.nb.mlt.wls.domain.model.Packaging
 
 @Schema(
@@ -19,7 +18,6 @@ import no.nb.mlt.wls.domain.model.Packaging
       "itemCategory": "PAPER",
       "preferredEnvironment": "NONE",
       "packaging": "NONE",
-      "owner": "NB",
       "callbackUrl": "https://callback-wls.no/item",
       "location": "SYNQ_WAREHOUSE",
       "quantity": 1
@@ -65,11 +63,6 @@ data class NotificationItemPayload(
         examples = ["NONE", "BOX", "ABOX", "CRATE"]
     )
     val packaging: Packaging,
-    @Schema(
-        description = """Who owns the item. Usually the National Library of Norway ("NB") or the National Archives of Norway ("ARKIVVERKET").""",
-        examples = ["NB", "ARKIVVERKET"]
-    )
-    val owner: Owner,
     @Schema(
         description = """Callback URL to use for sending item updates to the host system.
             For example when item moves or changes quantity in storage.""",
@@ -101,7 +94,6 @@ fun NotificationItemPayload.toItem(): Item {
         itemCategory = itemCategory,
         preferredEnvironment = preferredEnvironment,
         packaging = packaging,
-        owner = owner,
         callbackUrl = callbackUrl,
         location = location,
         quantity = quantity
@@ -116,7 +108,6 @@ fun Item.toNotificationItemPayload(): NotificationItemPayload {
         itemCategory = itemCategory,
         preferredEnvironment = preferredEnvironment,
         packaging = packaging,
-        owner = owner,
         callbackUrl = callbackUrl,
         location = location,
         quantity = quantity

src/main/kotlin/no/nb/mlt/wls/infrastructure/callbacks/NotificationOrderPayload.kt

@@ -3,7 +3,6 @@ package no.nb.mlt.wls.infrastructure.callbacks
 import io.swagger.v3.oas.annotations.media.Schema
 import no.nb.mlt.wls.domain.model.HostName
 import no.nb.mlt.wls.domain.model.Order
-import no.nb.mlt.wls.domain.model.Owner
 
 @Schema(
     description = """Payload for updates about orders sent from Hermes WLS to the appropriate catalogues.""",
@@ -19,7 +18,6 @@ import no.nb.mlt.wls.domain.model.Owner
         }
       ],
       "orderType": "LOAN",
-      "owner": "NB",
       "contactPerson": "Dr. Heinz Doofenshmirtz",
       "address": {
         "recipient": "Doug Dimmadome",
@@ -66,11 +64,6 @@ data class NotificationOrderPayload(
         examples = ["LOAN", "DIGITIZATION"]
     )
     val orderType: Order.Type,
-    @Schema(
-        description = """Who's the owner of the material in the order.""",
-        examples = ["NB", "ARKIVVERKET"]
-    )
-    val owner: Owner?,
     @Schema(
         description = """Who to contact in relation to the order if case of any problems/issues/questions.""",
         example = "Dr. Heinz Doofenshmirtz"
@@ -101,7 +94,6 @@ fun Order.toNotificationOrderPayload() =
         status = status,
         orderLine = orderLine,
         orderType = orderType,
-        owner = owner,
         contactPerson = contactPerson,
         address = address,
         note = note,

src/main/kotlin/no/nb/mlt/wls/infrastructure/repositories/item/MongoItem.kt

@@ -4,7 +4,6 @@ import no.nb.mlt.wls.domain.model.Environment
 import no.nb.mlt.wls.domain.model.HostName
 import no.nb.mlt.wls.domain.model.Item
 import no.nb.mlt.wls.domain.model.ItemCategory
-import no.nb.mlt.wls.domain.model.Owner
 import no.nb.mlt.wls.domain.model.Packaging
 import org.springframework.data.mongodb.core.mapping.Document
 
@@ -16,7 +15,6 @@ data class MongoItem(
     val itemCategory: ItemCategory,
     val preferredEnvironment: Environment,
     val packaging: Packaging,
-    val owner: Owner,
     val callbackUrl: String?,
     val location: String?,
     val quantity: Int?
@@ -30,7 +28,6 @@ fun Item.toMongoItem() =
         this.itemCategory,
         this.preferredEnvironment,
         this.packaging,
-        this.owner,
         this.callbackUrl,
         this.location,
         this.quantity
@@ -44,7 +41,6 @@ fun MongoItem.toItem() =
         this.itemCategory,
         this.preferredEnvironment,
         this.packaging,
-        this.owner,
         this.callbackUrl,
         this.location,
         this.quantity

src/main/kotlin/no/nb/mlt/wls/infrastructure/repositories/order/MongoOrder.kt

@@ -2,7 +2,6 @@ package no.nb.mlt.wls.infrastructure.repositories.order
 
 import no.nb.mlt.wls.domain.model.HostName
 import no.nb.mlt.wls.domain.model.Order
-import no.nb.mlt.wls.domain.model.Owner
 import org.bson.types.ObjectId
 import org.springframework.data.annotation.Id
 import org.springframework.data.mongodb.core.index.CompoundIndex
@@ -18,7 +17,6 @@ data class MongoOrder(
     val status: Order.Status,
     val orderLine: List<Order.OrderItem>,
     val orderType: Order.Type,
-    val owner: Owner,
     val contactPerson: String,
     val address: Order.Address?,
     val note: String?,
@@ -32,7 +30,6 @@ fun Order.toMongoOrder(): MongoOrder {
         status = status,
         orderLine = orderLine,
         orderType = orderType,
-        owner = owner,
         contactPerson = contactPerson,
         address = address,
         note = note,
@@ -47,7 +44,6 @@ fun MongoOrder.toOrder(): Order {
         status = status,
         orderLine = orderLine,
         orderType = orderType,
-        owner = owner,
         contactPerson = contactPerson,
         address = address,
         note = note,