diff --git a/src/main/kotlin/service/CollectionItemService.kt b/src/main/kotlin/service/CollectionItemService.kt index bd32b71..8b3986c 100644 --- a/src/main/kotlin/service/CollectionItemService.kt +++ b/src/main/kotlin/service/CollectionItemService.kt @@ -148,53 +148,53 @@ class CollectionItemService(private val connection: Connection) { throw DbElementNotFoundException("Could not find collection item with id $id") } } -} -fun createItemFromResult(resultSet: ResultSet): CollectionItem { - try { - val id = resultSet.getLong("id") - val title = resultSet.getString("title") - val author = resultSet.getString("author") - val publisher = resultSet.getString("publisher") - val publishingDate = resultSet.getDate("publishing_date") - val locNumber = resultSet.getString("loc_number") - val deweyDecimalNumber = resultSet.getString("dewey_decimal_number") - val isbn = resultSet.getLong("isbn") - val sortTitle = resultSet.getString("sort_title") - val format = resultSet.getString("format") - val language = resultSet.getString("language") - val pageCount = resultSet.getInt("page_count") - val categories = resultSet.getString("categories") - val description = resultSet.getString("description") - val priceInCents = resultSet.getInt("price_in_cents") - val coverImageUri = resultSet.getString("cover_image_uri") ?: "" - val isCheckedIn = resultSet.getBoolean("is_checked_in") - val isArchived = resultSet.getBoolean("is_archived") - val isLost = resultSet.getBoolean("is_lost") - val lostDate = resultSet.getDate("lost_date") - return CollectionItem( - id = id, - title = title, - author = author, - publisher = publisher, - publishingDate = publishingDate.toString(), - locNumber = locNumber, - deweyDecimalNumber = deweyDecimalNumber, - isbn = isbn, - sortTitle = sortTitle, - format = format, - language = language, - pageCount = pageCount, - categories = categories, - description = description, - priceInCents = priceInCents, - coverImageUri = coverImageUri, - isCheckedIn = isCheckedIn, - isArchived = isArchived, - isLost = isLost, - lostDate = lostDate.toString() - ) - } catch (cause: NullPointerException) { - throw DbElementInsertionException("${cause.message}\nresultSet = ${resultSet.metaData}") + private fun createItemFromResult(resultSet: ResultSet): CollectionItem { + try { + val id = resultSet.getLong("id") + val title = resultSet.getString("title") + val author = resultSet.getString("author") + val publisher = resultSet.getString("publisher") + val publishingDate = resultSet.getDate("publishing_date") + val locNumber = resultSet.getString("loc_number") + val deweyDecimalNumber = resultSet.getString("dewey_decimal_number") + val isbn = resultSet.getLong("isbn") + val sortTitle = resultSet.getString("sort_title") + val format = resultSet.getString("format") + val language = resultSet.getString("language") + val pageCount = resultSet.getInt("page_count") + val categories = resultSet.getString("categories") + val description = resultSet.getString("description") + val priceInCents = resultSet.getInt("price_in_cents") + val coverImageUri = resultSet.getString("cover_image_uri") ?: "" + val isCheckedIn = resultSet.getBoolean("is_checked_in") + val isArchived = resultSet.getBoolean("is_archived") + val isLost = resultSet.getBoolean("is_lost") + val lostDate = resultSet.getDate("lost_date") + return CollectionItem( + id = id, + title = title, + author = author, + publisher = publisher, + publishingDate = publishingDate.toString(), + locNumber = locNumber, + deweyDecimalNumber = deweyDecimalNumber, + isbn = isbn, + sortTitle = sortTitle, + format = format, + language = language, + pageCount = pageCount, + categories = categories, + description = description, + priceInCents = priceInCents, + coverImageUri = coverImageUri, + isCheckedIn = isCheckedIn, + isArchived = isArchived, + isLost = isLost, + lostDate = lostDate.toString() + ) + } catch (cause: NullPointerException) { + throw DbElementInsertionException("${cause.message}\nresultSet = ${resultSet.metaData}") + } } }