From 660c8b6f6f4645459a66925b8f41e0a1028d2563 Mon Sep 17 00:00:00 2001 From: NKO Date: Thu, 13 Nov 2025 12:01:07 +0100 Subject: [PATCH 01/70] TIMAAT Weiterentwicklung #9 - categories view * Added tab responsible to switch to categories view * Defined basic structure of categories view * Implemented timaat.categories module responsible to manage the new categories view --- src/main/webapp/index.html | 31 +++++++++++++ .../webapp/js/datasets/timaat.categories.js | 44 +++++++++++++++++++ src/main/webapp/js/timaat.init.js | 2 + src/main/webapp/js/ui/timaat.ui.js | 3 ++ 4 files changed, 80 insertions(+) create mode 100644 src/main/webapp/js/datasets/timaat.categories.js diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html index 89e66d41..efeb60c2 100644 --- a/src/main/webapp/index.html +++ b/src/main/webapp/index.html @@ -263,6 +263,23 @@

+
  • + + + +
  • Language + + +
    +
    +
    +
    +

    col-4

    +
    +
    +

    col-8

    +
    +
    +
    +
    diff --git a/src/main/webapp/js/datasets/timaat.categories.js b/src/main/webapp/js/datasets/timaat.categories.js new file mode 100644 index 00000000..9a5fbf80 --- /dev/null +++ b/src/main/webapp/js/datasets/timaat.categories.js @@ -0,0 +1,44 @@ +/* + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + +/** + * @author Nico Kotlenga + */ +'use strict'; +(function (factory, window) { + /*globals define, module, require*/ + + // define an AMD module that relies on 'TIMAAT' + if (typeof define === 'function' && define.amd) { + define(['TIMAAT'], factory); + + // define a Common JS module that relies on 'TIMAAT' + } else if (typeof exports === 'object') { + module.exports = factory(require('TIMAAT')); + } + + // attach your plugin to the global 'TIMAAT' variable + if(typeof window !== 'undefined' && window.TIMAAT){ + factory(window.TIMAAT); + } + +} (function (TIMAAT) { + TIMAAT.Categories = { + + initCategoriesComponent: function () { + TIMAAT.URLHistory.setURL(null, 'Categories ', '#categories'); + TIMAAT.UI.showComponent('categories'); + } + } +})) \ No newline at end of file diff --git a/src/main/webapp/js/timaat.init.js b/src/main/webapp/js/timaat.init.js index 1b870ba7..393a930b 100644 --- a/src/main/webapp/js/timaat.init.js +++ b/src/main/webapp/js/timaat.init.js @@ -52,6 +52,7 @@ requirejs.config({ "TIMAAT-categoryLists" : 'datasets/timaat.lists.category', "TIMAAT-languageLists" : 'datasets/timaat.lists.language', "TIMAAT-tagLists" : 'datasets/timaat.lists.tag', + "TIMAAT-categories" : 'datasets/timaat.categories', "TIMAAT-service" : 'service/timaat.service', "TIMAAT-userService" : 'service/timaat.service.usersettings', "TIMAAT-publicationService" : 'service/timaat.service.publication', @@ -194,6 +195,7 @@ require(['domReady', 'TIMAAT-categoryLists', 'TIMAAT-categoryService', 'TIMAAT-categorySetService', + 'TIMAAT-categories', 'TIMAAT-event', 'TIMAAT-eventDatasets', 'TIMAAT-eventService', diff --git a/src/main/webapp/js/ui/timaat.ui.js b/src/main/webapp/js/ui/timaat.ui.js index f9b3349e..69ef1a84 100644 --- a/src/main/webapp/js/ui/timaat.ui.js +++ b/src/main/webapp/js/ui/timaat.ui.js @@ -185,6 +185,9 @@ case 'lists': $('#componentLists').show(); break; + case 'categories': + $('#componentCategories').show(); + break; case 'media': $('#componentMedia').show(); break; From 38a88ff233f41f9fd4aa7447aa71c9dc452d157a Mon Sep 17 00:00:00 2001 From: NKO Date: Mon, 17 Nov 2025 11:03:35 +0100 Subject: [PATCH 02/70] TIMAAT Weiterentwicklung #9 - categories view * Added nav tabs for categories and category sets * Implemented switch between different tabs * Implemented setting of correct sub url and opening the correct view when opening the client by using a specific url --- src/main/webapp/index.html | 23 ++-- .../webapp/js/datasets/timaat.categories.js | 27 ++++- src/main/webapp/js/datasets/timaat.lists.js | 21 +--- src/main/webapp/js/timaat.url.js | 103 +++--------------- src/main/webapp/js/ui/timaat.ui.js | 1 + 5 files changed, 56 insertions(+), 119 deletions(-) diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html index efeb60c2..195eb4af 100644 --- a/src/main/webapp/index.html +++ b/src/main/webapp/index.html @@ -1908,16 +1908,6 @@
    Language with this name or code already exists.
    diff --git a/src/main/webapp/js/datasets/timaat.categories.js b/src/main/webapp/js/datasets/timaat.categories.js index 92a0f500..8d9cc08b 100644 --- a/src/main/webapp/js/datasets/timaat.categories.js +++ b/src/main/webapp/js/datasets/timaat.categories.js @@ -35,7 +35,7 @@ }(function (TIMAAT) { TIMAAT.Categories = { - categoryDataTable: null, categorySetDataTable: null, + categoryDataTable: null, categorySetDataTable: null, relatedMusicTable: null, relatedMediumTable: null, init: function () { $('#categorySetTab').on('click', function (event) { @@ -114,6 +114,9 @@ }) + //init datatables + TIMAAT.Categories.relatedMusicTable = TIMAAT.Categories.initRelatedMusicTable() + TIMAAT.Categories.relatedMediumTable = TIMAAT.Categories.initRelatedMediumTable() }, initCategoriesComponent: function () { TIMAAT.UI.showComponent('categories'); $('#categoryTab').trigger('click'); @@ -185,6 +188,66 @@ return categorySetsDropDown }, + initRelatedMusicTable: function () { + const musicTypesById = new Map([[1, "Anashid"], [2, "Church music"]]) + const columns = [new TIMAAT.Table.FieldTableColumnConfig("title", "Title", "displayTitle.name"), new TIMAAT.Table.FieldTableColumnConfig("id", "ID", "id"), new TIMAAT.Table.FieldTableColumnConfig("beat", "Beat", "beat"), + new TIMAAT.Table.FieldTableColumnConfig("instrumentation", "Instrumentation", "instrumentation"), new TIMAAT.Table.FieldTableColumnConfig("tempo", "Tempo", "tempo"), new TIMAAT.Table.FieldTableColumnConfig("remark", "Remark", "remark"), + new TIMAAT.Table.FieldTableColumnConfig("harmony", "Harmony", "harmony"), new TIMAAT.Table.FieldTableColumnConfig("melody", "Melody", "melody"),new TIMAAT.Table.ValueMapperTableColumnConfig("musicType", "Music Type", "musicType.id", musicTypesById)] + const activeColumnIds = ["id", "title", "musicType", "beat", "instrumentation", "tempo", "remark", "harmony", "melody"] + const musicTable = new TIMAAT.Table.Table("#categoriesMusicTable", columns, activeColumnIds, "api/music/list") + $('#musicTableCollapse').on('shown.bs.collapse', (event) => { + musicTable.resizeToParent() + }); + + return musicTable + }, + + initRelatedMediumTable: function () { + const mediaTypesById = new Map([[1, "Audio"], [2, "Document"], [3, "Image"], [4, "Software"], [5, "Text"], [6, " Video"], [7, "Videogame"]]) + + const MediumDurationColumnConfig = class MediumDurationColumnConfig extends TIMAAT.Table.TableColumnConfig { + constructor() { + super("duration", "Duration", ""); + } + + render(data, type, row) { + let cellValue; + if (row.mediumVideo) { + cellValue = TIMAAT.Util.formatTime(row.mediumVideo.length); + } else if (row.mediumAudio) { + cellValue = TIMAAT.Util.formatTime(row.mediumAudio.length); + } else { + cellValue = "-" + } + + return `

    ${cellValue}

    ` + } + } + + const imageThumbnailGeneratorFunction = (row) => { + let thumbnailPath = null + if(row.mediumVideo) { + thumbnailPath = "/TIMAAT/api/medium/video/"+row.id+"/thumbnail"+"?token=" + row.viewToken + } + + return thumbnailPath + } + + const columns = [new TIMAAT.Table.FieldTableColumnConfig("id", "ID", "id"), new TIMAAT.Table.FieldTableColumnConfig("copyright", "Copyright", "copyright"), new TIMAAT.Table.FieldTableColumnConfig("fileHash", "File Hash", "fileHash"), + new TIMAAT.Table.FieldTableColumnConfig("releaseDate", "ReleaseDate", "releaseDate"), new TIMAAT.Table.DateTableColumnConfig("releaseDate", "Release Date", "releaseDate"), new TIMAAT.Table.DateTableColumnConfig("recordingStartDate", "Recording Start Date", "recordingStartDate"), + new TIMAAT.Table.DateTableColumnConfig("recordingEndDate", "Recording End Date", "recordingEndDate"), new TIMAAT.Table.FieldTableColumnConfig("remark", "Remark", "remark"), new TIMAAT.Table.FieldTableColumnConfig("title", "Title", "displayTitle.name"), + new TIMAAT.Table.ValueMapperTableColumnConfig("mediaType", "Media Type", "mediaType.id", mediaTypesById), new MediumDurationColumnConfig(), new TIMAAT.Table.ImageDownloadTableColumnConfig("thumbnail", "Thumbnail", imageThumbnailGeneratorFunction)] + const activeColumnIds = ["thumbnail", "id", "title", "mediaType", "duration", "releaseDate", 'recordingStartDate', 'recordingEndDate', "fileHash", "copyright", "remark"] + const mediumTable = new TIMAAT.Table.Table("#categoriesMediumTable", columns, activeColumnIds, "api/medium/list") + + $('#mediumTableCollapse').on('shown.bs.collapse', (event) => { + mediumTable.resizeToParent() + }); + + + return mediumTable + }, + createCategoriesDropDown: function () { const categoryDropDown = $('#categoryMultiSelectDropdown') categoryDropDown.empty() @@ -270,6 +333,9 @@ showAssignedEntitiesPanel() { $('.categoriesRightPanelContent').hide() + $('#categoriesAssignedEntitiesPanel').show() + TIMAAT.Categories.relatedMusicTable.draw() + TIMAAT.Categories.relatedMediumTable.draw() }, showAddCategorySetPanel() { diff --git a/src/main/webapp/js/timaat.init.js b/src/main/webapp/js/timaat.init.js index b9017b0e..f7a18fa8 100644 --- a/src/main/webapp/js/timaat.init.js +++ b/src/main/webapp/js/timaat.init.js @@ -36,6 +36,7 @@ requirejs.config({ "TIMAAT-ui" : 'ui/timaat.ui', "TIMAAT-ui-inspector" : 'ui/timaat.inspector', "TIMAAT-ui-timeline" : 'ui/timaat.timeline', + "TIMAAT-ui-table" : 'ui/timaat.table', "TIMAAT-uploadManager" : 'components/timaat.uploadmanager', "TIMAAT-videoPlayer" : 'components/timaat.component.videoplayer', "TIMAAT-settings" : 'components/timaat.component.settings', @@ -160,6 +161,7 @@ require(['domReady', 'TIMAAT-URLHistory', 'TIMAAT-ui', 'TIMAAT-ui-inspector', + 'TIMAAT-ui-table', 'TIMAAT-ui-timeline', 'TIMAAT-uploadManager', 'TIMAAT-videoPlayer', diff --git a/src/main/webapp/js/ui/timaat.table.js b/src/main/webapp/js/ui/timaat.table.js new file mode 100644 index 00000000..3b40e0b1 --- /dev/null +++ b/src/main/webapp/js/ui/timaat.table.js @@ -0,0 +1,213 @@ +/** + * @author Nico Kotlenga + */ +'use strict'; +(function (factory, window) { + /*globals define, module, require*/ + + // define an AMD module that relies on 'TIMAAT' + if (typeof define === 'function' && define.amd) { + define(['TIMAAT'], factory); + + + // define a Common JS module that relies on 'TIMAAT' + } else if (typeof exports === 'object') { + module.exports = factory(require('TIMAAT')); + } + + // attach your plugin to the global 'TIMAAT' variable + if (typeof window !== 'undefined' && window.TIMAAT) { + factory(window.TIMAAT); + } + +}(function (TIMAAT) { + TIMAAT.Table = {} + TIMAAT.Table.TableColumnConfig = class { + _id; + _title; + _data; + _sortable; + + constructor(id, title, data, sortable = true) { + this._id = id; + this._title = title; + this._data = data; + this._sortable = sortable; + } + + get title() { + return this._title; + } + + get data() { + return this._data; + } + + get id() { + return this._id; + } + + get sortable() { + return this._sortable; + } + + render(data, type, row) { + throw new Error("This method need to get overridden") + } + } + TIMAAT.Table.FieldTableColumnConfig = class extends TIMAAT.Table.TableColumnConfig { + constructor(id, title, data, sortable = true) { + super(id, title, data, sortable); + } + + render(data, type, row) { + let cellValue = data + if (!data || (typeof data === 'string' && data.length === 0)) { + cellValue = "-" + } + + return `

    ${cellValue}

    ` + } + } + TIMAAT.Table.DateTableColumnConfig = class extends TIMAAT.Table.TableColumnConfig { + constructor(id, title, data, sortable = true) { + super(id, title, data, sortable); + } + + render(data, type, row) { + let cellValue + if (!data || (typeof data === 'string' && data.length === 0)) { + cellValue = "-" + } else { + cellValue = moment.utc(data).format('YYYY-MM-DD'); + } + + return `

    ${cellValue}

    ` + } + } + + TIMAAT.Table.ValueMapperTableColumnConfig = class extends TIMAAT.Table.TableColumnConfig { + _valueMap; + + constructor(id, title, data, valueMap, sortable = true) { + super(id, title, data, sortable); + this._valueMap = valueMap; + + this.render = this.render.bind(this); + } + + render(data, type, row) { + let cellValue = '-' + + if (data && this._valueMap.has(data)) { + cellValue = this._valueMap.get(data) + } + + return `

    ${cellValue}

    ` + } + } + + TIMAAT.Table.ImageDownloadTableColumnConfig = class extends TIMAAT.Table.TableColumnConfig { + _imagePathGeneratorFunction; + + /** + * Constructs a table column downloading an image from the generated path of the + * imagePathGeneratorFunction. + * @param id + * @param title + * @param imagePathGeneratorFunction: (row) => string | null + */ + constructor(id, title, imagePathGeneratorFunction) { + super(id, title, "", false); + this._imagePathGeneratorFunction = imagePathGeneratorFunction; + + this.render = this.render.bind(this); + } + + render(data, type, row) { + const imagePath = this._imagePathGeneratorFunction(row); + let imageSrc = imagePath ?? "img/preview-placeholder.png" + return `Image column` + } + } + + TIMAAT.Table.Table = class { + _tableColumnConfigsById + _activeTableColumnIds + _selector + _dataUrl + _$headerRow + _dataTable = null; + + constructor(selector, tableColumnConfigs, activeTableColumnConfigIds, dataUrl) { + this._tableColumnConfigsById = new Map() + for (let tableColumnConfig of tableColumnConfigs) { + this._tableColumnConfigsById.set(tableColumnConfig.id, tableColumnConfig); + } + this._selector = selector + this._activeTableColumnIds = activeTableColumnConfigIds; + this._dataUrl = dataUrl; + this._$headerRow = $(selector + " thead tr") + } + + set activeTableColumnIds(activeTableColumnConfigIds) { + this._activeTableColumnIds = activeTableColumnConfigIds; + } + + draw() { + const columnConfigs = [] + this._$headerRow.empty() + for (let activeTableColumnId of this._activeTableColumnIds) { + const currentTableColumnConfig = this._tableColumnConfigsById.get(activeTableColumnId); + columnConfigs.push({ + title: currentTableColumnConfig.title, + data: currentTableColumnConfig.data, + render: currentTableColumnConfig.render, + orderable: currentTableColumnConfig.sortable + }); + $('').text(currentTableColumnConfig.title).appendTo(this._$headerRow); + } + + this._dataTable = $(this._selector).DataTable({ + "destroy": true, + "autoWidth": false, + "lengthMenu": [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]], + "pagingType": "full", + "dom": 'ip>', + "processing": true, + "stateSave": true, + "scrollX": true, + "rowId": 'id', + "serverSide": true, + "ajax": { + "url": this._dataUrl, + "contentType": "application/json; charset=utf-8", + "dataType": "json", + "beforeSend": function (xhr) { + xhr.setRequestHeader('Authorization', 'Bearer ' + TIMAAT.Service.token); + }, + "data": function (data) { + let serverData = { + draw: data.draw, + start: data.start, + length: data.length, + orderby: data.columns[data.order[0].column].name, + dir: data.order[0].dir, // musicSubtype: '' + } + if (data.search && data.search.value && data.search.value.length > 0) serverData.search = data.search.value; + return serverData; + } + }, + "columns": columnConfigs + }) + } + + /* + Sometimes the table dimension couldn't be calculated correctly and need to get recalculated. + E.g. The table is located inside a collapse which is initially in a hidden state. + */ + resizeToParent() { + this._dataTable?.columns.adjust().draw() + } + } +}, window)) \ No newline at end of file From 5eaa6209fc729c0888dbf22418d860ad752bb7e3 Mon Sep 17 00:00:00 2001 From: NKO Date: Mon, 24 Nov 2025 19:25:23 +0100 Subject: [PATCH 10/70] TIMAAT Weiterentwicklung #9 - Implemented categories table for actors * Implemneted categories table for actors * Added TableColumnConfig for address objects --- src/main/webapp/index.html | 10 ++++- .../webapp/js/datasets/timaat.categories.js | 37 ++++++++++++++++--- src/main/webapp/js/ui/timaat.table.js | 15 +++++++- 3 files changed, 55 insertions(+), 7 deletions(-) diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html index 7bb57b38..ee3a964e 100644 --- a/src/main/webapp/index.html +++ b/src/main/webapp/index.html @@ -2378,7 +2378,15 @@
    - Some placeholder content for the first accordion panel. This panel is shown by default, thanks to the .show class. + + + + + + + + +
    diff --git a/src/main/webapp/js/datasets/timaat.categories.js b/src/main/webapp/js/datasets/timaat.categories.js index 8d9cc08b..fbfacfdc 100644 --- a/src/main/webapp/js/datasets/timaat.categories.js +++ b/src/main/webapp/js/datasets/timaat.categories.js @@ -36,6 +36,7 @@ }(function (TIMAAT) { TIMAAT.Categories = { categoryDataTable: null, categorySetDataTable: null, relatedMusicTable: null, relatedMediumTable: null, + relatedActorTable: null, init: function () { $('#categorySetTab').on('click', function (event) { @@ -117,6 +118,7 @@ //init datatables TIMAAT.Categories.relatedMusicTable = TIMAAT.Categories.initRelatedMusicTable() TIMAAT.Categories.relatedMediumTable = TIMAAT.Categories.initRelatedMediumTable() + TIMAAT.Categories.relatedActorTable = TIMAAT.Categories.initRelatedActorTable() }, initCategoriesComponent: function () { TIMAAT.UI.showComponent('categories'); $('#categoryTab').trigger('click'); @@ -192,9 +194,9 @@ const musicTypesById = new Map([[1, "Anashid"], [2, "Church music"]]) const columns = [new TIMAAT.Table.FieldTableColumnConfig("title", "Title", "displayTitle.name"), new TIMAAT.Table.FieldTableColumnConfig("id", "ID", "id"), new TIMAAT.Table.FieldTableColumnConfig("beat", "Beat", "beat"), new TIMAAT.Table.FieldTableColumnConfig("instrumentation", "Instrumentation", "instrumentation"), new TIMAAT.Table.FieldTableColumnConfig("tempo", "Tempo", "tempo"), new TIMAAT.Table.FieldTableColumnConfig("remark", "Remark", "remark"), - new TIMAAT.Table.FieldTableColumnConfig("harmony", "Harmony", "harmony"), new TIMAAT.Table.FieldTableColumnConfig("melody", "Melody", "melody"),new TIMAAT.Table.ValueMapperTableColumnConfig("musicType", "Music Type", "musicType.id", musicTypesById)] + new TIMAAT.Table.FieldTableColumnConfig("harmony", "Harmony", "harmony"), new TIMAAT.Table.FieldTableColumnConfig("melody", "Melody", "melody"), new TIMAAT.Table.ValueMapperTableColumnConfig("musicType", "Music Type", "musicType.id", musicTypesById)] const activeColumnIds = ["id", "title", "musicType", "beat", "instrumentation", "tempo", "remark", "harmony", "melody"] - const musicTable = new TIMAAT.Table.Table("#categoriesMusicTable", columns, activeColumnIds, "api/music/list") + const musicTable = new TIMAAT.Table.Table("#categoriesMusicTable", columns, activeColumnIds, "api/music/list") $('#musicTableCollapse').on('shown.bs.collapse', (event) => { musicTable.resizeToParent() }); @@ -203,6 +205,7 @@ }, initRelatedMediumTable: function () { + //TODO: Check subtypes const mediaTypesById = new Map([[1, "Audio"], [2, "Document"], [3, "Image"], [4, "Software"], [5, "Text"], [6, " Video"], [7, "Videogame"]]) const MediumDurationColumnConfig = class MediumDurationColumnConfig extends TIMAAT.Table.TableColumnConfig { @@ -226,8 +229,8 @@ const imageThumbnailGeneratorFunction = (row) => { let thumbnailPath = null - if(row.mediumVideo) { - thumbnailPath = "/TIMAAT/api/medium/video/"+row.id+"/thumbnail"+"?token=" + row.viewToken + if (row.mediumVideo) { + thumbnailPath = "/TIMAAT/api/medium/video/" + row.id + "/thumbnail" + "?token=" + row.viewToken } return thumbnailPath @@ -244,10 +247,33 @@ mediumTable.resizeToParent() }); - return mediumTable }, + initRelatedActorTable: function () { + const actorTypesById = new Map([[1, "Person"], [2, "Collective"]]) + const sexTypesById = new Map([[1, "Female"], [2, "Male"], [3, "Other"], [4, "Unknown"]]) + + const columns = [new TIMAAT.Table.FieldTableColumnConfig("id", "ID", "id"), new TIMAAT.Table.ValueMapperTableColumnConfig("type", "Type", "actorType.id", actorTypesById), + new TIMAAT.Table.FieldTableColumnConfig("name", "Name", "displayName.name"), new TIMAAT.Table.DateTableColumnConfig("nameUsedFrom", "Name used from", "displayName.usedFrom"), + new TIMAAT.Table.DateTableColumnConfig("nameUsedUntil", "Name used until", "displayName.usedUntil"), new TIMAAT.Table.AddressTableColumnConfig("primaryAddress", "Primary address", "primaryAddress"), + new TIMAAT.Table.FieldTableColumnConfig("primaryPhoneNumber", "Primary phone number", "primaryPhoneNumber.phoneNumber"), new TIMAAT.Table.FieldTableColumnConfig("primaryEmailAddress", "Primary email address", "primaryEmailAddress.email"), + new TIMAAT.Table.DateTableColumnConfig("disbanded", "Disbanded", "actorCollective.disbanded"), new TIMAAT.Table.DateTableColumnConfig("founded", "Founded", "actorCollective.founded"), + new TIMAAT.Table.DateTableColumnConfig("dateOfBirth", "Date of birth", "actorPerson.dateOfBirth"), new TIMAAT.Table.DateTableColumnConfig("dayOfDeath", "Day of death", "actorPerson.dayOfDeath"), + new TIMAAT.Table.FieldTableColumnConfig("title", "Title", "actorPerson.title"), new TIMAAT.Table.FieldTableColumnConfig("citizenship", "Citizenship", "actorPerson.citizenship"), + new TIMAAT.Table.FieldTableColumnConfig("placeOfBirth", "Place of birth", "actorPerson.placeOfBirth"), new TIMAAT.Table.FieldTableColumnConfig("placeOfDeath", "Place of death", "actorPerson.placeOfDeath"), + new TIMAAT.Table.ValueMapperTableColumnConfig("sex", "Sex", "actorPerson.sex.id", sexTypesById) + ] + const activeColumnIds = ["id", "name", "nameUsedFrom", "nameUsedUntil", "type", "primaryAddress", "primaryPhoneNumber", "primaryEmailAddress", "disbanded", "founded", "dateOfBirth", "dayOfDeath", "title", "citizenship", "placeOfBirth", "placeOfDeath", "sex"] + const actorTable = new TIMAAT.Table.Table("#categoriesActorTable", columns, activeColumnIds, "api/actor/list") + + $('#actorTableCollapse').on('shown.bs.collapse', (event) => { + actorTable.resizeToParent() + }); + + return actorTable + }, + createCategoriesDropDown: function () { const categoryDropDown = $('#categoryMultiSelectDropdown') categoryDropDown.empty() @@ -336,6 +362,7 @@ $('#categoriesAssignedEntitiesPanel').show() TIMAAT.Categories.relatedMusicTable.draw() TIMAAT.Categories.relatedMediumTable.draw() + TIMAAT.Categories.relatedActorTable.draw() }, showAddCategorySetPanel() { diff --git a/src/main/webapp/js/ui/timaat.table.js b/src/main/webapp/js/ui/timaat.table.js index 3b40e0b1..51d26140 100644 --- a/src/main/webapp/js/ui/timaat.table.js +++ b/src/main/webapp/js/ui/timaat.table.js @@ -115,7 +115,7 @@ * imagePathGeneratorFunction. * @param id * @param title - * @param imagePathGeneratorFunction: (row) => string | null + * @param imagePathGeneratorFunction : (row) => string | null */ constructor(id, title, imagePathGeneratorFunction) { super(id, title, "", false); @@ -131,6 +131,19 @@ } } + TIMAAT.Table.AddressTableColumnConfig = class extends TIMAAT.Table.TableColumnConfig { + constructor(id, title, data) { + super(id, title, data, false); + } + + render(data, type, row) { + if(data){ + return `

    ${data.street ?? ""} ${data.streetNumber ?? ""} ${data.streetAddition ?? ""}
    ${data.postalCode} ${data.city}

    ` + } + return `

    -

    ` + } + } + TIMAAT.Table.Table = class { _tableColumnConfigsById _activeTableColumnIds From 3dcb2420a67da6b78ac7afca89e2756f2a4f9d6f Mon Sep 17 00:00:00 2001 From: NKO Date: Fri, 28 Nov 2025 11:22:55 +0100 Subject: [PATCH 11/70] TIMAAT Weiterentwicklung #9 - Implemented listing structure for storages * Defined paging and sorting parameter type * Defined basic query parameter which can be used for listing endpoints * Defined filters for annotation listing endpoint --- .../bitgilde/TIMAAT/model/DataTableInfo.java | 6 +- .../de/bitgilde/TIMAAT/model/SortOrder.java | 11 +++ .../rest/endpoint/EndpointAnnotation.java | 12 +++ .../AnnotationListingQueryParameter.java | 53 +++++++++++++ .../parameter/ListingQueryParameter.java | 76 +++++++++++++++++++ .../TIMAAT/storage/ListingResult.java | 33 ++++++++ .../TIMAAT/storage/PagingParameter.java | 21 +++++ .../TIMAAT/storage/SortingParameter.java | 24 ++++++ .../storage/entity/AnnotationStorage.java | 24 ++++++ src/main/webapp/index.html | 44 +++++++++++ .../webapp/js/datasets/timaat.categories.js | 7 ++ 11 files changed, 308 insertions(+), 3 deletions(-) create mode 100644 src/main/java/de/bitgilde/TIMAAT/model/SortOrder.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/rest/model/annotation/AnnotationListingQueryParameter.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/rest/model/parameter/ListingQueryParameter.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/storage/ListingResult.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/storage/PagingParameter.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/storage/SortingParameter.java diff --git a/src/main/java/de/bitgilde/TIMAAT/model/DataTableInfo.java b/src/main/java/de/bitgilde/TIMAAT/model/DataTableInfo.java index a0ecfcfb..3376a612 100644 --- a/src/main/java/de/bitgilde/TIMAAT/model/DataTableInfo.java +++ b/src/main/java/de/bitgilde/TIMAAT/model/DataTableInfo.java @@ -19,20 +19,20 @@ /** * @author Mirko Scherf */ -public class DataTableInfo { +public class DataTableInfo { public int draw; public long recordsTotal; public long recordsFiltered; - public List data; + public List data; public DataTableInfo() { } - public DataTableInfo(int draw, long recordsTotal, long recordsFiltered, List data) { + public DataTableInfo(int draw, long recordsTotal, long recordsFiltered, List data) { this.draw = draw; this.recordsTotal = recordsTotal; this.recordsFiltered = recordsFiltered; diff --git a/src/main/java/de/bitgilde/TIMAAT/model/SortOrder.java b/src/main/java/de/bitgilde/TIMAAT/model/SortOrder.java new file mode 100644 index 00000000..2eb7cda2 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/model/SortOrder.java @@ -0,0 +1,11 @@ +package de.bitgilde.TIMAAT.model; + +/** + * Enum describing the used sorting orders of this service + * + * @author Nico Kotlenga + * @since 28.11.25 + */ +public enum SortOrder { + ASC, DESC; +} diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnnotation.java b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnnotation.java index c9128e2e..e711392f 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnnotation.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnnotation.java @@ -22,6 +22,7 @@ import de.bitgilde.TIMAAT.processing.video.exception.VideoEngineException; import de.bitgilde.TIMAAT.rest.Secured; import de.bitgilde.TIMAAT.rest.filter.AuthenticationFilter; +import de.bitgilde.TIMAAT.rest.model.annotation.AnnotationListingQueryParameter; import de.bitgilde.TIMAAT.rest.model.annotation.CreateAnnotationPayload; import de.bitgilde.TIMAAT.rest.model.annotation.UpdateAnnotationPayload; import de.bitgilde.TIMAAT.rest.model.annotation.UpdateAnnotationThumbnailPayload; @@ -31,6 +32,7 @@ import de.bitgilde.TIMAAT.rest.security.authorization.AnnotationAuthorizationVerifier; import de.bitgilde.TIMAAT.rest.security.authorization.PermissionType; import de.bitgilde.TIMAAT.security.UserLogManager; +import de.bitgilde.TIMAAT.storage.ListingResult; import de.bitgilde.TIMAAT.storage.entity.AnnotationStorage; import de.bitgilde.TIMAAT.storage.entity.AnnotationStorage.CreateAnnotation; import de.bitgilde.TIMAAT.storage.entity.AnnotationStorage.UpdateAnnotation; @@ -44,6 +46,7 @@ import jakarta.persistence.EntityTransaction; import jakarta.persistence.Query; import jakarta.validation.Valid; +import jakarta.ws.rs.BeanParam; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.ForbiddenException; @@ -113,6 +116,15 @@ public class EndpointAnnotation { @Inject TemporaryFileStorage temporaryFileStorage; + @GET + @Produces + @Path("list") + public DataTableInfo getAnnotationList(@BeanParam @Valid AnnotationListingQueryParameter annotationListingQueryParameter) { + int draw = annotationListingQueryParameter.getDraw() == null ? 0 : annotationListingQueryParameter.getDraw(); + ListingResult annotationListingResult = annotationStorage.getAnnotations(annotationListingQueryParameter, annotationListingQueryParameter, annotationListingQueryParameter); + return new DataTableInfo<>(draw, annotationListingResult.getTotalItemCount(), annotationListingResult.getMatchedItemsCount(), annotationListingResult.getItems()); + } + @GET @Produces(MediaType.APPLICATION_JSON) @Path("{id}") diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/model/annotation/AnnotationListingQueryParameter.java b/src/main/java/de/bitgilde/TIMAAT/rest/model/annotation/AnnotationListingQueryParameter.java new file mode 100644 index 00000000..6398fc82 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/rest/model/annotation/AnnotationListingQueryParameter.java @@ -0,0 +1,53 @@ +package de.bitgilde.TIMAAT.rest.model.annotation; + +import de.bitgilde.TIMAAT.rest.model.parameter.ListingQueryParameter; +import de.bitgilde.TIMAAT.storage.entity.AnnotationStorage.AnnotationFilter; +import jakarta.ws.rs.QueryParam; + +import java.util.Collection; +import java.util.Optional; + +/** + * Defines the query parameter used by the listing endpoint of {@link de.bitgilde.TIMAAT.model.FIPOP.Annotation}s + * + * @author Nico Kotlenga + * @since 28.11.25 + */ +public class AnnotationListingQueryParameter extends ListingQueryParameter implements AnnotationFilter { + + @QueryParam("categoryIds") + private final Collection categoryIds; + @QueryParam("categorySetIds") + private final Collection categorySetIds; + + public AnnotationListingQueryParameter(Integer draw, Integer start, Integer length, String orderby, String direction, String search, Collection categoryIds, Collection categorySetIds) { + super(draw, start, length, orderby, direction, search); + this.categoryIds = categoryIds; + this.categorySetIds = categorySetIds; + } + + @Override + public Optional> getCategoryIds() { + if (categoryIds != null && !categoryIds.isEmpty()) { + return Optional.of(categoryIds); + } + return Optional.empty(); + } + + @Override + public Optional> getCategorySetIds() { + if (categorySetIds != null && !categorySetIds.isEmpty()) { + return Optional.of(categorySetIds); + } + return Optional.empty(); + } + + @Override + public Optional getAnnotationNameSearch() { + if (this.getSearch() != null && !this.getSearch().isEmpty()) { + return Optional.of(this.getSearch()); + } + + return Optional.empty(); + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/model/parameter/ListingQueryParameter.java b/src/main/java/de/bitgilde/TIMAAT/rest/model/parameter/ListingQueryParameter.java new file mode 100644 index 00000000..1097c92e --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/rest/model/parameter/ListingQueryParameter.java @@ -0,0 +1,76 @@ +package de.bitgilde.TIMAAT.rest.model.parameter; + +import de.bitgilde.TIMAAT.model.SortOrder; +import de.bitgilde.TIMAAT.storage.PagingParameter; +import de.bitgilde.TIMAAT.storage.SortingParameter; +import jakarta.annotation.Nullable; +import jakarta.validation.constraints.PositiveOrZero; +import jakarta.ws.rs.QueryParam; + +import java.util.Optional; + +/** + * This class contains the basic query parameter used by datatable listing endpoints. + * It can be integrated as {@link jakarta.ws.rs.BeanParam} to the corresponding endpoint + * method. + * + * @author Nico Kotlenga + * @since 28.11.25 + */ +public class ListingQueryParameter implements SortingParameter, PagingParameter { + + @QueryParam("draw") + private final Integer draw; + @PositiveOrZero + @QueryParam("start") + private final Integer start; + @PositiveOrZero + @QueryParam("length") + private final Integer length; + @QueryParam("orderby") + private final String orderby; + @QueryParam("dir") + private final String direction; + @QueryParam("search") + private final String search; + + + public ListingQueryParameter(Integer draw, Integer start, Integer length, String orderby, String direction, String search) { + this.draw = draw; + this.start = start; + this.length = length; + this.orderby = orderby; + this.direction = direction; + this.search = search; + } + + public Integer getDraw() { + return draw; + } + + @Override + public Optional startIndex() { + return Optional.ofNullable(start); + } + + @Override + public Optional limit() { + return Optional.ofNullable(length); + } + + @Nullable + @Override + public Optional getSortOrder() { + return Optional.ofNullable(direction).map(SortOrder::valueOf); + } + + @Nullable + @Override + public Optional getSortFieldName() { + return Optional.ofNullable(orderby); + } + + protected String getSearch() { + return search; + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/ListingResult.java b/src/main/java/de/bitgilde/TIMAAT/storage/ListingResult.java new file mode 100644 index 00000000..e161bbcc --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/storage/ListingResult.java @@ -0,0 +1,33 @@ +package de.bitgilde.TIMAAT.storage; + +import java.util.List; + +/** + * This result type is used by storages for listing results + * + * @author Nico Kotlenga + * @since 28.11.25 + */ +public class ListingResult { + private final List items; + private final Long totalItemCount; + private final Long matchedItemsCount; + + public ListingResult(List items, Long totalItemCount, Long matchedItemsCount) { + this.items = items; + this.totalItemCount = totalItemCount; + this.matchedItemsCount = matchedItemsCount; + } + + public List getItems() { + return items; + } + + public Long getTotalItemCount() { + return totalItemCount; + } + + public Long getMatchedItemsCount() { + return matchedItemsCount; + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/PagingParameter.java b/src/main/java/de/bitgilde/TIMAAT/storage/PagingParameter.java new file mode 100644 index 00000000..d45844ce --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/storage/PagingParameter.java @@ -0,0 +1,21 @@ +package de.bitgilde.TIMAAT.storage; + +import java.util.Optional; + +/** + * Paging parameter which can be used for storage listings + * + * @author Nico Kotlenga + * @since 28.11.25 + */ +public interface PagingParameter { + /** + * @return the index where the listing result should start + */ + Optional startIndex(); + + /** + * @return number of maximum allowed listing results + */ + Optional limit(); +} diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/SortingParameter.java b/src/main/java/de/bitgilde/TIMAAT/storage/SortingParameter.java new file mode 100644 index 00000000..5ff412af --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/storage/SortingParameter.java @@ -0,0 +1,24 @@ +package de.bitgilde.TIMAAT.storage; + +import de.bitgilde.TIMAAT.model.SortOrder; + +import java.util.Optional; + +/** + * Sorting parameters which can be used for sorting storage listings + * + * @author Nico Kotlenga + * @since 28.11.25 + */ +public interface SortingParameter { + + /** + * @return the sorting order which should be used for listing results + */ + Optional getSortOrder(); + + /** + * @return the name of the field on which the listing results should be sort on + */ + Optional getSortFieldName(); +} diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/AnnotationStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/AnnotationStorage.java index e9ae4bf5..98215077 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/AnnotationStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/AnnotationStorage.java @@ -19,6 +19,9 @@ import de.bitgilde.TIMAAT.model.FIPOP.Tag; import de.bitgilde.TIMAAT.model.FIPOP.UserAccount; import de.bitgilde.TIMAAT.model.IndexBasedRange; +import de.bitgilde.TIMAAT.storage.ListingResult; +import de.bitgilde.TIMAAT.storage.PagingParameter; +import de.bitgilde.TIMAAT.storage.SortingParameter; import jakarta.inject.Inject; import jakarta.persistence.EntityManagerFactory; @@ -27,6 +30,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; +import java.util.Optional; import java.util.logging.Level; import java.util.logging.Logger; /* @@ -61,6 +65,10 @@ public AnnotationStorage(EntityManagerFactory emf, TagStorage tagStorage) { this.tagStorage = tagStorage; } + public ListingResult getAnnotations(AnnotationFilter filter, PagingParameter pagingParameter, SortingParameter sortingParameter){ + return new ListingResult<>(Collections.emptyList(), 0L, 0L); + } + public boolean removeTranscriptionAreaFromAnnotationHasMusicForLanguage(int annotationId, int musicId, int languageId) throws DbTransactionExecutionException { logger.log(Level.FINE, "Removing transcription area from annotation {0} for music {1} in language {2} ", new Object[]{annotationId, musicId, languageId}); @@ -257,6 +265,22 @@ public Annotation getAnnotationById(int annotationId) throws DbTransactionExecut return this.executeDbTransaction(entityManager -> entityManager.find(Annotation.class, annotationId)); } + public interface AnnotationFilter { + /** + * @return the category ids the returning annotations should belong to + */ + Optional> getCategoryIds(); + /** + * @return the category set ids the retuning annotations should belong to + */ + Optional> getCategorySetIds(); + + /** + * @return the search text which the annotation name should match + */ + Optional getAnnotationNameSearch(); + } + public static class CreateAnnotation { private final String title; private final String comment; diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html index ee3a964e..25f3ce87 100644 --- a/src/main/webapp/index.html +++ b/src/main/webapp/index.html @@ -2391,6 +2391,50 @@
    +
    +
    + +
    +
    +
    + + + + + + + + +
    +
    +
    +
    + +
    +
    +
    + +
    +
    +
    + + + + + + + + +
    +
    +
    +
    +
    diff --git a/src/main/webapp/js/datasets/timaat.categories.js b/src/main/webapp/js/datasets/timaat.categories.js index fbfacfdc..273e7d43 100644 --- a/src/main/webapp/js/datasets/timaat.categories.js +++ b/src/main/webapp/js/datasets/timaat.categories.js @@ -274,6 +274,13 @@ return actorTable }, + initRelatedAnnotationTable: function () { + const columns = [] + const activeColumnIds = [] + + const annotationTable = new TIMAAT.Table.Table("#categoriesAnnotationTable", columns, activeColumnIds, "api/annotation/list") + }, + createCategoriesDropDown: function () { const categoryDropDown = $('#categoryMultiSelectDropdown') categoryDropDown.empty() From e62e7b3a202305db9c13aa3e3efde56c1f752d3f Mon Sep 17 00:00:00 2001 From: NKO Date: Tue, 2 Dec 2025 15:24:42 +0100 Subject: [PATCH 12/70] TIMAAT Weiterentwicklung #9 - Added metamodel processor * Added jpa metamodel process org.eclipse.persistence.jpa.modelgen.processor * Configured maven to include generated sources of metamodel processor into the resulting war file --- pom.xml | 10 ++++- .../de/bitgilde/TIMAAT/model/SortOrder.java | 14 ++++++ .../rest/endpoint/EndpointAnnotation.java | 5 ++- .../AnnotationListingQueryParameter.java | 18 +++++--- .../parameter/ListingQueryParameter.java | 43 ++++++++++++++++--- .../TIMAAT/storage/PagingParameter.java | 14 ++++++ .../TIMAAT/storage/SortingParameter.java | 14 ++++++ .../storage/entity/AnnotationStorage.java | 13 +++++- .../webapp/js/datasets/timaat.categories.js | 15 +++++-- 9 files changed, 127 insertions(+), 19 deletions(-) diff --git a/pom.xml b/pom.xml index 821fcd4d..45b7d458 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,9 @@ 3.11.0 11 - + + ${project.build.directory}/generated-sources/annotations + @@ -44,6 +46,7 @@ + @@ -171,6 +174,11 @@ eclipselink 3.0.2 + + org.eclipse.persistence + org.eclipse.persistence.jpa.modelgen.processor + 3.0.2 + jakarta.xml.bind diff --git a/src/main/java/de/bitgilde/TIMAAT/model/SortOrder.java b/src/main/java/de/bitgilde/TIMAAT/model/SortOrder.java index 2eb7cda2..6afa44c4 100644 --- a/src/main/java/de/bitgilde/TIMAAT/model/SortOrder.java +++ b/src/main/java/de/bitgilde/TIMAAT/model/SortOrder.java @@ -1,5 +1,19 @@ package de.bitgilde.TIMAAT.model; +/* + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + /** * Enum describing the used sorting orders of this service * diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnnotation.java b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnnotation.java index e711392f..49827353 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnnotation.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnnotation.java @@ -120,8 +120,11 @@ public class EndpointAnnotation { @Produces @Path("list") public DataTableInfo getAnnotationList(@BeanParam @Valid AnnotationListingQueryParameter annotationListingQueryParameter) { + UserAccount userAccount = (UserAccount) containerRequestContext.getProperty( + AuthenticationFilter.USER_ACCOUNT_PROPERTY_NAME); + int draw = annotationListingQueryParameter.getDraw() == null ? 0 : annotationListingQueryParameter.getDraw(); - ListingResult annotationListingResult = annotationStorage.getAnnotations(annotationListingQueryParameter, annotationListingQueryParameter, annotationListingQueryParameter); + ListingResult annotationListingResult = annotationStorage.getAnnotations(annotationListingQueryParameter, annotationListingQueryParameter, annotationListingQueryParameter, userAccount); return new DataTableInfo<>(draw, annotationListingResult.getTotalItemCount(), annotationListingResult.getMatchedItemsCount(), annotationListingResult.getItems()); } diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/model/annotation/AnnotationListingQueryParameter.java b/src/main/java/de/bitgilde/TIMAAT/rest/model/annotation/AnnotationListingQueryParameter.java index 6398fc82..fad85068 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/model/annotation/AnnotationListingQueryParameter.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/model/annotation/AnnotationListingQueryParameter.java @@ -16,14 +16,12 @@ public class AnnotationListingQueryParameter extends ListingQueryParameter implements AnnotationFilter { @QueryParam("categoryIds") - private final Collection categoryIds; + private Collection categoryIds; @QueryParam("categorySetIds") - private final Collection categorySetIds; + private Collection categorySetIds; + + public AnnotationListingQueryParameter() { - public AnnotationListingQueryParameter(Integer draw, Integer start, Integer length, String orderby, String direction, String search, Collection categoryIds, Collection categorySetIds) { - super(draw, start, length, orderby, direction, search); - this.categoryIds = categoryIds; - this.categorySetIds = categorySetIds; } @Override @@ -50,4 +48,12 @@ public Optional getAnnotationNameSearch() { return Optional.empty(); } + + public void setCategoryIds(Collection categoryIds) { + this.categoryIds = categoryIds; + } + + public void setCategorySetIds(Collection categorySetIds) { + this.categorySetIds = categorySetIds; + } } diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/model/parameter/ListingQueryParameter.java b/src/main/java/de/bitgilde/TIMAAT/rest/model/parameter/ListingQueryParameter.java index 1097c92e..a51077f8 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/model/parameter/ListingQueryParameter.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/model/parameter/ListingQueryParameter.java @@ -9,6 +9,20 @@ import java.util.Optional; +/* + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + /** * This class contains the basic query parameter used by datatable listing endpoints. * It can be integrated as {@link jakarta.ws.rs.BeanParam} to the corresponding endpoint @@ -20,27 +34,42 @@ public class ListingQueryParameter implements SortingParameter, PagingParameter { @QueryParam("draw") - private final Integer draw; + private Integer draw; @PositiveOrZero @QueryParam("start") - private final Integer start; + private Integer start; @PositiveOrZero @QueryParam("length") - private final Integer length; + private Integer length; @QueryParam("orderby") - private final String orderby; + private String orderby; @QueryParam("dir") - private final String direction; + private String direction; @QueryParam("search") - private final String search; + private String search; - public ListingQueryParameter(Integer draw, Integer start, Integer length, String orderby, String direction, String search) { + public void setDraw(Integer draw) { this.draw = draw; + } + + public void setStart(Integer start) { this.start = start; + } + + public void setLength(Integer length) { this.length = length; + } + + public void setOrderby(String orderby) { this.orderby = orderby; + } + + public void setDirection(String direction) { this.direction = direction; + } + + public void setSearch(String search) { this.search = search; } diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/PagingParameter.java b/src/main/java/de/bitgilde/TIMAAT/storage/PagingParameter.java index d45844ce..e9a9a7d1 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/PagingParameter.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/PagingParameter.java @@ -2,6 +2,20 @@ import java.util.Optional; +/* + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + /** * Paging parameter which can be used for storage listings * diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/SortingParameter.java b/src/main/java/de/bitgilde/TIMAAT/storage/SortingParameter.java index 5ff412af..f81066e7 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/SortingParameter.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/SortingParameter.java @@ -4,6 +4,20 @@ import java.util.Optional; +/* + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + /** * Sorting parameters which can be used for sorting storage listings * diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/AnnotationStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/AnnotationStorage.java index 98215077..6c5d62b4 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/AnnotationStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/AnnotationStorage.java @@ -24,6 +24,9 @@ import de.bitgilde.TIMAAT.storage.SortingParameter; import jakarta.inject.Inject; import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import java.sql.Timestamp; import java.time.Instant; @@ -65,7 +68,15 @@ public AnnotationStorage(EntityManagerFactory emf, TagStorage tagStorage) { this.tagStorage = tagStorage; } - public ListingResult getAnnotations(AnnotationFilter filter, PagingParameter pagingParameter, SortingParameter sortingParameter){ + public ListingResult getAnnotations(AnnotationFilter filter, PagingParameter pagingParameter, SortingParameter sortingParameter, UserAccount userAccount) { + executeDbTransaction(entityManager -> { + CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder(); + CriteriaQuery criteriaQuery = criteriaBuilder.createQuery(Annotation.class); + Root root = criteriaQuery.from(Annotation.class); + + + return Void.TYPE; + }); return new ListingResult<>(Collections.emptyList(), 0L, 0L); } diff --git a/src/main/webapp/js/datasets/timaat.categories.js b/src/main/webapp/js/datasets/timaat.categories.js index 273e7d43..f768f1c0 100644 --- a/src/main/webapp/js/datasets/timaat.categories.js +++ b/src/main/webapp/js/datasets/timaat.categories.js @@ -36,7 +36,7 @@ }(function (TIMAAT) { TIMAAT.Categories = { categoryDataTable: null, categorySetDataTable: null, relatedMusicTable: null, relatedMediumTable: null, - relatedActorTable: null, + relatedActorTable: null, relatedAnnotationTable: null, init: function () { $('#categorySetTab').on('click', function (event) { @@ -119,6 +119,7 @@ TIMAAT.Categories.relatedMusicTable = TIMAAT.Categories.initRelatedMusicTable() TIMAAT.Categories.relatedMediumTable = TIMAAT.Categories.initRelatedMediumTable() TIMAAT.Categories.relatedActorTable = TIMAAT.Categories.initRelatedActorTable() + TIMAAT.Categories.relatedAnnotationTable = TIMAAT.Categories.initRelatedAnnotationTable() }, initCategoriesComponent: function () { TIMAAT.UI.showComponent('categories'); $('#categoryTab').trigger('click'); @@ -275,10 +276,17 @@ }, initRelatedAnnotationTable: function () { - const columns = [] - const activeColumnIds = [] + const columns = [new TIMAAT.Table.FieldTableColumnConfig("id", "ID", "id")] + const activeColumnIds = ["id"] const annotationTable = new TIMAAT.Table.Table("#categoriesAnnotationTable", columns, activeColumnIds, "api/annotation/list") + + $('#annotationTableCollapse').on('shown.bs.collapse', (event) => { + annotationTable.resizeToParent() + }); + + + return annotationTable }, createCategoriesDropDown: function () { @@ -370,6 +378,7 @@ TIMAAT.Categories.relatedMusicTable.draw() TIMAAT.Categories.relatedMediumTable.draw() TIMAAT.Categories.relatedActorTable.draw() + TIMAAT.Categories.relatedAnnotationTable.draw() }, showAddCategorySetPanel() { From e59b4f9ff117af0021f94ec0ff52d8e23c33ca0b Mon Sep 17 00:00:00 2001 From: NKO Date: Wed, 3 Dec 2025 11:58:03 +0100 Subject: [PATCH 13/70] TIMAAT Weiterentwicklung #9 - Started implementation of table column popover --- .../storage/entity/AnnotationStorage.java | 4 +- src/main/webapp/index.html | 45 ++++++++++++------- .../webapp/js/datasets/timaat.categories.js | 1 + src/main/webapp/js/ui/timaat.table.js | 19 ++++++++ 4 files changed, 53 insertions(+), 16 deletions(-) diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/AnnotationStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/AnnotationStorage.java index 6c5d62b4..f0ad4ae8 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/AnnotationStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/AnnotationStorage.java @@ -122,7 +122,8 @@ public Annotation createAnnotation(CreateAnnotation createAnnotation, UserAccoun logger.log(Level.FINE, "Creating new annotation"); return this.executeDbTransaction(entityManager -> { - MediumAnalysisList mediumAnalysisList = entityManager.find(MediumAnalysisList.class, createAnnotation.analysisListId); + MediumAnalysisList mediumAnalysisList = entityManager.find(MediumAnalysisList.class, + createAnnotation.analysisListId); Language defaultLanguage = entityManager.find(Language.class, 1); SvgShapeType polygonShapeType = entityManager.find(SvgShapeType.class, 5); @@ -281,6 +282,7 @@ public interface AnnotationFilter { * @return the category ids the returning annotations should belong to */ Optional> getCategoryIds(); + /** * @return the category set ids the retuning annotations should belong to */ diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html index 25f3ce87..c8f898ff 100644 --- a/src/main/webapp/index.html +++ b/src/main/webapp/index.html @@ -2328,9 +2328,12 @@
    - +
    + + +
    @@ -2350,9 +2353,12 @@
    - +
    + + +
    @@ -2372,9 +2378,12 @@
    - +
    + + +
    @@ -2394,9 +2403,12 @@
    - +
    + + +
    @@ -2416,9 +2428,12 @@
    - +
    + + +
    diff --git a/src/main/webapp/js/datasets/timaat.categories.js b/src/main/webapp/js/datasets/timaat.categories.js index f768f1c0..47dcb792 100644 --- a/src/main/webapp/js/datasets/timaat.categories.js +++ b/src/main/webapp/js/datasets/timaat.categories.js @@ -202,6 +202,7 @@ musicTable.resizeToParent() }); + const musicColumnSelectorPopover = new TIMAAT.Table.ColumnSelectorPopover(musicTable, "#categoriesMusicTableColumnButton", columns) return musicTable }, diff --git a/src/main/webapp/js/ui/timaat.table.js b/src/main/webapp/js/ui/timaat.table.js index 51d26140..51149450 100644 --- a/src/main/webapp/js/ui/timaat.table.js +++ b/src/main/webapp/js/ui/timaat.table.js @@ -223,4 +223,23 @@ this._dataTable?.columns.adjust().draw() } } + + TIMAAT.Table.ColumnSelectorPopover = class { + _table + _tableColumnConfigs + constructor(table, columnSelectorButtonSelector, tableColumnConfigs) { + this._table = table; + this._tableColumnConfigs = tableColumnConfigs; + this.openPopover = this.openPopover.bind(this); + + console.log(columnSelectorButtonSelector) + $(columnSelectorButtonSelector).on('click', () => { + console.log("test") + }) + } + + openPopover(event){ + console.log(event) + } + } }, window)) \ No newline at end of file From 902b0468872f3309549a28ca232be5987597567e Mon Sep 17 00:00:00 2001 From: NKO Date: Sun, 7 Dec 2025 16:23:18 +0100 Subject: [PATCH 14/70] TIMAAT Weiterentwicklung #9 - Implemented column selector component * Implemented component which uses the tableColumnConfigs to show a popover on which columns of a table can be enabled and disabled * Added method which allows enable and disabled columns of tables --- src/main/webapp/js/ui/timaat.table.js | 77 ++++++++++++++++++++++----- 1 file changed, 64 insertions(+), 13 deletions(-) diff --git a/src/main/webapp/js/ui/timaat.table.js b/src/main/webapp/js/ui/timaat.table.js index 51149450..08c1e5d9 100644 --- a/src/main/webapp/js/ui/timaat.table.js +++ b/src/main/webapp/js/ui/timaat.table.js @@ -149,7 +149,6 @@ _activeTableColumnIds _selector _dataUrl - _$headerRow _dataTable = null; constructor(selector, tableColumnConfigs, activeTableColumnConfigIds, dataUrl) { @@ -160,16 +159,37 @@ this._selector = selector this._activeTableColumnIds = activeTableColumnConfigIds; this._dataUrl = dataUrl; - this._$headerRow = $(selector + " thead tr") } - set activeTableColumnIds(activeTableColumnConfigIds) { - this._activeTableColumnIds = activeTableColumnConfigIds; + /** + * Changes the active state of the specified column + * @param columnId + * @param active + * @return boolean indicating the new state + */ + changeTableColumnActivState(columnId, active){ + const activeColumnIndex = this._activeTableColumnIds.indexOf(columnId); + if(active && activeColumnIndex === -1) { + this._activeTableColumnIds.push(columnId); + this.draw() + }else if(!active && activeColumnIndex > -1 && this.activeTableColumnIds.length > 1){ + this._activeTableColumnIds.splice(activeColumnIndex, 1); + this.draw() + } + + return this._activeTableColumnIds.indexOf(columnId) > -1 + } + + get activeTableColumnIds() { + return this._activeTableColumnIds; } draw() { + this._dataTable?.clear().destroy() + const $headerRow = $(this._selector + " thead tr") + const columnConfigs = [] - this._$headerRow.empty() + $headerRow.empty() for (let activeTableColumnId of this._activeTableColumnIds) { const currentTableColumnConfig = this._tableColumnConfigsById.get(activeTableColumnId); columnConfigs.push({ @@ -178,7 +198,7 @@ render: currentTableColumnConfig.render, orderable: currentTableColumnConfig.sortable }); - $('').text(currentTableColumnConfig.title).appendTo(this._$headerRow); + $('').text(currentTableColumnConfig.title).appendTo($headerRow); } this._dataTable = $(this._selector).DataTable({ @@ -227,19 +247,50 @@ TIMAAT.Table.ColumnSelectorPopover = class { _table _tableColumnConfigs + _$columnSelectorButton constructor(table, columnSelectorButtonSelector, tableColumnConfigs) { this._table = table; - this._tableColumnConfigs = tableColumnConfigs; - this.openPopover = this.openPopover.bind(this); + this._tableColumnConfigs = tableColumnConfigs.sort((a, b) => a.title.localeCompare(b.title)); + + this._$columnSelectorButton = $(columnSelectorButtonSelector) + this._$columnSelectorButton.on('click', this.openPopover); - console.log(columnSelectorButtonSelector) - $(columnSelectorButtonSelector).on('click', () => { - console.log("test") + this.createPopover(); + } + + createPopover(){ + const popoverMenuItems = this.createMenuItems(); + this._$columnSelectorButton.popover({ + title: "Columns", + content: popoverMenuItems, + html: true, + placement: "bottom" }) } - openPopover(event){ - console.log(event) + createMenuItems() { + const $listGroup = $(`
      `) + const currentActiveTableColumnIds = this._table.activeTableColumnIds + + for(const currentTableColumnConfig of this._tableColumnConfigs) { + const $currentListGroupItemCheckbox = $(``) + const initialSelected = currentActiveTableColumnIds.indexOf(currentTableColumnConfig.id) > -1; + + $currentListGroupItemCheckbox.prop("checked", initialSelected) + + const table = this._table + $currentListGroupItemCheckbox.on("change", (e) => { + const newState = table.changeTableColumnActivState(currentTableColumnConfig.id, e.target.checked); + $currentListGroupItemCheckbox.prop("checked", newState) + }) + + const $currentListGroupItem = $(`
    • ${currentTableColumnConfig.title}
      • `) + $currentListGroupItem.append($currentListGroupItemCheckbox) + + $listGroup.append($currentListGroupItem) + } + + return $listGroup } } }, window)) \ No newline at end of file From 0a30f494c7b4ff74f6216b94ac667d7a5618285c Mon Sep 17 00:00:00 2001 From: NKO Date: Sun, 7 Dec 2025 17:30:12 +0100 Subject: [PATCH 15/70] TIMAAT Weiterentwicklung #9 - Added persisting and loading of active column state * added storage implementation using the local storage to persist the current active column state of tables * added column selector popover component for medium, actor and annotation table --- .../webapp/js/datasets/timaat.categories.js | 6 ++- src/main/webapp/js/ui/timaat.table.js | 46 +++++++++++++++++-- 2 files changed, 45 insertions(+), 7 deletions(-) diff --git a/src/main/webapp/js/datasets/timaat.categories.js b/src/main/webapp/js/datasets/timaat.categories.js index 47dcb792..1ec8ef20 100644 --- a/src/main/webapp/js/datasets/timaat.categories.js +++ b/src/main/webapp/js/datasets/timaat.categories.js @@ -202,7 +202,7 @@ musicTable.resizeToParent() }); - const musicColumnSelectorPopover = new TIMAAT.Table.ColumnSelectorPopover(musicTable, "#categoriesMusicTableColumnButton", columns) + new TIMAAT.Table.ColumnSelectorPopover(musicTable, "#categoriesMusicTableColumnButton") return musicTable }, @@ -249,6 +249,7 @@ mediumTable.resizeToParent() }); + new TIMAAT.Table.ColumnSelectorPopover(mediumTable, "#categoriesMediumTableColumnButton") return mediumTable }, @@ -273,6 +274,7 @@ actorTable.resizeToParent() }); + new TIMAAT.Table.ColumnSelectorPopover(actorTable, "#categoriesActorTableColumnButton") return actorTable }, @@ -286,7 +288,7 @@ annotationTable.resizeToParent() }); - + new TIMAAT.Table.ColumnSelectorPopover(annotationTable, "#categoriesAnnotationTableColumnButton") return annotationTable }, diff --git a/src/main/webapp/js/ui/timaat.table.js b/src/main/webapp/js/ui/timaat.table.js index 08c1e5d9..a872554a 100644 --- a/src/main/webapp/js/ui/timaat.table.js +++ b/src/main/webapp/js/ui/timaat.table.js @@ -149,16 +149,18 @@ _activeTableColumnIds _selector _dataUrl + _tableId _dataTable = null; - constructor(selector, tableColumnConfigs, activeTableColumnConfigIds, dataUrl) { + constructor(selector, tableColumnConfigs, defaultActiveTableColumnConfigs, dataUrl, tableId=selector) { this._tableColumnConfigsById = new Map() for (let tableColumnConfig of tableColumnConfigs) { this._tableColumnConfigsById.set(tableColumnConfig.id, tableColumnConfig); } this._selector = selector - this._activeTableColumnIds = activeTableColumnConfigIds; + this._activeTableColumnIds = TIMAAT.Table.TableConfigurationStorage.getActiveColumnsForTable(tableId) ?? defaultActiveTableColumnConfigs this._dataUrl = dataUrl; + this._tableId = tableId } /** @@ -169,21 +171,34 @@ */ changeTableColumnActivState(columnId, active){ const activeColumnIndex = this._activeTableColumnIds.indexOf(columnId); + let changed = false + if(active && activeColumnIndex === -1) { + changed = true this._activeTableColumnIds.push(columnId); this.draw() }else if(!active && activeColumnIndex > -1 && this.activeTableColumnIds.length > 1){ + changed = true this._activeTableColumnIds.splice(activeColumnIndex, 1); this.draw() } - return this._activeTableColumnIds.indexOf(columnId) > -1 + if(changed){ + TIMAAT.Table.TableConfigurationStorage.saveActiveColumnsForTable(this._activeTableColumnIds, this._tableId) + return active + } + + return !active } get activeTableColumnIds() { return this._activeTableColumnIds; } + get tableColumnConfigs() { + return Array.from(this._tableColumnConfigsById.values()); + } + draw() { this._dataTable?.clear().destroy() const $headerRow = $(this._selector + " thead tr") @@ -248,9 +263,9 @@ _table _tableColumnConfigs _$columnSelectorButton - constructor(table, columnSelectorButtonSelector, tableColumnConfigs) { + constructor(table, columnSelectorButtonSelector) { this._table = table; - this._tableColumnConfigs = tableColumnConfigs.sort((a, b) => a.title.localeCompare(b.title)); + this._tableColumnConfigs = table.tableColumnConfigs.sort((a, b) => a.title.localeCompare(b.title)); this._$columnSelectorButton = $(columnSelectorButtonSelector) this._$columnSelectorButton.on('click', this.openPopover); @@ -293,4 +308,25 @@ return $listGroup } } + TIMAAT.Table.TableConfigurationStorage = { + saveActiveColumnsForTable: function(activeColumns, tableId){ + const localStorageIdentifier = TIMAAT.Table.TableConfigurationStorage.createLocalStorageIdentifierForActiveColumns(tableId) + localStorage.setItem(localStorageIdentifier, JSON.stringify(activeColumns)) + }, + + getActiveColumnsForTable: function (tableId){ + const localStorageIdentifier = TIMAAT.Table.TableConfigurationStorage.createLocalStorageIdentifierForActiveColumns(tableId) + const activeColumnsJson = localStorage.getItem(localStorageIdentifier) + + if(activeColumnsJson){ + return JSON.parse(activeColumnsJson) + } + + return null + }, + + createLocalStorageIdentifierForActiveColumns: function(tableId){ + return `TIMAAT.Table.${tableId}.activeColumns` + } + } }, window)) \ No newline at end of file From 19fa7d43dc1b7dfe7863e73a3d94bc435717f9f7 Mon Sep 17 00:00:00 2001 From: NKO Date: Mon, 8 Dec 2025 17:42:58 +0100 Subject: [PATCH 16/70] TIMAAT Weiterentwicklung #9 - Added col reorder plugin * Added datatables col-reorder plugin * Implemented mechanism to persist col order into local storage --- src/main/webapp/index.html | 55 +-- .../webapp/js/datasets/timaat.categories.js | 11 +- src/main/webapp/js/timaat.init.js | 4 +- src/main/webapp/js/ui/timaat.table.js | 45 +- .../css/colReorder.dataTables.css | 1 + .../js/colReorder.dataTables.js | 401 ++++++++++++++++++ 6 files changed, 456 insertions(+), 61 deletions(-) create mode 100644 src/main/webapp/third-party/datatables/ColReorder-1.5.2/css/colReorder.dataTables.css create mode 100644 src/main/webapp/third-party/datatables/ColReorder-1.5.2/js/colReorder.dataTables.js diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html index 84032915..2b385573 100644 --- a/src/main/webapp/index.html +++ b/src/main/webapp/index.html @@ -31,6 +31,7 @@ + @@ -2336,16 +2337,8 @@
      -
      - - - +
      -
      - - - -
      @@ -2361,16 +2354,7 @@
      -
      - - - - - - - - -
      +
      @@ -2386,16 +2370,7 @@
      -
      - - - - - - - - -
      +
      @@ -2411,16 +2386,7 @@
      -
      - - - - - - - - -
      +
      @@ -2436,16 +2402,7 @@
      -
      - - - - - - - - -
      +
      diff --git a/src/main/webapp/js/datasets/timaat.categories.js b/src/main/webapp/js/datasets/timaat.categories.js index 1ec8ef20..23b65f51 100644 --- a/src/main/webapp/js/datasets/timaat.categories.js +++ b/src/main/webapp/js/datasets/timaat.categories.js @@ -158,6 +158,9 @@ closeOnSelect: false, scrollAfterSelect: true, allowClear: true, + colReorder: { + enable: true + }, ajax: { url: 'api/categorySet/selectList', type: 'GET', @@ -197,7 +200,7 @@ new TIMAAT.Table.FieldTableColumnConfig("instrumentation", "Instrumentation", "instrumentation"), new TIMAAT.Table.FieldTableColumnConfig("tempo", "Tempo", "tempo"), new TIMAAT.Table.FieldTableColumnConfig("remark", "Remark", "remark"), new TIMAAT.Table.FieldTableColumnConfig("harmony", "Harmony", "harmony"), new TIMAAT.Table.FieldTableColumnConfig("melody", "Melody", "melody"), new TIMAAT.Table.ValueMapperTableColumnConfig("musicType", "Music Type", "musicType.id", musicTypesById)] const activeColumnIds = ["id", "title", "musicType", "beat", "instrumentation", "tempo", "remark", "harmony", "melody"] - const musicTable = new TIMAAT.Table.Table("#categoriesMusicTable", columns, activeColumnIds, "api/music/list") + const musicTable = new TIMAAT.Table.Table("categoriesMusicTable","#categoriesMusicTableContainer", columns, activeColumnIds, "api/music/list") $('#musicTableCollapse').on('shown.bs.collapse', (event) => { musicTable.resizeToParent() }); @@ -243,7 +246,7 @@ new TIMAAT.Table.DateTableColumnConfig("recordingEndDate", "Recording End Date", "recordingEndDate"), new TIMAAT.Table.FieldTableColumnConfig("remark", "Remark", "remark"), new TIMAAT.Table.FieldTableColumnConfig("title", "Title", "displayTitle.name"), new TIMAAT.Table.ValueMapperTableColumnConfig("mediaType", "Media Type", "mediaType.id", mediaTypesById), new MediumDurationColumnConfig(), new TIMAAT.Table.ImageDownloadTableColumnConfig("thumbnail", "Thumbnail", imageThumbnailGeneratorFunction)] const activeColumnIds = ["thumbnail", "id", "title", "mediaType", "duration", "releaseDate", 'recordingStartDate', 'recordingEndDate', "fileHash", "copyright", "remark"] - const mediumTable = new TIMAAT.Table.Table("#categoriesMediumTable", columns, activeColumnIds, "api/medium/list") + const mediumTable = new TIMAAT.Table.Table("categoriesMediumTable", "#categoriesMediumTableContainer", columns, activeColumnIds, "api/medium/list") $('#mediumTableCollapse').on('shown.bs.collapse', (event) => { mediumTable.resizeToParent() @@ -268,7 +271,7 @@ new TIMAAT.Table.ValueMapperTableColumnConfig("sex", "Sex", "actorPerson.sex.id", sexTypesById) ] const activeColumnIds = ["id", "name", "nameUsedFrom", "nameUsedUntil", "type", "primaryAddress", "primaryPhoneNumber", "primaryEmailAddress", "disbanded", "founded", "dateOfBirth", "dayOfDeath", "title", "citizenship", "placeOfBirth", "placeOfDeath", "sex"] - const actorTable = new TIMAAT.Table.Table("#categoriesActorTable", columns, activeColumnIds, "api/actor/list") + const actorTable = new TIMAAT.Table.Table("categoriesActorTable","#categoriesActorTableContainer", columns, activeColumnIds, "api/actor/list") $('#actorTableCollapse').on('shown.bs.collapse', (event) => { actorTable.resizeToParent() @@ -282,7 +285,7 @@ const columns = [new TIMAAT.Table.FieldTableColumnConfig("id", "ID", "id")] const activeColumnIds = ["id"] - const annotationTable = new TIMAAT.Table.Table("#categoriesAnnotationTable", columns, activeColumnIds, "api/annotation/list") + const annotationTable = new TIMAAT.Table.Table("categoriesAnnotationTable", "#categoriesAnnotationTableContainer", columns, activeColumnIds, "api/annotation/list") $('#annotationTableCollapse').on('shown.bs.collapse', (event) => { annotationTable.resizeToParent() diff --git a/src/main/webapp/js/timaat.init.js b/src/main/webapp/js/timaat.init.js index f7a18fa8..32cc6d6c 100644 --- a/src/main/webapp/js/timaat.init.js +++ b/src/main/webapp/js/timaat.init.js @@ -16,6 +16,7 @@ requirejs.config({ "datatables.net-bs4" : '../third-party/datatables/DataTables-1.11.5/js/dataTables.bootstrap4', "datatables.net-responsive" : '../third-party/datatables/Responsive-2.2.9/js/dataTables.responsive', "datatables.select" : '../third-party/datatables/Select-1.3.4/js/dataTables.select', + "datatables.col-reorder" : '../third-party/datatables/ColReorder-1.5.2/js/colReorder.dataTables', "domReady" : '../third-party/requirejs/domReady', "moment" : '../third-party/moment/moment-with-locales', "leaflet" : '../third-party/leaflet/leaflet', @@ -153,8 +154,9 @@ require(['domReady', console.info("TIMAAT::Init"); requirejs([ 'moment', - 'datatables.select', 'datatables', + 'datatables.col-reorder', + 'datatables.select', 'TIMAAT', 'TIMAAT-entityupdate', 'TIMAAT-html', diff --git a/src/main/webapp/js/ui/timaat.table.js b/src/main/webapp/js/ui/timaat.table.js index a872554a..7fb4aa5c 100644 --- a/src/main/webapp/js/ui/timaat.table.js +++ b/src/main/webapp/js/ui/timaat.table.js @@ -147,20 +147,22 @@ TIMAAT.Table.Table = class { _tableColumnConfigsById _activeTableColumnIds - _selector + _$container _dataUrl _tableId + _reorderableColumns _dataTable = null; - constructor(selector, tableColumnConfigs, defaultActiveTableColumnConfigs, dataUrl, tableId=selector) { + constructor(tableId, containerSelector, tableColumnConfigs, defaultActiveTableColumnConfigs, dataUrl,reorderableColumns=true) { this._tableColumnConfigsById = new Map() for (let tableColumnConfig of tableColumnConfigs) { this._tableColumnConfigsById.set(tableColumnConfig.id, tableColumnConfig); } - this._selector = selector + this._$container = $(containerSelector) this._activeTableColumnIds = TIMAAT.Table.TableConfigurationStorage.getActiveColumnsForTable(tableId) ?? defaultActiveTableColumnConfigs this._dataUrl = dataUrl; this._tableId = tableId + this._reorderableColumns = reorderableColumns; } /** @@ -200,11 +202,20 @@ } draw() { - this._dataTable?.clear().destroy() - const $headerRow = $(this._selector + " thead tr") + const self = this + this._dataTable?.clear().destroy(true) + this._$container.empty() + + const $table = $(`
      `) + const $tableHead = $(``) + const $tableBody = $(``) + $tableHead.appendTo($table) + $tableBody.appendTo($table) + + const $headerRow = $("") + $headerRow.appendTo($tableHead) const columnConfigs = [] - $headerRow.empty() for (let activeTableColumnId of this._activeTableColumnIds) { const currentTableColumnConfig = this._tableColumnConfigsById.get(activeTableColumnId); columnConfigs.push({ @@ -215,10 +226,15 @@ }); $('').text(currentTableColumnConfig.title).appendTo($headerRow); } + $table.appendTo(this._$container) - this._dataTable = $(this._selector).DataTable({ + this._dataTable = $table.DataTable({ "destroy": true, "autoWidth": false, + "colReorder": { + "enable": this._reorderableColumns, + "order": Array.from(columnConfigs.keys()) + }, "lengthMenu": [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]], "pagingType": "full", "dom": 'ip>', @@ -246,8 +262,23 @@ return serverData; } }, + "initComplete": function () { + if(self._reorderableColumns){ + self._dataTable?.colReorder.reset() + } + }, "columns": columnConfigs }) + + $table.on('column-reorder.dt', (e, settings, details) => { + if (!details || !details.mapping) return; + + const newOrder = details.mapping.map(i => self._activeTableColumnIds[i]); + + self._activeTableColumnIds = newOrder; + TIMAAT.Table.TableConfigurationStorage + .saveActiveColumnsForTable(newOrder, this._tableId); + }); } /* diff --git a/src/main/webapp/third-party/datatables/ColReorder-1.5.2/css/colReorder.dataTables.css b/src/main/webapp/third-party/datatables/ColReorder-1.5.2/css/colReorder.dataTables.css new file mode 100644 index 00000000..02d68298 --- /dev/null +++ b/src/main/webapp/third-party/datatables/ColReorder-1.5.2/css/colReorder.dataTables.css @@ -0,0 +1 @@ +table.DTCR_clonedTable.dataTable{position:absolute !important;background-color:rgba(255,255,255,0.7);z-index:202}div.DTCR_pointer{width:1px;background-color:#0259C4;z-index:201} \ No newline at end of file diff --git a/src/main/webapp/third-party/datatables/ColReorder-1.5.2/js/colReorder.dataTables.js b/src/main/webapp/third-party/datatables/ColReorder-1.5.2/js/colReorder.dataTables.js new file mode 100644 index 00000000..3686f218 --- /dev/null +++ b/src/main/webapp/third-party/datatables/ColReorder-1.5.2/js/colReorder.dataTables.js @@ -0,0 +1,401 @@ +/*! + Copyright 2010-2019 SpryMedia Ltd. + + This source file is free software, available under the following license: + MIT license - http://datatables.net/license/mit + + This source file is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + or FITNESS FOR A PARTICULAR PURPOSE. See the license files for details. + + For details please refer to: http://www.datatables.net + ColReorder 1.5.2 + ©2010-2019 SpryMedia Ltd - datatables.net/license +*/ +(function (d) { + "function" === typeof define && define.amd ? define(["jquery", "datatables.net"], function (t) { + return d(t, window, document) + }) : "object" === typeof exports ? module.exports = function (t, r) { + t || (t = window); + r && r.fn.dataTable || (r = require("datatables.net")(t, r).$); + return d(r, t, t.document) + } : d(jQuery, window, document) +})(function (d, t, r, w) { + function v(a) { + for (var b = [], c = 0, d = a.length; c < d; c++) b[a[c]] = c; + return b + } + + function u(a, b, c) { + b = a.splice(b, 1)[0]; + a.splice(c, 0, b) + } + + function x(a, b, c) { + for (var d = [], h = 0, f = a.childNodes.length; h < + f; h++) 1 == a.childNodes[h].nodeType && d.push(a.childNodes[h]); + b = d[b]; + null !== c ? a.insertBefore(b, d[c]) : a.appendChild(b) + } + + var y = d.fn.dataTable; + d.fn.dataTableExt.oApi.fnColReorder = function (a, b, c, g, h) { + var f, p, n = a.aoColumns.length; + var q = function (a, b, c) { + if (a[b] && "function" !== typeof a[b]) { + var e = a[b].split("."), d = e.shift(); + isNaN(1 * d) || (a[b] = c[1 * d] + "." + e.join(".")) + } + }; + if (b != c) if (0 > b || b >= n) this.oApi._fnLog(a, 1, "ColReorder 'from' index is out of bounds: " + b); else if (0 > c || c >= n) this.oApi._fnLog(a, 1, "ColReorder 'to' index is out of bounds: " + + c); else { + var l = []; + var e = 0; + for (f = n; e < f; e++) l[e] = e; + u(l, b, c); + var k = v(l); + e = 0; + for (f = a.aaSorting.length; e < f; e++) a.aaSorting[e][0] = k[a.aaSorting[e][0]]; + if (null !== a.aaSortingFixed) for (e = 0, f = a.aaSortingFixed.length; e < f; e++) a.aaSortingFixed[e][0] = k[a.aaSortingFixed[e][0]]; + e = 0; + for (f = n; e < f; e++) { + var m = a.aoColumns[e]; + l = 0; + for (p = m.aDataSort.length; l < p; l++) m.aDataSort[l] = k[m.aDataSort[l]]; + m.idx = k[m.idx] + } + d.each(a.aLastSort, function (b, c) { + a.aLastSort[b].src = k[c.src] + }); + e = 0; + for (f = n; e < f; e++) m = a.aoColumns[e], "number" == typeof m.mData ? + m.mData = k[m.mData] : d.isPlainObject(m.mData) && (q(m.mData, "_", k), q(m.mData, "filter", k), q(m.mData, "sort", k), q(m.mData, "type", k)); + if (a.aoColumns[b].bVisible) { + q = this.oApi._fnColumnIndexToVisible(a, b); + p = null; + for (e = c < b ? c : c + 1; null === p && e < n;) p = this.oApi._fnColumnIndexToVisible(a, e), e++; + l = a.nTHead.getElementsByTagName("tr"); + e = 0; + for (f = l.length; e < f; e++) x(l[e], q, p); + if (null !== a.nTFoot) for (l = a.nTFoot.getElementsByTagName("tr"), e = 0, f = l.length; e < f; e++) x(l[e], q, p); + e = 0; + for (f = a.aoData.length; e < f; e++) null !== a.aoData[e].nTr && + x(a.aoData[e].nTr, q, p) + } + u(a.aoColumns, b, c); + e = 0; + for (f = n; e < f; e++) a.oApi._fnColumnOptions(a, e, {}); + u(a.aoPreSearchCols, b, c); + e = 0; + for (f = a.aoData.length; e < f; e++) { + p = a.aoData[e]; + if (m = p.anCells) for (u(m, b, c), l = 0, q = m.length; l < q; l++) m[l] && m[l]._DT_CellIndex && (m[l]._DT_CellIndex.column = l); + "dom" !== p.src && d.isArray(p._aData) && u(p._aData, b, c) + } + e = 0; + for (f = a.aoHeader.length; e < f; e++) u(a.aoHeader[e], b, c); + if (null !== a.aoFooter) for (e = 0, f = a.aoFooter.length; e < f; e++) u(a.aoFooter[e], b, c); + (h || h === w) && d.fn.dataTable.Api(a).rows().invalidate(); + e = 0; + for (f = n; e < f; e++) d(a.aoColumns[e].nTh).off(".DT"), this.oApi._fnSortAttachListener(a, a.aoColumns[e].nTh, e); + d(a.oInstance).trigger("column-reorder.dt", [a, { + from: b, + to: c, + mapping: k, + drop: g, + iFrom: b, + iTo: c, + aiInvertMapping: k + }]) + } + }; + var k = function (a, b) { + a = (new d.fn.dataTable.Api(a)).settings()[0]; + if (a._colReorder) return a._colReorder; + !0 === b && (b = {}); + var c = d.fn.dataTable.camelToHungarian; + c && (c(k.defaults, k.defaults, !0), c(k.defaults, b || {})); + this.s = { + dt: null, + enable: null, + init: d.extend(!0, {}, k.defaults, b), + fixed: 0, + fixedRight: 0, + reorderCallback: null, + mouse: {startX: -1, startY: -1, offsetX: -1, offsetY: -1, target: -1, targetIndex: -1, fromIndex: -1}, + aoTargets: [] + }; + this.dom = {drag: null, pointer: null}; + this.s.enable = this.s.init.bEnable; + this.s.dt = a; + this.s.dt._colReorder = this; + this._fnConstruct(); + return this + }; + d.extend(k.prototype, { + fnEnable: function (a) { + if (!1 === a) return fnDisable(); + this.s.enable = !0 + }, fnDisable: function () { + this.s.enable = !1 + }, fnReset: function () { + this._fnOrderColumns(this.fnOrder()); + return this + }, fnGetCurrentOrder: function () { + return this.fnOrder() + }, + fnOrder: function (a, b) { + var c = [], g, h = this.s.dt.aoColumns; + if (a === w) { + b = 0; + for (g = h.length; b < g; b++) c.push(h[b]._ColReorder_iOrigCol); + return c + } + if (b) { + h = this.fnOrder(); + b = 0; + for (g = a.length; b < g; b++) c.push(d.inArray(a[b], h)); + a = c + } + this._fnOrderColumns(v(a)); + return this + }, fnTranspose: function (a, b) { + b || (b = "toCurrent"); + var c = this.fnOrder(), g = this.s.dt.aoColumns; + return "toCurrent" === b ? d.isArray(a) ? d.map(a, function (a) { + return d.inArray(a, c) + }) : d.inArray(a, c) : d.isArray(a) ? d.map(a, function (a) { + return g[a]._ColReorder_iOrigCol + }) : + g[a]._ColReorder_iOrigCol + }, _fnConstruct: function () { + var a = this, b = this.s.dt.aoColumns.length, c = this.s.dt.nTable, g; + this.s.init.iFixedColumns && (this.s.fixed = this.s.init.iFixedColumns); + this.s.init.iFixedColumnsLeft && (this.s.fixed = this.s.init.iFixedColumnsLeft); + this.s.fixedRight = this.s.init.iFixedColumnsRight ? this.s.init.iFixedColumnsRight : 0; + this.s.init.fnReorderCallback && (this.s.reorderCallback = this.s.init.fnReorderCallback); + for (g = 0; g < b; g++) g > this.s.fixed - 1 && g < b - this.s.fixedRight && this._fnMouseListener(g, + this.s.dt.aoColumns[g].nTh), this.s.dt.aoColumns[g]._ColReorder_iOrigCol = g; + this.s.dt.oApi._fnCallbackReg(this.s.dt, "aoStateSaveParams", function (b, c) { + a._fnStateSave.call(a, c) + }, "ColReorder_State"); + var h = null; + this.s.init.aiOrder && (h = this.s.init.aiOrder.slice()); + this.s.dt.oLoadedState && "undefined" != typeof this.s.dt.oLoadedState.ColReorder && this.s.dt.oLoadedState.ColReorder.length == this.s.dt.aoColumns.length && (h = this.s.dt.oLoadedState.ColReorder); + if (h) if (a.s.dt._bInitComplete) b = v(h), a._fnOrderColumns.call(a, + b); else { + var f = !1; + d(c).on("draw.dt.colReorder", function () { + if (!a.s.dt._bInitComplete && !f) { + f = !0; + var b = v(h); + a._fnOrderColumns.call(a, b) + } + }) + } else this._fnSetColumnIndexes(); + d(c).on("destroy.dt.colReorder", function () { + d(c).off("destroy.dt.colReorder draw.dt.colReorder"); + d.each(a.s.dt.aoColumns, function (a, b) { + d(b.nTh).off(".ColReorder"); + d(b.nTh).removeAttr("data-column-index") + }); + a.s.dt._colReorder = null; + a.s = null + }) + }, _fnOrderColumns: function (a) { + var b = !1; + if (a.length != this.s.dt.aoColumns.length) this.s.dt.oInstance.oApi._fnLog(this.s.dt, + 1, "ColReorder - array reorder does not match known number of columns. Skipping."); else { + for (var c = 0, g = a.length; c < g; c++) { + var h = d.inArray(c, a); + c != h && (u(a, h, c), this.s.dt.oInstance.fnColReorder(h, c, !0, !1), b = !0) + } + this._fnSetColumnIndexes(); + b && (d.fn.dataTable.Api(this.s.dt).rows().invalidate(), "" === this.s.dt.oScroll.sX && "" === this.s.dt.oScroll.sY || this.s.dt.oInstance.fnAdjustColumnSizing(!1), this.s.dt.oInstance.oApi._fnSaveState(this.s.dt), null !== this.s.reorderCallback && this.s.reorderCallback.call(this)) + } + }, + _fnStateSave: function (a) { + var b, c, g = this.s.dt.aoColumns; + a.ColReorder = []; + if (a.aaSorting) { + for (b = 0; b < a.aaSorting.length; b++) a.aaSorting[b][0] = g[a.aaSorting[b][0]]._ColReorder_iOrigCol; + var h = d.extend(!0, [], a.aoSearchCols); + b = 0; + for (c = g.length; b < c; b++) { + var f = g[b]._ColReorder_iOrigCol; + a.aoSearchCols[f] = h[b]; + a.abVisCols[f] = g[b].bVisible; + a.ColReorder.push(f) + } + } else if (a.order) { + for (b = 0; b < a.order.length; b++) a.order[b][0] = g[a.order[b][0]]._ColReorder_iOrigCol; + h = d.extend(!0, [], a.columns); + b = 0; + for (c = g.length; b < c; b++) f = + g[b]._ColReorder_iOrigCol, a.columns[f] = h[b], a.ColReorder.push(f) + } + }, _fnMouseListener: function (a, b) { + var c = this; + d(b).on("mousedown.ColReorder", function (a) { + c.s.enable && 1 === a.which && c._fnMouseDown.call(c, a, b) + }).on("touchstart.ColReorder", function (a) { + c.s.enable && c._fnMouseDown.call(c, a, b) + }) + }, _fnMouseDown: function (a, b) { + var c = this, g = d(a.target).closest("th, td").offset(); + b = parseInt(d(b).attr("data-column-index"), 10); + b !== w && (this.s.mouse.startX = this._fnCursorPosition(a, "pageX"), this.s.mouse.startY = this._fnCursorPosition(a, + "pageY"), this.s.mouse.offsetX = this._fnCursorPosition(a, "pageX") - g.left, this.s.mouse.offsetY = this._fnCursorPosition(a, "pageY") - g.top, this.s.mouse.target = this.s.dt.aoColumns[b].nTh, this.s.mouse.targetIndex = b, this.s.mouse.fromIndex = b, this._fnRegions(), d(r).on("mousemove.ColReorder touchmove.ColReorder", function (a) { + c._fnMouseMove.call(c, a) + }).on("mouseup.ColReorder touchend.ColReorder", function (a) { + c._fnMouseUp.call(c, a) + })) + }, _fnMouseMove: function (a) { + var b = this; + if (null === this.dom.drag) { + if (5 > Math.pow(Math.pow(this._fnCursorPosition(a, + "pageX") - this.s.mouse.startX, 2) + Math.pow(this._fnCursorPosition(a, "pageY") - this.s.mouse.startY, 2), .5)) return; + this._fnCreateDragNode() + } + this.dom.drag.css({ + left: this._fnCursorPosition(a, "pageX") - this.s.mouse.offsetX, + top: this._fnCursorPosition(a, "pageY") - this.s.mouse.offsetY + }); + var c = this.s.mouse.toIndex; + a = this._fnCursorPosition(a, "pageX"); + for (var d = function (a) { + for (; 0 <= a;) { + a--; + if (0 >= a) return null; + if (b.s.aoTargets[a + 1].x !== b.s.aoTargets[a].x) return b.s.aoTargets[a] + } + }, h = function () { + for (var a = 0; a < b.s.aoTargets.length - + 1; a++) if (b.s.aoTargets[a].x !== b.s.aoTargets[a + 1].x) return b.s.aoTargets[a] + }, f = function () { + for (var a = b.s.aoTargets.length - 1; 0 < a; a--) if (b.s.aoTargets[a].x !== b.s.aoTargets[a - 1].x) return b.s.aoTargets[a] + }, k = 1; k < this.s.aoTargets.length; k++) { + var n = d(k); + n || (n = h()); + var q = n.x + (this.s.aoTargets[k].x - n.x) / 2; + if (this._fnIsLtr()) { + if (a < q) { + var l = n; + break + } + } else if (a > q) { + l = n; + break + } + } + l ? (this.dom.pointer.css("left", l.x), this.s.mouse.toIndex = l.to) : (this.dom.pointer.css("left", f().x), this.s.mouse.toIndex = f().to); + this.s.init.bRealtime && + c !== this.s.mouse.toIndex && (this.s.dt.oInstance.fnColReorder(this.s.mouse.fromIndex, this.s.mouse.toIndex), this.s.mouse.fromIndex = this.s.mouse.toIndex, "" === this.s.dt.oScroll.sX && "" === this.s.dt.oScroll.sY || this.s.dt.oInstance.fnAdjustColumnSizing(!1), this._fnRegions()) + }, _fnMouseUp: function (a) { + d(r).off(".ColReorder"); + null !== this.dom.drag && (this.dom.drag.remove(), this.dom.pointer.remove(), this.dom.drag = null, this.dom.pointer = null, this.s.dt.oInstance.fnColReorder(this.s.mouse.fromIndex, this.s.mouse.toIndex, + !0), this._fnSetColumnIndexes(), "" === this.s.dt.oScroll.sX && "" === this.s.dt.oScroll.sY || this.s.dt.oInstance.fnAdjustColumnSizing(!1), this.s.dt.oInstance.oApi._fnSaveState(this.s.dt), null !== this.s.reorderCallback && this.s.reorderCallback.call(this)) + }, _fnRegions: function () { + var a = this.s.dt.aoColumns, b = this._fnIsLtr(); + this.s.aoTargets.splice(0, this.s.aoTargets.length); + var c = d(this.s.dt.nTable).offset().left, g = []; + d.each(a, function (a, f) { + if (f.bVisible && "none" !== f.nTh.style.display) { + f = d(f.nTh); + var h = f.offset().left; + b && (h += f.outerWidth()); + g.push({index: a, bound: h}); + c = h + } else g.push({index: a, bound: c}) + }); + var h = g[0]; + a = d(a[h.index].nTh).outerWidth(); + this.s.aoTargets.push({to: 0, x: h.bound - a}); + for (h = 0; h < g.length; h++) { + a = g[h]; + var f = a.index; + a.index < this.s.mouse.fromIndex && f++; + this.s.aoTargets.push({to: f, x: a.bound}) + } + 0 !== this.s.fixedRight && this.s.aoTargets.splice(this.s.aoTargets.length - this.s.fixedRight); + 0 !== this.s.fixed && this.s.aoTargets.splice(0, this.s.fixed) + }, _fnCreateDragNode: function () { + var a = "" !== this.s.dt.oScroll.sX || + "" !== this.s.dt.oScroll.sY, b = this.s.dt.aoColumns[this.s.mouse.targetIndex].nTh, c = b.parentNode, + g = c.parentNode, h = g.parentNode, f = d(b).clone(); + this.dom.drag = d(h.cloneNode(!1)).addClass("DTCR_clonedTable").append(d(g.cloneNode(!1)).append(d(c.cloneNode(!1)).append(f[0]))).css({ + position: "absolute", + top: 0, + left: 0, + width: d(b).outerWidth(), + height: d(b).outerHeight() + }).appendTo("body"); + this.dom.pointer = d("
      ").addClass("DTCR_pointer").css({ + position: "absolute", + top: a ? d("div.dataTables_scroll", this.s.dt.nTableWrapper).offset().top : + d(this.s.dt.nTable).offset().top, + height: a ? d("div.dataTables_scroll", this.s.dt.nTableWrapper).height() : d(this.s.dt.nTable).height() + }).appendTo("body") + }, _fnSetColumnIndexes: function () { + d.each(this.s.dt.aoColumns, function (a, b) { + d(b.nTh).attr("data-column-index", a) + }) + }, _fnCursorPosition: function (a, b) { + return -1 !== a.type.indexOf("touch") ? a.originalEvent.touches[0][b] : a[b] + }, _fnIsLtr: function () { + return "rtl" !== d(this.s.dt.nTable).css("direction") + } + }); + k.defaults = { + aiOrder: null, bEnable: !0, bRealtime: !0, iFixedColumnsLeft: 0, + iFixedColumnsRight: 0, fnReorderCallback: null + }; + k.version = "1.5.2"; + d.fn.dataTable.ColReorder = k; + d.fn.DataTable.ColReorder = k; + "function" == typeof d.fn.dataTable && "function" == typeof d.fn.dataTableExt.fnVersionCheck && d.fn.dataTableExt.fnVersionCheck("1.10.8") ? d.fn.dataTableExt.aoFeatures.push({ + fnInit: function (a) { + var b = a.oInstance; + a._colReorder ? b.oApi._fnLog(a, 1, "ColReorder attempted to initialise twice. Ignoring second") : (b = a.oInit, new k(a, b.colReorder || b.oColReorder || {})); + return null + }, cFeature: "R", sFeature: "ColReorder" + }) : + alert("Warning: ColReorder requires DataTables 1.10.8 or greater - www.datatables.net/download"); + d(r).on("preInit.dt.colReorder", function (a, b) { + if ("dt" === a.namespace) { + a = b.oInit.colReorder; + var c = y.defaults.colReorder; + if (a || c) c = d.extend({}, a, c), !1 !== a && new k(b, c) + } + }); + d.fn.dataTable.Api.register("colReorder.reset()", function () { + return this.iterator("table", function (a) { + a._colReorder.fnReset() + }) + }); + d.fn.dataTable.Api.register("colReorder.order()", function (a, b) { + return a ? this.iterator("table", function (c) { + c._colReorder.fnOrder(a, + b) + }) : this.context.length ? this.context[0]._colReorder.fnOrder() : null + }); + d.fn.dataTable.Api.register("colReorder.transpose()", function (a, b) { + return this.context.length && this.context[0]._colReorder ? this.context[0]._colReorder.fnTranspose(a, b) : a + }); + d.fn.dataTable.Api.register("colReorder.move()", function (a, b, c, d) { + this.context.length && (this.context[0]._colReorder.s.dt.oInstance.fnColReorder(a, b, c, d), this.context[0]._colReorder._fnSetColumnIndexes()); + return this + }); + d.fn.dataTable.Api.register("colReorder.enable()", + function (a) { + return this.iterator("table", function (b) { + b._colReorder && b._colReorder.fnEnable(a) + }) + }); + d.fn.dataTable.Api.register("colReorder.disable()", function () { + return this.iterator("table", function (a) { + a._colReorder && a._colReorder.fnDisable() + }) + }); + return k +}); \ No newline at end of file From 19242ce70d8f43871639837188e7a17150b5651b Mon Sep 17 00:00:00 2001 From: NKO Date: Sat, 13 Dec 2025 10:56:40 +0100 Subject: [PATCH 17/70] TIMAAT Weiterentwicklung #9 - Added category and category set query parameter to listing endpoint of music * Added methods to MusicStorage responsible to execute a listing by using the specified filter, paging and sorting parameter * Defined storage api which can be used across all storage implementations to load a stream of entities --- .../bitgilde/TIMAAT/db/DbAccessComponent.java | 26 ++++ .../TIMAAT/di/binder/TIMAATBinder.java | 4 +- .../rest/endpoint/EndpointAnnotation.java | 49 ++++--- .../TIMAAT/rest/endpoint/EndpointMusic.java | 114 ++++------------ ...InsensitiveEnumParamConverterProvider.java | 57 ++++++++ .../jersey/ObjectMapperContextResolver.java | 29 +++++ .../AnnotationListingQueryParameter.java | 5 +- .../music/MusicListingQueryParameter.java | 39 ++++++ .../parameter/ListingQueryParameter.java | 28 ++-- .../TIMAAT/storage/api/DbSortingField.java | 21 +++ .../storage/{ => api}/ListingResult.java | 2 +- .../storage/{ => api}/PagingParameter.java | 13 +- .../{model => storage/api}/SortOrder.java | 2 +- .../TIMAAT/storage/api/SortingField.java | 11 ++ .../storage/{ => api}/SortingParameter.java | 23 +++- .../{ => annotation}/AnnotationStorage.java | 12 +- .../api/AnnotationSortingField.java | 27 ++++ .../entity/{ => music}/MusicStorage.java | 123 ++++++++++++++++-- .../entity/music/api/MusicFilterCriteria.java | 70 ++++++++++ .../entity/music/api/MusicSortingField.java | 32 +++++ 20 files changed, 533 insertions(+), 154 deletions(-) create mode 100644 src/main/java/de/bitgilde/TIMAAT/rest/jersey/CaseInsensitiveEnumParamConverterProvider.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/rest/jersey/ObjectMapperContextResolver.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/rest/model/music/MusicListingQueryParameter.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/storage/api/DbSortingField.java rename src/main/java/de/bitgilde/TIMAAT/storage/{ => api}/ListingResult.java (94%) rename src/main/java/de/bitgilde/TIMAAT/storage/{ => api}/PagingParameter.java (76%) rename src/main/java/de/bitgilde/TIMAAT/{model => storage/api}/SortOrder.java (94%) create mode 100644 src/main/java/de/bitgilde/TIMAAT/storage/api/SortingField.java rename src/main/java/de/bitgilde/TIMAAT/storage/{ => api}/SortingParameter.java (63%) rename src/main/java/de/bitgilde/TIMAAT/storage/entity/{ => annotation}/AnnotationStorage.java (97%) create mode 100644 src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/api/AnnotationSortingField.java rename src/main/java/de/bitgilde/TIMAAT/storage/entity/{ => music}/MusicStorage.java (79%) create mode 100644 src/main/java/de/bitgilde/TIMAAT/storage/entity/music/api/MusicFilterCriteria.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/storage/entity/music/api/MusicSortingField.java diff --git a/src/main/java/de/bitgilde/TIMAAT/db/DbAccessComponent.java b/src/main/java/de/bitgilde/TIMAAT/db/DbAccessComponent.java index 89f41979..cd4b9066 100644 --- a/src/main/java/de/bitgilde/TIMAAT/db/DbAccessComponent.java +++ b/src/main/java/de/bitgilde/TIMAAT/db/DbAccessComponent.java @@ -6,6 +6,7 @@ import java.util.logging.Level; import java.util.logging.Logger; +import java.util.stream.Stream; /** * Components which require database connectivity can extend to this class. @@ -43,6 +44,31 @@ protected RESULT_TYPE executeDbTransaction(DbTransactionOperation< } } + /** + * Exceutes a {@link DbTransactionOperation} having a stream as result + * Always use this when working with {@link Stream}s. Otherwise the db transaction is already closed + * and results can't be gathered. + * + * @param dbTransactionOperation + * @return + * @param + * @throws DbTransactionExecutionException + */ + protected Stream executeStreamDbTransaction(DbTransactionOperation> dbTransactionOperation) throws DbTransactionExecutionException { + logger.log(Level.FINE, "Start execution of db transaction"); + EntityManager em = emf.createEntityManager(); + try { + em.getTransaction().begin(); + Stream result = dbTransactionOperation.execute(em); + + return result.onClose(em::close); + } catch (Exception e) { + logger.log(Level.SEVERE, "Error in execution of db transaction", e); + em.getTransaction().rollback(); + throw new DbTransactionExecutionException(e); + } + } + @FunctionalInterface public interface DbTransactionOperation { /** diff --git a/src/main/java/de/bitgilde/TIMAAT/di/binder/TIMAATBinder.java b/src/main/java/de/bitgilde/TIMAAT/di/binder/TIMAATBinder.java index 50d93f93..c8b5d9d4 100644 --- a/src/main/java/de/bitgilde/TIMAAT/di/binder/TIMAATBinder.java +++ b/src/main/java/de/bitgilde/TIMAAT/di/binder/TIMAATBinder.java @@ -9,13 +9,13 @@ import de.bitgilde.TIMAAT.rest.security.authorization.AnnotationAuthorizationVerifier; import de.bitgilde.TIMAAT.rest.security.authorization.DbAnnotationAuthorizationVerifier; import de.bitgilde.TIMAAT.sse.EntityUpdateEventService; -import de.bitgilde.TIMAAT.storage.entity.AnnotationStorage; +import de.bitgilde.TIMAAT.storage.entity.annotation.AnnotationStorage; import de.bitgilde.TIMAAT.storage.entity.AudioAnalysisResultStorage; import de.bitgilde.TIMAAT.storage.entity.CategorySetStorage; import de.bitgilde.TIMAAT.storage.entity.CategoryStorage; import de.bitgilde.TIMAAT.storage.entity.MediumStorage; import de.bitgilde.TIMAAT.storage.entity.MediumVideoStorage; -import de.bitgilde.TIMAAT.storage.entity.MusicStorage; +import de.bitgilde.TIMAAT.storage.entity.music.MusicStorage; import de.bitgilde.TIMAAT.storage.entity.TagStorage; import de.bitgilde.TIMAAT.storage.file.AnnotationFileStorage; import de.bitgilde.TIMAAT.storage.file.AudioFileStorage; diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnnotation.java b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnnotation.java index 49827353..af3715f1 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnnotation.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnnotation.java @@ -32,11 +32,11 @@ import de.bitgilde.TIMAAT.rest.security.authorization.AnnotationAuthorizationVerifier; import de.bitgilde.TIMAAT.rest.security.authorization.PermissionType; import de.bitgilde.TIMAAT.security.UserLogManager; -import de.bitgilde.TIMAAT.storage.ListingResult; -import de.bitgilde.TIMAAT.storage.entity.AnnotationStorage; -import de.bitgilde.TIMAAT.storage.entity.AnnotationStorage.CreateAnnotation; -import de.bitgilde.TIMAAT.storage.entity.AnnotationStorage.UpdateAnnotation; -import de.bitgilde.TIMAAT.storage.entity.AnnotationStorage.UpdateSelectorSvg; +import de.bitgilde.TIMAAT.storage.api.ListingResult; +import de.bitgilde.TIMAAT.storage.entity.annotation.AnnotationStorage; +import de.bitgilde.TIMAAT.storage.entity.annotation.AnnotationStorage.CreateAnnotation; +import de.bitgilde.TIMAAT.storage.entity.annotation.AnnotationStorage.UpdateAnnotation; +import de.bitgilde.TIMAAT.storage.entity.annotation.AnnotationStorage.UpdateSelectorSvg; import de.bitgilde.TIMAAT.storage.file.AnnotationFileStorage; import de.bitgilde.TIMAAT.storage.file.TemporaryFileStorage; import de.bitgilde.TIMAAT.storage.file.TemporaryFileStorage.TemporaryFile; @@ -122,10 +122,12 @@ public class EndpointAnnotation { public DataTableInfo getAnnotationList(@BeanParam @Valid AnnotationListingQueryParameter annotationListingQueryParameter) { UserAccount userAccount = (UserAccount) containerRequestContext.getProperty( AuthenticationFilter.USER_ACCOUNT_PROPERTY_NAME); - - int draw = annotationListingQueryParameter.getDraw() == null ? 0 : annotationListingQueryParameter.getDraw(); - ListingResult annotationListingResult = annotationStorage.getAnnotations(annotationListingQueryParameter, annotationListingQueryParameter, annotationListingQueryParameter, userAccount); - return new DataTableInfo<>(draw, annotationListingResult.getTotalItemCount(), annotationListingResult.getMatchedItemsCount(), annotationListingResult.getItems()); + int draw = annotationListingQueryParameter.getDraw().orElse(0); + ListingResult annotationListingResult = annotationStorage.getAnnotations( + annotationListingQueryParameter, annotationListingQueryParameter, annotationListingQueryParameter, + userAccount); + return new DataTableInfo<>(draw, annotationListingResult.getTotalItemCount(), + annotationListingResult.getMatchedItemsCount(), annotationListingResult.getItems()); } @GET @@ -705,8 +707,7 @@ public Annotation createAnnotation(@PathParam("mediumAnalysisListId") int medium UserAccount userAccount = (UserAccount) containerRequestContext.getProperty( AuthenticationFilter.USER_ACCOUNT_PROPERTY_NAME); - UpdateSelectorSvg updateSelectorSvg = new UpdateSelectorSvg( - createAnnotationPayload.getSelectorSvg().getColorHex(), + UpdateSelectorSvg updateSelectorSvg = new UpdateSelectorSvg(createAnnotationPayload.getSelectorSvg().getColorHex(), createAnnotationPayload.getSelectorSvg().getOpacity(), createAnnotationPayload.getSelectorSvg().getStrokeWidth(), createAnnotationPayload.getSelectorSvg().getSvgData()); @@ -719,7 +720,7 @@ public Annotation createAnnotation(@PathParam("mediumAnalysisListId") int medium Annotation createdAnnotation = annotationStorage.createAnnotation(createAnnotation, userAccount); int annotationThumbnailPosition = createAnnotationPayload.getThumbnailPositionMs() != null ? createAnnotationPayload.getThumbnailPositionMs() : createAnnotationPayload.getStartTime(); - if(updateAnnotationThumbnail(createdAnnotation, annotationThumbnailPosition, userAccount).isPresent()){ + if (updateAnnotationThumbnail(createdAnnotation, annotationThumbnailPosition, userAccount).isPresent()) { createdAnnotation.setThumbnailPositionMs(annotationThumbnailPosition); } @@ -736,14 +737,19 @@ public Response getAnnotationThumbnail(@PathParam("id") int annotationId) throws if (thumbnailFilePath.isPresent()) { return Response.ok(thumbnailFilePath.get().toFile()).build(); - }else { + } + else { Annotation annotation = annotationStorage.getAnnotationById(annotationId); - if(annotation.getThumbnailPositionMs() != null){ - logger.log(Level.WARNING, "Could not find thumbnail for annotation with id {0} which should be present. Creating new one.", annotationId); - Optional originalVideoFilePath = videoFileStorage.getPathToOriginalFile(annotation.getMediumId()); + if (annotation.getThumbnailPositionMs() != null) { + logger.log(Level.WARNING, + "Could not find thumbnail for annotation with id {0} which should be present. Creating new one.", + annotationId); + Optional originalVideoFilePath = videoFileStorage.getPathToOriginalFile( + annotation.getMediumId()); if (originalVideoFilePath.isPresent()) { - java.nio.file.Path createdThumbnailPath = createThumbnailForAnnotation(annotationId, originalVideoFilePath.get(), annotation.getThumbnailPositionMs()); + java.nio.file.Path createdThumbnailPath = createThumbnailForAnnotation(annotationId, + originalVideoFilePath.get(), annotation.getThumbnailPositionMs()); return Response.ok(createdThumbnailPath.toFile()).build(); } } @@ -774,10 +780,12 @@ public Response updateAnnotationThumbnail(@PathParam("id") int annotationId, Upd } private Optional updateAnnotationThumbnail(Annotation annotation, int thumbnailPositionMs, UserAccount userAccount) throws VideoEngineException, IOException { - Optional originalVideoFilePathOptional = videoFileStorage.getPathToOriginalFile(annotation.getMediumId()); + Optional originalVideoFilePathOptional = videoFileStorage.getPathToOriginalFile( + annotation.getMediumId()); if (originalVideoFilePathOptional.isPresent()) { annotationStorage.updateThumbnailPositionMs(annotation.getId(), thumbnailPositionMs, userAccount); - return Optional.of(createThumbnailForAnnotation(annotation.getId(), originalVideoFilePathOptional.get(), thumbnailPositionMs)); + return Optional.of(createThumbnailForAnnotation(annotation.getId(), originalVideoFilePathOptional.get(), + thumbnailPositionMs)); } return Optional.empty(); @@ -816,8 +824,7 @@ public Annotation updateAnnotation(@PathParam("id") int id, @Valid UpdateAnnotat UserAccount userAccount = (UserAccount) containerRequestContext.getProperty( AuthenticationFilter.USER_ACCOUNT_PROPERTY_NAME); - UpdateSelectorSvg updateSelectorSvg = new UpdateSelectorSvg( - updateAnnotationPayload.getSelectorSvg().getColorHex(), + UpdateSelectorSvg updateSelectorSvg = new UpdateSelectorSvg(updateAnnotationPayload.getSelectorSvg().getColorHex(), updateAnnotationPayload.getSelectorSvg().getOpacity(), updateAnnotationPayload.getSelectorSvg().getStrokeWidth(), updateAnnotationPayload.getSelectorSvg().getSvgData()); diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMusic.java b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMusic.java index e484d158..7f0168cc 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMusic.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMusic.java @@ -46,6 +46,7 @@ import de.bitgilde.TIMAAT.rest.Secured; import de.bitgilde.TIMAAT.rest.filter.AuthenticationFilter; import de.bitgilde.TIMAAT.rest.model.music.CreateUpdateMusicPayload; +import de.bitgilde.TIMAAT.rest.model.music.MusicListingQueryParameter; import de.bitgilde.TIMAAT.rest.model.music.UpdateMediumHasMusicListPayload; import de.bitgilde.TIMAAT.rest.model.music.UpdateMediumHasMusicListPayload.MediumHasMusicListEntry; import de.bitgilde.TIMAAT.rest.model.music.UpdateMusicCategoriesPayload; @@ -53,7 +54,10 @@ import de.bitgilde.TIMAAT.rest.model.music.UpdateMusicTranslationListPayload; import de.bitgilde.TIMAAT.rest.model.tags.UpdateAssignedTagsPayload; import de.bitgilde.TIMAAT.security.UserLogManager; -import de.bitgilde.TIMAAT.storage.entity.MusicStorage; +import de.bitgilde.TIMAAT.storage.api.PagingParameter; +import de.bitgilde.TIMAAT.storage.api.SortingParameter; +import de.bitgilde.TIMAAT.storage.entity.music.MusicStorage; +import de.bitgilde.TIMAAT.storage.entity.music.api.MusicFilterCriteria; import jakarta.inject.Inject; import jakarta.persistence.EntityManager; import jakarta.persistence.EntityTransaction; @@ -61,6 +65,7 @@ import jakarta.persistence.Query; import jakarta.servlet.ServletContext; import jakarta.validation.Valid; +import jakarta.ws.rs.BeanParam; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; @@ -193,93 +198,21 @@ public Response getMediumByMusicId(@PathParam("id") int id) { @Produces(MediaType.APPLICATION_JSON) @Secured @Path("list") - public Response getMusicList(@QueryParam("draw") Integer draw, @QueryParam("start") Integer start, @QueryParam("length") Integer length, @QueryParam("orderby") String orderby, @QueryParam("dir") String direction, @QueryParam("exclude_annotation") Integer excludedAnnotationId, @QueryParam("search") String search, @QueryParam("musicTypeId") Integer musicTypeId, @Context HttpHeaders httpHeaders) { - // System.out.println("EndpointMusic: getMusicList: draw: "+draw+" start: "+start+" length: "+length+" orderby: "+orderby+" dir: "+direction+" search: "+search); - String authToken = httpHeaders.getHeaderString("Authorization").substring(7); - int userId = 0; - if (AuthenticationFilter.isTokenValid(authToken)) { - userId = AuthenticationFilter.getTokenClaimUserId(authToken); - } - else { - return Response.status(Status.UNAUTHORIZED).build(); - } + public DataTableInfo getMusicList(@BeanParam MusicListingQueryParameter queryParameter) { + UserAccount userAccount = (UserAccount) containerRequestContext.getProperty( + AuthenticationFilter.USER_ACCOUNT_PROPERTY_NAME); + int draw = queryParameter.getDraw().orElse(0); - if (draw == null) { - draw = 0; - } - - // sanitize user input - if (direction != null && direction.equalsIgnoreCase("desc")) { - direction = "DESC"; - } - else { - direction = "ASC"; - } - String column = "m.id"; - if (orderby != null) { - if (orderby.equalsIgnoreCase("title")) { - column = "m.displayTitle.name"; - } - } - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - // calculate total # of records - Query countQuery = entityManager.createQuery("SELECT COUNT(m) FROM Music m"); - long recordsTotal = (long) countQuery.getSingleResult(); - long recordsFiltered = recordsTotal; - - // search - Query query; - String sql; - List musicList = new ArrayList<>(); - if ((search != null && !search.isEmpty()) || excludedAnnotationId != null || musicTypeId != null) { - // find all matching titles - sql = "SELECT m FROM Music m where (:musicTypeId is null or m.musicType.id = :musicTypeId) and (:excludedAnnotationId is null or m.id not in (select m2.id from Music m2 left join m2.annotationHasMusic annotationHasMusic where annotationHasMusic.annotation.id = :excludedAnnotationId))" + "AND (:search is null or lower(m.displayTitle.name) LIKE lower(concat('%', :search, '%'))) ORDER BY " + column + " " + direction; - query = entityManager.createQuery(sql).setParameter("search", search) - .setParameter("excludedAnnotationId", excludedAnnotationId) - .setParameter("musicTypeId", musicTypeId); - musicList = castList(Music.class, query.getResultList()); - // find all music belonging to those titles - if (start != null && start > 0) { - query.setFirstResult(start); - } - if (length != null && length > 0) { - query.setMaxResults(length); - } - if (length == -1) { // display all results - length = musicList.size(); - query.setMaxResults(length); - } - recordsFiltered = musicList.size(); - List filteredMusicList = new ArrayList<>(); - int i = start; - int end; - if ((recordsFiltered - start) < length) { - end = (int) recordsFiltered; - } - else { - end = start + length; - } - for (; i < end; i++) { - filteredMusicList.add(musicList.get(i)); - } - filterAnnotationReferencesByPermission(userId, filteredMusicList); - return Response.ok().entity(new DataTableInfo(draw, recordsTotal, recordsFiltered, filteredMusicList)).build(); - } - else { - sql = "SELECT m FROM Music m ORDER BY " + column + " " + direction; - query = entityManager.createQuery(sql); - if (start != null && start > 0) { - query.setFirstResult(start); - } - if (length != null && length > 0) { - query.setMaxResults(length); - } - musicList = castList(Music.class, query.getResultList()); - } + List matchingMusic = musicStorage.getMusicEntriesStream(queryParameter, queryParameter, queryParameter, + userAccount).collect(Collectors.toList()); + long totalMusicEntries = musicStorage.getNumberOfTotalMusicEntries(); + long filteredMusicEntries = musicStorage.getNumberOfMatchingMusicEntries(queryParameter); - filterAnnotationReferencesByPermission(userId, musicList); - return Response.ok().entity(new DataTableInfo(draw, recordsTotal, recordsFiltered, musicList)).build(); + /** + * TODO: This one can be removed when directly filter on storage layer + */ + filterAnnotationReferencesByPermission(userAccount.getId(), matchingMusic); + return new DataTableInfo<>(draw, totalMusicEntries, filteredMusicEntries, matchingMusic); } @GET @@ -287,8 +220,13 @@ public Response getMusicList(@QueryParam("draw") Integer draw, @QueryParam("star @Secured @Path("selectList") public List> getMusicSelectList(@QueryParam("search") String searchText) { - return musicStorage.getMusicEntries(searchText).map(currentMusic -> new SelectElement<>(currentMusic.getId(), - currentMusic.getDisplayTitle().getName())).collect(Collectors.toList()); + UserAccount userAccount = (UserAccount) containerRequestContext.getProperty( + AuthenticationFilter.USER_ACCOUNT_PROPERTY_NAME); + MusicFilterCriteria filterCriteria = new MusicFilterCriteria.Builder().musicNameSearch(searchText).build(); + return musicStorage.getMusicEntriesStream(filterCriteria, PagingParameter.NO_PAGING, + SortingParameter.defaultSortOrder(), userAccount) + .map(currentMusic -> new SelectElement<>(currentMusic.getId(), + currentMusic.getDisplayTitle().getName())).collect(Collectors.toList()); } @GET diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/jersey/CaseInsensitiveEnumParamConverterProvider.java b/src/main/java/de/bitgilde/TIMAAT/rest/jersey/CaseInsensitiveEnumParamConverterProvider.java new file mode 100644 index 00000000..b417f326 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/rest/jersey/CaseInsensitiveEnumParamConverterProvider.java @@ -0,0 +1,57 @@ +package de.bitgilde.TIMAAT.rest.jersey; + +import jakarta.ws.rs.ext.ParamConverter; +import jakarta.ws.rs.ext.ParamConverterProvider; +import jakarta.ws.rs.ext.Provider; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; + +/** + * This {@link ParamConverterProvider} will perform a case-insensitive mapping of enum values + * for endpoint parameters. + * + * @author Nico Kotlenga + * @since 12.12.25 + */ +@Provider +public class CaseInsensitiveEnumParamConverterProvider implements ParamConverterProvider { + + @Override + public ParamConverter getConverter(Class rawType, Type genericType, Annotation[] annotations) { + if(rawType.isEnum()){ + return new CaseInsensitiveParameterConverter<>(rawType); + } + + return null; + } + + + private static class CaseInsensitiveParameterConverter implements ParamConverter{ + + private final Class rawType; + + public CaseInsensitiveParameterConverter(Class rawType) { + this.rawType = rawType; + } + + @Override + public T fromString(String value) { + if(value == null){ + return null; + } + + for (T constant : rawType.getEnumConstants()) { + if (constant.toString().equalsIgnoreCase(value)) { + return constant; + } + } + throw new IllegalArgumentException("No enum constant " + rawType.getName() + "." + value); + } + + @Override + public String toString(T value) { + return value.toString(); + } + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/jersey/ObjectMapperContextResolver.java b/src/main/java/de/bitgilde/TIMAAT/rest/jersey/ObjectMapperContextResolver.java new file mode 100644 index 00000000..78e57926 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/rest/jersey/ObjectMapperContextResolver.java @@ -0,0 +1,29 @@ +package de.bitgilde.TIMAAT.rest.jersey; + +import com.fasterxml.jackson.databind.MapperFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.json.JsonMapper; +import jakarta.ws.rs.ext.ContextResolver; +import jakarta.ws.rs.ext.Provider; + +/** + * This {@link jakarta.ws.rs.ext.ContextResolver} is responsible to provide a custom + * configured {@link com.fasterxml.jackson.databind.ObjectMapper} instance to jersey. + * + * @author Nico Kotlenga + * @since 12.12.25 + */ +@Provider +public class ObjectMapperContextResolver implements ContextResolver { + + private final ObjectMapper objectMapper; + + public ObjectMapperContextResolver() { + this.objectMapper = JsonMapper.builder().enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS).build(); + } + + @Override + public ObjectMapper getContext(Class type) { + return objectMapper; + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/model/annotation/AnnotationListingQueryParameter.java b/src/main/java/de/bitgilde/TIMAAT/rest/model/annotation/AnnotationListingQueryParameter.java index fad85068..96fe445e 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/model/annotation/AnnotationListingQueryParameter.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/model/annotation/AnnotationListingQueryParameter.java @@ -1,7 +1,8 @@ package de.bitgilde.TIMAAT.rest.model.annotation; import de.bitgilde.TIMAAT.rest.model.parameter.ListingQueryParameter; -import de.bitgilde.TIMAAT.storage.entity.AnnotationStorage.AnnotationFilter; +import de.bitgilde.TIMAAT.storage.entity.annotation.AnnotationStorage.AnnotationFilter; +import de.bitgilde.TIMAAT.storage.entity.annotation.api.AnnotationSortingField; import jakarta.ws.rs.QueryParam; import java.util.Collection; @@ -13,7 +14,7 @@ * @author Nico Kotlenga * @since 28.11.25 */ -public class AnnotationListingQueryParameter extends ListingQueryParameter implements AnnotationFilter { +public class AnnotationListingQueryParameter extends ListingQueryParameter implements AnnotationFilter { @QueryParam("categoryIds") private Collection categoryIds; diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/model/music/MusicListingQueryParameter.java b/src/main/java/de/bitgilde/TIMAAT/rest/model/music/MusicListingQueryParameter.java new file mode 100644 index 00000000..3223bd8e --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/rest/model/music/MusicListingQueryParameter.java @@ -0,0 +1,39 @@ +package de.bitgilde.TIMAAT.rest.model.music; + +import de.bitgilde.TIMAAT.rest.model.parameter.ListingQueryParameter; +import de.bitgilde.TIMAAT.storage.entity.music.api.MusicFilterCriteria; +import de.bitgilde.TIMAAT.storage.entity.music.api.MusicSortingField; +import jakarta.ws.rs.QueryParam; + +import java.util.Collection; +import java.util.Optional; + +/** + * Queryparameters used for the listing endpoint of {@link de.bitgilde.TIMAAT.rest.endpoint.EndpointMusic} + * + * @author Nico Kotlenga + * @since 12.12.25 + */ +public class MusicListingQueryParameter extends ListingQueryParameter implements MusicFilterCriteria { + @QueryParam("categoryIds") + private Collection categoryIds; + @QueryParam("categorySetIds") + private Collection categorySetIds; + @QueryParam("search") + private String search; + + @Override + public Optional> getCategoryIds() { + return Optional.ofNullable(categoryIds); + } + + @Override + public Optional> getCategorySetIds() { + return Optional.ofNullable(categorySetIds); + } + + @Override + public Optional getMusicNameSearch() { + return Optional.ofNullable(search); + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/model/parameter/ListingQueryParameter.java b/src/main/java/de/bitgilde/TIMAAT/rest/model/parameter/ListingQueryParameter.java index a51077f8..11467249 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/model/parameter/ListingQueryParameter.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/model/parameter/ListingQueryParameter.java @@ -1,9 +1,9 @@ package de.bitgilde.TIMAAT.rest.model.parameter; -import de.bitgilde.TIMAAT.model.SortOrder; -import de.bitgilde.TIMAAT.storage.PagingParameter; -import de.bitgilde.TIMAAT.storage.SortingParameter; -import jakarta.annotation.Nullable; +import de.bitgilde.TIMAAT.storage.api.SortOrder; +import de.bitgilde.TIMAAT.storage.api.PagingParameter; +import de.bitgilde.TIMAAT.storage.api.SortingField; +import de.bitgilde.TIMAAT.storage.api.SortingParameter; import jakarta.validation.constraints.PositiveOrZero; import jakarta.ws.rs.QueryParam; @@ -31,7 +31,7 @@ * @author Nico Kotlenga * @since 28.11.25 */ -public class ListingQueryParameter implements SortingParameter, PagingParameter { +public class ListingQueryParameter implements SortingParameter, PagingParameter { @QueryParam("draw") private Integer draw; @@ -42,9 +42,9 @@ public class ListingQueryParameter implements SortingParameter, PagingParameter @QueryParam("length") private Integer length; @QueryParam("orderby") - private String orderby; + private SORTING_FIELD orderby; @QueryParam("dir") - private String direction; + private SortOrder direction; @QueryParam("search") private String search; @@ -61,11 +61,11 @@ public void setLength(Integer length) { this.length = length; } - public void setOrderby(String orderby) { + public void setOrderby(SORTING_FIELD orderby) { this.orderby = orderby; } - public void setDirection(String direction) { + public void setDirection(SortOrder direction) { this.direction = direction; } @@ -73,8 +73,8 @@ public void setSearch(String search) { this.search = search; } - public Integer getDraw() { - return draw; + public Optional getDraw() { + return Optional.ofNullable(draw); } @Override @@ -87,15 +87,13 @@ public Optional limit() { return Optional.ofNullable(length); } - @Nullable @Override public Optional getSortOrder() { - return Optional.ofNullable(direction).map(SortOrder::valueOf); + return Optional.ofNullable(direction); } - @Nullable @Override - public Optional getSortFieldName() { + public Optional getSortingField() { return Optional.ofNullable(orderby); } diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/api/DbSortingField.java b/src/main/java/de/bitgilde/TIMAAT/storage/api/DbSortingField.java new file mode 100644 index 00000000..a1cbb7f4 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/storage/api/DbSortingField.java @@ -0,0 +1,21 @@ +package de.bitgilde.TIMAAT.storage.api; + +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.metamodel.SingularAttribute; + +/** + * {@link SortingField} which can be used for storages using the database as + * storage layer + * + * @author Nico Kotlenga + * @since 12.12.25 + */ +public interface DbSortingField extends SortingField{ + + /** + * @return the {@link SingularAttribute} used as sorting parameter + */ + Path getPathFromRootEntity(Root root); +} + diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/ListingResult.java b/src/main/java/de/bitgilde/TIMAAT/storage/api/ListingResult.java similarity index 94% rename from src/main/java/de/bitgilde/TIMAAT/storage/ListingResult.java rename to src/main/java/de/bitgilde/TIMAAT/storage/api/ListingResult.java index e161bbcc..db9e6732 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/ListingResult.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/api/ListingResult.java @@ -1,4 +1,4 @@ -package de.bitgilde.TIMAAT.storage; +package de.bitgilde.TIMAAT.storage.api; import java.util.List; diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/PagingParameter.java b/src/main/java/de/bitgilde/TIMAAT/storage/api/PagingParameter.java similarity index 76% rename from src/main/java/de/bitgilde/TIMAAT/storage/PagingParameter.java rename to src/main/java/de/bitgilde/TIMAAT/storage/api/PagingParameter.java index e9a9a7d1..bc81a4aa 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/PagingParameter.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/api/PagingParameter.java @@ -1,4 +1,4 @@ -package de.bitgilde.TIMAAT.storage; +package de.bitgilde.TIMAAT.storage.api; import java.util.Optional; @@ -32,4 +32,15 @@ public interface PagingParameter { * @return number of maximum allowed listing results */ Optional limit(); + + PagingParameter NO_PAGING = new PagingParameter() { + @Override + public Optional startIndex() { + return Optional.empty(); + } + @Override + public Optional limit() { + return Optional.empty(); + } + }; } diff --git a/src/main/java/de/bitgilde/TIMAAT/model/SortOrder.java b/src/main/java/de/bitgilde/TIMAAT/storage/api/SortOrder.java similarity index 94% rename from src/main/java/de/bitgilde/TIMAAT/model/SortOrder.java rename to src/main/java/de/bitgilde/TIMAAT/storage/api/SortOrder.java index 6afa44c4..7b64f794 100644 --- a/src/main/java/de/bitgilde/TIMAAT/model/SortOrder.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/api/SortOrder.java @@ -1,4 +1,4 @@ -package de.bitgilde.TIMAAT.model; +package de.bitgilde.TIMAAT.storage.api; /* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/api/SortingField.java b/src/main/java/de/bitgilde/TIMAAT/storage/api/SortingField.java new file mode 100644 index 00000000..b2f15481 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/storage/api/SortingField.java @@ -0,0 +1,11 @@ +package de.bitgilde.TIMAAT.storage.api; + +/** + * Description of a field which can be passed as {@link SortingParameter} + * + * @author Nico Kotlenga + * @since 12.12.25 + */ +public interface SortingField { + +} diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/SortingParameter.java b/src/main/java/de/bitgilde/TIMAAT/storage/api/SortingParameter.java similarity index 63% rename from src/main/java/de/bitgilde/TIMAAT/storage/SortingParameter.java rename to src/main/java/de/bitgilde/TIMAAT/storage/api/SortingParameter.java index f81066e7..e1cab375 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/SortingParameter.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/api/SortingParameter.java @@ -1,6 +1,4 @@ -package de.bitgilde.TIMAAT.storage; - -import de.bitgilde.TIMAAT.model.SortOrder; +package de.bitgilde.TIMAAT.storage.api; import java.util.Optional; @@ -24,7 +22,7 @@ * @author Nico Kotlenga * @since 28.11.25 */ -public interface SortingParameter { +public interface SortingParameter { /** * @return the sorting order which should be used for listing results @@ -34,5 +32,20 @@ public interface SortingParameter { /** * @return the name of the field on which the listing results should be sort on */ - Optional getSortFieldName(); + Optional getSortingField(); + + static SortingParameter defaultSortOrder() { + return new SortingParameter() { + + @Override + public Optional getSortOrder() { + return Optional.empty(); + } + + @Override + public Optional getSortingField() { + return Optional.empty(); + } + }; + } } diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/AnnotationStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/AnnotationStorage.java similarity index 97% rename from src/main/java/de/bitgilde/TIMAAT/storage/entity/AnnotationStorage.java rename to src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/AnnotationStorage.java index f0ad4ae8..0ba7111c 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/AnnotationStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/AnnotationStorage.java @@ -1,4 +1,4 @@ -package de.bitgilde.TIMAAT.storage.entity; +package de.bitgilde.TIMAAT.storage.entity.annotation; import de.bitgilde.TIMAAT.db.DbAccessComponent; import de.bitgilde.TIMAAT.db.exception.DbTransactionExecutionException; @@ -19,9 +19,11 @@ import de.bitgilde.TIMAAT.model.FIPOP.Tag; import de.bitgilde.TIMAAT.model.FIPOP.UserAccount; import de.bitgilde.TIMAAT.model.IndexBasedRange; -import de.bitgilde.TIMAAT.storage.ListingResult; -import de.bitgilde.TIMAAT.storage.PagingParameter; -import de.bitgilde.TIMAAT.storage.SortingParameter; +import de.bitgilde.TIMAAT.storage.api.ListingResult; +import de.bitgilde.TIMAAT.storage.api.PagingParameter; +import de.bitgilde.TIMAAT.storage.api.SortingParameter; +import de.bitgilde.TIMAAT.storage.entity.TagStorage; +import de.bitgilde.TIMAAT.storage.entity.annotation.api.AnnotationSortingField; import jakarta.inject.Inject; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.criteria.CriteriaBuilder; @@ -68,7 +70,7 @@ public AnnotationStorage(EntityManagerFactory emf, TagStorage tagStorage) { this.tagStorage = tagStorage; } - public ListingResult getAnnotations(AnnotationFilter filter, PagingParameter pagingParameter, SortingParameter sortingParameter, UserAccount userAccount) { + public ListingResult getAnnotations(AnnotationFilter filter, PagingParameter pagingParameter, SortingParameter sortingParameter, UserAccount userAccount) { executeDbTransaction(entityManager -> { CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder(); CriteriaQuery criteriaQuery = criteriaBuilder.createQuery(Annotation.class); diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/api/AnnotationSortingField.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/api/AnnotationSortingField.java new file mode 100644 index 00000000..edb37ef6 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/api/AnnotationSortingField.java @@ -0,0 +1,27 @@ +package de.bitgilde.TIMAAT.storage.entity.annotation.api; + +import de.bitgilde.TIMAAT.model.FIPOP.Annotation; +import de.bitgilde.TIMAAT.model.FIPOP.Annotation_; +import de.bitgilde.TIMAAT.storage.api.DbSortingField; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Root; + +/** + * Sorting fields used by {@link de.bitgilde.TIMAAT.storage.entity.annotation.AnnotationStorage} + * + * @author Nico Kotlenga + * @since 12.12.25 + */ +public enum AnnotationSortingField implements DbSortingField { + ID; + + @Override + public Path getPathFromRootEntity(Root root) { + switch (this) { + case ID: + return root.get(Annotation_.id); + default: + throw new IllegalArgumentException("Unexpected sorting field"); + } + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/MusicStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/music/MusicStorage.java similarity index 79% rename from src/main/java/de/bitgilde/TIMAAT/storage/entity/MusicStorage.java rename to src/main/java/de/bitgilde/TIMAAT/storage/entity/music/MusicStorage.java index 2b93dab0..33bf4e16 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/MusicStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/music/MusicStorage.java @@ -1,9 +1,11 @@ -package de.bitgilde.TIMAAT.storage.entity; +package de.bitgilde.TIMAAT.storage.entity.music; import de.bitgilde.TIMAAT.db.DbAccessComponent; import de.bitgilde.TIMAAT.db.exception.DbTransactionExecutionException; import de.bitgilde.TIMAAT.model.FIPOP.Category; import de.bitgilde.TIMAAT.model.FIPOP.CategorySet; +import de.bitgilde.TIMAAT.model.FIPOP.CategorySet_; +import de.bitgilde.TIMAAT.model.FIPOP.Category_; import de.bitgilde.TIMAAT.model.FIPOP.DynamicMarking; import de.bitgilde.TIMAAT.model.FIPOP.Language; import de.bitgilde.TIMAAT.model.FIPOP.Medium; @@ -13,18 +15,27 @@ import de.bitgilde.TIMAAT.model.FIPOP.MusicTextSettingElementType; import de.bitgilde.TIMAAT.model.FIPOP.MusicTranslation; import de.bitgilde.TIMAAT.model.FIPOP.MusicType; +import de.bitgilde.TIMAAT.model.FIPOP.Music_; import de.bitgilde.TIMAAT.model.FIPOP.MusicalKey; import de.bitgilde.TIMAAT.model.FIPOP.Tag; import de.bitgilde.TIMAAT.model.FIPOP.TempoMarking; import de.bitgilde.TIMAAT.model.FIPOP.Title; +import de.bitgilde.TIMAAT.model.FIPOP.Title_; import de.bitgilde.TIMAAT.model.FIPOP.UserAccount; import de.bitgilde.TIMAAT.model.FIPOP.VoiceLeadingPattern; +import de.bitgilde.TIMAAT.storage.api.SortOrder; import de.bitgilde.TIMAAT.model.TimeRange; -import jakarta.annotation.Nullable; +import de.bitgilde.TIMAAT.storage.api.PagingParameter; +import de.bitgilde.TIMAAT.storage.api.SortingParameter; +import de.bitgilde.TIMAAT.storage.entity.TagStorage; +import de.bitgilde.TIMAAT.storage.entity.music.api.MusicFilterCriteria; +import de.bitgilde.TIMAAT.storage.entity.music.api.MusicSortingField; import jakarta.inject.Inject; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.Order; import jakarta.persistence.criteria.Predicate; import jakarta.persistence.criteria.Root; @@ -75,24 +86,110 @@ public MusicStorage(EntityManagerFactory emf, TagStorage tagStorage) { this.tagStorage = tagStorage; } - public Stream getMusicEntries(@Nullable String searchText) { - logger.log(Level.FINER, "Loading all currently defined music entries"); + public Long getNumberOfTotalMusicEntries(){ + logger.log(Level.FINE, "Loading number of total music entries"); return executeDbTransaction(entityManager -> { CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder(); - CriteriaQuery musicQuery = criteriaBuilder.createQuery(Music.class); - Root musicRoot = musicQuery.from(Music.class); - musicQuery.select(musicRoot); + CriteriaQuery criteriaQuery = criteriaBuilder.createQuery(Long.class); - List predicates = new ArrayList<>(); - if (searchText != null && !searchText.isEmpty()) { - predicates.add(criteriaBuilder.like(musicRoot.get("displayTitle").get("name"), "%" + searchText + "%")); - } + Root root = criteriaQuery.from(Music.class); + criteriaQuery.select(criteriaBuilder.count(root)); + + return entityManager.createQuery(criteriaQuery).getSingleResult(); + }); + } + + public Long getNumberOfMatchingMusicEntries(MusicFilterCriteria filter) { + logger.log(Level.FINE, "Loading number of matching music entries"); + return executeDbTransaction(entityManager -> { + CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder(); + CriteriaQuery criteriaQuery = criteriaBuilder.createQuery(Long.class); + + Root root = criteriaQuery.from(Music.class); + criteriaQuery.select(criteriaBuilder.count(root)); + List predicates = createPredicates(filter, root,criteriaBuilder); + + criteriaQuery.where(predicates.toArray(new Predicate[0])); + return entityManager.createQuery(criteriaQuery).getSingleResult(); + }); + } + + public Stream getMusicEntriesStream(MusicFilterCriteria filter, PagingParameter pagingParameter, SortingParameter sortingParameter, UserAccount userAccount) { + logger.log(Level.FINER, "Loading music entries matching the specified filter criteria"); + return executeStreamDbTransaction(entityManager -> { + CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder(); + CriteriaQuery criteriaQuery = criteriaBuilder.createQuery(Music.class); + Root root = criteriaQuery.from(Music.class); + + List predicates = createPredicates(filter, root, criteriaBuilder); + Order sortOrder = createSortOrder(sortingParameter, root, criteriaBuilder); + + criteriaQuery.where(predicates.toArray(new Predicate[0])); + criteriaQuery.orderBy(sortOrder); + criteriaQuery.select(root); - musicQuery.where(predicates.toArray(new Predicate[0])); - return entityManager.createQuery(musicQuery).getResultStream(); + Stream musicStream = entityManager.createQuery(criteriaQuery).getResultStream(); + return adjustStreamToPassedPagingParameter(musicStream, pagingParameter); }); } + private Stream adjustStreamToPassedPagingParameter(Stream stream, PagingParameter pagingParameter) { + Stream musicStream = stream; + if(pagingParameter.startIndex().isPresent()){ + musicStream = musicStream.skip(pagingParameter.startIndex().get()); + } + if(pagingParameter.limit().isPresent()){ + musicStream = musicStream.limit(pagingParameter.limit().get()); + } + + return musicStream; + } + + private Order createSortOrder(SortingParameter sortingParameter, Root root, CriteriaBuilder criteriaBuilder) { + SortOrder sortOrder = SortOrder.ASC; + if (sortingParameter.getSortOrder().isPresent()) { + sortOrder = sortingParameter.getSortOrder().get(); + } + + MusicSortingField musicSortingField = MusicSortingField.ID; + if (sortingParameter.getSortingField().isPresent()) { + musicSortingField = sortingParameter.getSortingField().get(); + } + + if (SortOrder.ASC.equals(sortOrder)) { + return criteriaBuilder.asc(musicSortingField.getPathFromRootEntity(root)); + } + else { + return criteriaBuilder.desc(musicSortingField.getPathFromRootEntity(root)); + } + } + + private List createPredicates(MusicFilterCriteria filter, Root root, CriteriaBuilder criteriaBuilder) { + List predicates = new ArrayList<>(); + + if (filter.getMusicNameSearch().isPresent()) { + String musicNameSearchText = filter.getMusicNameSearch().get(); + predicates.add( + criteriaBuilder.like(root.get(Music_.displayTitle).get(Title_.name), "%" + musicNameSearchText + "%")); + } + + if (filter.getCategoryIds().isPresent()) { + Collection categoryIds = filter.getCategoryIds().get(); + Join categoryJoin = root.join(Music_.categories); + + predicates.add(categoryJoin.get(Category_.id).in(categoryIds)); + } + + if (filter.getCategorySetIds().isPresent()) { + Collection categorySetIds = filter.getCategorySetIds().get(); + Join categorySetJoin = root.join(Music_.categorySets); + + predicates.add(categorySetJoin.get(CategorySet_.id).in(categorySetIds)); + } + + return predicates; + } + public Music createMusic(CreateMusic createMusic, int executedByUserId) throws DbTransactionExecutionException { logger.log(Level.INFO, "Creating new music entry"); diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/music/api/MusicFilterCriteria.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/music/api/MusicFilterCriteria.java new file mode 100644 index 00000000..a0a4825a --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/music/api/MusicFilterCriteria.java @@ -0,0 +1,70 @@ +package de.bitgilde.TIMAAT.storage.entity.music.api; + +import java.util.Collection; +import java.util.Optional; + +/** + * Criteria used by the {@link de.bitgilde.TIMAAT.storage.entity.music.MusicStorage} to filter the listing + * results + * + * @author Nico Kotlenga + * @since 12.12.25 + */ +public interface MusicFilterCriteria { + /** + * @return the category ids the returning music should belong to + */ + Optional> getCategoryIds(); + + /** + * @return the category set ids the retuning music should belong to + */ + Optional> getCategorySetIds(); + + /** + * @return the search text which the annotation name should match + */ + Optional getMusicNameSearch(); + + + class Builder { + + private Collection categoryIds = null; + private Collection categorySetIds = null; + private String musicNameSearch = null; + + public Builder categoryIds(Collection categoryIds) { + this.categoryIds = categoryIds; + return this; + } + + public Builder categorySetIds(Collection categorySetIds) { + this.categorySetIds = categorySetIds; + return this; + } + + public Builder musicNameSearch(String musicNameSearch) { + this.musicNameSearch = musicNameSearch; + return this; + } + + public MusicFilterCriteria build() { + return new MusicFilterCriteria() { + @Override + public Optional> getCategoryIds() { + return Optional.ofNullable(categoryIds); + } + + @Override + public Optional> getCategorySetIds() { + return Optional.ofNullable(categorySetIds); + } + + @Override + public Optional getMusicNameSearch() { + return Optional.ofNullable(musicNameSearch); + } + }; + } + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/music/api/MusicSortingField.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/music/api/MusicSortingField.java new file mode 100644 index 00000000..8090c7f7 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/music/api/MusicSortingField.java @@ -0,0 +1,32 @@ +package de.bitgilde.TIMAAT.storage.entity.music.api; + +import de.bitgilde.TIMAAT.model.FIPOP.Music; +import de.bitgilde.TIMAAT.model.FIPOP.Music_; +import de.bitgilde.TIMAAT.model.FIPOP.Title_; +import de.bitgilde.TIMAAT.storage.api.DbSortingField; +import de.bitgilde.TIMAAT.storage.entity.music.MusicStorage; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Root; + +/** + * Sorting field which can be used to sort the listing results of {@link MusicStorage} + * + * @author Nico Kotlenga + * @since 12.12.25 + */ +public enum MusicSortingField implements DbSortingField { + ID, TITLE; + + @Override + public Path getPathFromRootEntity(Root root) { + switch (this) { + case ID: + return root.get(Music_.id); + case TITLE: + return root.get(Music_.displayTitle).get(Title_.name); + default: + throw new IllegalStateException("Unexpected value: " + this); + } + } +} + From dcffa19cc91820a51711577e2ebbbbaf90371217 Mon Sep 17 00:00:00 2001 From: NKO Date: Sat, 13 Dec 2025 12:08:10 +0100 Subject: [PATCH 18/70] TIMAAT Weiterentwicklung #9 - Created a generic DbStorage * The storage allows the simple creation of database storage implementations by just define the filter, sorting field and root entity type --- .../TIMAAT/di/binder/TIMAATBinder.java | 2 +- .../TIMAAT/rest/endpoint/EndpointMedium.java | 2 +- .../TIMAAT/rest/endpoint/EndpointMusic.java | 8 +- ...InsensitiveEnumParamConverterProvider.java | 2 +- .../TIMAAT/storage/api/DbSortingField.java | 21 --- .../TIMAAT/storage/db/DbSortingField.java | 36 ++++ .../bitgilde/TIMAAT/storage/db/DbStorage.java | 172 ++++++++++++++++++ .../api/AnnotationSortingField.java | 2 +- .../entity/{ => medium}/MediumStorage.java | 2 +- .../storage/entity/music/MusicStorage.java | 91 +-------- .../entity/music/api/MusicSortingField.java | 2 +- 11 files changed, 222 insertions(+), 118 deletions(-) delete mode 100644 src/main/java/de/bitgilde/TIMAAT/storage/api/DbSortingField.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/storage/db/DbSortingField.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/storage/db/DbStorage.java rename src/main/java/de/bitgilde/TIMAAT/storage/entity/{ => medium}/MediumStorage.java (98%) diff --git a/src/main/java/de/bitgilde/TIMAAT/di/binder/TIMAATBinder.java b/src/main/java/de/bitgilde/TIMAAT/di/binder/TIMAATBinder.java index c8b5d9d4..67b31a5e 100644 --- a/src/main/java/de/bitgilde/TIMAAT/di/binder/TIMAATBinder.java +++ b/src/main/java/de/bitgilde/TIMAAT/di/binder/TIMAATBinder.java @@ -13,7 +13,7 @@ import de.bitgilde.TIMAAT.storage.entity.AudioAnalysisResultStorage; import de.bitgilde.TIMAAT.storage.entity.CategorySetStorage; import de.bitgilde.TIMAAT.storage.entity.CategoryStorage; -import de.bitgilde.TIMAAT.storage.entity.MediumStorage; +import de.bitgilde.TIMAAT.storage.entity.medium.MediumStorage; import de.bitgilde.TIMAAT.storage.entity.MediumVideoStorage; import de.bitgilde.TIMAAT.storage.entity.music.MusicStorage; import de.bitgilde.TIMAAT.storage.entity.TagStorage; diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java index a232524d..3ccec47d 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java @@ -51,7 +51,7 @@ import de.bitgilde.TIMAAT.rest.model.medium.UpdateMediumVideoThumbnailPayload; import de.bitgilde.TIMAAT.security.TIMAATKeyGenerator; import de.bitgilde.TIMAAT.security.UserLogManager; -import de.bitgilde.TIMAAT.storage.entity.MediumStorage; +import de.bitgilde.TIMAAT.storage.entity.medium.MediumStorage; import de.bitgilde.TIMAAT.storage.entity.MediumVideoStorage; import de.bitgilde.TIMAAT.storage.file.AudioFileStorage; import de.bitgilde.TIMAAT.storage.file.ImageFileStorage; diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMusic.java b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMusic.java index 7f0168cc..f54e6a7e 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMusic.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMusic.java @@ -203,10 +203,10 @@ public DataTableInfo getMusicList(@BeanParam MusicListingQueryParameter q AuthenticationFilter.USER_ACCOUNT_PROPERTY_NAME); int draw = queryParameter.getDraw().orElse(0); - List matchingMusic = musicStorage.getMusicEntriesStream(queryParameter, queryParameter, queryParameter, + List matchingMusic = musicStorage.getEntriesAsStream(queryParameter, queryParameter, queryParameter, userAccount).collect(Collectors.toList()); - long totalMusicEntries = musicStorage.getNumberOfTotalMusicEntries(); - long filteredMusicEntries = musicStorage.getNumberOfMatchingMusicEntries(queryParameter); + long totalMusicEntries = musicStorage.getNumberOfTotalEntries(); + long filteredMusicEntries = musicStorage.getNumberOfMatchingEntries(queryParameter); /** * TODO: This one can be removed when directly filter on storage layer @@ -223,7 +223,7 @@ public List> getMusicSelectList(@QueryParam("search") Str UserAccount userAccount = (UserAccount) containerRequestContext.getProperty( AuthenticationFilter.USER_ACCOUNT_PROPERTY_NAME); MusicFilterCriteria filterCriteria = new MusicFilterCriteria.Builder().musicNameSearch(searchText).build(); - return musicStorage.getMusicEntriesStream(filterCriteria, PagingParameter.NO_PAGING, + return musicStorage.getEntriesAsStream(filterCriteria, PagingParameter.NO_PAGING, SortingParameter.defaultSortOrder(), userAccount) .map(currentMusic -> new SelectElement<>(currentMusic.getId(), currentMusic.getDisplayTitle().getName())).collect(Collectors.toList()); diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/jersey/CaseInsensitiveEnumParamConverterProvider.java b/src/main/java/de/bitgilde/TIMAAT/rest/jersey/CaseInsensitiveEnumParamConverterProvider.java index b417f326..e182df19 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/jersey/CaseInsensitiveEnumParamConverterProvider.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/jersey/CaseInsensitiveEnumParamConverterProvider.java @@ -46,7 +46,7 @@ public T fromString(String value) { return constant; } } - throw new IllegalArgumentException("No enum constant " + rawType.getName() + "." + value); + return null; } @Override diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/api/DbSortingField.java b/src/main/java/de/bitgilde/TIMAAT/storage/api/DbSortingField.java deleted file mode 100644 index a1cbb7f4..00000000 --- a/src/main/java/de/bitgilde/TIMAAT/storage/api/DbSortingField.java +++ /dev/null @@ -1,21 +0,0 @@ -package de.bitgilde.TIMAAT.storage.api; - -import jakarta.persistence.criteria.Path; -import jakarta.persistence.criteria.Root; -import jakarta.persistence.metamodel.SingularAttribute; - -/** - * {@link SortingField} which can be used for storages using the database as - * storage layer - * - * @author Nico Kotlenga - * @since 12.12.25 - */ -public interface DbSortingField extends SortingField{ - - /** - * @return the {@link SingularAttribute} used as sorting parameter - */ - Path getPathFromRootEntity(Root root); -} - diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/db/DbSortingField.java b/src/main/java/de/bitgilde/TIMAAT/storage/db/DbSortingField.java new file mode 100644 index 00000000..3914d703 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/storage/db/DbSortingField.java @@ -0,0 +1,36 @@ +package de.bitgilde.TIMAAT.storage.db; + +import de.bitgilde.TIMAAT.storage.api.SortingField; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.metamodel.SingularAttribute; + +/* + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + +/** + * {@link SortingField} which can be used for storages using the database as + * storage layer + * + * @author Nico Kotlenga + * @since 12.12.25 + */ +public interface DbSortingField extends SortingField{ + + /** + * @return the {@link SingularAttribute} used as sorting parameter + */ + Path getPathFromRootEntity(Root root); +} + diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/db/DbStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/db/DbStorage.java new file mode 100644 index 00000000..33dd5127 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/storage/db/DbStorage.java @@ -0,0 +1,172 @@ +package de.bitgilde.TIMAAT.storage.db; + +import de.bitgilde.TIMAAT.db.DbAccessComponent; +import de.bitgilde.TIMAAT.model.FIPOP.Music; +import de.bitgilde.TIMAAT.model.FIPOP.UserAccount; +import de.bitgilde.TIMAAT.storage.api.PagingParameter; +import de.bitgilde.TIMAAT.storage.api.SortOrder; +import de.bitgilde.TIMAAT.storage.api.SortingParameter; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Order; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; + +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.stream.Stream; + +/* + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + +/** + * Storage using the database as persistence layer. + * @param which is managed by this {@link DbStorage} + * @param which can be applied to filter listing results + * @param which can be used to order the listing results + * + * @author Nico Kotlenga + * @since 13.12.25 + */ +public abstract class DbStorage> extends DbAccessComponent { + + private static final Logger logger = Logger.getLogger(DbStorage.class.getName()); + + private final Class entityTypeClass; + private final SORTING_FIELD_TYPE defaultSortingField; + + public DbStorage(Class entityTypeClass, SORTING_FIELD_TYPE defaultSortingField, EntityManagerFactory emf) { + super(emf); + this.entityTypeClass = entityTypeClass; + this.defaultSortingField = defaultSortingField; + } + + /** + * Loads the entries as stream matching the specified criteria. + * @param filter which the entities have to match + * @param pagingParameter used to limit the size of the resulting stream + * @param sortingParameter used to determine the order of entries inside the stream + * @param userAccount used to filter entries by authorization + * @return the resulting {@link Stream} + */ + public Stream getEntriesAsStream(FILTER_TYPE filter, PagingParameter pagingParameter, SortingParameter sortingParameter, UserAccount userAccount) { + logger.log(Level.FINER, "Loading music entries matching the specified filter criteria"); + return executeStreamDbTransaction(entityManager -> { + CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder(); + CriteriaQuery criteriaQuery = criteriaBuilder.createQuery(entityTypeClass); + Root root = criteriaQuery.from(entityTypeClass); + + List predicates = createPredicates(filter, root, criteriaBuilder); + Order sortOrder = createSortOrder(sortingParameter, root, criteriaBuilder); + + criteriaQuery.where(predicates.toArray(new Predicate[0])); + criteriaQuery.orderBy(sortOrder); + criteriaQuery.select(root); + + Stream resultStream = entityManager.createQuery(criteriaQuery).getResultStream(); + return adjustStreamToPassedPagingParameter(resultStream, pagingParameter); + }); + } + + /** + * Loads the count of entities matching the specified filters + * @param filter which the items will match + * @return the number of matching entries + */ + public Long getNumberOfMatchingEntries(FILTER_TYPE filter) { + logger.log(Level.FINE, "Loading number of matching music entries"); + return executeDbTransaction(entityManager -> { + CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder(); + CriteriaQuery criteriaQuery = criteriaBuilder.createQuery(Long.class); + + Root root = criteriaQuery.from(entityTypeClass); + criteriaQuery.select(criteriaBuilder.count(root)); + List predicates = createPredicates(filter, root, criteriaBuilder); + + criteriaQuery.where(predicates.toArray(new Predicate[0])); + return entityManager.createQuery(criteriaQuery).getSingleResult(); + }); + } + + /** + * @return the number of total entries inside the storage + */ + public Long getNumberOfTotalEntries() { + logger.log(Level.FINE, "Loading number of total music entries"); + return executeDbTransaction(entityManager -> { + CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder(); + CriteriaQuery criteriaQuery = criteriaBuilder.createQuery(Long.class); + + Root root = criteriaQuery.from(Music.class); + criteriaQuery.select(criteriaBuilder.count(root)); + + return entityManager.createQuery(criteriaQuery).getSingleResult(); + }); + } + + /** + * Creates the {@link Predicate}s to filter entities by the specified filter criteria + * @param filter which need to get fulfilled + * @param root of the current query + * @param criteriaBuilder which can be used the create the {@link Predicate}s + * @return a {@link List} of {@link Predicate}s + */ + protected abstract List createPredicates(FILTER_TYPE filter, Root root, CriteriaBuilder criteriaBuilder); + + /** + * Creates the {@link Order} to match current defined {@link SortingParameter} + * @param sortingParameter to which the resulting listing + * @param root of the current query + * @param criteriaBuilder which can be used the create the {@link Predicate}s + * @return a {@link List} of {@link Predicate}s + */ + private Order createSortOrder(SortingParameter sortingParameter, Root root, CriteriaBuilder criteriaBuilder) { + SortOrder sortOrder = SortOrder.ASC; + if (sortingParameter.getSortOrder().isPresent()) { + sortOrder = sortingParameter.getSortOrder().get(); + } + + SORTING_FIELD_TYPE sortingField = this.defaultSortingField; + if (sortingParameter.getSortingField().isPresent()) { + sortingField = sortingParameter.getSortingField().get(); + } + + if (SortOrder.ASC.equals(sortOrder)) { + return criteriaBuilder.asc(sortingField.getPathFromRootEntity(root)); + } + else { + return criteriaBuilder.desc(sortingField.getPathFromRootEntity(root)); + } + } + + /** + * Adjust the stream to match the specified {@link PagingParameter} + * @param stream which will be adjusted + * @param pagingParameter which should be matched + * @return the adjusted {@link Stream} + */ + private Stream adjustStreamToPassedPagingParameter(Stream stream, PagingParameter pagingParameter) { + Stream resultingStream = stream; + if (pagingParameter.startIndex().isPresent()) { + resultingStream = resultingStream.skip(pagingParameter.startIndex().get()); + } + if (pagingParameter.limit().isPresent()) { + resultingStream = resultingStream.limit(pagingParameter.limit().get()); + } + + return resultingStream; + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/api/AnnotationSortingField.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/api/AnnotationSortingField.java index edb37ef6..c3bf3706 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/api/AnnotationSortingField.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/api/AnnotationSortingField.java @@ -2,7 +2,7 @@ import de.bitgilde.TIMAAT.model.FIPOP.Annotation; import de.bitgilde.TIMAAT.model.FIPOP.Annotation_; -import de.bitgilde.TIMAAT.storage.api.DbSortingField; +import de.bitgilde.TIMAAT.storage.db.DbSortingField; import jakarta.persistence.criteria.Path; import jakarta.persistence.criteria.Root; diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/MediumStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/MediumStorage.java similarity index 98% rename from src/main/java/de/bitgilde/TIMAAT/storage/entity/MediumStorage.java rename to src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/MediumStorage.java index df871f89..d543f03e 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/MediumStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/MediumStorage.java @@ -1,4 +1,4 @@ -package de.bitgilde.TIMAAT.storage.entity; +package de.bitgilde.TIMAAT.storage.entity.medium; import de.bitgilde.TIMAAT.db.DbAccessComponent; import de.bitgilde.TIMAAT.model.FIPOP.Medium; diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/music/MusicStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/music/MusicStorage.java index 33bf4e16..1b7665f4 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/music/MusicStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/music/MusicStorage.java @@ -1,6 +1,5 @@ package de.bitgilde.TIMAAT.storage.entity.music; -import de.bitgilde.TIMAAT.db.DbAccessComponent; import de.bitgilde.TIMAAT.db.exception.DbTransactionExecutionException; import de.bitgilde.TIMAAT.model.FIPOP.Category; import de.bitgilde.TIMAAT.model.FIPOP.CategorySet; @@ -23,19 +22,15 @@ import de.bitgilde.TIMAAT.model.FIPOP.Title_; import de.bitgilde.TIMAAT.model.FIPOP.UserAccount; import de.bitgilde.TIMAAT.model.FIPOP.VoiceLeadingPattern; -import de.bitgilde.TIMAAT.storage.api.SortOrder; import de.bitgilde.TIMAAT.model.TimeRange; -import de.bitgilde.TIMAAT.storage.api.PagingParameter; -import de.bitgilde.TIMAAT.storage.api.SortingParameter; +import de.bitgilde.TIMAAT.storage.db.DbStorage; import de.bitgilde.TIMAAT.storage.entity.TagStorage; import de.bitgilde.TIMAAT.storage.entity.music.api.MusicFilterCriteria; import de.bitgilde.TIMAAT.storage.entity.music.api.MusicSortingField; import jakarta.inject.Inject; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.criteria.CriteriaBuilder; -import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Join; -import jakarta.persistence.criteria.Order; import jakarta.persistence.criteria.Predicate; import jakarta.persistence.criteria.Root; @@ -52,7 +47,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import java.util.stream.Collectors; -import java.util.stream.Stream; /* Licensed under the Apache License, Version 2.0 (the "License"); @@ -74,7 +68,7 @@ * @author Nico Kotlenga * @since 27.08.25 */ -public class MusicStorage extends DbAccessComponent { +public class MusicStorage extends DbStorage { private static final Logger logger = Logger.getLogger(MusicStorage.class.getName()); @@ -82,89 +76,12 @@ public class MusicStorage extends DbAccessComponent { @Inject public MusicStorage(EntityManagerFactory emf, TagStorage tagStorage) { - super(emf); + super(Music.class, MusicSortingField.ID, emf); this.tagStorage = tagStorage; } - public Long getNumberOfTotalMusicEntries(){ - logger.log(Level.FINE, "Loading number of total music entries"); - return executeDbTransaction(entityManager -> { - CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder(); - CriteriaQuery criteriaQuery = criteriaBuilder.createQuery(Long.class); - - Root root = criteriaQuery.from(Music.class); - criteriaQuery.select(criteriaBuilder.count(root)); - - return entityManager.createQuery(criteriaQuery).getSingleResult(); - }); - } - - public Long getNumberOfMatchingMusicEntries(MusicFilterCriteria filter) { - logger.log(Level.FINE, "Loading number of matching music entries"); - return executeDbTransaction(entityManager -> { - CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder(); - CriteriaQuery criteriaQuery = criteriaBuilder.createQuery(Long.class); - - Root root = criteriaQuery.from(Music.class); - criteriaQuery.select(criteriaBuilder.count(root)); - List predicates = createPredicates(filter, root,criteriaBuilder); - - criteriaQuery.where(predicates.toArray(new Predicate[0])); - return entityManager.createQuery(criteriaQuery).getSingleResult(); - }); - } - - public Stream getMusicEntriesStream(MusicFilterCriteria filter, PagingParameter pagingParameter, SortingParameter sortingParameter, UserAccount userAccount) { - logger.log(Level.FINER, "Loading music entries matching the specified filter criteria"); - return executeStreamDbTransaction(entityManager -> { - CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder(); - CriteriaQuery criteriaQuery = criteriaBuilder.createQuery(Music.class); - Root root = criteriaQuery.from(Music.class); - - List predicates = createPredicates(filter, root, criteriaBuilder); - Order sortOrder = createSortOrder(sortingParameter, root, criteriaBuilder); - - criteriaQuery.where(predicates.toArray(new Predicate[0])); - criteriaQuery.orderBy(sortOrder); - criteriaQuery.select(root); - - Stream musicStream = entityManager.createQuery(criteriaQuery).getResultStream(); - return adjustStreamToPassedPagingParameter(musicStream, pagingParameter); - }); - } - - private Stream adjustStreamToPassedPagingParameter(Stream stream, PagingParameter pagingParameter) { - Stream musicStream = stream; - if(pagingParameter.startIndex().isPresent()){ - musicStream = musicStream.skip(pagingParameter.startIndex().get()); - } - if(pagingParameter.limit().isPresent()){ - musicStream = musicStream.limit(pagingParameter.limit().get()); - } - - return musicStream; - } - - private Order createSortOrder(SortingParameter sortingParameter, Root root, CriteriaBuilder criteriaBuilder) { - SortOrder sortOrder = SortOrder.ASC; - if (sortingParameter.getSortOrder().isPresent()) { - sortOrder = sortingParameter.getSortOrder().get(); - } - - MusicSortingField musicSortingField = MusicSortingField.ID; - if (sortingParameter.getSortingField().isPresent()) { - musicSortingField = sortingParameter.getSortingField().get(); - } - - if (SortOrder.ASC.equals(sortOrder)) { - return criteriaBuilder.asc(musicSortingField.getPathFromRootEntity(root)); - } - else { - return criteriaBuilder.desc(musicSortingField.getPathFromRootEntity(root)); - } - } - private List createPredicates(MusicFilterCriteria filter, Root root, CriteriaBuilder criteriaBuilder) { + protected List createPredicates(MusicFilterCriteria filter, Root root, CriteriaBuilder criteriaBuilder) { List predicates = new ArrayList<>(); if (filter.getMusicNameSearch().isPresent()) { diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/music/api/MusicSortingField.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/music/api/MusicSortingField.java index 8090c7f7..46d00874 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/music/api/MusicSortingField.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/music/api/MusicSortingField.java @@ -3,7 +3,7 @@ import de.bitgilde.TIMAAT.model.FIPOP.Music; import de.bitgilde.TIMAAT.model.FIPOP.Music_; import de.bitgilde.TIMAAT.model.FIPOP.Title_; -import de.bitgilde.TIMAAT.storage.api.DbSortingField; +import de.bitgilde.TIMAAT.storage.db.DbSortingField; import de.bitgilde.TIMAAT.storage.entity.music.MusicStorage; import jakarta.persistence.criteria.Path; import jakarta.persistence.criteria.Root; From 11953087d819325108dce711264c5341184ddd17 Mon Sep 17 00:00:00 2001 From: NKO Date: Sat, 13 Dec 2025 13:25:14 +0100 Subject: [PATCH 19/70] TIMAAT Weiterentwicklung #9 - Created a generic DbStorage * Extending MediumStorage from DbStorage * Defined required filter criteria and sorting parameter --- .../TIMAAT/rest/endpoint/EndpointMedium.java | 8288 +++++++++-------- .../medium/MediumListingQueryParameter.java | 53 + .../storage/entity/medium/MediumStorage.java | 50 +- .../medium/api/MediumFilterCriteria.java | 82 + .../entity/medium/api/MediumSortingField.java | 44 + .../storage/entity/music/MusicStorage.java | 4 +- 6 files changed, 4483 insertions(+), 4038 deletions(-) create mode 100644 src/main/java/de/bitgilde/TIMAAT/rest/model/medium/MediumListingQueryParameter.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/api/MediumFilterCriteria.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/api/MediumSortingField.java diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java index 3ccec47d..7df6a485 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java @@ -46,13 +46,17 @@ import de.bitgilde.TIMAAT.rest.RangedStreamingOutput; import de.bitgilde.TIMAAT.rest.Secured; import de.bitgilde.TIMAAT.rest.filter.AuthenticationFilter; +import de.bitgilde.TIMAAT.rest.model.medium.MediumListingQueryParameter; import de.bitgilde.TIMAAT.rest.model.medium.UpdateMediumHasMusicListPayload; import de.bitgilde.TIMAAT.rest.model.medium.UpdateMediumHasMusicListPayload.MediumHasMusicListEntry; import de.bitgilde.TIMAAT.rest.model.medium.UpdateMediumVideoThumbnailPayload; import de.bitgilde.TIMAAT.security.TIMAATKeyGenerator; import de.bitgilde.TIMAAT.security.UserLogManager; +import de.bitgilde.TIMAAT.storage.api.PagingParameter; +import de.bitgilde.TIMAAT.storage.api.SortingParameter; import de.bitgilde.TIMAAT.storage.entity.medium.MediumStorage; import de.bitgilde.TIMAAT.storage.entity.MediumVideoStorage; +import de.bitgilde.TIMAAT.storage.entity.medium.api.MediumFilterCriteria; import de.bitgilde.TIMAAT.storage.file.AudioFileStorage; import de.bitgilde.TIMAAT.storage.file.ImageFileStorage; import de.bitgilde.TIMAAT.storage.file.ImageFileStorage.ImageFileType; @@ -72,6 +76,7 @@ import jakarta.persistence.Query; import jakarta.servlet.ServletContext; import jakarta.validation.Valid; +import jakarta.ws.rs.BeanParam; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; @@ -145,20 +150,20 @@ public class EndpointMedium { private static final int DEFAULT_THUMBNAIL_TIMESTAMP_MS = 1000; - @Context - ContainerRequestContext containerRequestContext; - @Context - ServletContext servletContext; - @Inject - private TaskService taskService; - @Inject - private VideoFileStorage videoFileStorage; - @Inject - private TemporaryFileStorage temporaryFileStorage; - @Inject - private AudioFileStorage audioFileStorage; - @Inject - private ImageFileStorage imageFileStorage; + @Context + ContainerRequestContext containerRequestContext; + @Context + ServletContext servletContext; + @Inject + private TaskService taskService; + @Inject + private VideoFileStorage videoFileStorage; + @Inject + private TemporaryFileStorage temporaryFileStorage; + @Inject + private AudioFileStorage audioFileStorage; + @Inject + private ImageFileStorage imageFileStorage; @Inject private MediumStorage mediumStorage; @Inject @@ -167,4087 +172,4310 @@ public class EndpointMedium { private FfmpegVideoEngine ffmpegVideoEngine; - @GET - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Secured - @Path("list") - public Response getMediaList( @QueryParam("draw") Integer draw, - @QueryParam("start") Integer start, - @QueryParam("length") Integer length, - @QueryParam("orderby") String orderby, - @QueryParam("dir") String direction, - @QueryParam("search") String search ) { - // System.out.println("EndpointMedium: getMediaList: draw: "+draw+" start: "+start+" length: "+length+" orderby: "+orderby+" dir: "+direction+" search: "+search); - if ( draw == null ) draw = 0; - - // sanitize user input - if ( direction != null && direction.equalsIgnoreCase("desc") ) direction = "DESC"; else direction = "ASC"; - String column = "m.displayTitle.name"; - if ( orderby != null) { - if (orderby.equalsIgnoreCase("title")) column = "m.displayTitle.name"; - // if (orderby.equalsIgnoreCase("duration")) column = ""; - // if (orderby.equalsIgnoreCase("producer")) column = ""; - if (orderby.equalsIgnoreCase("releaseDate")) column = "m.releaseDate"; - // if (orderby.equalsIgnoreCase("language")) column = ""; - } - - // calculate total # of records - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Query countQuery = entityManager.createQuery("SELECT COUNT(m) FROM Medium m"); - long recordsTotal = (long) countQuery.getSingleResult(); - long recordsFiltered = recordsTotal; - - // search - Query query; - String sql; - List mediumList = new ArrayList<>(); - if (search != null && search.length() > 0 ) { - // find all matching titles - sql = "SELECT DISTINCT m FROM Medium m, Title t WHERE t IN (m.titles) AND lower(t.name) LIKE lower(concat('%', :search, '%')) ORDER BY "+column+" "+direction; - query = entityManager.createQuery(sql) - .setParameter("search", search); - mediumList = castList(Medium.class, query.getResultList()); - // find all media belonging to those titles - if ( start != null && start > 0 ) query.setFirstResult(start); - if ( length != null && length > 0 ) query.setMaxResults(length); - if ( length == -1) { // display all results - length = mediumList.size(); - query.setMaxResults(length); - } - recordsFiltered = mediumList.size(); - List filteredMediumList = new ArrayList<>(); - int i = start; - int end; - if ((recordsFiltered - start) < length) { - end = (int)recordsFiltered; - } - else { - end = start + length; - } - for(; i < end; i++) { - filteredMediumList.add(mediumList.get(i)); - } - for (Medium medium : mediumList) { - String type = medium.getMediaType().getMediaTypeTranslations().get(0).getType(); - switch (type) { - case "video": - case "image": - // strip analysis lists for faster response --> get lists via EndpointMediumList - medium.getMediumAnalysisLists().clear(); - break; - } - } - return Response.ok().entity(new DataTableInfo(draw, recordsTotal, recordsFiltered, filteredMediumList)).build(); - } else { - sql = "SELECT m FROM Medium m ORDER BY "+column+" "+direction; - query = entityManager.createQuery(sql); - if ( start != null && start > 0 ) query.setFirstResult(start); - if ( length != null && length > 0 ) query.setMaxResults(length); - mediumList = castList(Medium.class, query.getResultList()); - - for (Medium medium : mediumList) { - String type = medium.getMediaType().getMediaTypeTranslations().get(0).getType(); - switch (type) { - case "video": - case "image": - // strip analysis lists for faster response --> get lists via EndpointMediumList - medium.getMediumAnalysisLists().clear(); - break; - } - } - - return Response.ok().entity(new DataTableInfo(draw, recordsTotal, recordsFiltered, mediumList)).build(); - } - } - - @GET - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Secured - @Path("selectList") - public Response getMediumSelectList(@QueryParam("start") Integer start, - @QueryParam("length") Integer length, - @QueryParam("orderby") String orderby, - @QueryParam("search") String search) { - // System.out.println("EndpointMedium: getMediumSelectList: start: "+start+" length: "+length+" orderby: "+orderby+" search: "+search); - - // TODO search all titles, not displayTitle only - // define default query strings - String mediumQuery = "SELECT m FROM Medium m ORDER BY m.displayTitle.name"; - String mediumSearchQuery = "SELECT m FROM Medium m WHERE lower(m.displayTitle.name) LIKE lower(concat('%', :name,'%')) ORDER BY m.displayTitle.name"; - - // search - Query query; - if ( search != null && search.length() > 0 ) { - // perform search - query = TIMAATApp.emf.createEntityManager().createQuery( - mediumSearchQuery); - query.setParameter("name", search); - // query.setParameter("mediumName", search); // birthName - } else { - query = TIMAATApp.emf.createEntityManager().createQuery( - mediumQuery); - } - // if ( start != null && start > 0 ) query.setFirstResult(start); - // if ( length != null && length > 0 ) query.setMaxResults(length); - - List mediumList = castList(Medium.class, query.getResultList()); - List mediumSelectList = new ArrayList<>(); - for (Medium medium : mediumList) { - mediumSelectList.add(new SelectElement(medium.getId(), medium.getDisplayTitle().getName())); - } - - return Response.ok().entity(mediumSelectList).build(); - - } - - @GET - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Secured - @Path("{id}/select") - public Response getMediumSelect(@PathParam("id") int id, - @QueryParam("start") Integer start, - @QueryParam("length") Integer length, - @QueryParam("orderby") String orderby, - @QueryParam("search") String search) - { - // System.out.println("EndpointMedium: getActorList: start: "+start+" length: "+length+" orderby: "+orderby+" search: "+search); - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Medium medium = entityManager.find(Medium.class, id); - List mediumSelectList = new ArrayList<>(); - mediumSelectList.add(new SelectElement(id, medium.getDisplayTitle().getName())); - - return Response.ok().entity(mediumSelectList).build(); - } - - @GET - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Secured - @Path("image/selectList") - public Response getImageSelectList( - @QueryParam("start") Integer start, - @QueryParam("length") Integer length, - @QueryParam("orderby") String orderby, - @QueryParam("search") String search) - { - // System.out.println("EndpointMedium: getImageSelectList: start: "+start+" length: "+length+" orderby: "+orderby+" search: "+search); - - // TODO search all titles, not displayTitle only - // define default query strings - String mediumQuery = "SELECT m FROM Medium m ORDER BY m.displayTitle.name"; - String mediumSearchQuery = "SELECT m FROM Medium m WHERE lower(m.displayTitle.name) LIKE lower(concat('%', :name,'%')) ORDER BY m.displayTitle.name"; - - // search - Query query; - if ( search != null && search.length() > 0 ) { - // perform search - query = TIMAATApp.emf.createEntityManager().createQuery( - mediumSearchQuery); - query.setParameter("name", search); - // query.setParameter("mediumName", search); // birthName - } else { - query = TIMAATApp.emf.createEntityManager().createQuery( - mediumQuery); - } - // if ( start != null && start > 0 ) query.setFirstResult(start); - // if ( length != null && length > 0 ) query.setMaxResults(length); - - List mediumList = castList(Medium.class, query.getResultList()); - List mediumSelectList = new ArrayList<>(); - for (Medium medium : mediumList) { - if (medium.getMediumImage() != null) { - // if (medium.getViewToken() == null) { - // medium.setViewToken(issueFileToken(medium.getId())); - // } - mediumSelectList.add(new SelectElementWithToken(medium.getId(), medium.getDisplayTitle().getName(), medium.getViewToken())); - } - } - - return Response.ok().entity(mediumSelectList).build(); - } - - @GET - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Secured - @Path("video/selectList") - public Response getVideoSelectList( - @QueryParam("start") Integer start, - @QueryParam("length") Integer length, - @QueryParam("orderby") String orderby, - @QueryParam("search") String search) - { - // System.out.println("EndpointMedium: getVideoSelectList: start: "+start+" length: "+length+" orderby: "+orderby+" search: "+search); - - // TODO search all titles, not displayTitle only - // define default query strings - String mediumQuery = "SELECT m FROM Medium m ORDER BY m.displayTitle.name"; - String mediumSearchQuery = "SELECT m FROM Medium m WHERE lower(m.displayTitle.name) LIKE lower(concat('%', :name,'%')) ORDER BY m.displayTitle.name"; - - // search - Query query; - if ( search != null && search.length() > 0 ) { - // perform search - query = TIMAATApp.emf.createEntityManager().createQuery( - mediumSearchQuery); - query.setParameter("name", search); - // query.setParameter("mediumName", search); // birthName - } else { - query = TIMAATApp.emf.createEntityManager().createQuery( - mediumQuery); - } - // if ( start != null && start > 0 ) query.setFirstResult(start); - // if ( length != null && length > 0 ) query.setMaxResults(length); - - List mediumList = castList(Medium.class, query.getResultList()); - List mediumSelectList = new ArrayList<>(); - for (Medium medium : mediumList) { - if (medium.getMediumVideo() != null) { - mediumSelectList.add(new SelectElement(medium.getId(), medium.getDisplayTitle().getName())); - } - } - - return Response.ok().entity(mediumSelectList).build(); - } - - @GET - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Secured - @Path("total") - public Response getMediaDatasetsTotal() { - // System.out.println("EndpointMedium: getMediaDatasetsTotal"); - Query query = TIMAATApp.emf.createEntityManager() - .createQuery("SELECT COUNT (m.id) FROM Medium m"); - long count = (long)query.getSingleResult(); - // int total = ((Integer)TIMAATApp.emf.createEntityManager() - // .createQuery("SELECT m.id, COUNT(m) FROM Medium m") - // .getSingleResult()).intValue(); - return Response.ok().entity(count).build(); - } - - @GET - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Secured - @Path("mediaType/list") - public Response getMediaTypeList() { - List mediaTypeList = castList(MediaType.class,TIMAATApp.emf.createEntityManager().createNamedQuery("MediaType.findAll").getResultList()); - return Response.ok().entity(mediaTypeList).build(); - } - - @GET - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Secured - @Path("audio/list") - public Response getAudioList(@QueryParam("draw") Integer draw, - @QueryParam("start") Integer start, - @QueryParam("length") Integer length, - @QueryParam("orderby") String orderby, - @QueryParam("dir") String direction, - @QueryParam("search") String search) { - // System.out.println("EndpointMedium: getAudioList: draw: "+draw+" start: "+start+" length: "+length+" orderby: "+orderby+" dir: "+direction+" search: "+search); - if ( draw == null ) draw = 0; - - // sanitize user input - if ( direction != null && direction.equalsIgnoreCase("desc") ) direction = "DESC"; else direction = "ASC"; - - String column = "ma.medium.displayTitle.name"; - if ( orderby != null ) { - if (orderby.equalsIgnoreCase("title")) column = "ma.medium.displayTitle.name"; - if (orderby.equalsIgnoreCase("duration")) column = "ma.length"; - // if (orderby.equalsIgnoreCase("producer")) column = ""; - if (orderby.equalsIgnoreCase("releaseDate")) column = "ma.medium.releaseDate"; - // if (orderby.equalsIgnoreCase("language")) column = ""; - } - - // calculate total # of records - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Query countQuery = entityManager.createQuery("SELECT COUNT(ma.medium) FROM MediumAudio ma"); - long recordsTotal = (long) countQuery.getSingleResult(); - long recordsFiltered = recordsTotal; - - // search - Query query; - String sql; - List mediumAudioList = new ArrayList<>(); - List mediumList = new ArrayList<>(); - if ( search != null && search.length() > 0 ) { - // find all matching titles - sql = "SELECT DISTINCT ma FROM MediumAudio ma, Medium m, Title t WHERE t IN (m.titles) AND lower(t.name) LIKE lower(concat('%', :search, '%')) AND ma.medium = m ORDER BY "+column+" "+direction; - query = entityManager.createQuery(sql) - .setParameter("search", search); - mediumAudioList = castList(MediumAudio.class, query.getResultList()); - // find all media belonging to those titles - if ( start != null && start > 0 ) query.setFirstResult(start); - if ( length != null && length > 0 ) query.setMaxResults(length); - if ( length == -1) { // display all results - length = mediumAudioList.size(); - query.setMaxResults(length); - } - recordsFiltered = mediumAudioList.size(); - for (MediumAudio mediumAudio : mediumAudioList) { - mediumAudio.getMedium().getMediumAnalysisLists().clear(); - mediumList.add(mediumAudio.getMedium()); - } - List filteredMediumList = new ArrayList<>(); - int i = start; - int end; - if ((recordsFiltered - start) < length) { - end = (int)recordsFiltered; - } - else { - end = start + length; - } - for(; i < end; i++) { - filteredMediumList.add(mediumList.get(i)); - } - return Response.ok().entity(new DataTableInfo(draw, recordsTotal, recordsFiltered, filteredMediumList)).build(); - } else { - sql = "SELECT ma.medium FROM MediumAudio ma ORDER BY "+column+" "+direction; - query = entityManager.createQuery(sql); - if ( start != null && start > 0 ) query.setFirstResult(start); - if ( length != null && length > 0 ) query.setMaxResults(length); - mediumList = castList(Medium.class, query.getResultList()); - } - - return Response.ok().entity(new DataTableInfo(draw, recordsTotal, recordsFiltered, mediumList)).build(); - } - - @GET - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Secured - @Path("document/list") - public Response getDocumentList(@QueryParam("draw") Integer draw, - @QueryParam("start") Integer start, - @QueryParam("length") Integer length, - @QueryParam("orderby") String orderby, - @QueryParam("dir") String direction, - @QueryParam("search") String search ) { - // System.out.println("EndpointMedium: getDocumentList: draw: "+draw+" start: "+start+" length: "+length+" orderby: "+orderby+" dir: "+direction+" search: "+search); - if ( draw == null ) draw = 0; - - // sanitize user input - if ( direction != null && direction.equalsIgnoreCase("desc") ) direction = "DESC"; else direction = "ASC"; - - String column = "md.medium.displayTitle.name"; - if ( orderby != null ) { - if (orderby.equalsIgnoreCase("title")) column = "md.medium.displayTitle.name"; - // if (orderby.equalsIgnoreCase("producer")) column = ""; - if (orderby.equalsIgnoreCase("releaseDate")) column = "md.medium.releaseDate"; - // if (orderby.equalsIgnoreCase("language")) column = ""; - } - - // calculate total # of records - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Query countQuery = entityManager.createQuery("SELECT COUNT(md.medium) FROM MediumDocument md"); - long recordsTotal = (long) countQuery.getSingleResult(); - long recordsFiltered = recordsTotal; - - // search - Query query; - String sql; - List mediumDocumentList = new ArrayList<>(); - List mediumList = new ArrayList<>(); - if ( search != null && search.length() > 0 ) { - // find all matching titles - sql = "SELECT DISTINCT md FROM MediumDocument md, Medium m, Title t WHERE t IN (m.titles) AND lower(t.name) LIKE lower(concat('%', :search, '%')) AND md.medium = m ORDER BY "+column+" "+direction; - query = entityManager.createQuery(sql) - .setParameter("search", search); - mediumDocumentList = castList(MediumDocument.class, query.getResultList()); - // find all media belonging to those titles - if ( start != null && start > 0 ) query.setFirstResult(start); - if ( length != null && length > 0 ) query.setMaxResults(length); - if ( length == -1) { // display all results - length = mediumDocumentList.size(); - query.setMaxResults(length); - } - recordsFiltered = mediumDocumentList.size(); - for (MediumDocument mediumDocument : mediumDocumentList) { - mediumDocument.getMedium().getMediumAnalysisLists().clear(); - mediumList.add(mediumDocument.getMedium()); - } - List filteredMediumList = new ArrayList<>(); - int i = start; - int end; - if ((recordsFiltered - start) < length) { - end = (int)recordsFiltered; - } - else { - end = start + length; - } - for(; i < end; i++) { - filteredMediumList.add(mediumList.get(i)); - } - return Response.ok().entity(new DataTableInfo(draw, recordsTotal, recordsFiltered, filteredMediumList)).build(); - } else { - sql = "SELECT md.medium FROM MediumDocument md ORDER BY "+column+" "+direction; - query = entityManager.createQuery(sql); - if ( start != null && start > 0 ) query.setFirstResult(start); - if ( length != null && length > 0 ) query.setMaxResults(length); - mediumList = castList(Medium.class, query.getResultList()); - } - - return Response.ok().entity(new DataTableInfo(draw, recordsTotal, recordsFiltered, mediumList)).build(); - } - - @GET - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Secured - @Path("image/list") - public Response getImageList( @QueryParam("draw") Integer draw, - @QueryParam("start") Integer start, - @QueryParam("length") Integer length, - @QueryParam("orderby") String orderby, - @QueryParam("dir") String direction, - @QueryParam("search") String search) { - // System.out.println("EndpointMedium: getImageList: draw: "+draw+" start: "+start+" length: "+length+" orderby: "+orderby+" dir: "+direction+" search: "+search); - if ( draw == null ) draw = 0; - - // sanitize user input - if ( direction != null && direction.equalsIgnoreCase("desc") ) direction = "DESC"; else direction = "ASC"; - - String column = "mi.medium.displayTitle.name"; - if ( orderby != null ) { - if (orderby.equalsIgnoreCase("title")) column = "mi.medium.displayTitle.name"; - // if (orderby.equalsIgnoreCase("producer")) column = ""; - if (orderby.equalsIgnoreCase("releaseDate")) column = "mi.medium.releaseDate"; - // if (orderby.equalsIgnoreCase("language")) column = ""; - } - - // calculate total # of records - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Query countQuery = entityManager.createQuery("SELECT COUNT(mi.medium) FROM MediumImage mi"); - long recordsTotal = (long) countQuery.getSingleResult(); - long recordsFiltered = recordsTotal; - - // search - Query query; - String sql; - List mediumImageList = new ArrayList<>(); - List mediumList = new ArrayList<>(); - if ( search != null && search.length() > 0 ) { - // find all matching titles - sql = "SELECT DISTINCT mi FROM MediumImage mi, Medium m, Title t WHERE t IN (m.titles) AND lower(t.name) LIKE lower(concat('%', :search, '%')) AND mi.medium = m ORDER BY "+column+" "+direction; - query = entityManager.createQuery(sql) - .setParameter("search", search); - mediumImageList = castList(MediumImage.class, query.getResultList()); - // find all media belonging to those titles - if ( start != null && start > 0 ) query.setFirstResult(start); - if ( length != null && length > 0 ) query.setMaxResults(length); - if ( length == -1) { // display all results - length = mediumImageList.size(); - query.setMaxResults(length); - } - recordsFiltered = mediumImageList.size(); - for (MediumImage mediumImage : mediumImageList) { - mediumImage.getMedium().getMediumAnalysisLists().clear(); - mediumList.add(mediumImage.getMedium()); - } - List filteredMediumList = new ArrayList<>(); - int i = start; - int end; - if ((recordsFiltered - start) < length) { - end = (int)recordsFiltered; - } - else { - end = start + length; - } - for(; i < end; i++) { - filteredMediumList.add(mediumList.get(i)); - } - return Response.ok().entity(new DataTableInfo(draw, recordsTotal, recordsFiltered, filteredMediumList)).build(); - } else { - sql = "SELECT mi.medium FROM MediumImage mi ORDER BY "+column+" "+direction; - query = entityManager.createQuery(sql); - if ( start != null && start > 0 ) query.setFirstResult(start); - if ( length != null && length > 0 ) query.setMaxResults(length); - mediumList = castList(Medium.class, query.getResultList()); - } - - return Response.ok().entity(new DataTableInfo(draw, recordsTotal, recordsFiltered, mediumList)).build(); - } - - @GET - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Secured - @Path("software/list") - public Response getSoftwareList(@QueryParam("draw") Integer draw, - @QueryParam("start") Integer start, - @QueryParam("length") Integer length, - @QueryParam("orderby") String orderby, - @QueryParam("dir") String direction, - @QueryParam("search") String search) { - // System.out.println("EndpointMedium: getSoftwareList: draw: "+draw+" start: "+start+" length: "+length+" orderby: "+orderby+" dir: "+direction+" search: "+search); - if ( draw == null ) draw = 0; - - // sanitize user input - if ( direction != null && direction.equalsIgnoreCase("desc") ) direction = "DESC"; else direction = "ASC"; - - String column = "ms.medium.displayTitle.name"; - if ( orderby != null ) { - if (orderby.equalsIgnoreCase("title")) column = "ms.medium.displayTitle.name"; - // if (orderby.equalsIgnoreCase("producer")) column = ""; - if (orderby.equalsIgnoreCase("releaseDate")) column = "ms.medium.releaseDate"; - // if (orderby.equalsIgnoreCase("language")) column = ""; - } - - // calculate total # of records - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Query countQuery = entityManager.createQuery("SELECT COUNT(ms.medium) FROM MediumSoftware ms"); - long recordsTotal = (long) countQuery.getSingleResult(); - long recordsFiltered = recordsTotal; - - // search - Query query; - String sql; - List mediumSoftwareList = new ArrayList<>(); - List mediumList = new ArrayList<>(); - if ( search != null && search.length() > 0 ) { - // find all matching titles - sql = "SELECT DISTINCT ms FROM MediumSoftware ms, Medium m, Title t WHERE t IN (m.titles) AND lower(t.name) LIKE lower(concat('%', :search, '%')) AND ms.medium = m ORDER BY "+column+" "+direction; - query = entityManager.createQuery(sql) - .setParameter("search", search); - mediumSoftwareList = castList(MediumSoftware.class, query.getResultList()); - // find all media belonging to those titles - if ( start != null && start > 0 ) query.setFirstResult(start); - if ( length != null && length > 0 ) query.setMaxResults(length); - if ( length == -1) { // display all results - length = mediumSoftwareList.size(); - query.setMaxResults(length); - } - recordsFiltered = mediumSoftwareList.size(); - for (MediumSoftware mediumSoftware : mediumSoftwareList) { - mediumSoftware.getMedium().getMediumAnalysisLists().clear(); - mediumList.add(mediumSoftware.getMedium()); - } - List filteredMediumList = new ArrayList<>(); - int i = start; - int end; - if ((recordsFiltered - start) < length) { - end = (int)recordsFiltered; - } - else { - end = start + length; - } - for(; i < end; i++) { - filteredMediumList.add(mediumList.get(i)); - } - return Response.ok().entity(new DataTableInfo(draw, recordsTotal, recordsFiltered, filteredMediumList)).build(); - } else { - sql = "SELECT ms.medium FROM MediumSoftware ms ORDER BY "+column+" "+direction; - query = entityManager.createQuery(sql); - if ( start != null && start > 0 ) query.setFirstResult(start); - if ( length != null && length > 0 ) query.setMaxResults(length); - mediumList = castList(Medium.class, query.getResultList()); - } - - return Response.ok().entity(new DataTableInfo(draw, recordsTotal, recordsFiltered, mediumList)).build(); - } - - @GET - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Secured - @Path("text/list") - public Response getTextList(@QueryParam("draw") Integer draw, - @QueryParam("start") Integer start, - @QueryParam("length") Integer length, - @QueryParam("orderby") String orderby, - @QueryParam("dir") String direction, - @QueryParam("search") String search) { - // System.out.println("EndpointMedium: getTextList: draw: "+draw+" start: "+start+" length: "+length+" orderby: "+orderby+" dir: "+direction+" search: "+search); - if ( draw == null ) draw = 0; - - // sanitize user input - if ( direction != null && direction.equalsIgnoreCase("desc") ) direction = "DESC"; else direction = "ASC"; - - String column = "mt.medium.displayTitle.name"; - if ( orderby != null ) { - if (orderby.equalsIgnoreCase("title")) column = "mt.medium.displayTitle.name"; - // if (orderby.equalsIgnoreCase("producer")) column = ""; - if (orderby.equalsIgnoreCase("releaseDate")) column = "mt.medium.releaseDate"; - // if (orderby.equalsIgnoreCase("language")) column = ""; - } - - // calculate total # of records - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Query countQuery = entityManager.createQuery("SELECT COUNT(mt.medium) FROM MediumText mt"); - long recordsTotal = (long) countQuery.getSingleResult(); - long recordsFiltered = recordsTotal; - - // search - Query query; - String sql; - List mediumTextList = new ArrayList<>(); - List mediumList = new ArrayList<>(); - if ( search != null && search.length() > 0 ) { - // find all matching titles - sql = "SELECT DISTINCT mt FROM MediumText mt, Medium m, Title t WHERE t IN (m.titles) AND lower(t.name) LIKE lower(concat('%', :search, '%')) AND mt.medium = m ORDER BY "+column+" "+direction; - query = entityManager.createQuery(sql) - .setParameter("search", search); - mediumTextList = castList(MediumText.class, query.getResultList()); - // find all media belonging to those titles - if ( start != null && start > 0 ) query.setFirstResult(start); - if ( length != null && length > 0 ) query.setMaxResults(length); - if ( length == -1) { // display all results - length = mediumTextList.size(); - query.setMaxResults(length); - } - recordsFiltered = mediumTextList.size(); - for (MediumText mediumText : mediumTextList) { - mediumText.getMedium().getMediumAnalysisLists().clear(); - mediumList.add(mediumText.getMedium()); - } - List filteredMediumList = new ArrayList<>(); - int i = start; - int end; - if ((recordsFiltered - start) < length) { - end = (int)recordsFiltered; - } - else { - end = start + length; - } - for(; i < end; i++) { - filteredMediumList.add(mediumList.get(i)); - } - return Response.ok().entity(new DataTableInfo(draw, recordsTotal, recordsFiltered, filteredMediumList)).build(); - } else { - sql = "SELECT mt.medium FROM MediumText mt ORDER BY "+column+" "+direction; - query = entityManager.createQuery(sql); - if ( start != null && start > 0 ) query.setFirstResult(start); - if ( length != null && length > 0 ) query.setMaxResults(length); - mediumList = castList(Medium.class, query.getResultList()); - } - - return Response.ok().entity(new DataTableInfo(draw, recordsTotal, recordsFiltered, mediumList)).build(); - } - - @GET - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Secured - @Path("video/list") - public Response getVideoList( @QueryParam("draw") Integer draw, - @QueryParam("start") Integer start, - @QueryParam("length") Integer length, - @QueryParam("orderby") String orderby, - @QueryParam("dir") String direction, - @QueryParam("search") String search ) { - - // System.out.println("EndpointMedium: getVideoList: draw: "+draw+" start: "+start+" length: "+length+" orderby: "+orderby+" dir: "+direction+" search: "+search); - if ( draw == null ) draw = 0; - - // sanitize user input - if ( direction != null && direction.equalsIgnoreCase("desc") ) direction = "DESC"; else direction = "ASC"; - - String column = "mv.medium.displayTitle.name"; - if ( orderby != null ) { - if (orderby.equalsIgnoreCase("title")) column = "mv.medium.displayTitle.name"; - if (orderby.equalsIgnoreCase("duration")) column = "mv.length"; - // if (orderby.equalsIgnoreCase("producer")) column = ""; - if (orderby.equalsIgnoreCase("releaseDate")) column = "mv.medium.releaseDate"; - // if (orderby.equalsIgnoreCase("language")) column = ""; - } - - // calculate total # of records - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Query countQuery = entityManager.createQuery("SELECT COUNT(mv.medium) FROM MediumVideo mv"); - long recordsTotal = (long) countQuery.getSingleResult(); - long recordsFiltered = recordsTotal; - - // search - Query query; - String sql; - List mediumVideoList = new ArrayList<>(); - List mediumList = new ArrayList<>(); - if ( search != null && search.length() > 0 ) { - // find all matching titles - sql = "SELECT DISTINCT mv FROM MediumVideo mv, Medium m, Title t WHERE t IN (m.titles) AND lower(t.name) LIKE lower(concat('%', :search, '%')) AND mv.medium = m ORDER BY "+column+" "+direction; - query = entityManager.createQuery(sql) - .setParameter("search", search); - mediumVideoList = castList(MediumVideo.class, query.getResultList()); - // find all media belonging to those titles - if ( start != null && start > 0 ) query.setFirstResult(start); - if ( length != null && length > 0 ) query.setMaxResults(length); - if ( length == -1) { // display all results - length = mediumVideoList.size(); - query.setMaxResults(length); - } - recordsFiltered = mediumVideoList.size(); - for (MediumVideo mediumVideo : mediumVideoList) { - mediumVideo.getMedium().getMediumAnalysisLists().clear(); - mediumList.add(mediumVideo.getMedium()); - } - List filteredMediumList = new ArrayList<>(); - int i = start; - int end; - if ((recordsFiltered - start) < length) { - end = (int)recordsFiltered; - } - else { - end = start + length; - } - for(; i < end; i++) { - filteredMediumList.add(mediumList.get(i)); - } - return Response.ok().entity(new DataTableInfo(draw, recordsTotal, recordsFiltered, filteredMediumList)).build(); - } else { - sql = "SELECT mv.medium FROM MediumVideo mv ORDER BY "+column+" "+direction; - query = entityManager.createQuery(sql); - if ( start != null && start > 0 ) query.setFirstResult(start); - if ( length != null && length > 0 ) query.setMaxResults(length); - mediumList = castList(Medium.class, query.getResultList()); - for (Medium medium : mediumList) { - medium.getMediumAnalysisLists().clear(); - } - return Response.ok().entity(new DataTableInfo(draw, recordsTotal, recordsFiltered, mediumList)).build(); - } - } - - @GET - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Secured - @Path("videogame/list") - public Response getVideogameList( @QueryParam("draw") Integer draw, - @QueryParam("start") Integer start, - @QueryParam("length") Integer length, - @QueryParam("orderby") String orderby, - @QueryParam("dir") String direction, - @QueryParam("search") String search ) { - // System.out.println("EndpointMedium: getVideoList: draw: "+draw+" start: "+start+" length: "+length+" orderby: "+orderby+" dir: "+direction+" search: "+search); - - if (draw == null) draw = 0; - - // sanitize user input - if ( direction != null && direction.equalsIgnoreCase("desc") ) direction = "DESC"; else direction = "ASC"; - - String column = "mv.medium.displayTitle.name"; - if ( orderby != null ) { - if (orderby.equalsIgnoreCase("title")) column = "mv.medium.displayTitle.name"; - // if (orderby.equalsIgnoreCase("producer")) column = ""; - if (orderby.equalsIgnoreCase("releaseDate")) column = "mv.medium.releaseDate"; - // if (orderby.equalsIgnoreCase("language")) column = ""; - } - - // calculate total # of records - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Query countQuery = TIMAATApp.emf.createEntityManager().createQuery("SELECT COUNT(mv.medium) FROM MediumVideogame mv"); - long recordsTotal = (long) countQuery.getSingleResult(); - long recordsFiltered = recordsTotal; - - // search - Query query; - String sql; - List mediumVideogameList = new ArrayList<>(); - List mediumList = new ArrayList<>(); - if ( search != null && search.length() > 0 ) { - // find all matching titles - sql = "SELECT DISTINCT mv FROM MediumVideogame mv, Medium m, Title t WHERE t IN (m.titles) AND lower(t.name) LIKE lower(concat('%', :search, '%')) AND mv.medium = m ORDER BY "+column+" "+direction; - query = entityManager.createQuery(sql) - .setParameter("search", search); - mediumVideogameList = castList(MediumVideogame.class, query.getResultList()); - // find all media belonging to those titles - if ( start != null && start > 0 ) query.setFirstResult(start); - if ( length != null && length > 0 ) query.setMaxResults(length); - if ( length == -1) { // display all results - length = mediumVideogameList.size(); - query.setMaxResults(length); - } - recordsFiltered = mediumVideogameList.size(); - for (MediumVideogame mediumVideogame : mediumVideogameList) { - mediumVideogame.getMedium().getMediumAnalysisLists().clear(); - mediumList.add(mediumVideogame.getMedium()); - } - List filteredMediumList = new ArrayList<>(); - int i = start; - int end; - if ((recordsFiltered - start) < length) { - end = (int)recordsFiltered; - } - else { - end = start + length; - } - for(; i < end; i++) { - filteredMediumList.add(mediumList.get(i)); - } - return Response.ok().entity(new DataTableInfo(draw, recordsTotal, recordsFiltered, filteredMediumList)).build(); - } else { - sql = "SELECT mv.medium FROM MediumVideogame mv ORDER BY "+column+" "+direction; - query = entityManager.createQuery(sql); - if ( start != null && start > 0 ) query.setFirstResult(start); - if ( length != null && length > 0 ) query.setMaxResults(length); - mediumList = castList(Medium.class, query.getResultList()); - } - - return Response.ok().entity(new DataTableInfo(draw, recordsTotal, recordsFiltered, mediumList)).build(); - } - - @GET - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Secured - @Path("hasActor/{actorId}/withRoles/selectList") - public Response getRoleSelectList(@PathParam("actorId") int actorId, - @QueryParam("search") String search, - @QueryParam("page") Integer page, - @QueryParam("per_page") Integer per_page, - @QueryParam("language") String languageCode) { - // returns list of id and name combinations of all roles of this actor - // System.out.println("EndpointMedium: getRoleSelectList for actor id: "+ actorId); - // System.out.println("EndpointMedium: getRoleSelectList - search string: "+ search); - - if ( languageCode == null) languageCode = "default"; // as long as multi-language is not implemented yet, use the 'default' language entry - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Actor actor = entityManager.find(Actor.class, actorId); - if ( actor == null ) return Response.status(Status.NOT_FOUND).build(); - - List roleList = actor.getRoles(); - List roleSelectList = new ArrayList<>(); - for (Role role: roleList) { - if (search != null && search.length() > 0) { - if (role.getRoleTranslations().get(0).getName().toLowerCase().contains(search.toLowerCase())) { - roleSelectList.add(new SelectElement(role.getId(), - role.getRoleTranslations().get(0).getName())); - } - } else { - roleSelectList.add(new SelectElement(role.getId(), - role.getRoleTranslations().get(0).getName())); - } - } - return Response.ok().entity(roleSelectList).build(); - } - - @GET - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Secured - @Path("{mediumId}/hasActorList") - public Response getActorList(@PathParam("mediumId") Integer mediumId) - { - // System.out.println("EndpointMedium: getActorList"); - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Medium medium = entityManager.find(Medium.class, mediumId); - List mediumHasActorWithRoleList = medium.getMediumHasActorWithRoles(); - List actorList = new ArrayList<>(); - for (MediumHasActorWithRole mediumHasActorWithRole : mediumHasActorWithRoleList) { - if (!actorList.contains(mediumHasActorWithRole.getActor())) { - actorList.add(mediumHasActorWithRole.getActor()); - } - } - return Response.ok().entity(actorList).build(); - } - - @GET - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Secured - @Path("{mediumId}/hasActor/{actorId}/withRoleList") - public Response getActorHasRoleList(@PathParam("mediumId") Integer mediumId, - @PathParam("actorId") Integer actorId) - { - // System.out.println("EndpointMedium: getActorHasRoleList"); - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - - Medium medium = entityManager.find(Medium.class, mediumId); - List mediumHasActorWithRoleList = medium.getMediumHasActorWithRoles(); - List roleList = new ArrayList<>(); - for (MediumHasActorWithRole mediumHasActorWithRole : mediumHasActorWithRoleList) { - if (mediumHasActorWithRole.getActor().getId() == actorId) { - roleList.add(entityManager.find(Role.class, mediumHasActorWithRole.getRole().getId())); - } - } - - return Response.ok().entity(roleList).build(); - } - - @GET - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Secured - @Path("{id}/categorySet/list") - public Response getCategorySetList(@PathParam("id") Integer id) - { - // System.out.println("EndpointMedium: getCategorySetList - ID: "+ id); - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Medium medium = entityManager.find(Medium.class, id); - List categorySetList = medium.getCategorySets(); - - return Response.ok().entity(categorySetList).build(); - } - - @GET - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Secured - @Path("{id}/category/list") - public Response getSelectedCategories(@PathParam("id") Integer id) - { - // System.out.println("EndpointMedium: getSelectedCategories - Id: "+ id); - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Medium medium = entityManager.find(Medium.class, id); - List categoryList = medium.getCategories(); - return Response.ok().entity(categoryList).build(); - } - - @GET - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Secured - @Path("{id}/category/selectList") - public Response getCategorySelectList(@PathParam("id") Integer id, - @QueryParam("start") Integer start, - @QueryParam("length") Integer length, - @QueryParam("orderby") String orderby, - @QueryParam("dir") String direction, - @QueryParam("search") String search) - { - // System.out.println("EndpointMedium: getCategorySelectList - Id: "+ id); - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Medium medium = entityManager.find(Medium.class, id); - List categorySetList = medium.getCategorySets(); - List categoryList = new ArrayList<>(); - List categorySelectList = new ArrayList<>(); - - for (CategorySet categorySet : categorySetList) { - Set cshc = categorySet.getCategorySetHasCategories(); - Iterator itr = cshc.iterator(); - while (itr.hasNext()) { - categoryList.add(itr.next().getCategory()); - } - } - - // search - Query query; - String sql; - if (search != null && search.length() > 0) { - // find all matching names - sql = "SELECT c FROM Category c WHERE lower(c.name) LIKE lower(concat('%', :name,'%')) ORDER BY c.name ASC"; - query = entityManager.createQuery(sql) - .setParameter("name", search); - // find all categories belonging to those names - if ( start != null && start > 0 ) query.setFirstResult(start); - if ( length != null && length > 0 ) query.setMaxResults(length); - List searchCategoryList = castList(Category.class, query.getResultList()); - for (Category category : searchCategoryList) { - if (categoryList.contains(category)) { - categorySelectList.add(new SelectElement(category.getId(), category.getName())); - } - } - } else { - for (Category category : categoryList) { - categorySelectList.add(new SelectElement(category.getId(), category.getName())); - } - } - - return Response.ok().entity(categorySelectList).build(); - } - - @GET - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Secured - @Path("{mediumId}/hasTagList") - public Response getTagList(@PathParam("mediumId") Integer mediumId) - { - // System.out.println("EndpointMedium: getTagList"); - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Medium medium = entityManager.find(Medium.class, mediumId); - if ( medium == null ) return Response.status(Status.NOT_FOUND).build(); - entityManager.refresh(medium); - return Response.ok().entity(medium.getTags()).build(); - } - - @GET - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Secured - @Path("{id}/titles/list") - public Response getTitlesList(@PathParam("id") int id) { - // Medium medium = TIMAATApp.emf.createEntityManager().find(Medium.class, id); - // if ( medium == null ) return Response.status(Status.NOT_FOUND).build(); - // // List titleList = TIMAATApp.emf.createEntityManager().createNamedQuery("titleList.findAll").getResultList(); - // // return Response.ok().entity(titleList).build(); - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - - // find medium - Medium medium = entityManager.find(Medium.class, id); - if ( medium == null ) return Response.status(Status.NOT_FOUND).build(); - - entityManager.refresh(medium); - - return Response.ok().entity(medium.getTitles()).build(); - } - - @POST - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("{id}") - @Secured - public Response createMedium(@PathParam("id") int id, String jsonData) { - // System.out.println("EndpointMedium: createMedium: " + jsonData); - ObjectMapper mapper = new ObjectMapper(); - Medium newMedium = null; - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - - // parse JSON data - try { - newMedium = mapper.readValue(jsonData, Medium.class); - } catch (IOException e) { - System.out.println("EndpointMedium: createMedium - IOException"); - e.printStackTrace(); - return Response.status(Status.BAD_REQUEST).build(); - } - if ( newMedium == null ) { - System.out.println("EndpointMedium: createMedium - newMedium == null"); - return Response.status(Status.BAD_REQUEST).build(); - } - // sanitize object data - newMedium.setId(0); - Title displayTitle = entityManager.find(Title.class, newMedium.getDisplayTitle().getId()); - newMedium.setDisplayTitle(displayTitle); - newMedium.setOriginalTitle(displayTitle); - Source source = new Source(); - - // update log metadata - Timestamp creationDate = new Timestamp(System.currentTimeMillis()); - newMedium.setCreatedAt(creationDate); - newMedium.setLastEditedAt(creationDate); - if ( containerRequestContext.getProperty("TIMAAT.userID") != null ) { - newMedium.setCreatedByUserAccount(entityManager.find(UserAccount.class, containerRequestContext.getProperty("TIMAAT.userID"))); - newMedium.setLastEditedByUserAccount((entityManager.find(UserAccount.class, containerRequestContext.getProperty("TIMAAT.userID")))); - } else { - // DEBUG do nothing - production system should abort with internal server error - return Response.serverError().build(); - } - - // persist Medium - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.persist(displayTitle); - entityManager.persist(newMedium); - entityManager.flush(); - newMedium.setDisplayTitle(displayTitle); - newMedium.setOriginalTitle(displayTitle); - entityTransaction.commit(); - entityManager.refresh(newMedium); - entityManager.refresh(displayTitle); - - // create medium_has_title-table entry - entityTransaction.begin(); - newMedium.getTitles().add(displayTitle); - displayTitle.getMediums3().add(newMedium); - entityManager.merge(displayTitle); - entityManager.merge(newMedium); - entityManager.persist(displayTitle); - entityManager.persist(newMedium); - entityTransaction.commit(); - entityManager.refresh(newMedium); - entityManager.refresh(displayTitle); - - // create source entry of medium - entityTransaction.begin(); - newMedium.getSources().add(source); - source.setMedium(newMedium); - entityManager.persist(source); - entityManager.persist(newMedium); - entityTransaction.commit(); - entityManager.refresh(newMedium); - entityManager.refresh(source); - - // add log entry - UserLogManager.getLogger() - .addLogEntry((int) containerRequestContext - .getProperty("TIMAAT.userID"), UserLogManager.LogEvents.MEDIUMCREATED); - return Response.ok().entity(newMedium).build(); - } - - @GET - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Secured - @Path("{id}") - public Response getMedium(@PathParam("id") int id) { - Medium medium = TIMAATApp.emf.createEntityManager().find(Medium.class, id); - if ( medium == null ) return Response.status(Status.NOT_FOUND).build(); - return Response.ok().entity(medium).build(); - } - - @GET - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Secured - @Path("{id}/title") - public Response getMediumTitle(@PathParam("id") int id) { - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Medium medium = entityManager.find(Medium.class, id); - if ( medium == null ) return Response.status(Status.NOT_FOUND).build(); - return Response.ok().entity(medium.getDisplayTitle()).build(); - } - - @GET - @Produces(jakarta.ws.rs.core.MediaType.TEXT_PLAIN) - @Secured - @Path("{id}/viewToken") - public Response getViewToken(@PathParam("id") int id) { - Medium medium = TIMAATApp.emf.createEntityManager().find(Medium.class, id); - if ( medium == null ) return Response.status(Status.NOT_FOUND).build(); - String viewToken = medium.getViewToken(); - return Response.ok().entity(viewToken).build(); - } - - @PATCH - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("{id}") - @Secured - public Response updateMedium(@PathParam("id") int id, String jsonData) { - // System.out.println("EndpointMedium: update medium - jsonData"+ jsonData); - - ObjectMapper mapper = new ObjectMapper(); - Medium updatedMedium = null; - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Medium medium = entityManager.find(Medium.class, id); - - if ( medium == null ) return Response.status(Status.NOT_FOUND).build(); - // parse JSON data - try { - updatedMedium = mapper.readValue(jsonData, Medium.class); - } catch (IOException e) { - System.out.println("EndpointMedium: update medium - IOException"); - e.printStackTrace(); - return Response.status(Status.BAD_REQUEST).build(); - } - if ( updatedMedium == null ) return Response.notModified().build(); - - // update medium - //! Don't change media type. MediumSubtype won't match anymore - if ( updatedMedium.getReleaseDate() != null ) medium.setReleaseDate(updatedMedium.getReleaseDate()); - medium.setRecordingStartDate(updatedMedium.getRecordingStartDate()); - medium.setRecordingEndDate(updatedMedium.getRecordingEndDate()); - if ( updatedMedium.getRemark() != null ) medium.setRemark(updatedMedium.getRemark()); - if ( updatedMedium.getCopyright() != null ) medium.setCopyright(updatedMedium.getCopyright()); - if ( updatedMedium.getDisplayTitle() != null ) medium.setDisplayTitle(updatedMedium.getDisplayTitle()); - medium.setMusic(updatedMedium.getMusic()); - medium.setOriginalTitle(updatedMedium.getOriginalTitle()); // originalTitle can be set to null - List<CategorySet> oldCategorySets = medium.getCategorySets(); - medium.setCategorySets(updatedMedium.getCategorySets()); - List<Category> oldCategories = medium.getCategories(); - medium.setCategories(updatedMedium.getCategories()); - List<Tag> oldTags = medium.getTags(); - medium.setTags(updatedMedium.getTags()); - - // update log metadata - medium.setLastEditedAt(new Timestamp(System.currentTimeMillis())); - if ( containerRequestContext.getProperty("TIMAAT.userID") != null ) { - medium.setLastEditedByUserAccount((entityManager.find(UserAccount.class, containerRequestContext.getProperty("TIMAAT.userID")))); - } else { - // DEBUG do nothing - production system should abort with internal server error - } - - //* time inconsistency check print out - // System.out.println(medium.getCreatedAt()); - // System.out.println(medium.getLastEditedAt()); - - // persist medium - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.merge(medium); - entityManager.persist(medium); - entityTransaction.commit(); - entityManager.refresh(medium); - for (CategorySet categorySet : medium.getCategorySets()) { - entityManager.refresh(categorySet); - } - for (CategorySet categorySet : oldCategorySets) { - entityManager.refresh(categorySet); - } - for (Category category : medium.getCategories()) { - entityManager.refresh(category); - } - for (Category category : oldCategories) { - entityManager.refresh(category); - } - for (Tag tag : medium.getTags()) { - entityManager.refresh(tag); - } - for (Tag tag : oldTags) { - entityManager.refresh(tag); - } - - //* time inconsistency check print out - // System.out.println("after"); - // System.out.println(medium.getCreatedAt()); - // System.out.println(medium.getLastEditedAt()); - - // if ( medium.getMediumVideo() != null ) { - // medium.getFileStatus(medium.getMediaType().getMediaTypeTranslations().get(0).getType()); - // TODO necessary? - medium.getFileStatus(); - medium.getViewToken(); - // } - - // add log entry - UserLogManager.getLogger() - .addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.MEDIUMEDITED); - return Response.ok().entity(medium).build(); - } - - @DELETE - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("{id}") - @Secured - public Response deleteMedium(@PathParam("id") int id) { - // System.out.println("EndpointMedium: deleteMedium"); - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Medium medium = entityManager.find(Medium.class, id); - - if ( medium == null ) return Response.status(Status.NOT_FOUND).build(); - - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - // for (Title title:medium.getTitles()) { - // medium.getTitles().remove(title); - // } - entityManager.remove(medium.getDisplayTitle()); - entityManager.remove(medium); - entityTransaction.commit(); - - // add log entry - UserLogManager.getLogger() - .addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.MEDIUMDELETED); - return Response.ok().build(); - } - - @POST - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("audio/{id}") - @Secured - public Response createAudio(@PathParam("id") int id, String jsonData) { - - // System.out.println("EndpointMedium: createAudio jsonData: "+jsonData); - ObjectMapper mapper = new ObjectMapper(); - MediumAudio newAudio = null; - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - - // parse JSON data - try { - newAudio = mapper.readValue(jsonData, MediumAudio.class); - } catch (IOException e) { - System.out.println("EndpointMedium: createAudio: IOException e !"); - e.printStackTrace(); - return Response.status(Status.BAD_REQUEST).build(); - } - if ( newAudio == null ) { - System.out.println("EndpointMedium: createAudio: newAudio == null !"); - return Response.status(Status.BAD_REQUEST).build(); - } - - // sanitize object data - // AudioPostProduction audioPostProduction = new AudioPostProduction(); - - // update log metadata - // Not necessary, a audio will always be created in conjunction with a medium - - // persist audio - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.persist(newAudio); - entityManager.flush(); - entityTransaction.commit(); - entityManager.refresh(newAudio); - entityManager.refresh(newAudio.getMedium()); - - // add log entry - UserLogManager.getLogger().addLogEntry(newAudio.getMedium().getCreatedByUserAccount().getId(), UserLogManager.LogEvents.AUDIOCREATED); - return Response.ok().entity(newAudio).build(); - } - - @PATCH - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("audio/{id}") - @Secured - public Response updateAudio(@PathParam("id") int id, String jsonData) { - - // System.out.println("EndpointMedium: update audio - jsonData: " + jsonData); - ObjectMapper mapper = new ObjectMapper(); - MediumAudio updatedAudio = null; - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - MediumAudio audio = entityManager.find(MediumAudio.class, id); - - if ( audio == null ) return Response.status(Status.NOT_FOUND).build(); - // parse JSON data - try { - updatedAudio = mapper.readValue(jsonData, MediumAudio.class); - } catch (IOException e) { - return Response.status(Status.BAD_REQUEST).build(); - } - if ( updatedAudio == null ) return Response.notModified().build(); - - // update audio - if ( updatedAudio.getLength() > 0) audio.setLength(updatedAudio.getLength()); - - // update log metadata - audio.getMedium().setLastEditedAt(new Timestamp(System.currentTimeMillis())); - if ( containerRequestContext.getProperty("TIMAAT.userID") != null ) { - audio.getMedium().setLastEditedByUserAccount((entityManager.find(UserAccount.class, containerRequestContext.getProperty("TIMAAT.userID")))); - } else { - // DEBUG do nothing - production system should abort with internal server error - } - - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.merge(audio); - entityManager.persist(audio); - entityTransaction.commit(); - entityManager.refresh(audio); - - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.AUDIOEDITED); - return Response.ok().entity(audio).build(); - } - - @DELETE - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("audio/{id}") - @Secured - public Response deleteAudio(@PathParam("id") int id) { - // System.out.println("EndpointMedium: deleteAudio with id: "+ id); - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Medium medium = entityManager.find(Medium.class, id); - if ( medium == null ) return Response.status(Status.NOT_FOUND).build(); - MediumAudio audio = entityManager.find(MediumAudio.class, id); - if ( audio == null ) return Response.status(Status.NOT_FOUND).build(); - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.remove(audio); - entityManager.remove(audio.getMedium().getDisplayTitle()); - entityManager.remove(audio.getMedium()); // remove audio, then corresponding medium - entityTransaction.commit(); - // add log entry - UserLogManager.getLogger() - .addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.AUDIODELETED); - return Response.ok().build(); - } - - @POST - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("document/{id}") - @Secured - public Response createDocument(@PathParam("id") int id, String jsonData) { - // System.out.println("EndpointMedium: createDocument jsonData: "+jsonData); - ObjectMapper mapper = new ObjectMapper(); - MediumDocument newDocument = null; - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - // parse JSON data - try { - newDocument = mapper.readValue(jsonData, MediumDocument.class); - } catch (IOException e) { - System.out.println("EndpointMedium: createDocument: IOException e !"); - e.printStackTrace(); - return Response.status(Status.BAD_REQUEST).build(); - } - if ( newDocument == null ) { - System.out.println("EndpointMedium: createDocument: newDocument == null !"); - return Response.status(Status.BAD_REQUEST).build(); - } - // sanitize object data - // update log metadata - // Not necessary, a document will always be created in conjunction with a medium - // persist document - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.persist(newDocument); - entityManager.flush(); - entityTransaction.commit(); - entityManager.refresh(newDocument); - entityManager.refresh(newDocument.getMedium()); - - // add log entry - UserLogManager.getLogger().addLogEntry(newDocument.getMedium().getCreatedByUserAccount().getId(), UserLogManager.LogEvents.DOCUMENTCREATED); - return Response.ok().entity(newDocument).build(); - } - - @PATCH - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("document/{id}") - @Secured - public Response updateDocument(@PathParam("id") int id, String jsonData) { - // System.out.println("EndpointMedium: update document - jsonData: " + jsonData); - ObjectMapper mapper = new ObjectMapper(); - MediumDocument updatedDocument = null; - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - MediumDocument document = entityManager.find(MediumDocument.class, id); - if ( document == null ) return Response.status(Status.NOT_FOUND).build(); - // parse JSON data - try { - updatedDocument = mapper.readValue(jsonData, MediumDocument.class); - } catch (IOException e) { - return Response.status(Status.BAD_REQUEST).build(); - } - if ( updatedDocument == null ) return Response.notModified().build(); - // update document - // no data to update at the moment - // update log metadata - document.getMedium().setLastEditedAt(new Timestamp(System.currentTimeMillis())); - if ( containerRequestContext.getProperty("TIMAAT.userID") != null ) { - document.getMedium().setLastEditedByUserAccount((entityManager.find(UserAccount.class, containerRequestContext.getProperty("TIMAAT.userID")))); - } else { - // DEBUG do nothing - production system should abort with internal server error - } - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.merge(document); - entityManager.persist(document); - entityTransaction.commit(); - entityManager.refresh(document); - - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.DOCUMENTEDITED); - return Response.ok().entity(document).build(); - } - - @DELETE - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("document/{id}") - @Secured - public Response deleteDocument(@PathParam("id") int id) { - // System.out.println("EndpointMedium: deleteDocument with id: "+ id); - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Medium medium = entityManager.find(Medium.class, id); - if ( medium == null ) return Response.status(Status.NOT_FOUND).build(); - MediumDocument document = entityManager.find(MediumDocument.class, id); - if ( document == null ) return Response.status(Status.NOT_FOUND).build(); - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.remove(document); - entityManager.remove(document.getMedium().getDisplayTitle()); - entityManager.remove(document.getMedium()); // remove document, then corresponding medium - entityTransaction.commit(); - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.DOCUMENTDELETED); - return Response.ok().build(); - } - - @POST - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("image/{id}") - @Secured - public Response createImage(@PathParam("id") int id, String jsonData) { - // System.out.println("EndpointMedium: createImage jsonData: "+jsonData); - ObjectMapper mapper = new ObjectMapper(); - MediumImage newImage = null; - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - // parse JSON data - try { - newImage = mapper.readValue(jsonData, MediumImage.class); - } catch (IOException e) { - System.out.println("EndpointMedium: createImage: IOException e !"); - e.printStackTrace(); - return Response.status(Status.BAD_REQUEST).build(); - } - if ( newImage == null ) { - System.out.println("EndpointMedium: createImage: newImage == null !"); - return Response.status(Status.BAD_REQUEST).build(); - } - // sanitize object data - // update log metadata - // Not necessary, an image will always be created in conjunction with a medium - // persist image - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.persist(newImage); - entityManager.flush(); - entityTransaction.commit(); - entityManager.refresh(newImage); - entityManager.refresh(newImage.getMedium()); - - // add log entry - UserLogManager.getLogger().addLogEntry(newImage.getMedium().getCreatedByUserAccount().getId(), UserLogManager.LogEvents.IMAGECREATED); - return Response.ok().entity(newImage).build(); - } - - @PATCH - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("image/{id}") - @Secured - public Response updateImage(@PathParam("id") int id, String jsonData) { - // System.out.println("EndpointMedium: update image - jsonData: " + jsonData); - ObjectMapper mapper = new ObjectMapper(); - MediumImage updatedImage = null; - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - MediumImage image = entityManager.find(MediumImage.class, id); - if ( image == null ) return Response.status(Status.NOT_FOUND).build(); - // parse JSON data - try { - updatedImage = mapper.readValue(jsonData, MediumImage.class); - } catch (IOException e) { - return Response.status(Status.BAD_REQUEST).build(); - } - if ( updatedImage == null ) return Response.notModified().build(); - - // update image - if ( updatedImage.getWidth() > 0 ) image.setWidth(updatedImage.getWidth()); - if ( updatedImage.getHeight() > 0 ) image.setHeight(updatedImage.getHeight()); - if ( updatedImage.getBitDepth() != null ) image.setBitDepth(updatedImage.getBitDepth()); - // update log metadata - image.getMedium().setLastEditedAt(new Timestamp(System.currentTimeMillis())); - if ( containerRequestContext.getProperty("TIMAAT.userID") != null ) { - image.getMedium().setLastEditedByUserAccount((entityManager.find(UserAccount.class, containerRequestContext.getProperty("TIMAAT.userID")))); - } else { - // DEBUG do nothing - production system should abort with internal server error - } - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.merge(image); - entityManager.persist(image); - entityTransaction.commit(); - entityManager.refresh(image); - - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.IMAGEEDITED); - return Response.ok().entity(image).build(); - } - - @DELETE - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("image/{id}") - @Secured - public Response deleteImage(@PathParam("id") int id) { - // System.out.println("EndpointMedium: deleteImage with id: "+ id); - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Medium medium = entityManager.find(Medium.class, id); - if ( medium == null ) return Response.status(Status.NOT_FOUND).build(); - MediumImage image = entityManager.find(MediumImage.class, id); - if ( image == null ) return Response.status(Status.NOT_FOUND).build(); - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.remove(image); - entityManager.remove(image.getMedium().getDisplayTitle()); - entityManager.remove(image.getMedium()); // remove image, then corresponding medium - entityTransaction.commit(); - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.IMAGEDELETED); - return Response.ok().build(); - } - - @POST - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("software/{id}") - @Secured - public Response createSoftware(@PathParam("id") int id, String jsonData) { - // System.out.println("EndpointMedium: createSoftware jsonData: "+jsonData); - ObjectMapper mapper = new ObjectMapper(); - MediumSoftware newSoftware = null; - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - // parse JSON data - try { - newSoftware = mapper.readValue(jsonData, MediumSoftware.class); - } catch (IOException e) { - System.out.println("EndpointMedium: createSoftware: IOException e !"); - e.printStackTrace(); - return Response.status(Status.BAD_REQUEST).build(); - } - if ( newSoftware == null ) { - System.out.println("EndpointMedium: createSoftware: newSoftware == null !"); - return Response.status(Status.BAD_REQUEST).build(); - } - // sanitize object data - // update log metadata - // Not necessary, a software will always be created in conjunction with a medium - // persist software - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.persist(newSoftware); - entityManager.flush(); - entityTransaction.commit(); - entityManager.refresh(newSoftware); - entityManager.refresh(newSoftware.getMedium()); - - // add log entry - UserLogManager.getLogger().addLogEntry(newSoftware.getMedium().getCreatedByUserAccount().getId(), UserLogManager.LogEvents.SOFTWARECREATED); - return Response.ok().entity(newSoftware).build(); - } - - @PATCH - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("software/{id}") - @Secured - public Response updateSoftware(@PathParam("id") int id, String jsonData) { - // System.out.println("EndpointMedium: update software - jsonData: " + jsonData); - ObjectMapper mapper = new ObjectMapper(); - MediumSoftware updatedSoftware = null; - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - MediumSoftware software = entityManager.find(MediumSoftware.class, id); - if ( software == null ) return Response.status(Status.NOT_FOUND).build(); - // parse JSON data - try { - updatedSoftware = mapper.readValue(jsonData, MediumSoftware.class); - } catch (IOException e) { - return Response.status(Status.BAD_REQUEST).build(); - } - if ( updatedSoftware == null ) return Response.notModified().build(); - - // update software - if ( updatedSoftware.getVersion() != null ) software.setVersion(updatedSoftware.getVersion()); - - // update log metadata - software.getMedium().setLastEditedAt(new Timestamp(System.currentTimeMillis())); - if ( containerRequestContext.getProperty("TIMAAT.userID") != null ) { - software.getMedium().setLastEditedByUserAccount((entityManager.find(UserAccount.class, containerRequestContext.getProperty("TIMAAT.userID")))); - } else { - // DEBUG do nothing - production system should abort with internal server error - } - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.merge(software); - entityManager.persist(software); - entityTransaction.commit(); - entityManager.refresh(software); - - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.SOFTWAREEDITED); - return Response.ok().entity(software).build(); - } - - @DELETE - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("software/{id}") - @Secured - public Response deleteSoftware(@PathParam("id") int id) { - // System.out.println("EndpointMedium: deleteSoftware with id: "+ id); - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Medium medium = entityManager.find(Medium.class, id); - if ( medium == null ) return Response.status(Status.NOT_FOUND).build(); - MediumSoftware software = entityManager.find(MediumSoftware.class, id); - if ( software == null ) return Response.status(Status.NOT_FOUND).build(); - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.remove(software); - entityManager.remove(software.getMedium().getDisplayTitle()); - entityManager.remove(software.getMedium()); // remove software, then corresponding medium - entityTransaction.commit(); - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.SOFTWAREDELETED); - return Response.ok().build(); - } - - @POST - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("text/{id}") - @Secured - public Response createText(@PathParam("id") int id, String jsonData) { - // System.out.println("EndpointMedium: createText jsonData: "+jsonData); - ObjectMapper mapper = new ObjectMapper(); - MediumText newText = null; - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - // parse JSON data - try { - newText = mapper.readValue(jsonData, MediumText.class); - } catch (IOException e) { - System.out.println("EndpointMedium: createText: IOException e !"); - e.printStackTrace(); - return Response.status(Status.BAD_REQUEST).build(); - } - if ( newText == null ) { - System.out.println("EndpointMedium: createText: newText == null !"); - return Response.status(Status.BAD_REQUEST).build(); - } - // sanitize object data - // update log metadata - // Not necessary, a text will always be created in conjunction with a medium - - // persist text - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.persist(newText); - entityManager.flush(); - entityTransaction.commit(); - entityManager.refresh(newText); - entityManager.refresh(newText.getMedium()); - - // add log entry - UserLogManager.getLogger().addLogEntry(newText.getMedium().getCreatedByUserAccount().getId(), UserLogManager.LogEvents.TEXTCREATED); - return Response.ok().entity(newText).build(); - } - - @PATCH - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("text/{id}") - @Secured - public Response updateText(@PathParam("id") int id, String jsonData) { - // System.out.println("EndpointMedium: update text - jsonData: " + jsonData); - ObjectMapper mapper = new ObjectMapper(); - MediumText updatedText = null; - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - MediumText text = entityManager.find(MediumText.class, id); - if ( text == null ) return Response.status(Status.NOT_FOUND).build(); - // parse JSON data - try { - updatedText = mapper.readValue(jsonData, MediumText.class); - } catch (IOException e) { - return Response.status(Status.BAD_REQUEST).build(); - } - if ( updatedText == null ) return Response.notModified().build(); - - // update text - if ( updatedText.getContent() != null ) text.setContent(updatedText.getContent()); - - // update log metadata - text.getMedium().setLastEditedAt(new Timestamp(System.currentTimeMillis())); - if ( containerRequestContext.getProperty("TIMAAT.userID") != null ) { - text.getMedium().setLastEditedByUserAccount((entityManager.find(UserAccount.class, containerRequestContext.getProperty("TIMAAT.userID")))); - } else { - // DEBUG do nothing - production system should abort with internal server error - } - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.merge(text); - entityManager.persist(text); - entityTransaction.commit(); - entityManager.refresh(text); - - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.TEXTEDITED); - return Response.ok().entity(text).build(); - } - - @DELETE - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("text/{id}") - @Secured - public Response deleteText(@PathParam("id") int id) { - // System.out.println("EndpointMedium: deleteText with id: "+ id); - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Medium medium = entityManager.find(Medium.class, id); - if ( medium == null ) return Response.status(Status.NOT_FOUND).build(); - MediumText text = entityManager.find(MediumText.class, id); - if ( text == null ) return Response.status(Status.NOT_FOUND).build(); - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.remove(text); - entityManager.remove(text.getMedium().getDisplayTitle()); - entityManager.remove(text.getMedium()); // remove text, then corresponding medium - entityTransaction.commit(); - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.TEXTDELETED); - return Response.ok().build(); - } - - @POST - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("video/{id}") - @Secured - public Response createVideo(@PathParam("id") int id, String jsonData) { - - // System.out.println("EndpointMedium: createVideo jsonData: "+jsonData); - ObjectMapper mapper = new ObjectMapper(); - MediumVideo newVideo = null; - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - - // parse JSON data - try { - newVideo = mapper.readValue(jsonData, MediumVideo.class); - } catch (IOException e) { - System.out.println("EndpointMedium: createVideo: IOException e !"); - e.printStackTrace(); - return Response.status(Status.BAD_REQUEST).build(); - } - if ( newVideo == null ) { - System.out.println("EndpointMedium: createVideo: newVideo == null !"); - return Response.status(Status.BAD_REQUEST).build(); - } - - // sanitize object data - - // update log metadata - // Not necessary, a video will always be created in conjunction with a medium - - // persist video - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.persist(newVideo); - entityManager.flush(); - entityTransaction.commit(); - entityManager.refresh(newVideo); - entityManager.refresh(newVideo.getMedium()); - - // add log entry - UserLogManager.getLogger() - .addLogEntry(newVideo.getMedium().getCreatedByUserAccount().getId(), UserLogManager.LogEvents.VIDEOCREATED); - - return Response.ok().entity(newVideo).build(); - - } - - @PATCH - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("video/{id}") - @Secured - public Response updateVideo(@PathParam("id") int id, String jsonData) { - - // System.out.println("EndpointMedium: update video - jsonData: " + jsonData); - ObjectMapper mapper = new ObjectMapper(); - MediumVideo updatedVideo = null; - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - MediumVideo video = entityManager.find(MediumVideo.class, id); - - if ( video == null ) return Response.status(Status.NOT_FOUND).build(); - // parse JSON data - try { - updatedVideo = mapper.readValue(jsonData, MediumVideo.class); - } catch (IOException e) { - System.out.println("EndpointMedium: update video - IOException: " + e.getMessage()); - return Response.status(Status.BAD_REQUEST).build(); - } - if ( updatedVideo == null ) return Response.notModified().build(); - - // update video - if ( updatedVideo.getLength() > 0 ) video.setLength(updatedVideo.getLength()); - if ( updatedVideo.getVideoCodec() != null ) video.setVideoCodec(updatedVideo.getVideoCodec()); - if ( updatedVideo.getWidth() > 0 ) video.setWidth(updatedVideo.getWidth()); - if ( updatedVideo.getHeight() > 0 ) video.setHeight(updatedVideo.getHeight()); - if ( updatedVideo.getFrameRate() > 0 ) video.setFrameRate(updatedVideo.getFrameRate()); - if ( updatedVideo.getDataRate() > 0 ) video.setDataRate(updatedVideo.getDataRate()); - if ( updatedVideo.getTotalBitrate() > 0 ) video.setTotalBitrate(updatedVideo.getTotalBitrate()); - if ( updatedVideo.getIsEpisode() != null ) video.setIsEpisode(updatedVideo.getIsEpisode()); - - // update log metadata - video.getMedium().setLastEditedAt(new Timestamp(System.currentTimeMillis())); - if ( containerRequestContext.getProperty("TIMAAT.userID") != null ) { - video.getMedium().setLastEditedByUserAccount((entityManager.find(UserAccount.class, containerRequestContext.getProperty("TIMAAT.userID")))); - } else { - // DEBUG do nothing - production system should abort with internal server error - } - - // persist video - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.merge(video); - entityManager.persist(video); - entityTransaction.commit(); - entityManager.refresh(video); - - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.VIDEOEDITED); - - // TODO necessary? - // video.getMedium().getFileStatus("video"); - // video.getMedium().getViewToken(); - - return Response.ok().entity(video).build(); - - } - - @DELETE - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("video/{id}") - @Secured - public Response deleteVideo(@PathParam("id") int id) { - - // System.out.println("EndpointMedium: deleteVideo with id: "+ id); - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Medium medium = entityManager.find(Medium.class, id); - if ( medium == null ) return Response.status(Status.NOT_FOUND).build(); - MediumVideo video = entityManager.find(MediumVideo.class, id); - if ( video == null ) return Response.status(Status.NOT_FOUND).build(); - - // persist video - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.remove(video); - entityManager.remove(video.getMedium().getDisplayTitle()); - entityManager.remove(video.getMedium()); // remove video, then corresponding medium - entityTransaction.commit(); - - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.VIDEODELETED); - - return Response.ok().build(); - } + @GET + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Secured + @Path("list") + public DataTableInfo<Medium> getMediaList(@BeanParam MediumListingQueryParameter queryParameter) { + UserAccount userAccount = (UserAccount) containerRequestContext.getProperty( + AuthenticationFilter.USER_ACCOUNT_PROPERTY_NAME); + int draw = queryParameter.getDraw().orElse(0); + + List<Medium> matchingMediums = mediumStorage.getEntriesAsStream(queryParameter, queryParameter, queryParameter, + userAccount).collect(Collectors.toList()); + long totalMediumEntries = mediumStorage.getNumberOfTotalEntries(); + long filteredMediumEntries = mediumStorage.getNumberOfMatchingEntries(queryParameter); + + + return new DataTableInfo<>(draw, totalMediumEntries, filteredMediumEntries, matchingMediums); + + } + + @GET + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Secured + @Path("selectList") + public List<SelectElement<Integer>> getMediumSelectList(@QueryParam("search") String search) { + UserAccount userAccount = (UserAccount) containerRequestContext.getProperty( + AuthenticationFilter.USER_ACCOUNT_PROPERTY_NAME); + MediumFilterCriteria filterCriteria = new MediumFilterCriteria.Builder().mediumNameSearch(search).build(); + + return mediumStorage.getEntriesAsStream(filterCriteria, PagingParameter.NO_PAGING, + SortingParameter.defaultSortOrder(), userAccount) + .map(currentMedium -> new SelectElement<Integer>(currentMedium.getId(), + currentMedium.getDisplayTitle().getName())).collect(Collectors.toList()); + } + + @GET + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Secured + @Path("{id}/select") + public Response getMediumSelect(@PathParam("id") int id, @QueryParam("start") Integer start, @QueryParam("length") Integer length, @QueryParam("orderby") String orderby, @QueryParam("search") String search) { + // System.out.println("EndpointMedium: getActorList: start: "+start+" length: "+length+" orderby: "+orderby+" search: "+search); + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Medium medium = entityManager.find(Medium.class, id); + List<SelectElement> mediumSelectList = new ArrayList<>(); + mediumSelectList.add(new SelectElement<Integer>(id, medium.getDisplayTitle().getName())); + + return Response.ok().entity(mediumSelectList).build(); + } + + @GET + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Secured + @Path("image/selectList") + public Response getImageSelectList(@QueryParam("start") Integer start, @QueryParam("length") Integer length, @QueryParam("orderby") String orderby, @QueryParam("search") String search) { + // System.out.println("EndpointMedium: getImageSelectList: start: "+start+" length: "+length+" orderby: "+orderby+" search: "+search); + + // TODO search all titles, not displayTitle only + // define default query strings + String mediumQuery = "SELECT m FROM Medium m ORDER BY m.displayTitle.name"; + String mediumSearchQuery = "SELECT m FROM Medium m WHERE lower(m.displayTitle.name) LIKE lower(concat('%', :name,'%')) ORDER BY m.displayTitle.name"; + + // search + Query query; + if (search != null && search.length() > 0) { + // perform search + query = TIMAATApp.emf.createEntityManager().createQuery(mediumSearchQuery); + query.setParameter("name", search); + // query.setParameter("mediumName", search); // birthName + } + else { + query = TIMAATApp.emf.createEntityManager().createQuery(mediumQuery); + } + // if ( start != null && start > 0 ) query.setFirstResult(start); + // if ( length != null && length > 0 ) query.setMaxResults(length); + + List<Medium> mediumList = castList(Medium.class, query.getResultList()); + List<SelectElementWithToken> mediumSelectList = new ArrayList<>(); + for (Medium medium : mediumList) { + if (medium.getMediumImage() != null) { + // if (medium.getViewToken() == null) { + // medium.setViewToken(issueFileToken(medium.getId())); + // } + mediumSelectList.add( + new SelectElementWithToken(medium.getId(), medium.getDisplayTitle().getName(), medium.getViewToken())); + } + } + + return Response.ok().entity(mediumSelectList).build(); + } + + @GET + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Secured + @Path("video/selectList") + public Response getVideoSelectList(@QueryParam("start") Integer start, @QueryParam("length") Integer length, @QueryParam("orderby") String orderby, @QueryParam("search") String search) { + // System.out.println("EndpointMedium: getVideoSelectList: start: "+start+" length: "+length+" orderby: "+orderby+" search: "+search); + + // TODO search all titles, not displayTitle only + // define default query strings + String mediumQuery = "SELECT m FROM Medium m ORDER BY m.displayTitle.name"; + String mediumSearchQuery = "SELECT m FROM Medium m WHERE lower(m.displayTitle.name) LIKE lower(concat('%', :name,'%')) ORDER BY m.displayTitle.name"; + + // search + Query query; + if (search != null && search.length() > 0) { + // perform search + query = TIMAATApp.emf.createEntityManager().createQuery(mediumSearchQuery); + query.setParameter("name", search); + // query.setParameter("mediumName", search); // birthName + } + else { + query = TIMAATApp.emf.createEntityManager().createQuery(mediumQuery); + } + // if ( start != null && start > 0 ) query.setFirstResult(start); + // if ( length != null && length > 0 ) query.setMaxResults(length); + + List<Medium> mediumList = castList(Medium.class, query.getResultList()); + List<SelectElement> mediumSelectList = new ArrayList<>(); + for (Medium medium : mediumList) { + if (medium.getMediumVideo() != null) { + mediumSelectList.add(new SelectElement<Integer>(medium.getId(), medium.getDisplayTitle().getName())); + } + } + + return Response.ok().entity(mediumSelectList).build(); + } + + @GET + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Secured + @Path("total") + public Response getMediaDatasetsTotal() { + // System.out.println("EndpointMedium: getMediaDatasetsTotal"); + Query query = TIMAATApp.emf.createEntityManager().createQuery("SELECT COUNT (m.id) FROM Medium m"); + long count = (long) query.getSingleResult(); + // int total = ((Integer)TIMAATApp.emf.createEntityManager() + // .createQuery("SELECT m.id, COUNT(m) FROM Medium m") + // .getSingleResult()).intValue(); + return Response.ok().entity(count).build(); + } + + @GET + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Secured + @Path("mediaType/list") + public Response getMediaTypeList() { + List<MediaType> mediaTypeList = castList(MediaType.class, + TIMAATApp.emf.createEntityManager().createNamedQuery("MediaType.findAll").getResultList()); + return Response.ok().entity(mediaTypeList).build(); + } + + @GET + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Secured + @Path("audio/list") + public Response getAudioList(@QueryParam("draw") Integer draw, @QueryParam("start") Integer start, @QueryParam("length") Integer length, @QueryParam("orderby") String orderby, @QueryParam("dir") String direction, @QueryParam("search") String search) { + // System.out.println("EndpointMedium: getAudioList: draw: "+draw+" start: "+start+" length: "+length+" orderby: "+orderby+" dir: "+direction+" search: "+search); + if (draw == null) { + draw = 0; + } + + // sanitize user input + if (direction != null && direction.equalsIgnoreCase("desc")) { + direction = "DESC"; + } + else { + direction = "ASC"; + } + + String column = "ma.medium.displayTitle.name"; + if (orderby != null) { + if (orderby.equalsIgnoreCase("title")) { + column = "ma.medium.displayTitle.name"; + } + if (orderby.equalsIgnoreCase("duration")) { + column = "ma.length"; + } + // if (orderby.equalsIgnoreCase("producer")) column = ""; + if (orderby.equalsIgnoreCase("releaseDate")) { + column = "ma.medium.releaseDate"; + } + // if (orderby.equalsIgnoreCase("language")) column = ""; + } + + // calculate total # of records + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Query countQuery = entityManager.createQuery("SELECT COUNT(ma.medium) FROM MediumAudio ma"); + long recordsTotal = (long) countQuery.getSingleResult(); + long recordsFiltered = recordsTotal; + + // search + Query query; + String sql; + List<MediumAudio> mediumAudioList = new ArrayList<>(); + List<Medium> mediumList = new ArrayList<>(); + if (search != null && search.length() > 0) { + // find all matching titles + sql = "SELECT DISTINCT ma FROM MediumAudio ma, Medium m, Title t WHERE t IN (m.titles) AND lower(t.name) LIKE lower(concat('%', :search, '%')) AND ma.medium = m ORDER BY " + column + " " + direction; + query = entityManager.createQuery(sql).setParameter("search", search); + mediumAudioList = castList(MediumAudio.class, query.getResultList()); + // find all media belonging to those titles + if (start != null && start > 0) { + query.setFirstResult(start); + } + if (length != null && length > 0) { + query.setMaxResults(length); + } + if (length == -1) { // display all results + length = mediumAudioList.size(); + query.setMaxResults(length); + } + recordsFiltered = mediumAudioList.size(); + for (MediumAudio mediumAudio : mediumAudioList) { + mediumAudio.getMedium().getMediumAnalysisLists().clear(); + mediumList.add(mediumAudio.getMedium()); + } + List<Medium> filteredMediumList = new ArrayList<>(); + int i = start; + int end; + if ((recordsFiltered - start) < length) { + end = (int) recordsFiltered; + } + else { + end = start + length; + } + for (; i < end; i++) { + filteredMediumList.add(mediumList.get(i)); + } + return Response.ok().entity(new DataTableInfo(draw, recordsTotal, recordsFiltered, filteredMediumList)).build(); + } + else { + sql = "SELECT ma.medium FROM MediumAudio ma ORDER BY " + column + " " + direction; + query = entityManager.createQuery(sql); + if (start != null && start > 0) { + query.setFirstResult(start); + } + if (length != null && length > 0) { + query.setMaxResults(length); + } + mediumList = castList(Medium.class, query.getResultList()); + } + + return Response.ok().entity(new DataTableInfo(draw, recordsTotal, recordsFiltered, mediumList)).build(); + } + + @GET + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Secured + @Path("document/list") + public Response getDocumentList(@QueryParam("draw") Integer draw, @QueryParam("start") Integer start, @QueryParam("length") Integer length, @QueryParam("orderby") String orderby, @QueryParam("dir") String direction, @QueryParam("search") String search) { + // System.out.println("EndpointMedium: getDocumentList: draw: "+draw+" start: "+start+" length: "+length+" orderby: "+orderby+" dir: "+direction+" search: "+search); + if (draw == null) { + draw = 0; + } + + // sanitize user input + if (direction != null && direction.equalsIgnoreCase("desc")) { + direction = "DESC"; + } + else { + direction = "ASC"; + } + + String column = "md.medium.displayTitle.name"; + if (orderby != null) { + if (orderby.equalsIgnoreCase("title")) { + column = "md.medium.displayTitle.name"; + } + // if (orderby.equalsIgnoreCase("producer")) column = ""; + if (orderby.equalsIgnoreCase("releaseDate")) { + column = "md.medium.releaseDate"; + } + // if (orderby.equalsIgnoreCase("language")) column = ""; + } + + // calculate total # of records + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Query countQuery = entityManager.createQuery("SELECT COUNT(md.medium) FROM MediumDocument md"); + long recordsTotal = (long) countQuery.getSingleResult(); + long recordsFiltered = recordsTotal; + + // search + Query query; + String sql; + List<MediumDocument> mediumDocumentList = new ArrayList<>(); + List<Medium> mediumList = new ArrayList<>(); + if (search != null && search.length() > 0) { + // find all matching titles + sql = "SELECT DISTINCT md FROM MediumDocument md, Medium m, Title t WHERE t IN (m.titles) AND lower(t.name) LIKE lower(concat('%', :search, '%')) AND md.medium = m ORDER BY " + column + " " + direction; + query = entityManager.createQuery(sql).setParameter("search", search); + mediumDocumentList = castList(MediumDocument.class, query.getResultList()); + // find all media belonging to those titles + if (start != null && start > 0) { + query.setFirstResult(start); + } + if (length != null && length > 0) { + query.setMaxResults(length); + } + if (length == -1) { // display all results + length = mediumDocumentList.size(); + query.setMaxResults(length); + } + recordsFiltered = mediumDocumentList.size(); + for (MediumDocument mediumDocument : mediumDocumentList) { + mediumDocument.getMedium().getMediumAnalysisLists().clear(); + mediumList.add(mediumDocument.getMedium()); + } + List<Medium> filteredMediumList = new ArrayList<>(); + int i = start; + int end; + if ((recordsFiltered - start) < length) { + end = (int) recordsFiltered; + } + else { + end = start + length; + } + for (; i < end; i++) { + filteredMediumList.add(mediumList.get(i)); + } + return Response.ok().entity(new DataTableInfo(draw, recordsTotal, recordsFiltered, filteredMediumList)).build(); + } + else { + sql = "SELECT md.medium FROM MediumDocument md ORDER BY " + column + " " + direction; + query = entityManager.createQuery(sql); + if (start != null && start > 0) { + query.setFirstResult(start); + } + if (length != null && length > 0) { + query.setMaxResults(length); + } + mediumList = castList(Medium.class, query.getResultList()); + } + + return Response.ok().entity(new DataTableInfo(draw, recordsTotal, recordsFiltered, mediumList)).build(); + } + + @GET + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Secured + @Path("image/list") + public Response getImageList(@QueryParam("draw") Integer draw, @QueryParam("start") Integer start, @QueryParam("length") Integer length, @QueryParam("orderby") String orderby, @QueryParam("dir") String direction, @QueryParam("search") String search) { + // System.out.println("EndpointMedium: getImageList: draw: "+draw+" start: "+start+" length: "+length+" orderby: "+orderby+" dir: "+direction+" search: "+search); + if (draw == null) { + draw = 0; + } + + // sanitize user input + if (direction != null && direction.equalsIgnoreCase("desc")) { + direction = "DESC"; + } + else { + direction = "ASC"; + } + + String column = "mi.medium.displayTitle.name"; + if (orderby != null) { + if (orderby.equalsIgnoreCase("title")) { + column = "mi.medium.displayTitle.name"; + } + // if (orderby.equalsIgnoreCase("producer")) column = ""; + if (orderby.equalsIgnoreCase("releaseDate")) { + column = "mi.medium.releaseDate"; + } + // if (orderby.equalsIgnoreCase("language")) column = ""; + } + + // calculate total # of records + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Query countQuery = entityManager.createQuery("SELECT COUNT(mi.medium) FROM MediumImage mi"); + long recordsTotal = (long) countQuery.getSingleResult(); + long recordsFiltered = recordsTotal; + + // search + Query query; + String sql; + List<MediumImage> mediumImageList = new ArrayList<>(); + List<Medium> mediumList = new ArrayList<>(); + if (search != null && search.length() > 0) { + // find all matching titles + sql = "SELECT DISTINCT mi FROM MediumImage mi, Medium m, Title t WHERE t IN (m.titles) AND lower(t.name) LIKE lower(concat('%', :search, '%')) AND mi.medium = m ORDER BY " + column + " " + direction; + query = entityManager.createQuery(sql).setParameter("search", search); + mediumImageList = castList(MediumImage.class, query.getResultList()); + // find all media belonging to those titles + if (start != null && start > 0) { + query.setFirstResult(start); + } + if (length != null && length > 0) { + query.setMaxResults(length); + } + if (length == -1) { // display all results + length = mediumImageList.size(); + query.setMaxResults(length); + } + recordsFiltered = mediumImageList.size(); + for (MediumImage mediumImage : mediumImageList) { + mediumImage.getMedium().getMediumAnalysisLists().clear(); + mediumList.add(mediumImage.getMedium()); + } + List<Medium> filteredMediumList = new ArrayList<>(); + int i = start; + int end; + if ((recordsFiltered - start) < length) { + end = (int) recordsFiltered; + } + else { + end = start + length; + } + for (; i < end; i++) { + filteredMediumList.add(mediumList.get(i)); + } + return Response.ok().entity(new DataTableInfo(draw, recordsTotal, recordsFiltered, filteredMediumList)).build(); + } + else { + sql = "SELECT mi.medium FROM MediumImage mi ORDER BY " + column + " " + direction; + query = entityManager.createQuery(sql); + if (start != null && start > 0) { + query.setFirstResult(start); + } + if (length != null && length > 0) { + query.setMaxResults(length); + } + mediumList = castList(Medium.class, query.getResultList()); + } + + return Response.ok().entity(new DataTableInfo(draw, recordsTotal, recordsFiltered, mediumList)).build(); + } + + @GET + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Secured + @Path("software/list") + public Response getSoftwareList(@QueryParam("draw") Integer draw, @QueryParam("start") Integer start, @QueryParam("length") Integer length, @QueryParam("orderby") String orderby, @QueryParam("dir") String direction, @QueryParam("search") String search) { + // System.out.println("EndpointMedium: getSoftwareList: draw: "+draw+" start: "+start+" length: "+length+" orderby: "+orderby+" dir: "+direction+" search: "+search); + if (draw == null) { + draw = 0; + } + + // sanitize user input + if (direction != null && direction.equalsIgnoreCase("desc")) { + direction = "DESC"; + } + else { + direction = "ASC"; + } + + String column = "ms.medium.displayTitle.name"; + if (orderby != null) { + if (orderby.equalsIgnoreCase("title")) { + column = "ms.medium.displayTitle.name"; + } + // if (orderby.equalsIgnoreCase("producer")) column = ""; + if (orderby.equalsIgnoreCase("releaseDate")) { + column = "ms.medium.releaseDate"; + } + // if (orderby.equalsIgnoreCase("language")) column = ""; + } + + // calculate total # of records + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Query countQuery = entityManager.createQuery("SELECT COUNT(ms.medium) FROM MediumSoftware ms"); + long recordsTotal = (long) countQuery.getSingleResult(); + long recordsFiltered = recordsTotal; + + // search + Query query; + String sql; + List<MediumSoftware> mediumSoftwareList = new ArrayList<>(); + List<Medium> mediumList = new ArrayList<>(); + if (search != null && search.length() > 0) { + // find all matching titles + sql = "SELECT DISTINCT ms FROM MediumSoftware ms, Medium m, Title t WHERE t IN (m.titles) AND lower(t.name) LIKE lower(concat('%', :search, '%')) AND ms.medium = m ORDER BY " + column + " " + direction; + query = entityManager.createQuery(sql).setParameter("search", search); + mediumSoftwareList = castList(MediumSoftware.class, query.getResultList()); + // find all media belonging to those titles + if (start != null && start > 0) { + query.setFirstResult(start); + } + if (length != null && length > 0) { + query.setMaxResults(length); + } + if (length == -1) { // display all results + length = mediumSoftwareList.size(); + query.setMaxResults(length); + } + recordsFiltered = mediumSoftwareList.size(); + for (MediumSoftware mediumSoftware : mediumSoftwareList) { + mediumSoftware.getMedium().getMediumAnalysisLists().clear(); + mediumList.add(mediumSoftware.getMedium()); + } + List<Medium> filteredMediumList = new ArrayList<>(); + int i = start; + int end; + if ((recordsFiltered - start) < length) { + end = (int) recordsFiltered; + } + else { + end = start + length; + } + for (; i < end; i++) { + filteredMediumList.add(mediumList.get(i)); + } + return Response.ok().entity(new DataTableInfo(draw, recordsTotal, recordsFiltered, filteredMediumList)).build(); + } + else { + sql = "SELECT ms.medium FROM MediumSoftware ms ORDER BY " + column + " " + direction; + query = entityManager.createQuery(sql); + if (start != null && start > 0) { + query.setFirstResult(start); + } + if (length != null && length > 0) { + query.setMaxResults(length); + } + mediumList = castList(Medium.class, query.getResultList()); + } + + return Response.ok().entity(new DataTableInfo(draw, recordsTotal, recordsFiltered, mediumList)).build(); + } + + @GET + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Secured + @Path("text/list") + public Response getTextList(@QueryParam("draw") Integer draw, @QueryParam("start") Integer start, @QueryParam("length") Integer length, @QueryParam("orderby") String orderby, @QueryParam("dir") String direction, @QueryParam("search") String search) { + // System.out.println("EndpointMedium: getTextList: draw: "+draw+" start: "+start+" length: "+length+" orderby: "+orderby+" dir: "+direction+" search: "+search); + if (draw == null) { + draw = 0; + } + + // sanitize user input + if (direction != null && direction.equalsIgnoreCase("desc")) { + direction = "DESC"; + } + else { + direction = "ASC"; + } + + String column = "mt.medium.displayTitle.name"; + if (orderby != null) { + if (orderby.equalsIgnoreCase("title")) { + column = "mt.medium.displayTitle.name"; + } + // if (orderby.equalsIgnoreCase("producer")) column = ""; + if (orderby.equalsIgnoreCase("releaseDate")) { + column = "mt.medium.releaseDate"; + } + // if (orderby.equalsIgnoreCase("language")) column = ""; + } + + // calculate total # of records + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Query countQuery = entityManager.createQuery("SELECT COUNT(mt.medium) FROM MediumText mt"); + long recordsTotal = (long) countQuery.getSingleResult(); + long recordsFiltered = recordsTotal; + + // search + Query query; + String sql; + List<MediumText> mediumTextList = new ArrayList<>(); + List<Medium> mediumList = new ArrayList<>(); + if (search != null && search.length() > 0) { + // find all matching titles + sql = "SELECT DISTINCT mt FROM MediumText mt, Medium m, Title t WHERE t IN (m.titles) AND lower(t.name) LIKE lower(concat('%', :search, '%')) AND mt.medium = m ORDER BY " + column + " " + direction; + query = entityManager.createQuery(sql).setParameter("search", search); + mediumTextList = castList(MediumText.class, query.getResultList()); + // find all media belonging to those titles + if (start != null && start > 0) { + query.setFirstResult(start); + } + if (length != null && length > 0) { + query.setMaxResults(length); + } + if (length == -1) { // display all results + length = mediumTextList.size(); + query.setMaxResults(length); + } + recordsFiltered = mediumTextList.size(); + for (MediumText mediumText : mediumTextList) { + mediumText.getMedium().getMediumAnalysisLists().clear(); + mediumList.add(mediumText.getMedium()); + } + List<Medium> filteredMediumList = new ArrayList<>(); + int i = start; + int end; + if ((recordsFiltered - start) < length) { + end = (int) recordsFiltered; + } + else { + end = start + length; + } + for (; i < end; i++) { + filteredMediumList.add(mediumList.get(i)); + } + return Response.ok().entity(new DataTableInfo(draw, recordsTotal, recordsFiltered, filteredMediumList)).build(); + } + else { + sql = "SELECT mt.medium FROM MediumText mt ORDER BY " + column + " " + direction; + query = entityManager.createQuery(sql); + if (start != null && start > 0) { + query.setFirstResult(start); + } + if (length != null && length > 0) { + query.setMaxResults(length); + } + mediumList = castList(Medium.class, query.getResultList()); + } + + return Response.ok().entity(new DataTableInfo(draw, recordsTotal, recordsFiltered, mediumList)).build(); + } + + @GET + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Secured + @Path("video/list") + public Response getVideoList(@QueryParam("draw") Integer draw, @QueryParam("start") Integer start, @QueryParam("length") Integer length, @QueryParam("orderby") String orderby, @QueryParam("dir") String direction, @QueryParam("search") String search) { + + // System.out.println("EndpointMedium: getVideoList: draw: "+draw+" start: "+start+" length: "+length+" orderby: "+orderby+" dir: "+direction+" search: "+search); + if (draw == null) { + draw = 0; + } + + // sanitize user input + if (direction != null && direction.equalsIgnoreCase("desc")) { + direction = "DESC"; + } + else { + direction = "ASC"; + } + + String column = "mv.medium.displayTitle.name"; + if (orderby != null) { + if (orderby.equalsIgnoreCase("title")) { + column = "mv.medium.displayTitle.name"; + } + if (orderby.equalsIgnoreCase("duration")) { + column = "mv.length"; + } + // if (orderby.equalsIgnoreCase("producer")) column = ""; + if (orderby.equalsIgnoreCase("releaseDate")) { + column = "mv.medium.releaseDate"; + } + // if (orderby.equalsIgnoreCase("language")) column = ""; + } + + // calculate total # of records + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Query countQuery = entityManager.createQuery("SELECT COUNT(mv.medium) FROM MediumVideo mv"); + long recordsTotal = (long) countQuery.getSingleResult(); + long recordsFiltered = recordsTotal; + + // search + Query query; + String sql; + List<MediumVideo> mediumVideoList = new ArrayList<>(); + List<Medium> mediumList = new ArrayList<>(); + if (search != null && search.length() > 0) { + // find all matching titles + sql = "SELECT DISTINCT mv FROM MediumVideo mv, Medium m, Title t WHERE t IN (m.titles) AND lower(t.name) LIKE lower(concat('%', :search, '%')) AND mv.medium = m ORDER BY " + column + " " + direction; + query = entityManager.createQuery(sql).setParameter("search", search); + mediumVideoList = castList(MediumVideo.class, query.getResultList()); + // find all media belonging to those titles + if (start != null && start > 0) { + query.setFirstResult(start); + } + if (length != null && length > 0) { + query.setMaxResults(length); + } + if (length == -1) { // display all results + length = mediumVideoList.size(); + query.setMaxResults(length); + } + recordsFiltered = mediumVideoList.size(); + for (MediumVideo mediumVideo : mediumVideoList) { + mediumVideo.getMedium().getMediumAnalysisLists().clear(); + mediumList.add(mediumVideo.getMedium()); + } + List<Medium> filteredMediumList = new ArrayList<>(); + int i = start; + int end; + if ((recordsFiltered - start) < length) { + end = (int) recordsFiltered; + } + else { + end = start + length; + } + for (; i < end; i++) { + filteredMediumList.add(mediumList.get(i)); + } + return Response.ok().entity(new DataTableInfo(draw, recordsTotal, recordsFiltered, filteredMediumList)).build(); + } + else { + sql = "SELECT mv.medium FROM MediumVideo mv ORDER BY " + column + " " + direction; + query = entityManager.createQuery(sql); + if (start != null && start > 0) { + query.setFirstResult(start); + } + if (length != null && length > 0) { + query.setMaxResults(length); + } + mediumList = castList(Medium.class, query.getResultList()); + for (Medium medium : mediumList) { + medium.getMediumAnalysisLists().clear(); + } + return Response.ok().entity(new DataTableInfo(draw, recordsTotal, recordsFiltered, mediumList)).build(); + } + } + + @GET + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Secured + @Path("videogame/list") + public Response getVideogameList(@QueryParam("draw") Integer draw, @QueryParam("start") Integer start, @QueryParam("length") Integer length, @QueryParam("orderby") String orderby, @QueryParam("dir") String direction, @QueryParam("search") String search) { + // System.out.println("EndpointMedium: getVideoList: draw: "+draw+" start: "+start+" length: "+length+" orderby: "+orderby+" dir: "+direction+" search: "+search); + + if (draw == null) { + draw = 0; + } + + // sanitize user input + if (direction != null && direction.equalsIgnoreCase("desc")) { + direction = "DESC"; + } + else { + direction = "ASC"; + } + + String column = "mv.medium.displayTitle.name"; + if (orderby != null) { + if (orderby.equalsIgnoreCase("title")) { + column = "mv.medium.displayTitle.name"; + } + // if (orderby.equalsIgnoreCase("producer")) column = ""; + if (orderby.equalsIgnoreCase("releaseDate")) { + column = "mv.medium.releaseDate"; + } + // if (orderby.equalsIgnoreCase("language")) column = ""; + } + + // calculate total # of records + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Query countQuery = TIMAATApp.emf.createEntityManager() + .createQuery("SELECT COUNT(mv.medium) FROM MediumVideogame mv"); + long recordsTotal = (long) countQuery.getSingleResult(); + long recordsFiltered = recordsTotal; + + // search + Query query; + String sql; + List<MediumVideogame> mediumVideogameList = new ArrayList<>(); + List<Medium> mediumList = new ArrayList<>(); + if (search != null && search.length() > 0) { + // find all matching titles + sql = "SELECT DISTINCT mv FROM MediumVideogame mv, Medium m, Title t WHERE t IN (m.titles) AND lower(t.name) LIKE lower(concat('%', :search, '%')) AND mv.medium = m ORDER BY " + column + " " + direction; + query = entityManager.createQuery(sql).setParameter("search", search); + mediumVideogameList = castList(MediumVideogame.class, query.getResultList()); + // find all media belonging to those titles + if (start != null && start > 0) { + query.setFirstResult(start); + } + if (length != null && length > 0) { + query.setMaxResults(length); + } + if (length == -1) { // display all results + length = mediumVideogameList.size(); + query.setMaxResults(length); + } + recordsFiltered = mediumVideogameList.size(); + for (MediumVideogame mediumVideogame : mediumVideogameList) { + mediumVideogame.getMedium().getMediumAnalysisLists().clear(); + mediumList.add(mediumVideogame.getMedium()); + } + List<Medium> filteredMediumList = new ArrayList<>(); + int i = start; + int end; + if ((recordsFiltered - start) < length) { + end = (int) recordsFiltered; + } + else { + end = start + length; + } + for (; i < end; i++) { + filteredMediumList.add(mediumList.get(i)); + } + return Response.ok().entity(new DataTableInfo(draw, recordsTotal, recordsFiltered, filteredMediumList)).build(); + } + else { + sql = "SELECT mv.medium FROM MediumVideogame mv ORDER BY " + column + " " + direction; + query = entityManager.createQuery(sql); + if (start != null && start > 0) { + query.setFirstResult(start); + } + if (length != null && length > 0) { + query.setMaxResults(length); + } + mediumList = castList(Medium.class, query.getResultList()); + } + + return Response.ok().entity(new DataTableInfo(draw, recordsTotal, recordsFiltered, mediumList)).build(); + } + + @GET + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Secured + @Path("hasActor/{actorId}/withRoles/selectList") + public Response getRoleSelectList(@PathParam("actorId") int actorId, @QueryParam("search") String search, @QueryParam("page") Integer page, @QueryParam("per_page") Integer per_page, @QueryParam("language") String languageCode) { + // returns list of id and name combinations of all roles of this actor + // System.out.println("EndpointMedium: getRoleSelectList for actor id: "+ actorId); + // System.out.println("EndpointMedium: getRoleSelectList - search string: "+ search); + + if (languageCode == null) { + languageCode = "default"; // as long as multi-language is not implemented yet, use the 'default' language entry + } + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Actor actor = entityManager.find(Actor.class, actorId); + if (actor == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + List<Role> roleList = actor.getRoles(); + List<SelectElement> roleSelectList = new ArrayList<>(); + for (Role role : roleList) { + if (search != null && search.length() > 0) { + if (role.getRoleTranslations().get(0).getName().toLowerCase().contains(search.toLowerCase())) { + roleSelectList.add(new SelectElement<Integer>(role.getId(), role.getRoleTranslations().get(0).getName())); + } + } + else { + roleSelectList.add(new SelectElement<Integer>(role.getId(), role.getRoleTranslations().get(0).getName())); + } + } + return Response.ok().entity(roleSelectList).build(); + } + + @GET + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Secured + @Path("{mediumId}/hasActorList") + public Response getActorList(@PathParam("mediumId") Integer mediumId) { + // System.out.println("EndpointMedium: getActorList"); + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Medium medium = entityManager.find(Medium.class, mediumId); + List<MediumHasActorWithRole> mediumHasActorWithRoleList = medium.getMediumHasActorWithRoles(); + List<Actor> actorList = new ArrayList<>(); + for (MediumHasActorWithRole mediumHasActorWithRole : mediumHasActorWithRoleList) { + if (!actorList.contains(mediumHasActorWithRole.getActor())) { + actorList.add(mediumHasActorWithRole.getActor()); + } + } + return Response.ok().entity(actorList).build(); + } + + @GET + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Secured + @Path("{mediumId}/hasActor/{actorId}/withRoleList") + public Response getActorHasRoleList(@PathParam("mediumId") Integer mediumId, @PathParam("actorId") Integer actorId) { + // System.out.println("EndpointMedium: getActorHasRoleList"); + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + + Medium medium = entityManager.find(Medium.class, mediumId); + List<MediumHasActorWithRole> mediumHasActorWithRoleList = medium.getMediumHasActorWithRoles(); + List<Role> roleList = new ArrayList<>(); + for (MediumHasActorWithRole mediumHasActorWithRole : mediumHasActorWithRoleList) { + if (mediumHasActorWithRole.getActor().getId() == actorId) { + roleList.add(entityManager.find(Role.class, mediumHasActorWithRole.getRole().getId())); + } + } + + return Response.ok().entity(roleList).build(); + } + + @GET + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Secured + @Path("{id}/categorySet/list") + public Response getCategorySetList(@PathParam("id") Integer id) { + // System.out.println("EndpointMedium: getCategorySetList - ID: "+ id); + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Medium medium = entityManager.find(Medium.class, id); + List<CategorySet> categorySetList = medium.getCategorySets(); + + return Response.ok().entity(categorySetList).build(); + } + + @GET + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Secured + @Path("{id}/category/list") + public Response getSelectedCategories(@PathParam("id") Integer id) { + // System.out.println("EndpointMedium: getSelectedCategories - Id: "+ id); + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Medium medium = entityManager.find(Medium.class, id); + List<Category> categoryList = medium.getCategories(); + return Response.ok().entity(categoryList).build(); + } + + @GET + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Secured + @Path("{id}/category/selectList") + public Response getCategorySelectList(@PathParam("id") Integer id, @QueryParam("start") Integer start, @QueryParam("length") Integer length, @QueryParam("orderby") String orderby, @QueryParam("dir") String direction, @QueryParam("search") String search) { + // System.out.println("EndpointMedium: getCategorySelectList - Id: "+ id); + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Medium medium = entityManager.find(Medium.class, id); + List<CategorySet> categorySetList = medium.getCategorySets(); + List<Category> categoryList = new ArrayList<>(); + List<SelectElement> categorySelectList = new ArrayList<>(); + + for (CategorySet categorySet : categorySetList) { + Set<CategorySetHasCategory> cshc = categorySet.getCategorySetHasCategories(); + Iterator<CategorySetHasCategory> itr = cshc.iterator(); + while (itr.hasNext()) { + categoryList.add(itr.next().getCategory()); + } + } + + // search + Query query; + String sql; + if (search != null && search.length() > 0) { + // find all matching names + sql = "SELECT c FROM Category c WHERE lower(c.name) LIKE lower(concat('%', :name,'%')) ORDER BY c.name ASC"; + query = entityManager.createQuery(sql).setParameter("name", search); + // find all categories belonging to those names + if (start != null && start > 0) { + query.setFirstResult(start); + } + if (length != null && length > 0) { + query.setMaxResults(length); + } + List<Category> searchCategoryList = castList(Category.class, query.getResultList()); + for (Category category : searchCategoryList) { + if (categoryList.contains(category)) { + categorySelectList.add(new SelectElement<Integer>(category.getId(), category.getName())); + } + } + } + else { + for (Category category : categoryList) { + categorySelectList.add(new SelectElement<Integer>(category.getId(), category.getName())); + } + } + + return Response.ok().entity(categorySelectList).build(); + } + + @GET + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Secured + @Path("{mediumId}/hasTagList") + public Response getTagList(@PathParam("mediumId") Integer mediumId) { + // System.out.println("EndpointMedium: getTagList"); + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Medium medium = entityManager.find(Medium.class, mediumId); + if (medium == null) { + return Response.status(Status.NOT_FOUND).build(); + } + entityManager.refresh(medium); + return Response.ok().entity(medium.getTags()).build(); + } + + @GET + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Secured + @Path("{id}/titles/list") + public Response getTitlesList(@PathParam("id") int id) { + // Medium medium = TIMAATApp.emf.createEntityManager().find(Medium.class, id); + // if ( medium == null ) return Response.status(Status.NOT_FOUND).build(); + // // List<Title> titleList = TIMAATApp.emf.createEntityManager().createNamedQuery("titleList.findAll").getResultList(); + // // return Response.ok().entity(titleList).build(); + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + + // find medium + Medium medium = entityManager.find(Medium.class, id); + if (medium == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + entityManager.refresh(medium); + + return Response.ok().entity(medium.getTitles()).build(); + } + + @POST + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("{id}") + @Secured + public Response createMedium(@PathParam("id") int id, String jsonData) { + // System.out.println("EndpointMedium: createMedium: " + jsonData); + ObjectMapper mapper = new ObjectMapper(); + Medium newMedium = null; + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + + // parse JSON data + try { + newMedium = mapper.readValue(jsonData, Medium.class); + } catch (IOException e) { + System.out.println("EndpointMedium: createMedium - IOException"); + e.printStackTrace(); + return Response.status(Status.BAD_REQUEST).build(); + } + if (newMedium == null) { + System.out.println("EndpointMedium: createMedium - newMedium == null"); + return Response.status(Status.BAD_REQUEST).build(); + } + // sanitize object data + newMedium.setId(0); + Title displayTitle = entityManager.find(Title.class, newMedium.getDisplayTitle().getId()); + newMedium.setDisplayTitle(displayTitle); + newMedium.setOriginalTitle(displayTitle); + Source source = new Source(); + + // update log metadata + Timestamp creationDate = new Timestamp(System.currentTimeMillis()); + newMedium.setCreatedAt(creationDate); + newMedium.setLastEditedAt(creationDate); + if (containerRequestContext.getProperty("TIMAAT.userID") != null) { + newMedium.setCreatedByUserAccount( + entityManager.find(UserAccount.class, containerRequestContext.getProperty("TIMAAT.userID"))); + newMedium.setLastEditedByUserAccount( + (entityManager.find(UserAccount.class, containerRequestContext.getProperty("TIMAAT.userID")))); + } + else { + // DEBUG do nothing - production system should abort with internal server error + return Response.serverError().build(); + } + + // persist Medium + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.persist(displayTitle); + entityManager.persist(newMedium); + entityManager.flush(); + newMedium.setDisplayTitle(displayTitle); + newMedium.setOriginalTitle(displayTitle); + entityTransaction.commit(); + entityManager.refresh(newMedium); + entityManager.refresh(displayTitle); + + // create medium_has_title-table entry + entityTransaction.begin(); + newMedium.getTitles().add(displayTitle); + displayTitle.getMediums3().add(newMedium); + entityManager.merge(displayTitle); + entityManager.merge(newMedium); + entityManager.persist(displayTitle); + entityManager.persist(newMedium); + entityTransaction.commit(); + entityManager.refresh(newMedium); + entityManager.refresh(displayTitle); + + // create source entry of medium + entityTransaction.begin(); + newMedium.getSources().add(source); + source.setMedium(newMedium); + entityManager.persist(source); + entityManager.persist(newMedium); + entityTransaction.commit(); + entityManager.refresh(newMedium); + entityManager.refresh(source); + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.MEDIUMCREATED); + return Response.ok().entity(newMedium).build(); + } + + @GET + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Secured + @Path("{id}") + public Response getMedium(@PathParam("id") int id) { + Medium medium = TIMAATApp.emf.createEntityManager().find(Medium.class, id); + if (medium == null) { + return Response.status(Status.NOT_FOUND).build(); + } + return Response.ok().entity(medium).build(); + } + + @GET + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Secured + @Path("{id}/title") + public Response getMediumTitle(@PathParam("id") int id) { + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Medium medium = entityManager.find(Medium.class, id); + if (medium == null) { + return Response.status(Status.NOT_FOUND).build(); + } + return Response.ok().entity(medium.getDisplayTitle()).build(); + } + + @GET + @Produces(jakarta.ws.rs.core.MediaType.TEXT_PLAIN) + @Secured + @Path("{id}/viewToken") + public Response getViewToken(@PathParam("id") int id) { + Medium medium = TIMAATApp.emf.createEntityManager().find(Medium.class, id); + if (medium == null) { + return Response.status(Status.NOT_FOUND).build(); + } + String viewToken = medium.getViewToken(); + return Response.ok().entity(viewToken).build(); + } + + @PATCH + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("{id}") + @Secured + public Response updateMedium(@PathParam("id") int id, String jsonData) { + // System.out.println("EndpointMedium: update medium - jsonData"+ jsonData); + + ObjectMapper mapper = new ObjectMapper(); + Medium updatedMedium = null; + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Medium medium = entityManager.find(Medium.class, id); + + if (medium == null) { + return Response.status(Status.NOT_FOUND).build(); + } + // parse JSON data + try { + updatedMedium = mapper.readValue(jsonData, Medium.class); + } catch (IOException e) { + System.out.println("EndpointMedium: update medium - IOException"); + e.printStackTrace(); + return Response.status(Status.BAD_REQUEST).build(); + } + if (updatedMedium == null) { + return Response.notModified().build(); + } + + // update medium + //! Don't change media type. MediumSubtype won't match anymore + if (updatedMedium.getReleaseDate() != null) { + medium.setReleaseDate(updatedMedium.getReleaseDate()); + } + medium.setRecordingStartDate(updatedMedium.getRecordingStartDate()); + medium.setRecordingEndDate(updatedMedium.getRecordingEndDate()); + if (updatedMedium.getRemark() != null) { + medium.setRemark(updatedMedium.getRemark()); + } + if (updatedMedium.getCopyright() != null) { + medium.setCopyright(updatedMedium.getCopyright()); + } + if (updatedMedium.getDisplayTitle() != null) { + medium.setDisplayTitle(updatedMedium.getDisplayTitle()); + } + medium.setMusic(updatedMedium.getMusic()); + medium.setOriginalTitle(updatedMedium.getOriginalTitle()); // originalTitle can be set to null + List<CategorySet> oldCategorySets = medium.getCategorySets(); + medium.setCategorySets(updatedMedium.getCategorySets()); + List<Category> oldCategories = medium.getCategories(); + medium.setCategories(updatedMedium.getCategories()); + List<Tag> oldTags = medium.getTags(); + medium.setTags(updatedMedium.getTags()); + + // update log metadata + medium.setLastEditedAt(new Timestamp(System.currentTimeMillis())); + if (containerRequestContext.getProperty("TIMAAT.userID") != null) { + medium.setLastEditedByUserAccount( + (entityManager.find(UserAccount.class, containerRequestContext.getProperty("TIMAAT.userID")))); + } + else { + // DEBUG do nothing - production system should abort with internal server error + } + + //* time inconsistency check print out + // System.out.println(medium.getCreatedAt()); + // System.out.println(medium.getLastEditedAt()); + + // persist medium + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.merge(medium); + entityManager.persist(medium); + entityTransaction.commit(); + entityManager.refresh(medium); + for (CategorySet categorySet : medium.getCategorySets()) { + entityManager.refresh(categorySet); + } + for (CategorySet categorySet : oldCategorySets) { + entityManager.refresh(categorySet); + } + for (Category category : medium.getCategories()) { + entityManager.refresh(category); + } + for (Category category : oldCategories) { + entityManager.refresh(category); + } + for (Tag tag : medium.getTags()) { + entityManager.refresh(tag); + } + for (Tag tag : oldTags) { + entityManager.refresh(tag); + } + + //* time inconsistency check print out + // System.out.println("after"); + // System.out.println(medium.getCreatedAt()); + // System.out.println(medium.getLastEditedAt()); + + // if ( medium.getMediumVideo() != null ) { + // medium.getFileStatus(medium.getMediaType().getMediaTypeTranslations().get(0).getType()); + // TODO necessary? + medium.getFileStatus(); + medium.getViewToken(); + // } + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.MEDIUMEDITED); + return Response.ok().entity(medium).build(); + } + + @DELETE + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("{id}") + @Secured + public Response deleteMedium(@PathParam("id") int id) { + // System.out.println("EndpointMedium: deleteMedium"); + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Medium medium = entityManager.find(Medium.class, id); + + if (medium == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + // for (Title title:medium.getTitles()) { + // medium.getTitles().remove(title); + // } + entityManager.remove(medium.getDisplayTitle()); + entityManager.remove(medium); + entityTransaction.commit(); + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.MEDIUMDELETED); + return Response.ok().build(); + } + + @POST + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("audio/{id}") + @Secured + public Response createAudio(@PathParam("id") int id, String jsonData) { + + // System.out.println("EndpointMedium: createAudio jsonData: "+jsonData); + ObjectMapper mapper = new ObjectMapper(); + MediumAudio newAudio = null; + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + + // parse JSON data + try { + newAudio = mapper.readValue(jsonData, MediumAudio.class); + } catch (IOException e) { + System.out.println("EndpointMedium: createAudio: IOException e !"); + e.printStackTrace(); + return Response.status(Status.BAD_REQUEST).build(); + } + if (newAudio == null) { + System.out.println("EndpointMedium: createAudio: newAudio == null !"); + return Response.status(Status.BAD_REQUEST).build(); + } + + // sanitize object data + // AudioPostProduction audioPostProduction = new AudioPostProduction(); + + // update log metadata + // Not necessary, a audio will always be created in conjunction with a medium + + // persist audio + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.persist(newAudio); + entityManager.flush(); + entityTransaction.commit(); + entityManager.refresh(newAudio); + entityManager.refresh(newAudio.getMedium()); + + // add log entry + UserLogManager.getLogger().addLogEntry(newAudio.getMedium().getCreatedByUserAccount().getId(), + UserLogManager.LogEvents.AUDIOCREATED); + return Response.ok().entity(newAudio).build(); + } + + @PATCH + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("audio/{id}") + @Secured + public Response updateAudio(@PathParam("id") int id, String jsonData) { + + // System.out.println("EndpointMedium: update audio - jsonData: " + jsonData); + ObjectMapper mapper = new ObjectMapper(); + MediumAudio updatedAudio = null; + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + MediumAudio audio = entityManager.find(MediumAudio.class, id); + + if (audio == null) { + return Response.status(Status.NOT_FOUND).build(); + } + // parse JSON data + try { + updatedAudio = mapper.readValue(jsonData, MediumAudio.class); + } catch (IOException e) { + return Response.status(Status.BAD_REQUEST).build(); + } + if (updatedAudio == null) { + return Response.notModified().build(); + } + + // update audio + if (updatedAudio.getLength() > 0) { + audio.setLength(updatedAudio.getLength()); + } + + // update log metadata + audio.getMedium().setLastEditedAt(new Timestamp(System.currentTimeMillis())); + if (containerRequestContext.getProperty("TIMAAT.userID") != null) { + audio.getMedium().setLastEditedByUserAccount( + (entityManager.find(UserAccount.class, containerRequestContext.getProperty("TIMAAT.userID")))); + } + else { + // DEBUG do nothing - production system should abort with internal server error + } + + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.merge(audio); + entityManager.persist(audio); + entityTransaction.commit(); + entityManager.refresh(audio); + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.AUDIOEDITED); + return Response.ok().entity(audio).build(); + } + + @DELETE + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("audio/{id}") + @Secured + public Response deleteAudio(@PathParam("id") int id) { + // System.out.println("EndpointMedium: deleteAudio with id: "+ id); + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Medium medium = entityManager.find(Medium.class, id); + if (medium == null) { + return Response.status(Status.NOT_FOUND).build(); + } + MediumAudio audio = entityManager.find(MediumAudio.class, id); + if (audio == null) { + return Response.status(Status.NOT_FOUND).build(); + } + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.remove(audio); + entityManager.remove(audio.getMedium().getDisplayTitle()); + entityManager.remove(audio.getMedium()); // remove audio, then corresponding medium + entityTransaction.commit(); + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.AUDIODELETED); + return Response.ok().build(); + } + + @POST + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("document/{id}") + @Secured + public Response createDocument(@PathParam("id") int id, String jsonData) { + // System.out.println("EndpointMedium: createDocument jsonData: "+jsonData); + ObjectMapper mapper = new ObjectMapper(); + MediumDocument newDocument = null; + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + // parse JSON data + try { + newDocument = mapper.readValue(jsonData, MediumDocument.class); + } catch (IOException e) { + System.out.println("EndpointMedium: createDocument: IOException e !"); + e.printStackTrace(); + return Response.status(Status.BAD_REQUEST).build(); + } + if (newDocument == null) { + System.out.println("EndpointMedium: createDocument: newDocument == null !"); + return Response.status(Status.BAD_REQUEST).build(); + } + // sanitize object data + // update log metadata + // Not necessary, a document will always be created in conjunction with a medium + // persist document + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.persist(newDocument); + entityManager.flush(); + entityTransaction.commit(); + entityManager.refresh(newDocument); + entityManager.refresh(newDocument.getMedium()); + + // add log entry + UserLogManager.getLogger().addLogEntry(newDocument.getMedium().getCreatedByUserAccount().getId(), + UserLogManager.LogEvents.DOCUMENTCREATED); + return Response.ok().entity(newDocument).build(); + } + + @PATCH + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("document/{id}") + @Secured + public Response updateDocument(@PathParam("id") int id, String jsonData) { + // System.out.println("EndpointMedium: update document - jsonData: " + jsonData); + ObjectMapper mapper = new ObjectMapper(); + MediumDocument updatedDocument = null; + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + MediumDocument document = entityManager.find(MediumDocument.class, id); + if (document == null) { + return Response.status(Status.NOT_FOUND).build(); + } + // parse JSON data + try { + updatedDocument = mapper.readValue(jsonData, MediumDocument.class); + } catch (IOException e) { + return Response.status(Status.BAD_REQUEST).build(); + } + if (updatedDocument == null) { + return Response.notModified().build(); + } + // update document + // no data to update at the moment + // update log metadata + document.getMedium().setLastEditedAt(new Timestamp(System.currentTimeMillis())); + if (containerRequestContext.getProperty("TIMAAT.userID") != null) { + document.getMedium().setLastEditedByUserAccount( + (entityManager.find(UserAccount.class, containerRequestContext.getProperty("TIMAAT.userID")))); + } + else { + // DEBUG do nothing - production system should abort with internal server error + } + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.merge(document); + entityManager.persist(document); + entityTransaction.commit(); + entityManager.refresh(document); + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.DOCUMENTEDITED); + return Response.ok().entity(document).build(); + } + + @DELETE + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("document/{id}") + @Secured + public Response deleteDocument(@PathParam("id") int id) { + // System.out.println("EndpointMedium: deleteDocument with id: "+ id); + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Medium medium = entityManager.find(Medium.class, id); + if (medium == null) { + return Response.status(Status.NOT_FOUND).build(); + } + MediumDocument document = entityManager.find(MediumDocument.class, id); + if (document == null) { + return Response.status(Status.NOT_FOUND).build(); + } + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.remove(document); + entityManager.remove(document.getMedium().getDisplayTitle()); + entityManager.remove(document.getMedium()); // remove document, then corresponding medium + entityTransaction.commit(); + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.DOCUMENTDELETED); + return Response.ok().build(); + } + + @POST + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("image/{id}") + @Secured + public Response createImage(@PathParam("id") int id, String jsonData) { + // System.out.println("EndpointMedium: createImage jsonData: "+jsonData); + ObjectMapper mapper = new ObjectMapper(); + MediumImage newImage = null; + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + // parse JSON data + try { + newImage = mapper.readValue(jsonData, MediumImage.class); + } catch (IOException e) { + System.out.println("EndpointMedium: createImage: IOException e !"); + e.printStackTrace(); + return Response.status(Status.BAD_REQUEST).build(); + } + if (newImage == null) { + System.out.println("EndpointMedium: createImage: newImage == null !"); + return Response.status(Status.BAD_REQUEST).build(); + } + // sanitize object data + // update log metadata + // Not necessary, an image will always be created in conjunction with a medium + // persist image + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.persist(newImage); + entityManager.flush(); + entityTransaction.commit(); + entityManager.refresh(newImage); + entityManager.refresh(newImage.getMedium()); + + // add log entry + UserLogManager.getLogger().addLogEntry(newImage.getMedium().getCreatedByUserAccount().getId(), + UserLogManager.LogEvents.IMAGECREATED); + return Response.ok().entity(newImage).build(); + } + + @PATCH + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("image/{id}") + @Secured + public Response updateImage(@PathParam("id") int id, String jsonData) { + // System.out.println("EndpointMedium: update image - jsonData: " + jsonData); + ObjectMapper mapper = new ObjectMapper(); + MediumImage updatedImage = null; + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + MediumImage image = entityManager.find(MediumImage.class, id); + if (image == null) { + return Response.status(Status.NOT_FOUND).build(); + } + // parse JSON data + try { + updatedImage = mapper.readValue(jsonData, MediumImage.class); + } catch (IOException e) { + return Response.status(Status.BAD_REQUEST).build(); + } + if (updatedImage == null) { + return Response.notModified().build(); + } + + // update image + if (updatedImage.getWidth() > 0) { + image.setWidth(updatedImage.getWidth()); + } + if (updatedImage.getHeight() > 0) { + image.setHeight(updatedImage.getHeight()); + } + if (updatedImage.getBitDepth() != null) { + image.setBitDepth(updatedImage.getBitDepth()); + } + // update log metadata + image.getMedium().setLastEditedAt(new Timestamp(System.currentTimeMillis())); + if (containerRequestContext.getProperty("TIMAAT.userID") != null) { + image.getMedium().setLastEditedByUserAccount( + (entityManager.find(UserAccount.class, containerRequestContext.getProperty("TIMAAT.userID")))); + } + else { + // DEBUG do nothing - production system should abort with internal server error + } + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.merge(image); + entityManager.persist(image); + entityTransaction.commit(); + entityManager.refresh(image); + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.IMAGEEDITED); + return Response.ok().entity(image).build(); + } + + @DELETE + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("image/{id}") + @Secured + public Response deleteImage(@PathParam("id") int id) { + // System.out.println("EndpointMedium: deleteImage with id: "+ id); + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Medium medium = entityManager.find(Medium.class, id); + if (medium == null) { + return Response.status(Status.NOT_FOUND).build(); + } + MediumImage image = entityManager.find(MediumImage.class, id); + if (image == null) { + return Response.status(Status.NOT_FOUND).build(); + } + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.remove(image); + entityManager.remove(image.getMedium().getDisplayTitle()); + entityManager.remove(image.getMedium()); // remove image, then corresponding medium + entityTransaction.commit(); + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.IMAGEDELETED); + return Response.ok().build(); + } + + @POST + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("software/{id}") + @Secured + public Response createSoftware(@PathParam("id") int id, String jsonData) { + // System.out.println("EndpointMedium: createSoftware jsonData: "+jsonData); + ObjectMapper mapper = new ObjectMapper(); + MediumSoftware newSoftware = null; + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + // parse JSON data + try { + newSoftware = mapper.readValue(jsonData, MediumSoftware.class); + } catch (IOException e) { + System.out.println("EndpointMedium: createSoftware: IOException e !"); + e.printStackTrace(); + return Response.status(Status.BAD_REQUEST).build(); + } + if (newSoftware == null) { + System.out.println("EndpointMedium: createSoftware: newSoftware == null !"); + return Response.status(Status.BAD_REQUEST).build(); + } + // sanitize object data + // update log metadata + // Not necessary, a software will always be created in conjunction with a medium + // persist software + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.persist(newSoftware); + entityManager.flush(); + entityTransaction.commit(); + entityManager.refresh(newSoftware); + entityManager.refresh(newSoftware.getMedium()); + + // add log entry + UserLogManager.getLogger().addLogEntry(newSoftware.getMedium().getCreatedByUserAccount().getId(), + UserLogManager.LogEvents.SOFTWARECREATED); + return Response.ok().entity(newSoftware).build(); + } + + @PATCH + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("software/{id}") + @Secured + public Response updateSoftware(@PathParam("id") int id, String jsonData) { + // System.out.println("EndpointMedium: update software - jsonData: " + jsonData); + ObjectMapper mapper = new ObjectMapper(); + MediumSoftware updatedSoftware = null; + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + MediumSoftware software = entityManager.find(MediumSoftware.class, id); + if (software == null) { + return Response.status(Status.NOT_FOUND).build(); + } + // parse JSON data + try { + updatedSoftware = mapper.readValue(jsonData, MediumSoftware.class); + } catch (IOException e) { + return Response.status(Status.BAD_REQUEST).build(); + } + if (updatedSoftware == null) { + return Response.notModified().build(); + } + + // update software + if (updatedSoftware.getVersion() != null) { + software.setVersion(updatedSoftware.getVersion()); + } + + // update log metadata + software.getMedium().setLastEditedAt(new Timestamp(System.currentTimeMillis())); + if (containerRequestContext.getProperty("TIMAAT.userID") != null) { + software.getMedium().setLastEditedByUserAccount( + (entityManager.find(UserAccount.class, containerRequestContext.getProperty("TIMAAT.userID")))); + } + else { + // DEBUG do nothing - production system should abort with internal server error + } + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.merge(software); + entityManager.persist(software); + entityTransaction.commit(); + entityManager.refresh(software); + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.SOFTWAREEDITED); + return Response.ok().entity(software).build(); + } + + @DELETE + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("software/{id}") + @Secured + public Response deleteSoftware(@PathParam("id") int id) { + // System.out.println("EndpointMedium: deleteSoftware with id: "+ id); + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Medium medium = entityManager.find(Medium.class, id); + if (medium == null) { + return Response.status(Status.NOT_FOUND).build(); + } + MediumSoftware software = entityManager.find(MediumSoftware.class, id); + if (software == null) { + return Response.status(Status.NOT_FOUND).build(); + } + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.remove(software); + entityManager.remove(software.getMedium().getDisplayTitle()); + entityManager.remove(software.getMedium()); // remove software, then corresponding medium + entityTransaction.commit(); + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.SOFTWAREDELETED); + return Response.ok().build(); + } + + @POST + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("text/{id}") + @Secured + public Response createText(@PathParam("id") int id, String jsonData) { + // System.out.println("EndpointMedium: createText jsonData: "+jsonData); + ObjectMapper mapper = new ObjectMapper(); + MediumText newText = null; + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + // parse JSON data + try { + newText = mapper.readValue(jsonData, MediumText.class); + } catch (IOException e) { + System.out.println("EndpointMedium: createText: IOException e !"); + e.printStackTrace(); + return Response.status(Status.BAD_REQUEST).build(); + } + if (newText == null) { + System.out.println("EndpointMedium: createText: newText == null !"); + return Response.status(Status.BAD_REQUEST).build(); + } + // sanitize object data + // update log metadata + // Not necessary, a text will always be created in conjunction with a medium + + // persist text + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.persist(newText); + entityManager.flush(); + entityTransaction.commit(); + entityManager.refresh(newText); + entityManager.refresh(newText.getMedium()); + + // add log entry + UserLogManager.getLogger().addLogEntry(newText.getMedium().getCreatedByUserAccount().getId(), + UserLogManager.LogEvents.TEXTCREATED); + return Response.ok().entity(newText).build(); + } + + @PATCH + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("text/{id}") + @Secured + public Response updateText(@PathParam("id") int id, String jsonData) { + // System.out.println("EndpointMedium: update text - jsonData: " + jsonData); + ObjectMapper mapper = new ObjectMapper(); + MediumText updatedText = null; + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + MediumText text = entityManager.find(MediumText.class, id); + if (text == null) { + return Response.status(Status.NOT_FOUND).build(); + } + // parse JSON data + try { + updatedText = mapper.readValue(jsonData, MediumText.class); + } catch (IOException e) { + return Response.status(Status.BAD_REQUEST).build(); + } + if (updatedText == null) { + return Response.notModified().build(); + } + + // update text + if (updatedText.getContent() != null) { + text.setContent(updatedText.getContent()); + } + + // update log metadata + text.getMedium().setLastEditedAt(new Timestamp(System.currentTimeMillis())); + if (containerRequestContext.getProperty("TIMAAT.userID") != null) { + text.getMedium().setLastEditedByUserAccount( + (entityManager.find(UserAccount.class, containerRequestContext.getProperty("TIMAAT.userID")))); + } + else { + // DEBUG do nothing - production system should abort with internal server error + } + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.merge(text); + entityManager.persist(text); + entityTransaction.commit(); + entityManager.refresh(text); + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.TEXTEDITED); + return Response.ok().entity(text).build(); + } + + @DELETE + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("text/{id}") + @Secured + public Response deleteText(@PathParam("id") int id) { + // System.out.println("EndpointMedium: deleteText with id: "+ id); + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Medium medium = entityManager.find(Medium.class, id); + if (medium == null) { + return Response.status(Status.NOT_FOUND).build(); + } + MediumText text = entityManager.find(MediumText.class, id); + if (text == null) { + return Response.status(Status.NOT_FOUND).build(); + } + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.remove(text); + entityManager.remove(text.getMedium().getDisplayTitle()); + entityManager.remove(text.getMedium()); // remove text, then corresponding medium + entityTransaction.commit(); + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.TEXTDELETED); + return Response.ok().build(); + } + + @POST + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("video/{id}") + @Secured + public Response createVideo(@PathParam("id") int id, String jsonData) { + + // System.out.println("EndpointMedium: createVideo jsonData: "+jsonData); + ObjectMapper mapper = new ObjectMapper(); + MediumVideo newVideo = null; + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + + // parse JSON data + try { + newVideo = mapper.readValue(jsonData, MediumVideo.class); + } catch (IOException e) { + System.out.println("EndpointMedium: createVideo: IOException e !"); + e.printStackTrace(); + return Response.status(Status.BAD_REQUEST).build(); + } + if (newVideo == null) { + System.out.println("EndpointMedium: createVideo: newVideo == null !"); + return Response.status(Status.BAD_REQUEST).build(); + } + + // sanitize object data + + // update log metadata + // Not necessary, a video will always be created in conjunction with a medium + + // persist video + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.persist(newVideo); + entityManager.flush(); + entityTransaction.commit(); + entityManager.refresh(newVideo); + entityManager.refresh(newVideo.getMedium()); + + // add log entry + UserLogManager.getLogger().addLogEntry(newVideo.getMedium().getCreatedByUserAccount().getId(), + UserLogManager.LogEvents.VIDEOCREATED); + + return Response.ok().entity(newVideo).build(); + + } + + @PATCH + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("video/{id}") + @Secured + public Response updateVideo(@PathParam("id") int id, String jsonData) { + + // System.out.println("EndpointMedium: update video - jsonData: " + jsonData); + ObjectMapper mapper = new ObjectMapper(); + MediumVideo updatedVideo = null; + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + MediumVideo video = entityManager.find(MediumVideo.class, id); + + if (video == null) { + return Response.status(Status.NOT_FOUND).build(); + } + // parse JSON data + try { + updatedVideo = mapper.readValue(jsonData, MediumVideo.class); + } catch (IOException e) { + System.out.println("EndpointMedium: update video - IOException: " + e.getMessage()); + return Response.status(Status.BAD_REQUEST).build(); + } + if (updatedVideo == null) { + return Response.notModified().build(); + } + + // update video + if (updatedVideo.getLength() > 0) { + video.setLength(updatedVideo.getLength()); + } + if (updatedVideo.getVideoCodec() != null) { + video.setVideoCodec(updatedVideo.getVideoCodec()); + } + if (updatedVideo.getWidth() > 0) { + video.setWidth(updatedVideo.getWidth()); + } + if (updatedVideo.getHeight() > 0) { + video.setHeight(updatedVideo.getHeight()); + } + if (updatedVideo.getFrameRate() > 0) { + video.setFrameRate(updatedVideo.getFrameRate()); + } + if (updatedVideo.getDataRate() > 0) { + video.setDataRate(updatedVideo.getDataRate()); + } + if (updatedVideo.getTotalBitrate() > 0) { + video.setTotalBitrate(updatedVideo.getTotalBitrate()); + } + if (updatedVideo.getIsEpisode() != null) { + video.setIsEpisode(updatedVideo.getIsEpisode()); + } + + // update log metadata + video.getMedium().setLastEditedAt(new Timestamp(System.currentTimeMillis())); + if (containerRequestContext.getProperty("TIMAAT.userID") != null) { + video.getMedium().setLastEditedByUserAccount( + (entityManager.find(UserAccount.class, containerRequestContext.getProperty("TIMAAT.userID")))); + } + else { + // DEBUG do nothing - production system should abort with internal server error + } + + // persist video + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.merge(video); + entityManager.persist(video); + entityTransaction.commit(); + entityManager.refresh(video); + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.VIDEOEDITED); + + // TODO necessary? + // video.getMedium().getFileStatus("video"); + // video.getMedium().getViewToken(); + + return Response.ok().entity(video).build(); + + } + + @DELETE + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("video/{id}") + @Secured + public Response deleteVideo(@PathParam("id") int id) { + + // System.out.println("EndpointMedium: deleteVideo with id: "+ id); + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Medium medium = entityManager.find(Medium.class, id); + if (medium == null) { + return Response.status(Status.NOT_FOUND).build(); + } + MediumVideo video = entityManager.find(MediumVideo.class, id); + if (video == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + // persist video + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.remove(video); + entityManager.remove(video.getMedium().getDisplayTitle()); + entityManager.remove(video.getMedium()); // remove video, then corresponding medium + entityTransaction.commit(); + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.VIDEODELETED); + + return Response.ok().build(); + } + + @POST + @Produces("image/png") + @Path("video/{id}/thumbnail") + @Secured + public Response updateMediumVideoThumbnail(@PathParam("id") int id, @Valid UpdateMediumVideoThumbnailPayload updateMediumVideoThumbnailPayload) throws IOException, VideoEngineException { + java.nio.file.Path thumbnailPath = createVideoThumbnail(id, + updateMediumVideoThumbnailPayload.getThumbnailPositionMs()); + return Response.ok().entity(thumbnailPath.toFile()).build(); + } + + @POST + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("videogame/{id}") + @Secured + public Response createVideogame(@PathParam("id") int id, String jsonData) { + // System.out.println("EndpointMedium: createVideogame jsonData: "+jsonData); + ObjectMapper mapper = new ObjectMapper(); + MediumVideogame newVideogame = null; + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + // parse JSON data + try { + newVideogame = mapper.readValue(jsonData, MediumVideogame.class); + } catch (IOException e) { + System.out.println("EndpointMedium: createVideogame: IOException e !"); + e.printStackTrace(); + return Response.status(Status.BAD_REQUEST).build(); + } + if (newVideogame == null) { + System.out.println("EndpointMedium: createVideogame: newVideogame == null !"); + return Response.status(Status.BAD_REQUEST).build(); + } + // sanitize object data + // update log metadata + // Not necessary, a videogame will always be created in conjunction with a medium + // persist videogame + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.persist(newVideogame); + entityManager.flush(); + entityTransaction.commit(); + entityManager.refresh(newVideogame); + entityManager.refresh(newVideogame.getMedium()); + + // add log entry + UserLogManager.getLogger().addLogEntry(newVideogame.getMedium().getCreatedByUserAccount().getId(), + UserLogManager.LogEvents.VIDEOGAMECREATED); + return Response.ok().entity(newVideogame).build(); + } + + @PATCH + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("videogame/{id}") + @Secured + public Response updateVideogame(@PathParam("id") int id, String jsonData) { + // System.out.println("EndpointMedium: update videogame - jsonData: " + jsonData); + ObjectMapper mapper = new ObjectMapper(); + MediumVideogame updatedVideogame = null; + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + MediumVideogame videogame = entityManager.find(MediumVideogame.class, id); + if (videogame == null) { + return Response.status(Status.NOT_FOUND).build(); + } + // parse JSON data + try { + updatedVideogame = mapper.readValue(jsonData, MediumVideogame.class); + } catch (IOException e) { + return Response.status(Status.BAD_REQUEST).build(); + } + if (updatedVideogame == null) { + return Response.notModified().build(); + } + + // update videogame + if (updatedVideogame.getIsEpisode() != null) { + videogame.setIsEpisode(updatedVideogame.getIsEpisode()); + } + + // update log metadata + videogame.getMedium().setLastEditedAt(new Timestamp(System.currentTimeMillis())); + if (containerRequestContext.getProperty("TIMAAT.userID") != null) { + videogame.getMedium().setLastEditedByUserAccount( + (entityManager.find(UserAccount.class, containerRequestContext.getProperty("TIMAAT.userID")))); + } + else { + // DEBUG do nothing - production system should abort with internal server error + } + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.merge(videogame); + entityManager.persist(videogame); + entityTransaction.commit(); + entityManager.refresh(videogame); + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.VIDEOGAMEEDITED); + return Response.ok().entity(videogame).build(); + } + + @DELETE + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("videogame/{id}") + @Secured + public Response deleteVideogame(@PathParam("id") int id) { + // System.out.println("EndpointMedium: deleteVideogame with id: "+ id); + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Medium medium = entityManager.find(Medium.class, id); + if (medium == null) { + return Response.status(Status.NOT_FOUND).build(); + } + MediumVideogame videogame = entityManager.find(MediumVideogame.class, id); + if (videogame == null) { + return Response.status(Status.NOT_FOUND).build(); + } + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.remove(videogame); + entityManager.remove(videogame.getMedium().getDisplayTitle()); + entityManager.remove(videogame.getMedium()); // remove videogame, then corresponding medium + entityTransaction.commit(); + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.VIDEOGAMEDELETED); + return Response.ok().build(); + } + + @POST + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("title/{id}") + @Secured + public Response createTitle(@PathParam("id") int id, String jsonData) { + + // System.out.println("EndpointMedium: createTitle: jsonData: "+jsonData); + ObjectMapper mapper = new ObjectMapper(); + Title newTitle = null; + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + + // parse JSON data + try { + newTitle = mapper.readValue(jsonData, Title.class); + } catch (IOException e) { + System.out.println("EndpointMedium: createTitle: IOException e !"); + e.printStackTrace(); + return Response.status(Status.BAD_REQUEST).build(); + } + if (newTitle == null) { + System.out.println("EndpointMedium: createTitle: newTitle == null !"); + return Response.status(Status.BAD_REQUEST).build(); + } + // sanitize object data + newTitle.setId(0); + Language language = entityManager.find(Language.class, newTitle.getLanguage().getId()); + newTitle.setLanguage(language); + + // update log metadata + // Not necessary, a title will always be created in conjunction with a medium + + // persist title + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.persist(language); + entityManager.persist(newTitle); + entityManager.flush(); + newTitle.setLanguage(language); + entityTransaction.commit(); + entityManager.refresh(newTitle); + entityManager.refresh(language); + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.TITLECREATED); + + return Response.ok().entity(newTitle).build(); + } + + @POST + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("{mediumId}/title/{id}") + @Secured + public Response addTitle(@PathParam("mediumId") int mediumId, @PathParam("id") int id, String jsonData) { + // System.out.println("EndpointMedium: addTitle: jsonData: "+jsonData); + + ObjectMapper mapper = new ObjectMapper(); + Title newTitle = null; + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + + // parse JSON data + try { + newTitle = mapper.readValue(jsonData, Title.class); + } catch (IOException e) { + System.out.println("EndpointMedium: addTitle: IOException e !"); + e.printStackTrace(); + return Response.status(Status.BAD_REQUEST).build(); + } + if (newTitle == null) { + System.out.println("EndpointMedium: addTitle: newTitle == null !"); + return Response.status(Status.BAD_REQUEST).build(); + } + // sanitize object data + newTitle.setId(0); + + Language language = entityManager.find(Language.class, newTitle.getLanguage().getId()); + newTitle.setLanguage(language); + + Medium medium = entityManager.find(Medium.class, mediumId); + + // update log metadata + // Not necessary, a title will always be created in conjunction with a medium + + // persist title + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.persist(language); + entityManager.persist(newTitle); + entityManager.flush(); + newTitle.setLanguage(language); //! TODO already set above + entityTransaction.commit(); + entityManager.refresh(newTitle); + entityManager.refresh(language); + + // create medium_has_title-table entries + entityTransaction.begin(); + medium.getTitles().add(newTitle); + newTitle.getMediums3().add(medium); + entityManager.merge(newTitle); + entityManager.merge(medium); + entityManager.persist(newTitle); + entityManager.persist(medium); + entityTransaction.commit(); + entityManager.refresh(medium); + entityManager.refresh(newTitle); + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.TITLECREATED); + + return Response.ok().entity(newTitle).build(); + } + + @PATCH + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("title/{id}") + @Secured + public Response updateTitle(@PathParam("id") int id, String jsonData) { + // System.out.println("EndpointMedium: UPDATE TITLE - jsonData: " + jsonData); + ObjectMapper mapper = new ObjectMapper(); + Title updatedTitle = null; + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Title title = entityManager.find(Title.class, id); + if (title == null) { + return Response.status(Status.NOT_FOUND).build(); + } + // parse JSON data + try { + updatedTitle = mapper.readValue(jsonData, Title.class); + } catch (IOException e) { + return Response.status(Status.BAD_REQUEST).build(); + } + if (updatedTitle == null) { + return Response.notModified().build(); + } + // update title + if (updatedTitle.getName() != null) { + title.setName(updatedTitle.getName()); + } + if (updatedTitle.getLanguage() != null) { + title.setLanguage(updatedTitle.getLanguage()); + } + + // update log metadata + // log metadata will be updated with the corresponding medium + // title.getMedium().setLastEditedAt(new Timestamp(System.currentTimeMillis())); + // if ( containerRequestContext.getProperty("TIMAAT.userID") != null ) { + // title.getMedium().setLastEditedByUserAccount((entityManager.find(UserAccount.class, containerRequestContext.getProperty("TIMAAT.userID")))); + // } else { + // // DEBUG do nothing - production system should abort with internal server error + // } + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.merge(title); + entityManager.persist(title); + entityTransaction.commit(); + entityManager.refresh(title); + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.TITLEEDITED); + return Response.ok().entity(title).build(); + } + + @DELETE + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("title/{id}") + @Secured + public Response deleteTitle(@PathParam("id") int id) { + // System.out.println("EndpointMedium: deleteTitle"); + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Title title = entityManager.find(Title.class, id); + if (title == null) { + return Response.status(Status.NOT_FOUND).build(); + } + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.remove(title); + entityTransaction.commit(); + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.TITLEDELETED); + return Response.ok().build(); + } + + @POST + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + // @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("{mediumId}/languageTrack/{languageTypeId}/{languageId}") + @Secured + public Response addMediumHasLanguageItem(@PathParam("mediumId") int mediumId, @PathParam("languageTypeId") int mediumLanguageTypeId, @PathParam("languageId") int languageId) { + // System.out.println("EndpointMedium: addLanguageTrack: "+mediumId+" "+mediumLanguageTypeId+ " "+languageId); + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Language language = entityManager.find(Language.class, languageId); + if (language == null) { + return Response.status(Status.NOT_FOUND).build(); + } + Medium medium = entityManager.find(Medium.class, mediumId); + if (medium == null) { + return Response.status(Status.NOT_FOUND).build(); + } + MediumLanguageType mediumLanguageType = entityManager.find(MediumLanguageType.class, mediumLanguageTypeId); + if (mediumLanguageType == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + MediumHasLanguage mhl = null; + try { + mhl = (MediumHasLanguage) entityManager.createQuery( + "SELECT mhl FROM MediumHasLanguage mhl WHERE mhl.language=:language AND mhl.medium=:medium AND mhl.mediumLanguageType=:mediumLanguageType") + .setParameter("language", language).setParameter("medium", medium) + .setParameter("mediumLanguageType", mediumLanguageType).getSingleResult(); + } catch (Exception e) { + // doesn't matter + } + if (mhl == null) { + mhl = new MediumHasLanguage(); + mhl.setLanguage(language); + mhl.setMedium(medium); + mhl.setMediumLanguageType(mediumLanguageType); + try { + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.persist(mhl); + entityTransaction.commit(); + entityManager.refresh(medium); + entityManager.refresh(mhl); + } catch (Exception e) { + e.printStackTrace(); + return Response.notModified().build(); + } + } + + // add log entry + // UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), UserLogManager.LogEvents.MEDIUMEDITED); + + return Response.ok().entity(mhl).build(); + } + + @PATCH + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("{mediumId}/languageTrack/{languageTypeId}/{languageId}") + @Secured + public Response updateMediumHasLanguageItem(@PathParam("mediumId") int mediumId, @PathParam("languageTypeId") int mediumLanguageTypeId, @PathParam("languageId") int languageId, String jsonData) throws IOException { + + // System.out.println("EndpointMedium: updateLanguageTrack: jsonData: "+jsonData); + ObjectMapper mapper = new ObjectMapper(); + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Language language = entityManager.find(Language.class, languageId); + if (language == null) { + return Response.status(Status.NOT_FOUND).build(); + } + Medium medium = entityManager.find(Medium.class, mediumId); + if (medium == null) { + return Response.status(Status.NOT_FOUND).build(); + } + MediumLanguageType mediumLanguageType = entityManager.find(MediumLanguageType.class, mediumLanguageTypeId); + if (mediumLanguageType == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + JsonNode jsonNode = mapper.readTree(jsonData); + int jsonNodeMedium = jsonNode.get("mediumId").asInt(); + int jsonNodeLanguage = jsonNode.get("languageId").asInt(); + int jsonNodeMediumLanguageType = jsonNode.get("mediumLanguageTypeId").asInt(); + Medium tempMedium = entityManager.find(Medium.class, jsonNodeMedium); + Language tempLanguage = entityManager.find(Language.class, jsonNodeLanguage); + MediumLanguageType tempLanguageType = entityManager.find(MediumLanguageType.class, jsonNodeMediumLanguageType); + MediumHasLanguage mediumHasLanguage = new MediumHasLanguage(); + mediumHasLanguage.setMedium(tempMedium); + mediumHasLanguage.setLanguage(tempLanguage); + mediumHasLanguage.setMediumLanguageType(tempLanguageType); + + // TODO This is a temporary fix until language track form is reworked + // don't update if mediumHasLanguage does already exist + MediumHasLanguage mhlInDB = null; + try { + mhlInDB = (MediumHasLanguage) entityManager.createQuery( + "SELECT mhlInDB FROM MediumHasLanguage mhlInDB WHERE mhlInDB.language=:language AND mhlInDB.medium=:medium AND mhlInDB.mediumLanguageType=:mediumLanguageType") + .setParameter("language", tempLanguage) + .setParameter("medium", tempMedium) + .setParameter("mediumLanguageType", tempLanguageType) + .getSingleResult(); + } catch (Exception e) { + // doesn't matter + } + if (mhlInDB != null) { + // entry already exists, don't add it + return Response.notModified().build(); + } + // END of TODO + + try { + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.createQuery( + "UPDATE MediumHasLanguage mhl SET mhl.language=:language, mhl.mediumLanguageType=:mediumLanguageType WHERE mhl.medium=:medium AND mhl.language=:oldLanguage AND mhl.mediumLanguageType=:oldMediumLanguageType") + .setParameter("language", mediumHasLanguage.getLanguage()) + .setParameter("medium", mediumHasLanguage.getMedium()) + .setParameter("mediumLanguageType", mediumHasLanguage.getMediumLanguageType()) + .setParameter("oldLanguage", language).setParameter("oldMediumLanguageType", mediumLanguageType) + .executeUpdate(); + // entityManager.persist(mhl); + entityTransaction.commit(); + entityManager.refresh(medium); + + } catch (Exception e) { + e.printStackTrace(); + return Response.notModified().build(); + } + + // add log entry + // UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), UserLogManager.LogEvents.MEDIUMEDITED); + + return Response.ok().entity(mediumHasLanguage).build(); + } + + @DELETE + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("{mediumId}/languageTrack/{languageTypeId}/{languageId}") + @Secured + public Response deleteMediumHasLanguageItem(@PathParam("mediumId") int mediumId, @PathParam("languageTypeId") int mediumLanguageTypeId, @PathParam("languageId") int languageId) { + // System.out.println("EndpointMedium: deleteMediumHasLanguageItem"); + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Language language = entityManager.find(Language.class, languageId); + if (language == null) { + return Response.status(Status.NOT_FOUND).build(); + } + Medium medium = entityManager.find(Medium.class, mediumId); + if (medium == null) { + return Response.status(Status.NOT_FOUND).build(); + } + MediumLanguageType mediumLanguageType = entityManager.find(MediumLanguageType.class, mediumLanguageTypeId); + if (mediumLanguageType == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + try { + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.createQuery( + "DELETE FROM MediumHasLanguage mhl WHERE mhl.language=:language AND mhl.medium=:medium AND mhl.mediumLanguageType=:mediumLanguageType") + .setParameter("language", language).setParameter("medium", medium) + .setParameter("mediumLanguageType", mediumLanguageType).executeUpdate(); + entityTransaction.commit(); + entityManager.refresh(medium); + } catch (Exception e) { + e.printStackTrace(); + return Response.notModified().build(); + } + // add log entry + // UserLogManager.getLogger().addLogEntry((int) crc.getProperty("TIMAAT.userID"), UserLogManager.LogEvents.MEDIUMHASLANGUAGEDELETED); + return Response.ok().build(); + } + + @POST + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("{mediumId}/hasActor/{actorId}/withRole/{roleId}") + @Secured + public Response addMediumHasActorWithRoles(@PathParam("mediumId") int mediumId, @PathParam("actorId") int actorId, @PathParam("roleId") int roleId) { + // System.out.println("EndpointMedium: addMediumHasActorWithRoles"); + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Medium medium = entityManager.find(Medium.class, mediumId); + if (medium == null) { + return Response.status(Status.NOT_FOUND).build(); + } + Actor actor = entityManager.find(Actor.class, actorId); + if (actor == null) { + return Response.status(Status.NOT_FOUND).build(); + } + Role role = entityManager.find(Role.class, roleId); + if (role == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + MediumHasActorWithRole mhawr = null; + try { + Query countQuery = entityManager.createQuery( + "SELECT COUNT(mhawr) FROM MediumHasActorWithRole mhawr WHERE mhawr.medium=:medium AND mhawr.actor=:actor AND mhawr.role=:role") + .setParameter("medium", medium).setParameter("actor", actor) + .setParameter("role", role); + long recordsTotal = (long) countQuery.getSingleResult(); + if (recordsTotal == 1) { + mhawr = (MediumHasActorWithRole) entityManager.createQuery( + "SELECT mhawr FROM MediumHasActorWithRole mhawr WHERE mhawr.medium=:medium AND mhawr.actor=:actor AND mhawr.role=:role") + .setParameter("medium", medium).setParameter("actor", actor) + .setParameter("role", role).getSingleResult(); + } + } catch (Exception e) { + e.printStackTrace(); + // doesn't matter + } + if (mhawr == null) { + mhawr = new MediumHasActorWithRole(); + mhawr.setMedium(medium); + mhawr.setActor(actor); + mhawr.setRole(role); + try { + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.persist(mhawr); + entityTransaction.commit(); + entityManager.refresh(medium); + entityManager.refresh(actor); + entityManager.refresh(role); + entityManager.refresh(mhawr); + } catch (Exception e) { + e.printStackTrace(); + return Response.notModified().build(); + } + } + + // add log entry + // UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), UserLogManager.LogEvents.MEDIUMEDITED); + + return Response.ok().entity(mhawr).build(); + } + + @DELETE + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("{mediumId}/hasActor/{actorId}") + @Secured + public Response deleteActorFromMediumHasActorWithRoles(@PathParam("mediumId") int mediumId, @PathParam("actorId") int actorId) { + // System.out.println("EndpointMedium: deleteMediumHasActorWithRolesItem"); + // deletes all entries of medium-actor matches + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Medium medium = entityManager.find(Medium.class, mediumId); + if (medium == null) { + return Response.status(Status.NOT_FOUND).build(); + } + Actor actor = entityManager.find(Actor.class, actorId); + if (actor == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + try { + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.createQuery( + "DELETE FROM MediumHasActorWithRole mhawr WHERE mhawr.medium=:medium AND mhawr.actor=:actor") + .setParameter("medium", medium).setParameter("actor", actor).executeUpdate(); + entityTransaction.commit(); + entityManager.refresh(medium); + // entityManager.refresh(actor); + } catch (Exception e) { + e.printStackTrace(); + return Response.notModified().build(); + } + + return Response.ok().build(); + } + + @DELETE + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("{mediumId}/hasActor/{actorId}/withRole/{roleId}") + @Secured + public Response deleteRoleFromMediumHasActorWithRoles(@PathParam("mediumId") int mediumId, @PathParam("actorId") int actorId, @PathParam("roleId") int roleId) { + // System.out.println("EndpointMedium: deleteMediumHasActorWithRolesItem"); + // deletes all entries of medium-actor matches + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Medium medium = entityManager.find(Medium.class, mediumId); + if (medium == null) { + return Response.status(Status.NOT_FOUND).build(); + } + Actor actor = entityManager.find(Actor.class, actorId); + if (actor == null) { + return Response.status(Status.NOT_FOUND).build(); + } + Role role = entityManager.find(Role.class, roleId); + if (role == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + try { + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.createQuery( + "DELETE FROM MediumHasActorWithRole mhawr WHERE mhawr.medium=:medium AND mhawr.actor=:actor AND mhawr.role=:role") + .setParameter("medium", medium).setParameter("actor", actor).setParameter("role", role) + .executeUpdate(); + entityTransaction.commit(); + entityManager.refresh(medium); + // entityManager.refresh(actor); + // entityManager.refresh(role); + } catch (Exception e) { + e.printStackTrace(); + return Response.notModified().build(); + } + + return Response.ok().build(); + } + + // Currently not in use + @POST + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("source/{id}") + @Secured + public Response createSource(@PathParam("id") int id, String jsonData) { + + // System.out.println("EndpointMedium: createSource: jsonData: "+jsonData); + ObjectMapper mapper = new ObjectMapper(); + Source newSource = null; + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + + // parse JSON data + try { + newSource = mapper.readValue(jsonData, Source.class); + } catch (IOException e) { + System.out.println("EndpointMedium: createSource: IOException e !"); + e.printStackTrace(); + return Response.status(Status.BAD_REQUEST).build(); + } + if (newSource == null) { + System.out.println("EndpointMedium: createSource: newSource == null !"); + return Response.status(Status.BAD_REQUEST).build(); + } + // sanitize object data + newSource.setId(0); + Medium medium = entityManager.find(Medium.class, newSource.getMedium().getId()); + newSource.setMedium(medium); + + // update log metadata + // Not necessary, a source will always be created in conjunction with a medium + + // persist source + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.persist(newSource); + medium.getSources().add(newSource); + // medium.addSource(newSource); + entityManager.persist(medium); + entityManager.flush(); + newSource.setMedium(medium); + entityTransaction.commit(); + entityManager.refresh(newSource); + entityManager.refresh(medium); + + // add log entry + // UserLogManager.getLogger().addLogEntry(newSource.getMediums1().get(0).getCreatedByUserAccount().getId(), UserLogManager.LogEvents.SOURCECREATED); + + return Response.ok().entity(newSource).build(); + } + + @PATCH + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("source/{id}") + @Secured + public Response updateSource(@PathParam("id") int id, String jsonData) { + // System.out.println("EndpointMedium: UPDATE SOURCE - jsonData: " + jsonData); + ObjectMapper mapper = new ObjectMapper(); + Source updatedSource = null; + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Source source = entityManager.find(Source.class, id); + if (source == null) { + return Response.status(Status.NOT_FOUND).build(); + } + // parse JSON data + try { + updatedSource = mapper.readValue(jsonData, Source.class); + } catch (IOException e) { + return Response.status(Status.BAD_REQUEST).build(); + } + if (updatedSource == null) { + return Response.notModified().build(); + } + + // update source + if (updatedSource.getIsPrimarySource() != null) { + source.setIsPrimarySource(updatedSource.getIsPrimarySource()); + } + source.setUrl(updatedSource.getUrl()); + source.setLastAccessed(updatedSource.getLastAccessed()); + if (updatedSource.getIsStillAvailable() != null) { + source.setIsStillAvailable(updatedSource.getIsStillAvailable()); + } + + // update log metadata + // log metadata will be updated with the corresponding medium + // source.getMedium().setLastEditedAt(new Timestamp(System.currentTimeMillis())); + // if ( containerRequestContext.getProperty("TIMAAT.userID") != null ) { + // source.getMedium().setLastEditedByUserAccount((entityManager.find(UserAccount.class, containerRequestContext.getProperty("TIMAAT.userID")))); + // } else { + // // DEBUG do nothing - production system should abort with internal server error + // } + + // persist source + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.merge(source); + entityManager.persist(source); + entityTransaction.commit(); + entityManager.refresh(source); + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.SOURCEEDITED); + return Response.ok().entity(source).build(); + } + + @DELETE + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("source/{id}") + @Secured + public Response deleteSource(@PathParam("id") int id) { + // System.out.println("EndpointMedium: deleteSource"); + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Source source = entityManager.find(Source.class, id); + if (source == null) { + return Response.status(Status.NOT_FOUND).build(); + } + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.remove(source); + entityTransaction.commit(); + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.SOURCEDELETED); + return Response.ok().build(); + } + + @POST + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("audioPostProduction/{id}") + @Secured + public Response createAudioPostProduction(@PathParam("id") int id) { + // System.out.println("EndpointMedium: createAudioPostProduction: "); + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + + // parse JSON data + AudioPostProduction audioPostProduction = new AudioPostProduction(); + + // sanitize object data + audioPostProduction.setId(0); + + // persist analysis method + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.persist(audioPostProduction); + entityManager.flush(); + entityTransaction.commit(); + entityManager.refresh(audioPostProduction); + // entityManager.refresh(audioPostProduction.getAnalysisMethod()); + + // add log entry + // UserLogManager.getLogger().addLogEntry(newAnalysis.getCreatedByUserAccount().getId(), UserLogManager.LogEvents.ANALYSISCREATED); + return Response.ok().entity(audioPostProduction).build(); + } + + @DELETE + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("audioPostProduction/{id}") + @Secured + public Response deleteAudioPostProduction(@PathParam("id") int id) { + // System.out.println("EndpointMedium: deleteAudioPostProduction"); + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + AudioPostProduction audioPostProduction = entityManager.find(AudioPostProduction.class, id); + + if (audioPostProduction == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.remove(audioPostProduction); + //* ON DELETE CASCADE deletes connected audio_post_production_translation entries + entityTransaction.commit(); + + // add log entry + // UserLogManager.getLogger() + // .addLogEntry((int) containerRequestContext + // .getProperty("TIMAAT.userID"), UserLogManager.LogEvents.ROLEDELETED); + return Response.ok().build(); + } + + @POST + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("audioPostProduction/{id}/translation") + @Secured + public Response createAudioPostProductionTranslation(@PathParam("id") int id, String jsonData) { + // System.out.println("EndpointMedium: createAudioPostProductionTranslation: " + jsonData); + ObjectMapper mapper = new ObjectMapper(); + AudioPostProductionTranslation audioPostProductionTranslation = null; + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + + // parse JSON data + try { + audioPostProductionTranslation = mapper.readValue(jsonData, AudioPostProductionTranslation.class); + } catch (IOException e) { + System.out.println("EndpointMedium: createAudioPostProductionTranslation: IOException e !"); + e.printStackTrace(); + return Response.status(Status.BAD_REQUEST).build(); + } + if (audioPostProductionTranslation == null) { + System.out.println("EndpointMedium: createAudioPostProductionTranslation: newAudio == null !"); + return Response.status(Status.BAD_REQUEST).build(); + } + + // sanitize object data + audioPostProductionTranslation.setId(0); + Language language = entityManager.find(Language.class, audioPostProductionTranslation.getLanguage().getId()); + audioPostProductionTranslation.setLanguage(language); + AudioPostProduction audioPostProduction = entityManager.find(AudioPostProduction.class, id); + audioPostProductionTranslation.setAudioPostProduction(audioPostProduction); + + // update log metadata + // Timestamp creationDate = new Timestamp(System.currentTimeMillis()); + // newAnalysis.setCreatedAt(creationDate); + // newAnalysis.setLastEditedAt(creationDate); + // if ( containerRequestContext.getProperty("TIMAAT.userID") != null ) { + // newAnalysis.setCreatedByUserAccount(entityManager.find(UserAccount.class, containerRequestContext.getProperty("TIMAAT.userID"))); + // newAnalysis.setLastEditedByUserAccount((entityManager.find(UserAccount.class, containerRequestContext.getProperty("TIMAAT.userID")))); + // } else { + // // DEBUG do nothing - production system should abort with internal server error + // return Response.serverError().build(); + // } + + // persist analysis method + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.persist(language); + entityManager.persist(audioPostProductionTranslation); + entityManager.flush(); + audioPostProductionTranslation.setLanguage(language); + audioPostProductionTranslation.setAudioPostProduction(audioPostProduction); + entityTransaction.commit(); + entityManager.refresh(audioPostProductionTranslation); + entityManager.refresh(language); + entityManager.refresh(audioPostProduction); + // entityManager.refresh(audioPostProduction.getAnalysisMethod()); + + // add log entry + // UserLogManager.getLogger().addLogEntry(newAnalysis.getCreatedByUserAccount().getId(), UserLogManager.LogEvents.ANALYSISCREATED); + return Response.ok().entity(audioPostProductionTranslation).build(); + } + + @PATCH + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("audioPostProduction/{id}/translation") + @Secured + public Response updateAudioPostProductionTranslation(@PathParam("id") int id, String jsonData) { + // System.out.println("EndpointMedium: updateAudioPostProductionTranslation: " + jsonData); + + ObjectMapper mapper = new ObjectMapper(); + AudioPostProductionTranslation updatedAudioPostProductionTranslation = null; + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + AudioPostProductionTranslation audioPostProductionTranslation = entityManager.find( + AudioPostProductionTranslation.class, id); + + if (audioPostProductionTranslation == null) { + return Response.status(Status.NOT_FOUND).build(); + } + // parse JSON data + try { + updatedAudioPostProductionTranslation = mapper.readValue(jsonData, AudioPostProductionTranslation.class); + } catch (IOException e) { + e.printStackTrace(); + return Response.status(Status.BAD_REQUEST).build(); + } + if (updatedAudioPostProductionTranslation == null) { + return Response.status(Status.BAD_REQUEST).build(); + } + + // update audioPostProductionTranslation + audioPostProductionTranslation.setOverdubbing(updatedAudioPostProductionTranslation.getOverdubbing()); + audioPostProductionTranslation.setReverb(updatedAudioPostProductionTranslation.getReverb()); + audioPostProductionTranslation.setDelay(updatedAudioPostProductionTranslation.getDelay()); + audioPostProductionTranslation.setPanning(updatedAudioPostProductionTranslation.getPanning()); + audioPostProductionTranslation.setBass(updatedAudioPostProductionTranslation.getBass()); + audioPostProductionTranslation.setTreble(updatedAudioPostProductionTranslation.getTreble()); + + // update log metadata + // Timestamp creationDate = new Timestamp(System.currentTimeMillis()); + // newAnalysis.setCreatedAt(creationDate); + // newAnalysis.setLastEditedAt(creationDate); + // if ( containerRequestContext.getProperty("TIMAAT.userID") != null ) { + // newAnalysis.setCreatedByUserAccount(entityManager.find(UserAccount.class, containerRequestContext.getProperty("TIMAAT.userID"))); + // newAnalysis.setLastEditedByUserAccount((entityManager.find(UserAccount.class, containerRequestContext.getProperty("TIMAAT.userID")))); + // } else { + // // DEBUG do nothing - production system should abort with internal server error + // return Response.serverError().build(); + // } + + // persist analysis method + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.merge(audioPostProductionTranslation); + entityManager.persist(audioPostProductionTranslation); + entityTransaction.commit(); + entityManager.refresh(audioPostProductionTranslation); + + // add log entry + // UserLogManager.getLogger().addLogEntry(newAnalysis.getCreatedByUserAccount().getId(), UserLogManager.LogEvents.ANALYSISCREATED); + return Response.ok().entity(audioPostProductionTranslation).build(); + } + + @POST + @Path("audio/{id}/upload") + @Consumes(jakarta.ws.rs.core.MediaType.MULTIPART_FORM_DATA) + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Secured + public Response uploadAudio(@PathParam("id") int id, @FormDataParam("file") InputStream uploadedInputStream) throws TaskServiceException { + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + MediumAudio mediumAudio = entityManager.find(MediumAudio.class, id); + if (mediumAudio == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + if (mediumAudio.getMedium().getFileStatus().compareTo("noFile") != 0) { + return Response.status(Status.FORBIDDEN).entity("ERROR::Audio file already exists").build(); + } + + try { + // TODO assume MP3 upload only + java.nio.file.Path mediumFilePath; + try (TemporaryFile temporaryFile = temporaryFileStorage.createTemporaryFile()) { + BufferedOutputStream stream = new BufferedOutputStream( + new FileOutputStream(temporaryFile.getTemporaryFilePath().toFile())); + byte[] bytes = new byte[1024]; + int sizeRead; + while ((sizeRead = uploadedInputStream.read(bytes, 0, 1024)) > 0) { + stream.write(bytes, 0, sizeRead); + } + stream.flush(); + stream.close(); + + mediumFilePath = audioFileStorage.persistOriginalFile(temporaryFile.getTemporaryFilePath(), id); + } + + // get data from ffmpeg + AudioInformation info = getAudioFileInfo(mediumFilePath); + // mediumAudio.setAudioCodec(""); + mediumAudio.setLength(info.getDuration()); + mediumAudio.getMedium().setFilePath(mediumFilePath.toString()); + + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.merge(mediumAudio); + entityManager.merge(mediumAudio.getMedium()); + entityManager.persist(mediumAudio); + entityManager.persist(mediumAudio.getMedium()); + entityManager.flush(); + entityTransaction.commit(); + entityManager.refresh(mediumAudio); + + taskService.executeMediumAudioAnalysisTask(id, SupportedMediumType.AUDIO); + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.MEDIUMCREATED); + + } catch (IOException e) { + e.printStackTrace(); + } + + return Response.ok().entity(mediumAudio).build(); + } + + @POST + @Path("image/{id}/upload") + @Consumes(jakarta.ws.rs.core.MediaType.MULTIPART_FORM_DATA) + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Secured + public Response uploadImage(@PathParam("id") int id, @FormDataParam("file") InputStream uploadedInputStream, @FormDataParam("file") FormDataContentDisposition fileDetail) { + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + MediumImage mediumImage = entityManager.find(MediumImage.class, id); + if (mediumImage == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + if (mediumImage.getMedium().getFileStatus().compareTo("noFile") != 0) { + return Response.status(Status.FORBIDDEN).entity("ERROR::Image file already exists").build(); + } + + try { + ImageFileType imageFileType = fileDetail.getFileName().toLowerCase() + .endsWith(".jpg") ? ImageFileType.JPG : ImageFileType.PNG; + + java.nio.file.Path mediumFilePath; + try (TemporaryFile temporaryFile = temporaryFileStorage.createTemporaryFile()) { + BufferedOutputStream stream = new BufferedOutputStream( + new FileOutputStream(temporaryFile.getTemporaryFilePath().toFile())); + byte[] bytes = new byte[1024]; + int sizeRead; + while ((sizeRead = uploadedInputStream.read(bytes, 0, 1024)) > 0) { + stream.write(bytes, 0, sizeRead); + } + stream.flush(); + stream.close(); + + mediumFilePath = imageFileStorage.persistOriginalImageFile(temporaryFile.getTemporaryFilePath(), id, + imageFileType); + } + + // get image metadata + ImageInformation info = getImageFileInfo(mediumFilePath, imageFileType); + mediumImage.setWidth(info.getWidth()); + mediumImage.setHeight(info.getHeight()); + + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.merge(mediumImage); + entityManager.merge(mediumImage.getMedium()); + entityManager.persist(mediumImage); + entityManager.persist(mediumImage.getMedium()); + entityManager.flush(); + entityTransaction.commit(); + entityManager.refresh(mediumImage); + + double width = mediumImage.getWidth(); + double height = mediumImage.getHeight(); + double aspectRatio = (double) width / height; + double sixteenToNine = 16.0 / 9.0; + double scaleFactor = 1.0; + int targetWidth = 0; + int targetHeight = 0; + // create thumbnail + if (aspectRatio >= sixteenToNine && width > 160) { + targetWidth = 160; + scaleFactor = 160 / width; + targetHeight = (int) Math.floor(height * scaleFactor); + } + else if (aspectRatio < sixteenToNine && height > 90) { + scaleFactor = 90 / height; + targetWidth = (int) Math.floor(width * scaleFactor); + targetHeight = 90; + } + + try (TemporaryFile temporaryFile = temporaryFileStorage.createTemporaryFile()) { + BufferedImage bufferedImage = ImageIO.read(mediumFilePath.toFile()); + if (targetHeight > 0 && targetWidth > 0) { + bufferedImage = resizeImage(bufferedImage, targetWidth, targetHeight); + } + ImageIO.write(bufferedImage, "png", temporaryFile.getTemporaryFilePath().toFile()); + imageFileStorage.persistThumbnailImageFile(temporaryFile.getTemporaryFilePath(), id); + } + + + targetHeight = 0; + targetWidth = 0; + // create scaled image for default view + if (aspectRatio >= sixteenToNine && width > 854) { + targetWidth = 854; + scaleFactor = 854 / width; + targetHeight = (int) Math.floor(height * scaleFactor); + } + else if (aspectRatio < sixteenToNine && height > 480) { + scaleFactor = 480 / height; + targetWidth = (int) Math.floor(width * scaleFactor); + targetHeight = 480; + } + + try (TemporaryFile temporaryFile = temporaryFileStorage.createTemporaryFile()) { + BufferedImage bufferedImage = ImageIO.read(mediumFilePath.toFile()); + if (targetHeight > 0 && targetWidth > 0) { + bufferedImage = resizeImage(bufferedImage, targetWidth, targetHeight); + } + ImageIO.write(bufferedImage, "png", temporaryFile.getTemporaryFilePath().toFile()); + imageFileStorage.persistScaledImageFile(temporaryFile.getTemporaryFilePath(), id); + } + + mediumImage.getMedium().setViewToken(issueFileToken(mediumImage.getMediumId())); + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.MEDIUMCREATED); + + } catch (IOException e) { + e.printStackTrace(); + } + + return Response.ok().entity(mediumImage).build(); + } + + @GET + @Path("/{id}/mediumAudioAnalysis/frequencyInformation") + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + public Response getVideoFrequencyInformation(@PathParam("id") int id, @QueryParam("startPositionMs") Integer startPositionMs, @QueryParam("endPositionMs") Integer endPositionMs, @QueryParam("token") String fileToken) throws IOException { + // verify token + if (fileToken == null) { + return Response.status(401).build(); + } + int tokenMediumID = 0; + try { + tokenMediumID = validateFileToken(fileToken); + } catch (Exception e) { + return Response.status(401).build(); + } + if (tokenMediumID != id) { + return Response.status(401).build(); + } + + + Optional<java.nio.file.Path> frequencyFilePath = videoFileStorage.getPathToFrequencyFile(id) + .or(() -> audioFileStorage.getPathToOriginalFile( + id)); + + if (frequencyFilePath.isPresent()) { + FrequencyFileReader frequencyFileReader = new FrequencyFileReader(frequencyFilePath.get()); + Optional<FrequencyInformation> frequencyInformation = frequencyFileReader.getFrequencyInformation(startPositionMs, + endPositionMs); + if (frequencyInformation.isPresent()) { + return Response.ok().entity(frequencyInformation.get()).build(); + } + else { + return Response.status(Status.BAD_REQUEST).build(); + } + } + + return Response.status(Status.NOT_FOUND).build(); + } + + + @POST + @Path("/{id}/mediumAudioAnalysis/start") + @Consumes(jakarta.ws.rs.core.MediaType.TEXT_PLAIN) + public Response triggerMediumVideoAudioAnalysis(@PathParam("id") int id, String fileToken) throws TaskServiceException { + // verify token + if (fileToken == null) { + return Response.status(401).build(); + } + int tokenMediumID = 0; + try { + tokenMediumID = validateFileToken(fileToken); + } catch (Exception e) { + return Response.status(401).build(); + } + if (tokenMediumID != id) { + return Response.status(401).build(); + } + + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + MediumAudioAnalysis mediumAudioAnalysis = entityManager.find(MediumAudioAnalysis.class, id); + + if (mediumAudioAnalysis == null || TaskState.FAILED.getDatabaseId() == mediumAudioAnalysis.getAudioAnalysisState() + .getId() || TaskState.DONE.getDatabaseId() == mediumAudioAnalysis.getAudioAnalysisState() + .getId()) { + SupportedMediumType mediumType = null; + int mediumTypeId = mediumAudioAnalysis.getMedium().getMediaType().getId(); + + if (mediumTypeId == 1) { + mediumType = SupportedMediumType.AUDIO; + } + else if (mediumTypeId == 6) { + mediumType = SupportedMediumType.VIDEO; + } + else { + return Response.status(Status.BAD_REQUEST).build(); + } + taskService.executeMediumAudioAnalysisTask(id, mediumType); + + return Response.noContent().build(); + } + + return Response.status(Status.PRECONDITION_FAILED).build(); + } + + @POST + @Path("video/{id}/upload") + @Consumes(jakarta.ws.rs.core.MediaType.MULTIPART_FORM_DATA) + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Secured + public Response uploadVideo(@PathParam("id") int id, @FormDataParam("file") InputStream uploadedInputStream, @FormDataParam("file") FormDataContentDisposition fileDetail) throws Exception { + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + MediumVideo mediumVideo = entityManager.find(MediumVideo.class, id); + int mediumId = mediumVideo.getMediumId(); + if (mediumVideo == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + if (mediumVideo.getMedium().getFileStatus().compareTo("noFile") != 0) { + return Response.status(Status.FORBIDDEN).entity("ERROR::Video file already exists").build(); + } + + try { + // TODO assume MP4 upload only + java.nio.file.Path originalVideoFilePath; + try (TemporaryFile uploadTempFile = temporaryFileStorage.createTemporaryFile()) { + BufferedOutputStream stream = new BufferedOutputStream( + new FileOutputStream(uploadTempFile.getTemporaryFilePath().toFile())); + byte[] bytes = new byte[1024]; + int sizeRead; + while ((sizeRead = uploadedInputStream.read(bytes, 0, 1024)) > 0) { + stream.write(bytes, 0, sizeRead); + } + stream.flush(); + stream.close(); + + originalVideoFilePath = videoFileStorage.persistOriginalFile(uploadTempFile.getTemporaryFilePath(), mediumId); + } + + // get data from ffmpeg + VideoInformation info = getVideoFileInfo(originalVideoFilePath); + mediumVideo.setWidth(info.getWidth()); + mediumVideo.setHeight(info.getHeight()); + mediumVideo.setFrameRate(info.getFramerate()); + mediumVideo.setVideoCodec(""); + mediumVideo.setLength(info.getDuration()); + + + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.merge(mediumVideo); + entityManager.merge(mediumVideo.getMedium()); + entityManager.persist(mediumVideo); + entityManager.persist(mediumVideo.getMedium()); + entityManager.flush(); + entityTransaction.commit(); + entityManager.refresh(mediumVideo); + + createVideoThumbnail(mediumId, DEFAULT_THUMBNAIL_TIMESTAMP_MS); + taskService.executeMediumAudioAnalysisTask(mediumId, SupportedMediumType.VIDEO); + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.MEDIUMCREATED); + + } catch (IOException e) { + e.printStackTrace(); + } + + return Response.ok().entity(mediumVideo).build(); + } + + @HEAD + @Path("audio/{id}/download") + @Produces("audio/mpeg") + public Response getAudioFileInfo(@PathParam("id") int id, @QueryParam("token") String fileToken) { + + // verify token + if (fileToken == null) { + return Response.status(401).build(); + } + int tokenMediumID = 0; + try { + tokenMediumID = validateFileToken(fileToken); + } catch (Exception e) { + return Response.status(401).build(); + } + + if (tokenMediumID != id) { + return Response.status(401).build(); + } + + Optional<java.nio.file.Path> audioFilePath = audioFileStorage.getPathToOriginalFile(id); + if (audioFilePath.isPresent()) { + File audioFile = audioFilePath.get().toFile(); + return Response.ok().status(Response.Status.PARTIAL_CONTENT) + .header(HttpHeaders.CONTENT_LENGTH, audioFile.length()).header("Accept-Ranges", "bytes").build(); + } + + return Response.status(Status.NOT_FOUND).build(); + } + + @HEAD + @Path("video/{id}/download") + @Produces("video/mp4") + public Response getVideoFileInfo(@PathParam("id") int id, @QueryParam("token") String fileToken) { + + // verify token + if (fileToken == null) { + return Response.status(401).build(); + } + int tokenMediumID = 0; + try { + tokenMediumID = validateFileToken(fileToken); + } catch (Exception e) { + return Response.status(401).build(); + } + if (tokenMediumID != id) { + return Response.status(401).build(); + } + Optional<java.nio.file.Path> convertedVideoFilePath = videoFileStorage.getPathToConvertedVideoFile(id); + if (convertedVideoFilePath.isPresent()) { + File file = convertedVideoFilePath.get().toFile(); + return Response.ok().status(Response.Status.PARTIAL_CONTENT).header(HttpHeaders.CONTENT_LENGTH, file.length()) + .header("Accept-Ranges", "bytes").build(); + } + + Optional<java.nio.file.Path> originalVideoFilePath = videoFileStorage.getPathToOriginalFile(id); + if (originalVideoFilePath.isPresent()) { + File file = originalVideoFilePath.get().toFile(); + return Response.ok().status(Response.Status.PARTIAL_CONTENT).header(HttpHeaders.CONTENT_LENGTH, file.length()) + .header("Accept-Ranges", "bytes").build(); + } + + return Response.status(Status.NOT_FOUND).build(); + } + + @GET + @Path("audio/{id}/download") + @Produces("audio/mp4") + public Response getAudioFile(@Context HttpHeaders headers, @PathParam("id") int id, @QueryParam("token") String fileToken, @QueryParam("force") boolean force) { + + // verify token + if (fileToken == null) { + return Response.status(401).build(); + } + int tokenMediumID = 0; + try { + tokenMediumID = validateFileToken(fileToken); + } catch (Exception e) { + return Response.status(401).build(); + } + if (tokenMediumID != id) { + return Response.status(401).build(); + } + + Medium medium = TIMAATApp.emf.createEntityManager().find(Medium.class, id); + if (medium == null) { + return Response.status(Status.NOT_FOUND).build(); + } - @POST - @Produces("image/png") - @Path("video/{id}/thumbnail") + Optional<java.nio.file.Path> audioFilePath = audioFileStorage.getPathToOriginalFile(id); + if (audioFilePath.isPresent()) { + return downloadFile(audioFilePath.get(), headers, id + ".mp3"); + } + + return Response.status(Status.NOT_FOUND).build(); + } + + @GET + @Path("video/{id}/download") + @Produces("video/mp4") + public Response getVideoFile(@Context HttpHeaders headers, @PathParam("id") int id, @QueryParam("token") String fileToken, @QueryParam("force") boolean force) { + + // verify token + if (fileToken == null) { + return Response.status(401).build(); + } + int tokenMediumID = 0; + try { + tokenMediumID = validateFileToken(fileToken); + } catch (Exception e) { + return Response.status(401).build(); + } + if (tokenMediumID != id) { + return Response.status(401).build(); + } + + Medium m = TIMAATApp.emf.createEntityManager().find(Medium.class, id); + if (m == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + Optional<java.nio.file.Path> convertedVideoFilePath = videoFileStorage.getPathToConvertedVideoFile(id); + if (convertedVideoFilePath.isPresent()) { + return downloadFile(convertedVideoFilePath.get(), headers, id + ".mp3"); + } + + Optional<java.nio.file.Path> originalVideoFilePath = videoFileStorage.getPathToOriginalFile(id); + if (originalVideoFilePath.isPresent()) { + return downloadFile(originalVideoFilePath.get(), headers, id + ".mp3"); + } + return Response.status(Status.NOT_FOUND).build(); + } + + @GET + @Path("{type}/{id}/status") + @Produces(jakarta.ws.rs.core.MediaType.TEXT_PLAIN) @Secured - public Response updateMediumVideoThumbnail(@PathParam("id") int id, @Valid UpdateMediumVideoThumbnailPayload updateMediumVideoThumbnailPayload) throws IOException, VideoEngineException { - java.nio.file.Path thumbnailPath = createVideoThumbnail(id, updateMediumVideoThumbnailPayload.getThumbnailPositionMs()); - return Response.ok().entity(thumbnailPath.toFile()).build(); + public Response updateFileStatus(@PathParam("type") String type, @PathParam("id") int id) { + return Response.ok().entity(mediumFileStatus(id, type)).build(); } - @POST - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("videogame/{id}") - @Secured - public Response createVideogame(@PathParam("id") int id, String jsonData) { - // System.out.println("EndpointMedium: createVideogame jsonData: "+jsonData); - ObjectMapper mapper = new ObjectMapper(); - MediumVideogame newVideogame = null; - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - // parse JSON data - try { - newVideogame = mapper.readValue(jsonData, MediumVideogame.class); - } catch (IOException e) { - System.out.println("EndpointMedium: createVideogame: IOException e !"); - e.printStackTrace(); - return Response.status(Status.BAD_REQUEST).build(); - } - if ( newVideogame == null ) { - System.out.println("EndpointMedium: createVideogame: newVideogame == null !"); - return Response.status(Status.BAD_REQUEST).build(); - } - // sanitize object data - // update log metadata - // Not necessary, a videogame will always be created in conjunction with a medium - // persist videogame - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.persist(newVideogame); - entityManager.flush(); - entityTransaction.commit(); - entityManager.refresh(newVideogame); - entityManager.refresh(newVideogame.getMedium()); - - // add log entry - UserLogManager.getLogger().addLogEntry(newVideogame.getMedium().getCreatedByUserAccount().getId(), UserLogManager.LogEvents.VIDEOGAMECREATED); - return Response.ok().entity(newVideogame).build(); - } - - @PATCH - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("videogame/{id}") - @Secured - public Response updateVideogame(@PathParam("id") int id, String jsonData) { - // System.out.println("EndpointMedium: update videogame - jsonData: " + jsonData); - ObjectMapper mapper = new ObjectMapper(); - MediumVideogame updatedVideogame = null; - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - MediumVideogame videogame = entityManager.find(MediumVideogame.class, id); - if ( videogame == null ) return Response.status(Status.NOT_FOUND).build(); - // parse JSON data - try { - updatedVideogame = mapper.readValue(jsonData, MediumVideogame.class); - } catch (IOException e) { - return Response.status(Status.BAD_REQUEST).build(); - } - if ( updatedVideogame == null ) return Response.notModified().build(); - - // update videogame - if ( updatedVideogame.getIsEpisode() != null ) videogame.setIsEpisode(updatedVideogame.getIsEpisode()); - - // update log metadata - videogame.getMedium().setLastEditedAt(new Timestamp(System.currentTimeMillis())); - if ( containerRequestContext.getProperty("TIMAAT.userID") != null ) { - videogame.getMedium().setLastEditedByUserAccount((entityManager.find(UserAccount.class, containerRequestContext.getProperty("TIMAAT.userID")))); - } else { - // DEBUG do nothing - production system should abort with internal server error - } - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.merge(videogame); - entityManager.persist(videogame); - entityTransaction.commit(); - entityManager.refresh(videogame); - - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.VIDEOGAMEEDITED); - return Response.ok().entity(videogame).build(); - } - - @DELETE - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("videogame/{id}") - @Secured - public Response deleteVideogame(@PathParam("id") int id) { - // System.out.println("EndpointMedium: deleteVideogame with id: "+ id); - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Medium medium = entityManager.find(Medium.class, id); - if ( medium == null ) return Response.status(Status.NOT_FOUND).build(); - MediumVideogame videogame = entityManager.find(MediumVideogame.class, id); - if ( videogame == null ) return Response.status(Status.NOT_FOUND).build(); - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.remove(videogame); - entityManager.remove(videogame.getMedium().getDisplayTitle()); - entityManager.remove(videogame.getMedium()); // remove videogame, then corresponding medium - entityTransaction.commit(); - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.VIDEOGAMEDELETED); - return Response.ok().build(); - } - - @POST - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("title/{id}") - @Secured - public Response createTitle(@PathParam("id") int id, String jsonData) { - - // System.out.println("EndpointMedium: createTitle: jsonData: "+jsonData); - ObjectMapper mapper = new ObjectMapper(); - Title newTitle = null; - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - - // parse JSON data - try { - newTitle = mapper.readValue(jsonData, Title.class); - } catch (IOException e) { - System.out.println("EndpointMedium: createTitle: IOException e !"); - e.printStackTrace(); - return Response.status(Status.BAD_REQUEST).build(); - } - if ( newTitle == null ) { - System.out.println("EndpointMedium: createTitle: newTitle == null !"); - return Response.status(Status.BAD_REQUEST).build(); - } - // sanitize object data - newTitle.setId(0); - Language language = entityManager.find(Language.class, newTitle.getLanguage().getId()); - newTitle.setLanguage(language); - - // update log metadata - // Not necessary, a title will always be created in conjunction with a medium - - // persist title - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.persist(language); - entityManager.persist(newTitle); - entityManager.flush(); - newTitle.setLanguage(language); - entityTransaction.commit(); - entityManager.refresh(newTitle); - entityManager.refresh(language); - - // add log entry - UserLogManager.getLogger() - .addLogEntry((int) containerRequestContext - .getProperty("TIMAAT.userID"), UserLogManager.LogEvents.TITLECREATED); - - return Response.ok().entity(newTitle).build(); - } - - @POST - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("{mediumId}/title/{id}") - @Secured - public Response addTitle(@PathParam("mediumId") int mediumId, @PathParam("id") int id, String jsonData) { - // System.out.println("EndpointMedium: addTitle: jsonData: "+jsonData); - - ObjectMapper mapper = new ObjectMapper(); - Title newTitle = null; - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - - // parse JSON data - try { - newTitle = mapper.readValue(jsonData, Title.class); - } catch (IOException e) { - System.out.println("EndpointMedium: addTitle: IOException e !"); - e.printStackTrace(); - return Response.status(Status.BAD_REQUEST).build(); - } - if ( newTitle == null ) { - System.out.println("EndpointMedium: addTitle: newTitle == null !"); - return Response.status(Status.BAD_REQUEST).build(); - } - // sanitize object data - newTitle.setId(0); - - Language language = entityManager.find(Language.class, newTitle.getLanguage().getId()); - newTitle.setLanguage(language); - - Medium medium = entityManager.find(Medium.class, mediumId); - - // update log metadata - // Not necessary, a title will always be created in conjunction with a medium - - // persist title - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.persist(language); - entityManager.persist(newTitle); - entityManager.flush(); - newTitle.setLanguage(language); //! TODO already set above - entityTransaction.commit(); - entityManager.refresh(newTitle); - entityManager.refresh(language); - - // create medium_has_title-table entries - entityTransaction.begin(); - medium.getTitles().add(newTitle); - newTitle.getMediums3().add(medium); - entityManager.merge(newTitle); - entityManager.merge(medium); - entityManager.persist(newTitle); - entityManager.persist(medium); - entityTransaction.commit(); - entityManager.refresh(medium); - entityManager.refresh(newTitle); - - // add log entry - UserLogManager.getLogger() - .addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.TITLECREATED); - - return Response.ok().entity(newTitle).build(); - } - - @PATCH - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("title/{id}") - @Secured - public Response updateTitle(@PathParam("id") int id, String jsonData) { - // System.out.println("EndpointMedium: UPDATE TITLE - jsonData: " + jsonData); - ObjectMapper mapper = new ObjectMapper(); - Title updatedTitle = null; - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Title title = entityManager.find(Title.class, id); - if ( title == null ) return Response.status(Status.NOT_FOUND).build(); - // parse JSON data - try { - updatedTitle = mapper.readValue(jsonData, Title.class); - } catch (IOException e) { - return Response.status(Status.BAD_REQUEST).build(); - } - if ( updatedTitle == null ) return Response.notModified().build(); - // update title - if ( updatedTitle.getName() != null ) title.setName(updatedTitle.getName()); - if ( updatedTitle.getLanguage() != null ) title.setLanguage(updatedTitle.getLanguage()); - - // update log metadata - // log metadata will be updated with the corresponding medium - // title.getMedium().setLastEditedAt(new Timestamp(System.currentTimeMillis())); - // if ( containerRequestContext.getProperty("TIMAAT.userID") != null ) { - // title.getMedium().setLastEditedByUserAccount((entityManager.find(UserAccount.class, containerRequestContext.getProperty("TIMAAT.userID")))); - // } else { - // // DEBUG do nothing - production system should abort with internal server error - // } - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.merge(title); - entityManager.persist(title); - entityTransaction.commit(); - entityManager.refresh(title); - - // add log entry - UserLogManager.getLogger() - .addLogEntry((int) containerRequestContext - .getProperty("TIMAAT.userID"), UserLogManager.LogEvents.TITLEEDITED); - return Response.ok().entity(title).build(); - } - - @DELETE - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("title/{id}") - @Secured - public Response deleteTitle(@PathParam("id") int id) { - // System.out.println("EndpointMedium: deleteTitle"); - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Title title = entityManager.find(Title.class, id); - if ( title == null ) return Response.status(Status.NOT_FOUND).build(); - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.remove(title); - entityTransaction.commit(); - // add log entry - UserLogManager.getLogger() - .addLogEntry((int) containerRequestContext - .getProperty("TIMAAT.userID"), UserLogManager.LogEvents.TITLEDELETED); - return Response.ok().build(); - } - - @POST - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - // @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("{mediumId}/languageTrack/{languageTypeId}/{languageId}") - @Secured - public Response addMediumHasLanguageItem(@PathParam("mediumId") int mediumId, - @PathParam("languageTypeId") int mediumLanguageTypeId, - @PathParam("languageId") int languageId) { - // System.out.println("EndpointMedium: addLanguageTrack: "+mediumId+" "+mediumLanguageTypeId+ " "+languageId); - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Language language = entityManager.find(Language.class, languageId); - if (language == null) return Response.status(Status.NOT_FOUND).build(); - Medium medium = entityManager.find(Medium.class, mediumId); - if (medium == null) return Response.status(Status.NOT_FOUND).build(); - MediumLanguageType mediumLanguageType = entityManager.find(MediumLanguageType.class, mediumLanguageTypeId); - if (mediumLanguageType == null) return Response.status(Status.NOT_FOUND).build(); - - MediumHasLanguage mhl = null; - try { - mhl = (MediumHasLanguage) entityManager.createQuery( - "SELECT mhl FROM MediumHasLanguage mhl WHERE mhl.language=:language AND mhl.medium=:medium AND mhl.mediumLanguageType=:mediumLanguageType") - .setParameter("language", language) - .setParameter("medium", medium) - .setParameter("mediumLanguageType", mediumLanguageType) - .getSingleResult(); - } catch (Exception e) { - // doesn't matter - } - if ( mhl == null ) { - mhl = new MediumHasLanguage(); - mhl.setLanguage(language); - mhl.setMedium(medium); - mhl.setMediumLanguageType(mediumLanguageType); - try { - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.persist(mhl); - entityTransaction.commit(); - entityManager.refresh(medium); - entityManager.refresh(mhl); - } catch (Exception e) { - e.printStackTrace(); - return Response.notModified().build(); - } - } - - // add log entry - // UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), UserLogManager.LogEvents.MEDIUMEDITED); - - return Response.ok().entity(mhl).build(); - } - - @PATCH - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("{mediumId}/languageTrack/{languageTypeId}/{languageId}") - @Secured - public Response updateMediumHasLanguageItem(@PathParam("mediumId") int mediumId, - @PathParam("languageTypeId") int mediumLanguageTypeId, - @PathParam("languageId") int languageId, - String jsonData) throws IOException { - - // System.out.println("EndpointMedium: updateLanguageTrack: jsonData: "+jsonData); - ObjectMapper mapper = new ObjectMapper(); - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Language language = entityManager.find(Language.class, languageId); - if (language == null) return Response.status(Status.NOT_FOUND).build(); - Medium medium = entityManager.find(Medium.class, mediumId); - if (medium == null) return Response.status(Status.NOT_FOUND).build(); - MediumLanguageType mediumLanguageType = entityManager.find(MediumLanguageType.class, mediumLanguageTypeId); - if (mediumLanguageType == null) return Response.status(Status.NOT_FOUND).build(); - - JsonNode jsonNode = mapper.readTree(jsonData); - int jsonNodeMedium = jsonNode.get("mediumId").asInt(); - int jsonNodeLanguage = jsonNode.get("languageId").asInt(); - int jsonNodeMediumLanguageType = jsonNode.get("mediumLanguageTypeId").asInt(); - Medium tempMedium = entityManager.find(Medium.class, jsonNodeMedium); - Language tempLanguage = entityManager.find(Language.class, jsonNodeLanguage); - MediumLanguageType tempLanguageType = entityManager.find(MediumLanguageType.class, jsonNodeMediumLanguageType); - MediumHasLanguage mediumHasLanguage = new MediumHasLanguage(); - mediumHasLanguage.setMedium(tempMedium); - mediumHasLanguage.setLanguage(tempLanguage); - mediumHasLanguage.setMediumLanguageType(tempLanguageType); - - // TODO This is a temporary fix until language track form is reworked - // don't update if mediumHasLanguage does already exist - MediumHasLanguage mhlInDB = null; - try { - mhlInDB = (MediumHasLanguage) entityManager.createQuery( - "SELECT mhlInDB FROM MediumHasLanguage mhlInDB WHERE mhlInDB.language=:language AND mhlInDB.medium=:medium AND mhlInDB.mediumLanguageType=:mediumLanguageType") - .setParameter("language", tempLanguage) - .setParameter("medium", tempMedium) - .setParameter("mediumLanguageType", tempLanguageType) - .getSingleResult(); - } catch (Exception e) { - // doesn't matter - } - if (mhlInDB != null) { - // entry already exists, don't add it - return Response.notModified().build(); - } - // END of TODO - - try { - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.createQuery( - "UPDATE MediumHasLanguage mhl SET mhl.language=:language, mhl.mediumLanguageType=:mediumLanguageType WHERE mhl.medium=:medium AND mhl.language=:oldLanguage AND mhl.mediumLanguageType=:oldMediumLanguageType") - .setParameter("language", mediumHasLanguage.getLanguage()) - .setParameter("medium", mediumHasLanguage.getMedium()) - .setParameter("mediumLanguageType", mediumHasLanguage.getMediumLanguageType()) - .setParameter("oldLanguage", language) - .setParameter("oldMediumLanguageType", mediumLanguageType) - .executeUpdate(); - // entityManager.persist(mhl); - entityTransaction.commit(); - entityManager.refresh(medium); - - } catch (Exception e) { - e.printStackTrace(); - return Response.notModified().build(); - } - - // add log entry - // UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), UserLogManager.LogEvents.MEDIUMEDITED); - - return Response.ok().entity(mediumHasLanguage).build(); - } - - @DELETE - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("{mediumId}/languageTrack/{languageTypeId}/{languageId}") - @Secured - public Response deleteMediumHasLanguageItem(@PathParam("mediumId") int mediumId, - @PathParam("languageTypeId") int mediumLanguageTypeId, - @PathParam("languageId") int languageId) { - // System.out.println("EndpointMedium: deleteMediumHasLanguageItem"); - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Language language = entityManager.find(Language.class, languageId); - if ( language == null ) return Response.status(Status.NOT_FOUND).build(); - Medium medium = entityManager.find(Medium.class, mediumId); - if ( medium == null ) return Response.status(Status.NOT_FOUND).build(); - MediumLanguageType mediumLanguageType = entityManager.find(MediumLanguageType.class, mediumLanguageTypeId); - if ( mediumLanguageType == null ) return Response.status(Status.NOT_FOUND).build(); - - try { - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.createQuery("DELETE FROM MediumHasLanguage mhl WHERE mhl.language=:language AND mhl.medium=:medium AND mhl.mediumLanguageType=:mediumLanguageType") - .setParameter("language", language) - .setParameter("medium", medium) - .setParameter("mediumLanguageType", mediumLanguageType) - .executeUpdate(); - entityTransaction.commit(); - entityManager.refresh(medium); - } catch (Exception e) { - e.printStackTrace(); - return Response.notModified().build(); - } - // add log entry - // UserLogManager.getLogger().addLogEntry((int) crc.getProperty("TIMAAT.userID"), UserLogManager.LogEvents.MEDIUMHASLANGUAGEDELETED); - return Response.ok().build(); - } - - @POST - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("{mediumId}/hasActor/{actorId}/withRole/{roleId}") - @Secured - public Response addMediumHasActorWithRoles(@PathParam("mediumId") int mediumId, - @PathParam("actorId") int actorId, - @PathParam("roleId") int roleId) { - // System.out.println("EndpointMedium: addMediumHasActorWithRoles"); - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Medium medium = entityManager.find(Medium.class, mediumId); - if (medium == null) return Response.status(Status.NOT_FOUND).build(); - Actor actor = entityManager.find(Actor.class, actorId); - if (actor == null) return Response.status(Status.NOT_FOUND).build(); - Role role = entityManager.find(Role.class, roleId); - if (role == null) return Response.status(Status.NOT_FOUND).build(); - - MediumHasActorWithRole mhawr = null; - try { - Query countQuery = entityManager.createQuery("SELECT COUNT(mhawr) FROM MediumHasActorWithRole mhawr WHERE mhawr.medium=:medium AND mhawr.actor=:actor AND mhawr.role=:role") - .setParameter("medium", medium) - .setParameter("actor", actor) - .setParameter("role", role); - long recordsTotal = (long) countQuery.getSingleResult(); - if (recordsTotal == 1) { - mhawr = (MediumHasActorWithRole) entityManager.createQuery( - "SELECT mhawr FROM MediumHasActorWithRole mhawr WHERE mhawr.medium=:medium AND mhawr.actor=:actor AND mhawr.role=:role") - .setParameter("medium", medium) - .setParameter("actor", actor) - .setParameter("role", role) - .getSingleResult(); - } - } catch (Exception e) { - e.printStackTrace(); - // doesn't matter - } - if ( mhawr == null ) { - mhawr = new MediumHasActorWithRole(); - mhawr.setMedium(medium); - mhawr.setActor(actor); - mhawr.setRole(role); - try { - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.persist(mhawr); - entityTransaction.commit(); - entityManager.refresh(medium); - entityManager.refresh(actor); - entityManager.refresh(role); - entityManager.refresh(mhawr); - } catch (Exception e) { - e.printStackTrace(); - return Response.notModified().build(); - } - } - - // add log entry - // UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), UserLogManager.LogEvents.MEDIUMEDITED); - - return Response.ok().entity(mhawr).build(); - } - - @DELETE - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("{mediumId}/hasActor/{actorId}") - @Secured - public Response deleteActorFromMediumHasActorWithRoles(@PathParam("mediumId") int mediumId, - @PathParam("actorId") int actorId) { - // System.out.println("EndpointMedium: deleteMediumHasActorWithRolesItem"); - // deletes all entries of medium-actor matches - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Medium medium = entityManager.find(Medium.class, mediumId); - if ( medium == null ) return Response.status(Status.NOT_FOUND).build(); - Actor actor = entityManager.find(Actor.class, actorId); - if ( actor == null ) return Response.status(Status.NOT_FOUND).build(); - - try { - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.createQuery("DELETE FROM MediumHasActorWithRole mhawr WHERE mhawr.medium=:medium AND mhawr.actor=:actor") - .setParameter("medium", medium) - .setParameter("actor", actor) - .executeUpdate(); - entityTransaction.commit(); - entityManager.refresh(medium); - // entityManager.refresh(actor); - } catch (Exception e) { - e.printStackTrace(); - return Response.notModified().build(); - } - - return Response.ok().build(); - } - - @DELETE - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("{mediumId}/hasActor/{actorId}/withRole/{roleId}") - @Secured - public Response deleteRoleFromMediumHasActorWithRoles(@PathParam("mediumId") int mediumId, - @PathParam("actorId") int actorId, - @PathParam("roleId") int roleId) { - // System.out.println("EndpointMedium: deleteMediumHasActorWithRolesItem"); - // deletes all entries of medium-actor matches - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Medium medium = entityManager.find(Medium.class, mediumId); - if ( medium == null ) return Response.status(Status.NOT_FOUND).build(); - Actor actor = entityManager.find(Actor.class, actorId); - if ( actor == null ) return Response.status(Status.NOT_FOUND).build(); - Role role = entityManager.find(Role.class, roleId); - if ( role == null ) return Response.status(Status.NOT_FOUND).build(); - - try { - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.createQuery("DELETE FROM MediumHasActorWithRole mhawr WHERE mhawr.medium=:medium AND mhawr.actor=:actor AND mhawr.role=:role") - .setParameter("medium", medium) - .setParameter("actor", actor) - .setParameter("role", role) - .executeUpdate(); - entityTransaction.commit(); - entityManager.refresh(medium); - // entityManager.refresh(actor); - // entityManager.refresh(role); - } catch (Exception e) { - e.printStackTrace(); - return Response.notModified().build(); - } - - return Response.ok().build(); - } - - // Currently not in use - @POST - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("source/{id}") - @Secured - public Response createSource(@PathParam("id") int id, String jsonData) { - - // System.out.println("EndpointMedium: createSource: jsonData: "+jsonData); - ObjectMapper mapper = new ObjectMapper(); - Source newSource = null; - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - - // parse JSON data - try { - newSource = mapper.readValue(jsonData, Source.class); - } catch (IOException e) { - System.out.println("EndpointMedium: createSource: IOException e !"); - e.printStackTrace(); - return Response.status(Status.BAD_REQUEST).build(); - } - if ( newSource == null ) { - System.out.println("EndpointMedium: createSource: newSource == null !"); - return Response.status(Status.BAD_REQUEST).build(); - } - // sanitize object data - newSource.setId(0); - Medium medium = entityManager.find(Medium.class, newSource.getMedium().getId()); - newSource.setMedium(medium); - - // update log metadata - // Not necessary, a source will always be created in conjunction with a medium - - // persist source - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.persist(newSource); - medium.getSources().add(newSource); - // medium.addSource(newSource); - entityManager.persist(medium); - entityManager.flush(); - newSource.setMedium(medium); - entityTransaction.commit(); - entityManager.refresh(newSource); - entityManager.refresh(medium); - - // add log entry - // UserLogManager.getLogger().addLogEntry(newSource.getMediums1().get(0).getCreatedByUserAccount().getId(), UserLogManager.LogEvents.SOURCECREATED); - - return Response.ok().entity(newSource).build(); - } - - @PATCH - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("source/{id}") - @Secured - public Response updateSource(@PathParam("id") int id, String jsonData) { - // System.out.println("EndpointMedium: UPDATE SOURCE - jsonData: " + jsonData); - ObjectMapper mapper = new ObjectMapper(); - Source updatedSource = null; - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Source source = entityManager.find(Source.class, id); - if ( source == null ) return Response.status(Status.NOT_FOUND).build(); - // parse JSON data - try { - updatedSource = mapper.readValue(jsonData, Source.class); - } catch (IOException e) { - return Response.status(Status.BAD_REQUEST).build(); - } - if ( updatedSource == null ) return Response.notModified().build(); - - // update source - if ( updatedSource.getIsPrimarySource() != null ) source.setIsPrimarySource(updatedSource.getIsPrimarySource()); - source.setUrl(updatedSource.getUrl()); - source.setLastAccessed(updatedSource.getLastAccessed()); - if ( updatedSource.getIsStillAvailable() != null ) source.setIsStillAvailable(updatedSource.getIsStillAvailable()); - - // update log metadata - // log metadata will be updated with the corresponding medium - // source.getMedium().setLastEditedAt(new Timestamp(System.currentTimeMillis())); - // if ( containerRequestContext.getProperty("TIMAAT.userID") != null ) { - // source.getMedium().setLastEditedByUserAccount((entityManager.find(UserAccount.class, containerRequestContext.getProperty("TIMAAT.userID")))); - // } else { - // // DEBUG do nothing - production system should abort with internal server error - // } - - // persist source - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.merge(source); - entityManager.persist(source); - entityTransaction.commit(); - entityManager.refresh(source); - - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.SOURCEEDITED); - return Response.ok().entity(source).build(); - } - - @DELETE - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("source/{id}") - @Secured - public Response deleteSource(@PathParam("id") int id) { - // System.out.println("EndpointMedium: deleteSource"); - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Source source = entityManager.find(Source.class, id); - if ( source == null ) return Response.status(Status.NOT_FOUND).build(); - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.remove(source); - entityTransaction.commit(); - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.SOURCEDELETED); - return Response.ok().build(); - } - - @POST - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("audioPostProduction/{id}") - @Secured - public Response createAudioPostProduction(@PathParam("id") int id) { - // System.out.println("EndpointMedium: createAudioPostProduction: "); - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - - // parse JSON data - AudioPostProduction audioPostProduction = new AudioPostProduction(); - - // sanitize object data - audioPostProduction.setId(0); - - // persist analysis method - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.persist(audioPostProduction); - entityManager.flush(); - entityTransaction.commit(); - entityManager.refresh(audioPostProduction); - // entityManager.refresh(audioPostProduction.getAnalysisMethod()); - - // add log entry - // UserLogManager.getLogger().addLogEntry(newAnalysis.getCreatedByUserAccount().getId(), UserLogManager.LogEvents.ANALYSISCREATED); - return Response.ok().entity(audioPostProduction).build(); - } - - @DELETE - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("audioPostProduction/{id}") - @Secured - public Response deleteAudioPostProduction(@PathParam("id") int id) { - // System.out.println("EndpointMedium: deleteAudioPostProduction"); - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AudioPostProduction audioPostProduction = entityManager.find(AudioPostProduction.class, id); - - if ( audioPostProduction == null ) return Response.status(Status.NOT_FOUND).build(); - - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.remove(audioPostProduction); - //* ON DELETE CASCADE deletes connected audio_post_production_translation entries - entityTransaction.commit(); - - // add log entry - // UserLogManager.getLogger() - // .addLogEntry((int) containerRequestContext - // .getProperty("TIMAAT.userID"), UserLogManager.LogEvents.ROLEDELETED); - return Response.ok().build(); - } - - @POST - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("audioPostProduction/{id}/translation") - @Secured - public Response createAudioPostProductionTranslation(@PathParam("id") int id, - String jsonData) { - // System.out.println("EndpointMedium: createAudioPostProductionTranslation: " + jsonData); - ObjectMapper mapper = new ObjectMapper(); - AudioPostProductionTranslation audioPostProductionTranslation = null; - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - - // parse JSON data - try { - audioPostProductionTranslation = mapper.readValue(jsonData, AudioPostProductionTranslation.class); - } catch (IOException e) { - System.out.println("EndpointMedium: createAudioPostProductionTranslation: IOException e !"); - e.printStackTrace(); - return Response.status(Status.BAD_REQUEST).build(); - } - if ( audioPostProductionTranslation == null ) { - System.out.println("EndpointMedium: createAudioPostProductionTranslation: newAudio == null !"); - return Response.status(Status.BAD_REQUEST).build(); - } - - // sanitize object data - audioPostProductionTranslation.setId(0); - Language language = entityManager.find(Language.class, audioPostProductionTranslation.getLanguage().getId()); - audioPostProductionTranslation.setLanguage(language); - AudioPostProduction audioPostProduction = entityManager.find(AudioPostProduction.class, id); - audioPostProductionTranslation.setAudioPostProduction(audioPostProduction); - - // update log metadata - // Timestamp creationDate = new Timestamp(System.currentTimeMillis()); - // newAnalysis.setCreatedAt(creationDate); - // newAnalysis.setLastEditedAt(creationDate); - // if ( containerRequestContext.getProperty("TIMAAT.userID") != null ) { - // newAnalysis.setCreatedByUserAccount(entityManager.find(UserAccount.class, containerRequestContext.getProperty("TIMAAT.userID"))); - // newAnalysis.setLastEditedByUserAccount((entityManager.find(UserAccount.class, containerRequestContext.getProperty("TIMAAT.userID")))); - // } else { - // // DEBUG do nothing - production system should abort with internal server error - // return Response.serverError().build(); - // } - - // persist analysis method - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.persist(language); - entityManager.persist(audioPostProductionTranslation); - entityManager.flush(); - audioPostProductionTranslation.setLanguage(language); - audioPostProductionTranslation.setAudioPostProduction(audioPostProduction); - entityTransaction.commit(); - entityManager.refresh(audioPostProductionTranslation); - entityManager.refresh(language); - entityManager.refresh(audioPostProduction); - // entityManager.refresh(audioPostProduction.getAnalysisMethod()); - - // add log entry - // UserLogManager.getLogger().addLogEntry(newAnalysis.getCreatedByUserAccount().getId(), UserLogManager.LogEvents.ANALYSISCREATED); - return Response.ok().entity(audioPostProductionTranslation).build(); - } - - @PATCH - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("audioPostProduction/{id}/translation") - @Secured - public Response updateAudioPostProductionTranslation(@PathParam("id") int id, - String jsonData) { - // System.out.println("EndpointMedium: updateAudioPostProductionTranslation: " + jsonData); - - ObjectMapper mapper = new ObjectMapper(); - AudioPostProductionTranslation updatedAudioPostProductionTranslation = null; - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AudioPostProductionTranslation audioPostProductionTranslation = entityManager.find(AudioPostProductionTranslation.class, id); - - if (audioPostProductionTranslation == null) return Response.status(Status.NOT_FOUND).build(); - // parse JSON data - try { - updatedAudioPostProductionTranslation = mapper.readValue(jsonData, AudioPostProductionTranslation.class); - } catch (IOException e) { - e.printStackTrace(); - return Response.status(Status.BAD_REQUEST).build(); - } - if ( updatedAudioPostProductionTranslation == null ) { - return Response.status(Status.BAD_REQUEST).build(); - } - - // update audioPostProductionTranslation - audioPostProductionTranslation.setOverdubbing(updatedAudioPostProductionTranslation.getOverdubbing()); - audioPostProductionTranslation.setReverb(updatedAudioPostProductionTranslation.getReverb()); - audioPostProductionTranslation.setDelay(updatedAudioPostProductionTranslation.getDelay()); - audioPostProductionTranslation.setPanning(updatedAudioPostProductionTranslation.getPanning()); - audioPostProductionTranslation.setBass(updatedAudioPostProductionTranslation.getBass()); - audioPostProductionTranslation.setTreble(updatedAudioPostProductionTranslation.getTreble()); - - // update log metadata - // Timestamp creationDate = new Timestamp(System.currentTimeMillis()); - // newAnalysis.setCreatedAt(creationDate); - // newAnalysis.setLastEditedAt(creationDate); - // if ( containerRequestContext.getProperty("TIMAAT.userID") != null ) { - // newAnalysis.setCreatedByUserAccount(entityManager.find(UserAccount.class, containerRequestContext.getProperty("TIMAAT.userID"))); - // newAnalysis.setLastEditedByUserAccount((entityManager.find(UserAccount.class, containerRequestContext.getProperty("TIMAAT.userID")))); - // } else { - // // DEBUG do nothing - production system should abort with internal server error - // return Response.serverError().build(); - // } - - // persist analysis method - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.merge(audioPostProductionTranslation); - entityManager.persist(audioPostProductionTranslation); - entityTransaction.commit(); - entityManager.refresh(audioPostProductionTranslation); - - // add log entry - // UserLogManager.getLogger().addLogEntry(newAnalysis.getCreatedByUserAccount().getId(), UserLogManager.LogEvents.ANALYSISCREATED); - return Response.ok().entity(audioPostProductionTranslation).build(); - } - - @POST - @Path("audio/{id}/upload") - @Consumes(jakarta.ws.rs.core.MediaType.MULTIPART_FORM_DATA) - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Secured - public Response uploadAudio(@PathParam("id") int id, - @FormDataParam("file") InputStream uploadedInputStream) throws TaskServiceException { - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - MediumAudio mediumAudio = entityManager.find(MediumAudio.class, id); - if (mediumAudio == null) return Response.status(Status.NOT_FOUND).build(); - - if ( mediumAudio.getMedium().getFileStatus().compareTo("noFile") != 0 ) - return Response.status(Status.FORBIDDEN).entity("ERROR::Audio file already exists").build(); - - try { - // TODO assume MP3 upload only - java.nio.file.Path mediumFilePath; - try(TemporaryFile temporaryFile = temporaryFileStorage.createTemporaryFile()){ - BufferedOutputStream stream = new BufferedOutputStream(new FileOutputStream(temporaryFile.getTemporaryFilePath().toFile())); - byte[] bytes = new byte[1024]; - int sizeRead; - while ((sizeRead = uploadedInputStream.read(bytes, 0, 1024)) > 0) { - stream.write(bytes, 0, sizeRead); - } - stream.flush(); - stream.close(); - - mediumFilePath = audioFileStorage.persistOriginalFile(temporaryFile.getTemporaryFilePath(), id); - } - - // get data from ffmpeg - AudioInformation info = getAudioFileInfo( - mediumFilePath); - // mediumAudio.setAudioCodec(""); - mediumAudio.setLength(info.getDuration()); - mediumAudio.getMedium().setFilePath(mediumFilePath.toString()); - - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.merge(mediumAudio); - entityManager.merge(mediumAudio.getMedium()); - entityManager.persist(mediumAudio); - entityManager.persist(mediumAudio.getMedium()); - entityManager.flush(); - entityTransaction.commit(); - entityManager.refresh(mediumAudio); - - taskService.executeMediumAudioAnalysisTask(id, SupportedMediumType.AUDIO); - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.MEDIUMCREATED); - - } catch (IOException e) { - e.printStackTrace(); - } - - return Response.ok().entity(mediumAudio).build(); - } - - @POST - @Path("image/{id}/upload") - @Consumes(jakarta.ws.rs.core.MediaType.MULTIPART_FORM_DATA) - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Secured - public Response uploadImage(@PathParam("id") int id, - @FormDataParam("file") InputStream uploadedInputStream, - @FormDataParam("file") FormDataContentDisposition fileDetail) { - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - MediumImage mediumImage = entityManager.find(MediumImage.class, id); - if (mediumImage == null) return Response.status(Status.NOT_FOUND).build(); - - if ( mediumImage.getMedium().getFileStatus().compareTo("noFile") != 0 ) - return Response.status(Status.FORBIDDEN).entity("ERROR::Image file already exists").build(); - - try { - ImageFileType imageFileType = fileDetail.getFileName().toLowerCase().endsWith(".jpg") ? ImageFileType.JPG : ImageFileType.PNG; - - java.nio.file.Path mediumFilePath; - try(TemporaryFile temporaryFile = temporaryFileStorage.createTemporaryFile()){ - BufferedOutputStream stream = new BufferedOutputStream(new FileOutputStream(temporaryFile.getTemporaryFilePath().toFile())); - byte[] bytes = new byte[1024]; - int sizeRead; - while ((sizeRead = uploadedInputStream.read(bytes, 0, 1024)) > 0) { - stream.write(bytes, 0, sizeRead); - } - stream.flush(); - stream.close(); - - mediumFilePath = imageFileStorage.persistOriginalImageFile(temporaryFile.getTemporaryFilePath(), id, imageFileType); - } + @GET + @Path("{id}/audio/combined") + @Produces("application/json") + public Response getAudioWaveform(@PathParam("id") int id, @QueryParam("token") String fileToken) throws IOException { - // get image metadata - ImageInformation info = getImageFileInfo(mediumFilePath, imageFileType); - mediumImage.setWidth(info.getWidth()); - mediumImage.setHeight(info.getHeight()); - - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.merge(mediumImage); - entityManager.merge(mediumImage.getMedium()); - entityManager.persist(mediumImage); - entityManager.persist(mediumImage.getMedium()); - entityManager.flush(); - entityTransaction.commit(); - entityManager.refresh(mediumImage); - - double width = mediumImage.getWidth(); - double height = mediumImage.getHeight(); - double aspectRatio = (double) width / height; - double sixteenToNine = 16.0 / 9.0; - double scaleFactor = 1.0; - int targetWidth = 0; - int targetHeight = 0; - // create thumbnail - if ( aspectRatio >= sixteenToNine && width > 160) { - targetWidth = 160; - scaleFactor = 160 / width; - targetHeight = (int)Math.floor(height * scaleFactor); - } else if (aspectRatio < sixteenToNine && height > 90) { - scaleFactor = 90 / height; - targetWidth = (int)Math.floor(width * scaleFactor); - targetHeight = 90; - } - - try(TemporaryFile temporaryFile = temporaryFileStorage.createTemporaryFile()){ - BufferedImage bufferedImage = ImageIO.read(mediumFilePath.toFile()); - if (targetHeight > 0 && targetWidth > 0) { - bufferedImage = resizeImage(bufferedImage, targetWidth, targetHeight); - } - ImageIO.write(bufferedImage, "png", temporaryFile.getTemporaryFilePath().toFile()); - imageFileStorage.persistThumbnailImageFile(temporaryFile.getTemporaryFilePath(), id); - } + // verify token + if (fileToken == null) { + return Response.status(401).build(); + } + int tokenMediumID = 0; + try { + tokenMediumID = validateFileToken(fileToken); + } catch (Exception e) { + return Response.status(401).build(); + } + if (tokenMediumID != id) { + return Response.status(401).build(); + } + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Medium medium = entityManager.find(Medium.class, id); - targetHeight = 0; - targetWidth = 0; - // create scaled image for default view - if ( aspectRatio >= sixteenToNine && width > 854) { - targetWidth = 854; - scaleFactor = 854 / width; - targetHeight = (int)Math.floor(height * scaleFactor); - } else if (aspectRatio < sixteenToNine && height > 480) { - scaleFactor = 480 / height; - targetWidth = (int)Math.floor(width * scaleFactor); - targetHeight = 480; - } - - try(TemporaryFile temporaryFile = temporaryFileStorage.createTemporaryFile()){ - BufferedImage bufferedImage = ImageIO.read(mediumFilePath.toFile()); - if (targetHeight > 0 && targetWidth > 0) { - bufferedImage = resizeImage(bufferedImage, targetWidth, targetHeight); - } - ImageIO.write(bufferedImage, "png", temporaryFile.getTemporaryFilePath().toFile()); - imageFileStorage.persistScaledImageFile(temporaryFile.getTemporaryFilePath(), id); - } + Optional<WaveformBinaryFileReader> waveformBinaryFileReader = Optional.empty(); + if (medium.getMediumAudio() != null) { + waveformBinaryFileReader = audioFileStorage.getPathToWaveformFile(id).map(WaveformBinaryFileReader::new); + } + else if (medium.getMediumVideo() != null) { + waveformBinaryFileReader = videoFileStorage.getPathToWaveformFile(id).map(WaveformBinaryFileReader::new); + } - mediumImage.getMedium().setViewToken(issueFileToken(mediumImage.getMediumId())); - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.MEDIUMCREATED); - - } catch (IOException e) { - e.printStackTrace(); - } - - return Response.ok().entity(mediumImage).build(); - } - - @GET - @Path("/{id}/mediumAudioAnalysis/frequencyInformation") - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - public Response getVideoFrequencyInformation(@PathParam("id") int id, @QueryParam("startPositionMs") Integer startPositionMs, @QueryParam("endPositionMs") Integer endPositionMs, @QueryParam("token") String fileToken) throws IOException { - // verify token - if ( fileToken == null ) return Response.status(401).build(); - int tokenMediumID = 0; - try { - tokenMediumID = validateFileToken(fileToken); - } catch (Exception e) { - return Response.status(401).build(); - } - if ( tokenMediumID != id ) return Response.status(401).build(); + if (waveformBinaryFileReader.isPresent()) { + List<Float> averageValues = waveformBinaryFileReader.get().readAverageValues(); + return Response.ok(averageValues).build(); + } + else { + return Response.status(Status.NOT_FOUND).build(); + } + } + @GET + @Path("image/{id}/preview") + @Produces("image/png") + public Response getImagePreview(@PathParam("id") int id, @QueryParam("token") String fileToken) { + // verify token + if (fileToken == null) { + return Response.status(401).build(); + } + int tokenMediumId = 0; + try { + tokenMediumId = validateFileToken(fileToken); + } catch (Exception e) { + return Response.status(401).build(); + } + if (tokenMediumId != id) { + return Response.status(401).build(); + } - Optional<java.nio.file.Path> frequencyFilePath = videoFileStorage.getPathToFrequencyFile(id).or(() -> audioFileStorage.getPathToOriginalFile(id)); + File image = new File(TIMAATApp.timaatProps.getProp( + PropertyConstants.STORAGE_LOCATION) + "medium/image/" + id + "/" + id + "-image-scaled.png"); + if (!image.exists() || !image.canRead()) { + image = new File(servletContext.getRealPath("img/preview-placeholder.png")); + } - if(frequencyFilePath.isPresent()) { - FrequencyFileReader frequencyFileReader = new FrequencyFileReader(frequencyFilePath.get()); - Optional<FrequencyInformation> frequencyInformation = frequencyFileReader.getFrequencyInformation(startPositionMs, endPositionMs); - if(frequencyInformation.isPresent()) { - return Response.ok().entity(frequencyInformation.get()).build(); - } else { - return Response.status(Status.BAD_REQUEST).build(); - } - } + return Response.ok().entity(image).build(); + } - return Response.status(Status.NOT_FOUND).build(); + @GET + @Path("image/{id}/thumbnail") + @Produces("image/png") + public Response getImageThumbnail(@PathParam("id") int id, @QueryParam("token") String fileToken) { + // verify token + if (fileToken == null) { + return Response.status(401).build(); + } + int tokenMediumId = 0; + try { + tokenMediumId = validateFileToken(fileToken); + } catch (Exception e) { + return Response.status(401).build(); + } + if (tokenMediumId != id) { + return Response.status(401).build(); } + Optional<java.nio.file.Path> videoThumbnail = videoFileStorage.getPathToThumbnailFile(id); + java.nio.file.Path thumbnailPath = videoThumbnail.orElse( + java.nio.file.Path.of(servletContext.getRealPath("img/preview-placeholder.png"))); - @POST - @Path("/{id}/mediumAudioAnalysis/start") - @Consumes(jakarta.ws.rs.core.MediaType.TEXT_PLAIN) - public Response triggerMediumVideoAudioAnalysis(@PathParam("id") int id, String fileToken) throws TaskServiceException { - // verify token - if ( fileToken == null ) return Response.status(401).build(); - int tokenMediumID = 0; - try { - tokenMediumID = validateFileToken(fileToken); - } catch (Exception e) { - return Response.status(401).build(); - } - if ( tokenMediumID != id ) return Response.status(401).build(); + return Response.ok().entity(thumbnailPath.toFile()).build(); + } + // TODO: Usage of MediumFileStorage to access image files + @HEAD + @Path("image/{id}/download") + @Produces({"image/png", "image/jpeg"}) + public Response getImageFileInfo(@PathParam("id") int id, @QueryParam("token") String fileToken) { - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - MediumAudioAnalysis mediumAudioAnalysis = entityManager.find(MediumAudioAnalysis.class, id); + // verify token + if (fileToken == null) { + return Response.status(401).build(); + } + int tokenMediumID = 0; + try { + tokenMediumID = validateFileToken(fileToken); + } catch (Exception e) { + return Response.status(401).build(); + } + if (tokenMediumID != id) { + return Response.status(401).build(); + } - if (mediumAudioAnalysis == null || - TaskState.FAILED.getDatabaseId() == mediumAudioAnalysis.getAudioAnalysisState().getId() || - TaskState.DONE.getDatabaseId() == mediumAudioAnalysis.getAudioAnalysisState().getId()) { - SupportedMediumType mediumType = null; - int mediumTypeId = mediumAudioAnalysis.getMedium().getMediaType().getId(); + Optional<java.nio.file.Path> scaledImagePath = imageFileStorage.getPathToScaledImage(id); + if (scaledImagePath.isPresent()) { + File file = scaledImagePath.get().toFile(); + return Response.ok().status(Response.Status.PARTIAL_CONTENT).header(HttpHeaders.CONTENT_LENGTH, file.length()) + .header("Accept-Ranges", "bytes").build(); + } - if(mediumTypeId == 1){ - mediumType = SupportedMediumType.AUDIO; - }else if(mediumTypeId == 6){ - mediumType = SupportedMediumType.VIDEO; - } else { - return Response.status(Status.BAD_REQUEST).build(); - } - taskService.executeMediumAudioAnalysisTask(id, mediumType); + Optional<java.nio.file.Path> originalImagePath = imageFileStorage.getPathToOriginalImage(id); + if (originalImagePath.isPresent()) { + File file = originalImagePath.get().toFile(); + return Response.ok().status(Response.Status.PARTIAL_CONTENT).header(HttpHeaders.CONTENT_LENGTH, file.length()) + .header("Accept-Ranges", "bytes").build(); + } + return Response.status(Status.NOT_FOUND).build(); + } - return Response.noContent().build(); - } + @GET + @Path("image/{id}/download") + @Produces({"image/png", "image/jpeg"}) + public Response getImageFile(@Context HttpHeaders headers, @PathParam("id") int id, @QueryParam("token") String fileToken, @QueryParam("force") boolean force) { + // System.out.println("triggered getImageOriginalFile"); + // verify token + if (fileToken == null) { + return Response.status(401).build(); + } + int tokenMediumId = 0; + try { + tokenMediumId = validateFileToken(fileToken); + } catch (Exception e) { + return Response.status(401).build(); + } + if (tokenMediumId != id) { + return Response.status(401).build(); + } - return Response.status(Status.PRECONDITION_FAILED).build(); - } - - @POST - @Path("video/{id}/upload") - @Consumes(jakarta.ws.rs.core.MediaType.MULTIPART_FORM_DATA) - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Secured - public Response uploadVideo(@PathParam("id") int id, - @FormDataParam("file") InputStream uploadedInputStream, - @FormDataParam("file") FormDataContentDisposition fileDetail) throws Exception { - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - MediumVideo mediumVideo = entityManager.find(MediumVideo.class, id); - int mediumId = mediumVideo.getMediumId(); - if (mediumVideo == null) return Response.status(Status.NOT_FOUND).build(); - - if ( mediumVideo.getMedium().getFileStatus().compareTo("noFile") != 0 ) - return Response.status(Status.FORBIDDEN).entity("ERROR::Video file already exists").build(); - - try { - // TODO assume MP4 upload only - java.nio.file.Path originalVideoFilePath; - try(TemporaryFile uploadTempFile = temporaryFileStorage.createTemporaryFile()){ - BufferedOutputStream stream = new BufferedOutputStream(new FileOutputStream(uploadTempFile.getTemporaryFilePath().toFile())); - byte[] bytes = new byte[1024]; - int sizeRead; - while ((sizeRead = uploadedInputStream.read(bytes, 0, 1024)) > 0) { - stream.write(bytes, 0, sizeRead); - } - stream.flush(); - stream.close(); + Medium medium = TIMAATApp.emf.createEntityManager().find(Medium.class, id); + if (medium == null) { + return Response.status(Status.NOT_FOUND).build(); + } - originalVideoFilePath = videoFileStorage.persistOriginalFile(uploadTempFile.getTemporaryFilePath(), mediumId); - } - - // get data from ffmpeg - VideoInformation info = getVideoFileInfo(originalVideoFilePath); - mediumVideo.setWidth(info.getWidth()); - mediumVideo.setHeight(info.getHeight()); - mediumVideo.setFrameRate(info.getFramerate()); - mediumVideo.setVideoCodec(""); - mediumVideo.setLength(info.getDuration()); - - - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.merge(mediumVideo); - entityManager.merge(mediumVideo.getMedium()); - entityManager.persist(mediumVideo); - entityManager.persist(mediumVideo.getMedium()); - entityManager.flush(); - entityTransaction.commit(); - entityManager.refresh(mediumVideo); - - createVideoThumbnail(mediumId, DEFAULT_THUMBNAIL_TIMESTAMP_MS); - taskService.executeMediumAudioAnalysisTask(mediumId, SupportedMediumType.VIDEO); - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.MEDIUMCREATED); - - } catch (IOException e) { - e.printStackTrace(); - } - - return Response.ok().entity(mediumVideo).build(); - } - - @HEAD - @Path("audio/{id}/download") - @Produces("audio/mpeg") - public Response getAudioFileInfo(@PathParam("id") int id, - @QueryParam("token") String fileToken) { - - // verify token - if ( fileToken == null ) return Response.status(401).build(); - int tokenMediumID = 0; - try { - tokenMediumID = validateFileToken(fileToken); - } catch (Exception e) { - return Response.status(401).build(); - } - - if ( tokenMediumID != id ) return Response.status(401).build(); - - Optional<java.nio.file.Path> audioFilePath = audioFileStorage.getPathToOriginalFile(id); - if(audioFilePath.isPresent()) { - File audioFile = audioFilePath.get().toFile(); - return Response.ok() - .status( Response.Status.PARTIAL_CONTENT ) - .header( HttpHeaders.CONTENT_LENGTH, audioFile.length() ) - .header( "Accept-Ranges", "bytes" ) - .build(); - } + Optional<java.nio.file.Path> scaledImagePath = imageFileStorage.getPathToScaledImage(id); + if (scaledImagePath.isPresent()) { + return downloadFile(scaledImagePath.get(), headers, id + ".png"); + } - return Response.status(Status.NOT_FOUND).build(); - } - - @HEAD - @Path("video/{id}/download") - @Produces("video/mp4") - public Response getVideoFileInfo(@PathParam("id") int id, - @QueryParam("token") String fileToken) { - - // verify token - if ( fileToken == null ) return Response.status(401).build(); - int tokenMediumID = 0; - try { - tokenMediumID = validateFileToken(fileToken); - } catch (Exception e) { - return Response.status(401).build(); - } - if ( tokenMediumID != id ) return Response.status(401).build(); - Optional<java.nio.file.Path> convertedVideoFilePath = videoFileStorage.getPathToConvertedVideoFile(id); - if ( convertedVideoFilePath.isPresent() ) { - File file = convertedVideoFilePath.get().toFile(); - return Response.ok() - .status( Response.Status.PARTIAL_CONTENT ) - .header( HttpHeaders.CONTENT_LENGTH, file.length() ) - .header( "Accept-Ranges", "bytes" ) - .build(); - } + Optional<java.nio.file.Path> originalImagePath = imageFileStorage.getPathToOriginalImage(id); + if (originalImagePath.isPresent()) { + return downloadFile(originalImagePath.get(), headers, id + ".png"); + } + return Response.status(Status.NOT_FOUND).build(); + } - Optional<java.nio.file.Path> originalVideoFilePath = videoFileStorage.getPathToOriginalFile(id); - if(originalVideoFilePath.isPresent()) { - File file = originalVideoFilePath.get().toFile(); - return Response.ok() - .status( Response.Status.PARTIAL_CONTENT ) - .header( HttpHeaders.CONTENT_LENGTH, file.length() ) - .header( "Accept-Ranges", "bytes" ) - .build(); - } + @GET + @Path("video/{id}/thumbnail") + @Produces("image/jpg") + public Response getVideoThumbnail(@PathParam("id") int id, @QueryParam("time") Long timeMs, @QueryParam("token") String fileToken) { - return Response.status(Status.NOT_FOUND).build(); - } - - @GET - @Path("audio/{id}/download") - @Produces("audio/mp4") - public Response getAudioFile(@Context HttpHeaders headers, - @PathParam("id") int id, - @QueryParam("token") String fileToken, - @QueryParam("force") boolean force) { - - // verify token - if ( fileToken == null ) { - return Response.status(401).build(); - } - int tokenMediumID = 0; - try { - tokenMediumID = validateFileToken(fileToken); - } catch (Exception e) { - return Response.status(401).build(); - } - if ( tokenMediumID != id ) { - return Response.status(401).build(); - } - - Medium medium = TIMAATApp.emf.createEntityManager().find(Medium.class, id); - if ( medium == null ) return Response.status(Status.NOT_FOUND).build(); - - Optional<java.nio.file.Path> audioFilePath = audioFileStorage.getPathToOriginalFile(id); - if(audioFilePath.isPresent()) { - return downloadFile(audioFilePath.get(), headers, id + ".mp3"); - } + // verify token + if (fileToken == null) { + return Response.status(401).build(); + } + int tokenMediumID = 0; + try { + tokenMediumID = validateFileToken(fileToken); + } catch (Exception e) { + return Response.status(401).build(); + } + if (tokenMediumID != id) { + return Response.status(401).build(); + } - return Response.status(Status.NOT_FOUND).build(); - } - - @GET - @Path("video/{id}/download") - @Produces("video/mp4") - public Response getVideoFile(@Context HttpHeaders headers, - @PathParam("id") int id, - @QueryParam("token") String fileToken, - @QueryParam("force") boolean force) { - - // verify token - if ( fileToken == null ) return Response.status(401).build(); - int tokenMediumID = 0; - try { - tokenMediumID = validateFileToken(fileToken); - } catch (Exception e) { - return Response.status(401).build(); - } - if ( tokenMediumID != id ) return Response.status(401).build(); - - Medium m = TIMAATApp.emf.createEntityManager().find(Medium.class, id); - if ( m == null ) return Response.status(Status.NOT_FOUND).build(); - - Optional<java.nio.file.Path> convertedVideoFilePath = videoFileStorage.getPathToConvertedVideoFile(id); - if ( convertedVideoFilePath.isPresent() ) { - return downloadFile(convertedVideoFilePath.get(), headers, id+".mp3"); - } - - Optional<java.nio.file.Path> originalVideoFilePath = videoFileStorage.getPathToOriginalFile(id); - if(originalVideoFilePath.isPresent()) { - return downloadFile(originalVideoFilePath.get(), headers, id+".mp3"); - } - return Response.status(Status.NOT_FOUND).build(); - } - - @GET - @Path("{type}/{id}/status") - @Produces(jakarta.ws.rs.core.MediaType.TEXT_PLAIN) - @Secured - public Response updateFileStatus(@PathParam("type") String type, - @PathParam("id") int id) { - return Response.ok().entity(mediumFileStatus(id, type)).build(); - } - - @GET - @Path("{id}/audio/combined") - @Produces("application/json") - public Response getAudioWaveform(@PathParam("id") int id, - @QueryParam("token") String fileToken) throws IOException { - - // verify token - if ( fileToken == null ) return Response.status(401).build(); - int tokenMediumID = 0; - try { - tokenMediumID = validateFileToken(fileToken); - } catch (Exception e) { - return Response.status(401).build(); - } - if ( tokenMediumID != id ) return Response.status(401).build(); - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Medium medium = entityManager.find(Medium.class, id); - - Optional<WaveformBinaryFileReader> waveformBinaryFileReader = Optional.empty(); - if(medium.getMediumAudio() != null){ - waveformBinaryFileReader = audioFileStorage.getPathToWaveformFile(id).map(WaveformBinaryFileReader::new); - }else if(medium.getMediumVideo() != null){ - waveformBinaryFileReader = videoFileStorage.getPathToWaveformFile(id).map(WaveformBinaryFileReader::new); - } - - if(waveformBinaryFileReader.isPresent()) { - List<Float> averageValues = waveformBinaryFileReader.get().readAverageValues(); - return Response.ok(averageValues).build(); - }else { - return Response.status(Status.NOT_FOUND).build(); - } - } - - @GET - @Path("image/{id}/preview") - @Produces("image/png") - public Response getImagePreview(@PathParam("id") int id, - @QueryParam("token") String fileToken){ - // verify token - if (fileToken == null) { - return Response.status(401).build(); - } - int tokenMediumId = 0; - try { - tokenMediumId = validateFileToken(fileToken); - } catch (Exception e) { - return Response.status(401).build(); - } - if (tokenMediumId != id) { - return Response.status(401).build(); - } - - File image = new File(TIMAATApp.timaatProps.getProp(PropertyConstants.STORAGE_LOCATION) - + "medium/image/" + id + "/" + id + "-image-scaled.png"); - if ( !image.exists() || !image.canRead() ) image = new File(servletContext.getRealPath("img/preview-placeholder.png")); - - return Response.ok().entity(image).build(); - } - - @GET - @Path("image/{id}/thumbnail") - @Produces("image/png") - public Response getImageThumbnail(@PathParam("id") int id, - @QueryParam("token") String fileToken){ - // verify token - if (fileToken == null) { - return Response.status(401).build(); - } - int tokenMediumId = 0; - try { - tokenMediumId = validateFileToken(fileToken); - } catch (Exception e) { - return Response.status(401).build(); - } - if (tokenMediumId != id) { - return Response.status(401).build(); - } - - Optional<java.nio.file.Path> videoThumbnail = videoFileStorage.getPathToThumbnailFile(id); - java.nio.file.Path thumbnailPath = videoThumbnail.orElse(java.nio.file.Path.of(servletContext.getRealPath("img/preview-placeholder.png"))); - - return Response.ok().entity(thumbnailPath.toFile()).build(); - } - - // TODO: Usage of MediumFileStorage to access image files - @HEAD - @Path("image/{id}/download") - @Produces({"image/png","image/jpeg"}) - public Response getImageFileInfo(@PathParam("id") int id, - @QueryParam("token") String fileToken) { - - // verify token - if ( fileToken == null ) return Response.status(401).build(); - int tokenMediumID = 0; - try { - tokenMediumID = validateFileToken(fileToken); - } catch (Exception e) { - return Response.status(401).build(); - } - if ( tokenMediumID != id ) return Response.status(401).build(); - - Optional<java.nio.file.Path> scaledImagePath = imageFileStorage.getPathToScaledImage(id); - if(scaledImagePath.isPresent()) { - File file = scaledImagePath.get().toFile(); - return Response.ok() - .status( Response.Status.PARTIAL_CONTENT ) - .header( HttpHeaders.CONTENT_LENGTH, file.length() ) - .header( "Accept-Ranges", "bytes" ) - .build(); - } - - Optional<java.nio.file.Path> originalImagePath = imageFileStorage.getPathToOriginalImage(id); - if(originalImagePath.isPresent()) { - File file = originalImagePath.get().toFile(); - return Response.ok() - .status( Response.Status.PARTIAL_CONTENT ) - .header( HttpHeaders.CONTENT_LENGTH, file.length() ) - .header( "Accept-Ranges", "bytes" ) - .build(); - } - return Response.status(Status.NOT_FOUND).build(); - } - - @GET - @Path("image/{id}/download") - @Produces({"image/png","image/jpeg"}) - public Response getImageFile(@Context HttpHeaders headers, - @PathParam("id") int id, - @QueryParam("token") String fileToken, - @QueryParam("force") boolean force) { - // System.out.println("triggered getImageOriginalFile"); - // verify token - if (fileToken == null) { - return Response.status(401).build(); - } - int tokenMediumId = 0; - try { - tokenMediumId = validateFileToken(fileToken); - } catch (Exception e) { - return Response.status(401).build(); - } - if (tokenMediumId != id) { - return Response.status(401).build(); - } - - Medium medium = TIMAATApp.emf.createEntityManager().find(Medium.class, id); - if ( medium == null ) return Response.status(Status.NOT_FOUND).build(); - - Optional<java.nio.file.Path> scaledImagePath = imageFileStorage.getPathToScaledImage(id); - if(scaledImagePath.isPresent()) { - return downloadFile(scaledImagePath.get(), headers, id + ".png"); - } - - Optional<java.nio.file.Path> originalImagePath = imageFileStorage.getPathToOriginalImage(id); - if(originalImagePath.isPresent()) { - return downloadFile(originalImagePath.get(), headers, id + ".png"); - } - return Response.status(Status.NOT_FOUND).build(); - } - - @GET - @Path("video/{id}/thumbnail") - @Produces("image/jpg") - public Response getVideoThumbnail( - @PathParam("id") int id, - @QueryParam("time") Long timeMs, - @QueryParam("token") String fileToken) { - - // verify token - if ( fileToken == null ) return Response.status(401).build(); - int tokenMediumID = 0; - try { - tokenMediumID = validateFileToken(fileToken); - } catch (Exception e) { - return Response.status(401).build(); - } - if ( tokenMediumID != id ) return Response.status(401).build(); - - Optional<java.nio.file.Path> videoThumbnail = Optional.empty(); - if(timeMs != null){ - videoThumbnail = videoFileStorage.getPathToFrameFile(id, timeMs); - } + Optional<java.nio.file.Path> videoThumbnail = Optional.empty(); + if (timeMs != null) { + videoThumbnail = videoFileStorage.getPathToFrameFile(id, timeMs); + } - if(videoThumbnail.isEmpty()) { - videoThumbnail = videoFileStorage.getPathToThumbnailFile(id); - } + if (videoThumbnail.isEmpty()) { + videoThumbnail = videoFileStorage.getPathToThumbnailFile(id); + } - java.nio.file.Path thumbnailPath = videoThumbnail.orElse(java.nio.file.Path.of(servletContext.getRealPath("img/preview-placeholder.png"))); - return Response.ok().entity(thumbnailPath.toFile()).build(); - } + java.nio.file.Path thumbnailPath = videoThumbnail.orElse( + java.nio.file.Path.of(servletContext.getRealPath("img/preview-placeholder.png"))); + return Response.ok().entity(thumbnailPath.toFile()).build(); + } - /** - * Gets list of annotations for medium (video) - * @param id - * @return - */ - @GET + /** + * Gets list of annotations for medium (video) + * @param id + * @return + */ + @GET @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("{id}/analysisLists") - @Secured - public Response getMediumAnalysisLists(@PathParam("id") int mediumId, - @QueryParam("authToken") String authToken) { - - // verify auth token - int userId = 0; - if (AuthenticationFilter.isTokenValid(authToken)) { - userId = AuthenticationFilter.getTokenClaimUserId(authToken); - } else { - return Response.status(Status.UNAUTHORIZED).build(); - } - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - String sql = "SELECT DISTINCT mal FROM MediumAnalysisList mal, UserAccountHasMediumAnalysisList uahmal WHERE mal.medium.id = :mediumId AND (mal.id = uahmal.mediumAnalysisList.id AND uahmal.userAccount.id = :userId OR mal.globalPermission > 0)"; - Query query = entityManager.createQuery(sql) - .setParameter("mediumId", mediumId) - .setParameter("userId", userId); - List<MediumAnalysisList> mediumAnalysisLists = castList(MediumAnalysisList.class, query.getResultList()); - - if (userId == 1) { // admin - // find medium and get all its' mediumAnalysisLists - Medium medium = entityManager.find(Medium.class, mediumId); - if ( medium == null ) return Response.status(Status.NOT_FOUND).build(); - entityManager.refresh(medium); - mediumAnalysisLists = medium.getMediumAnalysisLists(); - } - - return Response.ok().entity(mediumAnalysisLists).build(); - } + @Path("{id}/analysisLists") + @Secured + public Response getMediumAnalysisLists(@PathParam("id") int mediumId, @QueryParam("authToken") String authToken) { + + // verify auth token + int userId = 0; + if (AuthenticationFilter.isTokenValid(authToken)) { + userId = AuthenticationFilter.getTokenClaimUserId(authToken); + } + else { + return Response.status(Status.UNAUTHORIZED).build(); + } + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + String sql = "SELECT DISTINCT mal FROM MediumAnalysisList mal, UserAccountHasMediumAnalysisList uahmal WHERE mal.medium.id = :mediumId AND (mal.id = uahmal.mediumAnalysisList.id AND uahmal.userAccount.id = :userId OR mal.globalPermission > 0)"; + Query query = entityManager.createQuery(sql).setParameter("mediumId", mediumId).setParameter("userId", userId); + List<MediumAnalysisList> mediumAnalysisLists = castList(MediumAnalysisList.class, query.getResultList()); + + if (userId == 1) { // admin + // find medium and get all its' mediumAnalysisLists + Medium medium = entityManager.find(Medium.class, mediumId); + if (medium == null) { + return Response.status(Status.NOT_FOUND).build(); + } + entityManager.refresh(medium); + mediumAnalysisLists = medium.getMediumAnalysisLists(); + } + + return Response.ok().entity(mediumAnalysisLists).build(); + } @PUT @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) @Path("{mediumId}/mediumHasMusicList") @Secured public List<MediumHasMusic> updateMediumHasMusicList(@PathParam("mediumId") int mediumId, UpdateMediumHasMusicListPayload updateMediumHasMusicListPayload) { - Map<Integer, Collection<TimeRange>> timeRangesByMusicId = updateMediumHasMusicListPayload.getMediumHasMusicListEntries().stream().collect(Collectors.toMap( - MediumHasMusicListEntry::getMusicId, MediumHasMusicListEntry::getTimeRanges)); + Map<Integer, Collection<TimeRange>> timeRangesByMusicId = updateMediumHasMusicListPayload.getMediumHasMusicListEntries() + .stream().collect( + Collectors.toMap(MediumHasMusicListEntry::getMusicId, MediumHasMusicListEntry::getTimeRanges)); return mediumStorage.updateMediumHasMusicList(mediumId, timeRangesByMusicId); } - @POST - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("{mediumId}/tag/{tagId}") - @Secured - public Response addExistingTag(@PathParam("mediumId") int mediumId, - @PathParam("tagId") int tagId) { - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Medium medium = entityManager.find(Medium.class, mediumId); - if ( medium == null ) return Response.status(Status.NOT_FOUND).build(); - Tag tag = entityManager.find(Tag.class, tagId); - if ( tag == null ) return Response.status(Status.NOT_FOUND).build(); - - // attach tag to annotation and vice versa - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - medium.getTags().add(tag); - tag.getMediums().add(medium); - entityManager.merge(tag); - entityManager.merge(medium); - entityManager.persist(medium); - entityManager.persist(tag); - entityTransaction.commit(); - entityManager.refresh(medium); - - return Response.ok().entity(tag).build(); - } - - @DELETE + @POST + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("{mediumId}/tag/{tagId}") + @Secured + public Response addExistingTag(@PathParam("mediumId") int mediumId, @PathParam("tagId") int tagId) { + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Medium medium = entityManager.find(Medium.class, mediumId); + if (medium == null) { + return Response.status(Status.NOT_FOUND).build(); + } + Tag tag = entityManager.find(Tag.class, tagId); + if (tag == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + // attach tag to annotation and vice versa + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + medium.getTags().add(tag); + tag.getMediums().add(medium); + entityManager.merge(tag); + entityManager.merge(medium); + entityManager.persist(medium); + entityManager.persist(tag); + entityTransaction.commit(); + entityManager.refresh(medium); + + return Response.ok().entity(tag).build(); + } + + @DELETE + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Path("{mediumId}/tag/{tagId}") + @Secured + public Response removeTag(@PathParam("mediumId") int mediumId, @PathParam("tagId") int tagId) { + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Medium medium = entityManager.find(Medium.class, mediumId); + if (medium == null) { + return Response.status(Status.NOT_FOUND).build(); + } + Tag tag = entityManager.find(Tag.class, tagId); + if (tag == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + // attach tag to annotation and vice versa + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + medium.getTags().remove(tag); + tag.getMediums().remove(medium); + entityManager.merge(tag); + entityManager.merge(medium); + entityManager.persist(medium); + entityManager.persist(tag); + entityTransaction.commit(); + entityManager.refresh(medium); + + return Response.ok().build(); + } + + @POST @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("{mediumId}/tag/{tagId}") - @Secured - public Response removeTag(@PathParam("mediumId") int mediumId, - @PathParam("tagId") int tagId) { - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Medium medium = entityManager.find(Medium.class, mediumId); - if ( medium == null ) return Response.status(Status.NOT_FOUND).build(); - Tag tag = entityManager.find(Tag.class, tagId); - if ( tag == null ) return Response.status(Status.NOT_FOUND).build(); - - // attach tag to annotation and vice versa - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - medium.getTags().remove(tag); - tag.getMediums().remove(medium); - entityManager.merge(tag); - entityManager.merge(medium); - entityManager.persist(medium); - entityManager.persist(tag); - entityTransaction.commit(); - entityManager.refresh(medium); - - return Response.ok().build(); - } - - @POST + @Path("{mediumId}/categorySet/{categorySetId}") + @Secured + public Response addExistingCategorySet(@PathParam("mediumId") int mediumId, @PathParam("categorySetId") int categorySetId) { + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Medium medium = entityManager.find(Medium.class, mediumId); + if (medium == null) { + return Response.status(Status.NOT_FOUND).build(); + } + CategorySet categorySet = entityManager.find(CategorySet.class, categorySetId); + if (categorySet == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + // attach categorySet to annotation and vice versa + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + medium.getCategorySets().add(categorySet); + categorySet.getMediums().add(medium); + entityManager.merge(categorySet); + entityManager.merge(medium); + entityManager.persist(medium); + entityManager.persist(categorySet); + entityTransaction.commit(); + entityManager.refresh(medium); + + return Response.ok().entity(categorySet).build(); + } + + @DELETE @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("{mediumId}/categorySet/{categorySetId}") - @Secured - public Response addExistingCategorySet(@PathParam("mediumId") int mediumId, - @PathParam("categorySetId") int categorySetId) { - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Medium medium = entityManager.find(Medium.class, mediumId); - if ( medium == null ) return Response.status(Status.NOT_FOUND).build(); - CategorySet categorySet = entityManager.find(CategorySet.class, categorySetId); - if ( categorySet == null ) return Response.status(Status.NOT_FOUND).build(); - - // attach categorySet to annotation and vice versa - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - medium.getCategorySets().add(categorySet); - categorySet.getMediums().add(medium); - entityManager.merge(categorySet); - entityManager.merge(medium); - entityManager.persist(medium); - entityManager.persist(categorySet); - entityTransaction.commit(); - entityManager.refresh(medium); - - return Response.ok().entity(categorySet).build(); - } - - @DELETE + @Path("{mediumId}/categorySet/{categorySetId}") + @Secured + public Response removeCategorySet(@PathParam("mediumId") int mediumId, @PathParam("categorySetId") int categorySetId) { + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Medium medium = entityManager.find(Medium.class, mediumId); + if (medium == null) { + return Response.status(Status.NOT_FOUND).build(); + } + CategorySet categorySet = entityManager.find(CategorySet.class, categorySetId); + if (categorySet == null) { + return Response.status(Status.NOT_FOUND).build(); + } + // TODO delete categories from media of matching categorySets + List<Category> categoryList = new ArrayList<>(); + Set<CategorySetHasCategory> cshc = categorySet.getCategorySetHasCategories(); + Iterator<CategorySetHasCategory> itr = cshc.iterator(); + EntityTransaction entityTransaction = entityManager.getTransaction(); + + while (itr.hasNext()) { + categoryList.add(itr.next().getCategory()); + } + // remove all categories from removed category set from the medium + List<Category> mediumCategoryList = medium.getCategories(); + List<Category> categoriesToRemove = categoryList.stream().distinct().filter(mediumCategoryList::contains) + .collect(Collectors.toList()); + entityTransaction.begin(); + for (Category category : categoriesToRemove) { + medium.getCategories().remove(category); + } + entityManager.merge(medium); + entityManager.persist(medium); + entityTransaction.commit(); + entityManager.refresh(medium); + + // attach categorySet to medium and vice versa + entityTransaction.begin(); + medium.getCategorySets().remove(categorySet); + categorySet.getMediums().remove(medium); + entityManager.merge(categorySet); + entityManager.merge(medium); + entityManager.persist(medium); + entityManager.persist(categorySet); + entityTransaction.commit(); + entityManager.refresh(medium); + + return Response.ok().build(); + } + + @POST @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("{mediumId}/categorySet/{categorySetId}") - @Secured - public Response removeCategorySet(@PathParam("mediumId") int mediumId, - @PathParam("categorySetId") int categorySetId) { - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Medium medium = entityManager.find(Medium.class, mediumId); - if ( medium == null ) return Response.status(Status.NOT_FOUND).build(); - CategorySet categorySet = entityManager.find(CategorySet.class, categorySetId); - if ( categorySet == null ) return Response.status(Status.NOT_FOUND).build(); - // TODO delete categories from media of matching categorySets - List<Category> categoryList = new ArrayList<>(); - Set<CategorySetHasCategory> cshc = categorySet.getCategorySetHasCategories(); - Iterator<CategorySetHasCategory> itr = cshc.iterator(); - EntityTransaction entityTransaction = entityManager.getTransaction(); - - while (itr.hasNext()) { - categoryList.add(itr.next().getCategory()); - } - // remove all categories from removed category set from the medium - List<Category> mediumCategoryList = medium.getCategories(); - List<Category> categoriesToRemove = categoryList.stream() - .distinct() - .filter(mediumCategoryList::contains) - .collect(Collectors.toList()); - entityTransaction.begin(); - for (Category category : categoriesToRemove) { - medium.getCategories().remove(category); - } - entityManager.merge(medium); - entityManager.persist(medium); - entityTransaction.commit(); - entityManager.refresh(medium); - - // attach categorySet to medium and vice versa - entityTransaction.begin(); - medium.getCategorySets().remove(categorySet); - categorySet.getMediums().remove(medium); - entityManager.merge(categorySet); - entityManager.merge(medium); - entityManager.persist(medium); - entityManager.persist(categorySet); - entityTransaction.commit(); - entityManager.refresh(medium); - - return Response.ok().build(); - } - - @POST - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("{mediumId}/category/{categoryId}") - @Secured - public Response addExistingCategory(@PathParam("mediumId") int mediumId, - @PathParam("categoryId") int categoryId) { - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Medium medium = entityManager.find(Medium.class, mediumId); - if ( medium == null ) return Response.status(Status.NOT_FOUND).build(); - Category category = entityManager.find(Category.class, categoryId); - if ( category == null ) return Response.status(Status.NOT_FOUND).build(); - - // attach category to annotation and vice versa - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - medium.getCategories().add(category); - category.getMediums().add(medium); - entityManager.merge(category); - entityManager.merge(medium); - entityManager.persist(medium); - entityManager.persist(category); - entityTransaction.commit(); - entityManager.refresh(medium); - - return Response.ok().entity(category).build(); - } - - @DELETE + @Path("{mediumId}/category/{categoryId}") + @Secured + public Response addExistingCategory(@PathParam("mediumId") int mediumId, @PathParam("categoryId") int categoryId) { + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Medium medium = entityManager.find(Medium.class, mediumId); + if (medium == null) { + return Response.status(Status.NOT_FOUND).build(); + } + Category category = entityManager.find(Category.class, categoryId); + if (category == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + // attach category to annotation and vice versa + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + medium.getCategories().add(category); + category.getMediums().add(medium); + entityManager.merge(category); + entityManager.merge(medium); + entityManager.persist(medium); + entityManager.persist(category); + entityTransaction.commit(); + entityManager.refresh(medium); + + return Response.ok().entity(category).build(); + } + + @DELETE @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("{mediumId}/category/{categoryId}") - @Secured - public Response removeCategory(@PathParam("mediumId") int mediumId, - @PathParam("categoryId") int categoryId) { + @Path("{mediumId}/category/{categoryId}") + @Secured + public Response removeCategory(@PathParam("mediumId") int mediumId, @PathParam("categoryId") int categoryId) { // System.out.println("TCL: EndpointMedium - removeCategory"); - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Medium medium = entityManager.find(Medium.class, mediumId); - if ( medium == null ) return Response.status(Status.NOT_FOUND).build(); - Category category = entityManager.find(Category.class, categoryId); - if ( category == null ) return Response.status(Status.NOT_FOUND).build(); - - // attach category to medium and vice versa - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - medium.getCategories().remove(category); - category.getMediums().remove(medium); - entityManager.merge(category); - entityManager.merge(medium); - entityManager.persist(medium); - entityManager.persist(category); - entityTransaction.commit(); - entityManager.refresh(medium); - return Response.ok().build(); - } - - @PATCH + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Medium medium = entityManager.find(Medium.class, mediumId); + if (medium == null) { + return Response.status(Status.NOT_FOUND).build(); + } + Category category = entityManager.find(Category.class, categoryId); + if (category == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + // attach category to medium and vice versa + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + medium.getCategories().remove(category); + category.getMediums().remove(medium); + entityManager.merge(category); + entityManager.merge(medium); + entityManager.persist(medium); + entityManager.persist(category); + entityTransaction.commit(); + entityManager.refresh(medium); + return Response.ok().build(); + } + + @PATCH @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) - @Path("fileLengthFix") - @Secured - public Response updateAllFileLengths(@QueryParam("authToken") String authToken) { - // verify auth token - int userId = 0; - if (AuthenticationFilter.isTokenValid(authToken)) { - userId = AuthenticationFilter.getTokenClaimUserId(authToken); - } else { - return Response.status(Status.UNAUTHORIZED).build(); - } - if (userId != 1) { // only Admin may update file lengths - return Response.status(Status.FORBIDDEN).build(); - } - - Runtime r = Runtime.getRuntime(); - Process p; // Process tracks one external native process - BufferedReader is; // reader for output of process - String line; - String filename; - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - String sql = "SELECT m FROM Medium m WHERE m.filePath IS NOT NULL"; - Query query = entityManager.createQuery(sql); - List<Medium> mediumList = castList(Medium.class, query.getResultList()); - EntityTransaction entityTransaction = entityManager.getTransaction(); - - for (Medium medium : mediumList) { - if (!(medium.getFilePath().contains("medium"))) { - medium.setFilePath(null); - } - if ((medium.getMediumAudio() != null || medium.getMediumVideo() != null) && medium.getFilePath() != null){ - filename = medium.getFilePath(); - String[] commandLine = { TIMAATApp.timaatProps.getProp(PropertyConstants.FFMPEG_LOCATION)+"ffprobe"+TIMAATApp.systemExt, - "-v", "error", "-select_streams", "v:0", - "-show_entries", "stream=width,height,r_frame_rate,codec_name", - "-show_entries", "format=duration", "-sexagesimal", - "-of", "json", filename }; - try { - p = r.exec(commandLine); - is = new BufferedReader(new InputStreamReader(p.getInputStream())); - - try { - p.waitFor(); // wait for process to complete - } catch (InterruptedException e) { - System.err.println(e); // "can't happen" - } - - String jsonString = ""; - while ((line = is.readLine()) != null) if ( line != null ) jsonString += line; - - JSONObject json = new JSONObject(jsonString); - String sDuration = json.getJSONObject("format").getString("duration"); - String[] hms = sDuration.split(":"); - double dTotalSecs = Integer.parseInt(hms[0]) * 3600 - + Integer.parseInt(hms[1]) * 60 - + Double.parseDouble(hms[2]); - long lDuration = (long) (dTotalSecs*1000); - - if (medium.getMediumAudio() != null) { - medium.getMediumAudio().setLength(lDuration); - } else if (medium.getMediumVideo() != null) { - medium.getMediumVideo().setLength(lDuration); - } - - entityTransaction.begin(); - entityManager.merge(medium); - entityManager.persist(medium); - entityTransaction.commit(); - entityManager.refresh(medium); - - } catch (IOException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - } - } - return Response.ok().build(); -} + @Path("fileLengthFix") + @Secured + public Response updateAllFileLengths(@QueryParam("authToken") String authToken) { + // verify auth token + int userId = 0; + if (AuthenticationFilter.isTokenValid(authToken)) { + userId = AuthenticationFilter.getTokenClaimUserId(authToken); + } + else { + return Response.status(Status.UNAUTHORIZED).build(); + } + if (userId != 1) { // only Admin may update file lengths + return Response.status(Status.FORBIDDEN).build(); + } + + Runtime r = Runtime.getRuntime(); + Process p; // Process tracks one external native process + BufferedReader is; // reader for output of process + String line; + String filename; + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + String sql = "SELECT m FROM Medium m WHERE m.filePath IS NOT NULL"; + Query query = entityManager.createQuery(sql); + List<Medium> mediumList = castList(Medium.class, query.getResultList()); + EntityTransaction entityTransaction = entityManager.getTransaction(); + + for (Medium medium : mediumList) { + if (!(medium.getFilePath().contains("medium"))) { + medium.setFilePath(null); + } + if ((medium.getMediumAudio() != null || medium.getMediumVideo() != null) && medium.getFilePath() != null) { + filename = medium.getFilePath(); + String[] commandLine = {TIMAATApp.timaatProps.getProp( + PropertyConstants.FFMPEG_LOCATION) + "ffprobe" + TIMAATApp.systemExt, "-v", "error", "-select_streams", "v:0", "-show_entries", "stream=width,height,r_frame_rate,codec_name", "-show_entries", "format=duration", "-sexagesimal", "-of", "json", filename}; + try { + p = r.exec(commandLine); + is = new BufferedReader(new InputStreamReader(p.getInputStream())); + + try { + p.waitFor(); // wait for process to complete + } catch (InterruptedException e) { + System.err.println(e); // "can't happen" + } + + String jsonString = ""; + while ((line = is.readLine()) != null) { + if (line != null) { + jsonString += line; + } + } + + JSONObject json = new JSONObject(jsonString); + String sDuration = json.getJSONObject("format").getString("duration"); + String[] hms = sDuration.split(":"); + double dTotalSecs = Integer.parseInt(hms[0]) * 3600 + Integer.parseInt(hms[1]) * 60 + Double.parseDouble( + hms[2]); + long lDuration = (long) (dTotalSecs * 1000); + + if (medium.getMediumAudio() != null) { + medium.getMediumAudio().setLength(lDuration); + } + else if (medium.getMediumVideo() != null) { + medium.getMediumVideo().setLength(lDuration); + } + + entityTransaction.begin(); + entityManager.merge(medium); + entityManager.persist(medium); + entityTransaction.commit(); + entityManager.refresh(medium); + + } catch (IOException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + } + } + return Response.ok().build(); + } - private Response downloadFile(java.nio.file.Path filePath, HttpHeaders headers, String asFile) { - Response response = null; - - // Retrieve the file - File file = filePath.toFile(); - - if (file.exists()) { - String fileExtension = file.getName().substring(file.getName().lastIndexOf('.')+1); - String fileType = "video"; - if ( fileExtension.equalsIgnoreCase("png") || fileExtension.equalsIgnoreCase("jpg") ) fileType = "image"; - if ( fileExtension.equalsIgnoreCase("mp3") ) fileType = "audio"; - - ResponseBuilder builder = Response.ok(); - if ( asFile != null ) builder.header("Content-Disposition", "attachment; filename=\""+asFile+"\""); - - builder.header("Accept-Ranges", "bytes"); - if ( headers.getRequestHeaders().containsKey("Range") ) { - String rangeHeader = headers.getHeaderString("Range"); - String[] acceptRanges = rangeHeader.split("="); - if ( acceptRanges.length < 2 ) return Response.status(Status.BAD_REQUEST).build(); - } - - int from,to=0; - if (!headers.getRequestHeaders().containsKey("Range")) { - builder.header("Content-Length", file.length()); - builder.header("Content-Type", fileType+"/"+fileExtension); - from = 0; - to = (int)file.length(); - } else { - String rangeHeader = headers.getHeaderString("Range"); - builder.status(Status.PARTIAL_CONTENT); - builder.header("Content-Type", fileType+"/"+fileExtension); - - String[] acceptRanges = rangeHeader.split("="); - String[] bounds = acceptRanges[1].split("-"); - from = Integer.parseInt(bounds[0]); - to = (int) file.length()-1; - if ( bounds.length > 1 ) to = Integer.parseInt(bounds[1]); - from = Math.max(0, from); - from = (int) Math.min(file.length(), from); - to = Math.max(0, to); - to = (int) Math.min(file.length(), to); - to = Math.max(from+1, to); - builder.header("Content-Length", to-from+1); - builder.header("Content-Range", "bytes "+from+"-"+to+"/"+file.length()); + private Response downloadFile(java.nio.file.Path filePath, HttpHeaders headers, String asFile) { + Response response = null; + + // Retrieve the file + File file = filePath.toFile(); + + if (file.exists()) { + String fileExtension = file.getName().substring(file.getName().lastIndexOf('.') + 1); + String fileType = "video"; + if (fileExtension.equalsIgnoreCase("png") || fileExtension.equalsIgnoreCase("jpg")) { + fileType = "image"; + } + if (fileExtension.equalsIgnoreCase("mp3")) { + fileType = "audio"; + } + + ResponseBuilder builder = Response.ok(); + if (asFile != null) { + builder.header("Content-Disposition", "attachment; filename=\"" + asFile + "\""); + } + + builder.header("Accept-Ranges", "bytes"); + if (headers.getRequestHeaders().containsKey("Range")) { + String rangeHeader = headers.getHeaderString("Range"); + String[] acceptRanges = rangeHeader.split("="); + if (acceptRanges.length < 2) { + return Response.status(Status.BAD_REQUEST).build(); + } + } + + int from, to = 0; + if (!headers.getRequestHeaders().containsKey("Range")) { + builder.header("Content-Length", file.length()); + builder.header("Content-Type", fileType + "/" + fileExtension); + from = 0; + to = (int) file.length(); + } + else { + String rangeHeader = headers.getHeaderString("Range"); + builder.status(Status.PARTIAL_CONTENT); + builder.header("Content-Type", fileType + "/" + fileExtension); + + String[] acceptRanges = rangeHeader.split("="); + String[] bounds = acceptRanges[1].split("-"); + from = Integer.parseInt(bounds[0]); + to = (int) file.length() - 1; + if (bounds.length > 1) { + to = Integer.parseInt(bounds[1]); + } + from = Math.max(0, from); + from = (int) Math.min(file.length(), from); + to = Math.max(0, to); + to = (int) Math.min(file.length(), to); + to = Math.max(from + 1, to); + builder.header("Content-Length", to - from + 1); + builder.header("Content-Range", "bytes " + from + "-" + to + "/" + file.length()); // builder.header("Cache-Control", "no-cache, no-store, must-revalidate"); // HTTP 1.1 // builder.header("Pragma", "no-cache"); // HTTP 1.0 // builder.header("Expires", "0"); // Proxies // builder.header("Content-Disposition", "attachment; filename=" + file.getName()); - } - - RangedStreamingOutput stream = new RangedStreamingOutput(from, to, file); - builder.entity(stream); - response = builder.build(); - } else { - response = Response.status(404). - entity("INTERNAL ERROR::FILE NOT FOUND"). - type("text/plain"). - build(); - } - - return response; - } - //TODO: In future versions another mechanism should be found for that, so the storages are the only components knowing the paths to the files - public static String mediumFileStatus(int id, String type) { - File mediumDir = java.nio.file.Path.of(TIMAATApp.timaatProps.getProp(PropertyConstants.STORAGE_LOCATION)).resolve("medium").resolve(type).resolve(String.valueOf(id)).toFile(); - String fileStatus = "noFile"; - if ( !mediumDir.exists() ) { - return fileStatus; - } - - String fileExtension = ""; // TODO determine correct file type - if (type.equalsIgnoreCase("audio")) fileExtension = "mp3"; - if (type.equalsIgnoreCase("image")) fileExtension = "png"; - if (type.equalsIgnoreCase("video")) fileExtension = "mp4"; - - switch (type) { - case "audio": // currently mp3 files will only be uploaded but not converted - if ( new File(mediumDir + "/" + id + "-" + type + "." + fileExtension ).exists() ) fileStatus = "ready"; - break; - case "image": - if ( new File(mediumDir + "/" + id + "-" + type + "-original." + fileExtension ).exists() || new File(mediumDir + "-" + type + "-original." + "jpg" ).exists() ) fileStatus = "uploaded"; - if ( new File(mediumDir + "/" + id + "-" + type + "-thumb." + fileExtension ).exists() ) fileStatus = "thumbCreated"; - if ( new File(mediumDir + "/" + id + "-" + type + "-scaled." + fileExtension ).exists() ) fileStatus = "ready"; - break; - case "video": - if ( new File(mediumDir + "/" + id + "-" + type + "-original." + fileExtension ).exists() ) fileStatus = "waiting"; - if ( new File(mediumDir + "/" + id + "-" + type + "." + fileExtension ).exists() ) fileStatus = "ready"; - if ( new File(mediumDir + "/" + id + "-transcoding.pid" ).exists() ) fileStatus = "transcoding"; - break; - } - - // TODO implement status "unavailable" - - return fileStatus; - } - - private AudioInformation getAudioFileInfo(java.nio.file.Path mediumFilePath) throws IOException { - Runtime r = Runtime.getRuntime(); - Process p; // Process tracks one external native process - BufferedReader is; // reader for output of process - String line; - - String[] commandLine = { TIMAATApp.timaatProps.getProp(PropertyConstants.FFMPEG_LOCATION)+"ffprobe"+TIMAATApp.systemExt, - "-v", "error", "-select_streams", "v:0", - "-show_entries", "stream=r_frame_rate,codec_name", - "-show_entries", "format=duration", "-sexagesimal", - "-of", "json", mediumFilePath.toString() }; - AudioInformation audioInfo = new AudioInformation(0, ""); - - try { - p = r.exec(commandLine); - is = new BufferedReader(new InputStreamReader(p.getInputStream())); - - try { - p.waitFor(); // wait for process to complete - } catch (InterruptedException e) { - System.err.println(e); // "can't happen" - } - - String jsonString = ""; - while ((line = is.readLine()) != null) if ( line != null ) jsonString += line; - - JSONObject json = new JSONObject(jsonString); - String sDuration = json.getJSONObject("format").getString("duration"); - String[] hms = sDuration.split(":"); - double dTotalSecs = Integer.parseInt(hms[0]) * 3600 - + Integer.parseInt(hms[1]) * 60 - + Double.parseDouble(hms[2]); - long lDuration = (long) (dTotalSecs*1000); - audioInfo.setDuration(lDuration); - if (json.getJSONArray("streams").length() > 0) { - audioInfo.setCodec(json.getJSONArray("streams").getJSONObject(0).getString("codec_name")); - } - } catch (IOException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - return audioInfo; - } - - private ImageInformation getImageFileInfo(java.nio.file.Path imagePath, ImageFileType imageFileType) throws IOException { - String suffix = imageFileType.getFileSuffix(); - ImageInformation imageInfo = new ImageInformation(0, 0, "0", ""); - Iterator<ImageReader> iter = ImageIO.getImageReadersBySuffix(suffix); - while(iter.hasNext()) { - ImageReader reader = iter.next(); - try { - ImageInputStream stream = new FileImageInputStream(imagePath.toFile()); - reader.setInput(stream); - int width = reader.getWidth(reader.getMinIndex()); - int height = reader.getHeight(reader.getMinIndex()); - // IIOMetadata metadata = reader.getImageMetadata(0); - // if (metadata.isStandardMetadataFormatSupported()) { // true for all bundled formats - // IIOMetadataNode bitDepth = (IIOMetadataNode) metadata.getAsTree("jakarta_imageio_1.0") - // .getElementsByTagName('Data').item(0) - // .get_elements_by_tag_name('BitsPerSample').item(0) - // .getAttribute('value'); - imageInfo.setWidth(width); - imageInfo.setHeight(height); - stream.flush(); - stream.close(); - // imageInfo.setBitDepth(bitDepth); - return imageInfo; - } catch (IOException e) { - System.out.println("Error reading: " + imagePath + e); - } finally { - reader.dispose(); - } - } - throw new IOException("Not a known image file: " + imagePath); - // Runtime r = Runtime.getRuntime(); - // Process p; // Process tracks one external native process - // BufferedReader is; // reader for output of process - // String line; - - // String[] commandLine = { TIMAATApp.timaatProps.getProp(PropertyConstants.FFMPEG_LOCATION)+"ffprobe"+TIMAATApp.systemExt, - // "-v", "error", "-select_streams", "v:0", - // "-show_entries", "stream=width,height,r_frame_rate,codec_name", - // "-show_entries", "format=duration", - // "-of", "json", filename }; - // ImageInformation imageInfo = new ImageInformation("0", "0", "0", ""); - - // try { - // p = r.exec(commandLine); - // is = new BufferedReader(new InputStreamReader(p.getInputStream())); - - // try { - // p.waitFor(); // wait for process to complete - // } catch (InterruptedException e) { - // System.err.println(e); // "can't happen" - // } - - // String jsonString = ""; - // while ((line = is.readLine()) != null) if ( line != null ) jsonString += line; - - // JSONObject json = new JSONObject(jsonString); - // imageInfo.setWidth(json.getJSONArray("streams").getJSONObject(0).getString("width")); - // imageInfo.setHeight(json.getJSONArray("streams").getJSONObject(0).getString("height")); - // imageInfo.setbitDepth(json.getJSONArray("streams").getJSONObject(0).getString("bitDepth")); - // imageInfo.setFileExtension(json.getJSONArray("streams").getJSONObject(0).getString("fileExtension")); - - - // } catch (IOException e1) { - // // TODO Auto-generated catch block - // e1.printStackTrace(); - // } - - // return imageInfo; -} + } + + RangedStreamingOutput stream = new RangedStreamingOutput(from, to, file); + builder.entity(stream); + response = builder.build(); + } + else { + response = Response.status(404).entity("INTERNAL ERROR::FILE NOT FOUND").type("text/plain").build(); + } + + return response; + } + + //TODO: In future versions another mechanism should be found for that, so the storages are the only components knowing the paths to the files + public static String mediumFileStatus(int id, String type) { + File mediumDir = java.nio.file.Path.of(TIMAATApp.timaatProps.getProp(PropertyConstants.STORAGE_LOCATION)) + .resolve("medium").resolve(type).resolve(String.valueOf(id)).toFile(); + String fileStatus = "noFile"; + if (!mediumDir.exists()) { + return fileStatus; + } + + String fileExtension = ""; // TODO determine correct file type + if (type.equalsIgnoreCase("audio")) { + fileExtension = "mp3"; + } + if (type.equalsIgnoreCase("image")) { + fileExtension = "png"; + } + if (type.equalsIgnoreCase("video")) { + fileExtension = "mp4"; + } + + switch (type) { + case "audio": // currently mp3 files will only be uploaded but not converted + if (new File(mediumDir + "/" + id + "-" + type + "." + fileExtension).exists()) { + fileStatus = "ready"; + } + break; + case "image": + if (new File(mediumDir + "/" + id + "-" + type + "-original." + fileExtension).exists() || new File( + mediumDir + "-" + type + "-original." + "jpg").exists()) { + fileStatus = "uploaded"; + } + if (new File(mediumDir + "/" + id + "-" + type + "-thumb." + fileExtension).exists()) { + fileStatus = "thumbCreated"; + } + if (new File(mediumDir + "/" + id + "-" + type + "-scaled." + fileExtension).exists()) { + fileStatus = "ready"; + } + break; + case "video": + if (new File(mediumDir + "/" + id + "-" + type + "-original." + fileExtension).exists()) { + fileStatus = "waiting"; + } + if (new File(mediumDir + "/" + id + "-" + type + "." + fileExtension).exists()) { + fileStatus = "ready"; + } + if (new File(mediumDir + "/" + id + "-transcoding.pid").exists()) { + fileStatus = "transcoding"; + } + break; + } + + // TODO implement status "unavailable" + + return fileStatus; + } + + private AudioInformation getAudioFileInfo(java.nio.file.Path mediumFilePath) throws IOException { + Runtime r = Runtime.getRuntime(); + Process p; // Process tracks one external native process + BufferedReader is; // reader for output of process + String line; + + String[] commandLine = {TIMAATApp.timaatProps.getProp( + PropertyConstants.FFMPEG_LOCATION) + "ffprobe" + TIMAATApp.systemExt, "-v", "error", "-select_streams", "v:0", "-show_entries", "stream=r_frame_rate,codec_name", "-show_entries", "format=duration", "-sexagesimal", "-of", "json", mediumFilePath.toString()}; + AudioInformation audioInfo = new AudioInformation(0, ""); + + try { + p = r.exec(commandLine); + is = new BufferedReader(new InputStreamReader(p.getInputStream())); + + try { + p.waitFor(); // wait for process to complete + } catch (InterruptedException e) { + System.err.println(e); // "can't happen" + } + + String jsonString = ""; + while ((line = is.readLine()) != null) { + if (line != null) { + jsonString += line; + } + } + + JSONObject json = new JSONObject(jsonString); + String sDuration = json.getJSONObject("format").getString("duration"); + String[] hms = sDuration.split(":"); + double dTotalSecs = Integer.parseInt(hms[0]) * 3600 + Integer.parseInt(hms[1]) * 60 + Double.parseDouble(hms[2]); + long lDuration = (long) (dTotalSecs * 1000); + audioInfo.setDuration(lDuration); + if (json.getJSONArray("streams").length() > 0) { + audioInfo.setCodec(json.getJSONArray("streams").getJSONObject(0).getString("codec_name")); + } + } catch (IOException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + return audioInfo; + } + + private ImageInformation getImageFileInfo(java.nio.file.Path imagePath, ImageFileType imageFileType) throws IOException { + String suffix = imageFileType.getFileSuffix(); + ImageInformation imageInfo = new ImageInformation(0, 0, "0", ""); + Iterator<ImageReader> iter = ImageIO.getImageReadersBySuffix(suffix); + while (iter.hasNext()) { + ImageReader reader = iter.next(); + try { + ImageInputStream stream = new FileImageInputStream(imagePath.toFile()); + reader.setInput(stream); + int width = reader.getWidth(reader.getMinIndex()); + int height = reader.getHeight(reader.getMinIndex()); + // IIOMetadata metadata = reader.getImageMetadata(0); + // if (metadata.isStandardMetadataFormatSupported()) { // true for all bundled formats + // IIOMetadataNode bitDepth = (IIOMetadataNode) metadata.getAsTree("jakarta_imageio_1.0") + // .getElementsByTagName('Data').item(0) + // .get_elements_by_tag_name('BitsPerSample').item(0) + // .getAttribute('value'); + imageInfo.setWidth(width); + imageInfo.setHeight(height); + stream.flush(); + stream.close(); + // imageInfo.setBitDepth(bitDepth); + return imageInfo; + } catch (IOException e) { + System.out.println("Error reading: " + imagePath + e); + } finally { + reader.dispose(); + } + } + throw new IOException("Not a known image file: " + imagePath); + // Runtime r = Runtime.getRuntime(); + // Process p; // Process tracks one external native process + // BufferedReader is; // reader for output of process + // String line; + + // String[] commandLine = { TIMAATApp.timaatProps.getProp(PropertyConstants.FFMPEG_LOCATION)+"ffprobe"+TIMAATApp.systemExt, + // "-v", "error", "-select_streams", "v:0", + // "-show_entries", "stream=width,height,r_frame_rate,codec_name", + // "-show_entries", "format=duration", + // "-of", "json", filename }; + // ImageInformation imageInfo = new ImageInformation("0", "0", "0", ""); + + // try { + // p = r.exec(commandLine); + // is = new BufferedReader(new InputStreamReader(p.getInputStream())); + + // try { + // p.waitFor(); // wait for process to complete + // } catch (InterruptedException e) { + // System.err.println(e); // "can't happen" + // } + + // String jsonString = ""; + // while ((line = is.readLine()) != null) if ( line != null ) jsonString += line; + + // JSONObject json = new JSONObject(jsonString); + // imageInfo.setWidth(json.getJSONArray("streams").getJSONObject(0).getString("width")); + // imageInfo.setHeight(json.getJSONArray("streams").getJSONObject(0).getString("height")); + // imageInfo.setbitDepth(json.getJSONArray("streams").getJSONObject(0).getString("bitDepth")); + // imageInfo.setFileExtension(json.getJSONArray("streams").getJSONObject(0).getString("fileExtension")); + + + // } catch (IOException e1) { + // // TODO Auto-generated catch block + // e1.printStackTrace(); + // } + + // return imageInfo; + } + + private VideoInformation getVideoFileInfo(java.nio.file.Path mediumFilePath) throws IOException { + Runtime r = Runtime.getRuntime(); + Process p; // Process tracks one external native process + BufferedReader is; // reader for output of process + String line; + + String[] commandLine = {TIMAATApp.timaatProps.getProp( + PropertyConstants.FFMPEG_LOCATION) + "ffprobe" + TIMAATApp.systemExt, "-v", "error", "-select_streams", "v:0", "-show_entries", "stream=width,height,r_frame_rate,codec_name", "-show_entries", "format=duration", "-sexagesimal", "-of", "json", mediumFilePath.toString()}; + VideoInformation videoInfo = new VideoInformation(0, 0, 25, 0, ""); + + try { + p = r.exec(commandLine); + is = new BufferedReader(new InputStreamReader(p.getInputStream())); + + try { + p.waitFor(); // wait for process to complete + } catch (InterruptedException e) { + System.err.println(e); // "can't happen" + } + + String jsonString = ""; + while ((line = is.readLine()) != null) { + if (line != null) { + jsonString += line; + } + } + + JSONObject json = new JSONObject(jsonString); + int framerate = 30; // TODO + videoInfo.setWidth(json.getJSONArray("streams").getJSONObject(0).getInt("width")); + videoInfo.setHeight(json.getJSONArray("streams").getJSONObject(0).getInt("height")); + videoInfo.setFramerate(framerate); + String sDuration = json.getJSONObject("format").getString("duration"); + String[] hms = sDuration.split(":"); + double dTotalSecs = Integer.parseInt(hms[0]) * 3600 + Integer.parseInt(hms[1]) * 60 + Double.parseDouble(hms[2]); + long lDuration = (long) (dTotalSecs * 1000); + videoInfo.setDuration(lDuration); + videoInfo.setCodec(json.getJSONArray("streams").getJSONObject(0).getString("codec_name")); + } catch (IOException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + + return videoInfo; + } + + private BufferedImage resizeImage(BufferedImage originalImage, int targetWidth, int targetHeight) throws IOException { + BufferedImage resizedImage = new BufferedImage(targetWidth, targetHeight, BufferedImage.TYPE_INT_RGB); + Graphics2D graphics2D = resizedImage.createGraphics(); + graphics2D.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR); + graphics2D.drawImage(originalImage, 0, 0, targetWidth, targetHeight, null); + graphics2D.dispose(); + return resizedImage; + } - private VideoInformation getVideoFileInfo(java.nio.file.Path mediumFilePath) throws IOException { - Runtime r = Runtime.getRuntime(); - Process p; // Process tracks one external native process - BufferedReader is; // reader for output of process - String line; - - String[] commandLine = { TIMAATApp.timaatProps.getProp(PropertyConstants.FFMPEG_LOCATION)+"ffprobe"+TIMAATApp.systemExt, - "-v", "error", "-select_streams", "v:0", - "-show_entries", "stream=width,height,r_frame_rate,codec_name", - "-show_entries", "format=duration", "-sexagesimal", - "-of", "json", mediumFilePath.toString() }; - VideoInformation videoInfo = new VideoInformation(0, 0, 25, 0, ""); - - try { - p = r.exec(commandLine); - is = new BufferedReader(new InputStreamReader(p.getInputStream())); - - try { - p.waitFor(); // wait for process to complete - } catch (InterruptedException e) { - System.err.println(e); // "can't happen" - } - - String jsonString = ""; - while ((line = is.readLine()) != null) if ( line != null ) jsonString += line; - - JSONObject json = new JSONObject(jsonString); - int framerate = 30; // TODO - videoInfo.setWidth(json.getJSONArray("streams").getJSONObject(0).getInt("width")); - videoInfo.setHeight(json.getJSONArray("streams").getJSONObject(0).getInt("height")); - videoInfo.setFramerate(framerate); - String sDuration = json.getJSONObject("format").getString("duration"); - String[] hms = sDuration.split(":"); - double dTotalSecs = Integer.parseInt(hms[0]) * 3600 - + Integer.parseInt(hms[1]) * 60 - + Double.parseDouble(hms[2]); - long lDuration = (long) (dTotalSecs*1000); - videoInfo.setDuration(lDuration); - videoInfo.setCodec(json.getJSONArray("streams").getJSONObject(0).getString("codec_name")); - } catch (IOException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - - return videoInfo; - } - - private BufferedImage resizeImage(BufferedImage originalImage, int targetWidth, int targetHeight) throws IOException - { - BufferedImage resizedImage = new BufferedImage(targetWidth, targetHeight, BufferedImage.TYPE_INT_RGB); - Graphics2D graphics2D = resizedImage.createGraphics(); - graphics2D.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR); - graphics2D.drawImage(originalImage, 0, 0, targetWidth, targetHeight, null); - graphics2D.dispose(); - return resizedImage; - } - - private java.nio.file.Path createVideoThumbnail(int mediumId, int frameTimeStampMs) throws IOException, VideoEngineException { + private java.nio.file.Path createVideoThumbnail(int mediumId, int frameTimeStampMs) throws IOException, VideoEngineException { Optional<java.nio.file.Path> mediumVideoFilePathOptional = videoFileStorage.getPathToOriginalFile(mediumId); float frameTimeStampInSeconds = frameTimeStampMs / 1000f; - if(mediumVideoFilePathOptional.isPresent()) { + if (mediumVideoFilePathOptional.isPresent()) { java.nio.file.Path mediumVideoFilePath = mediumVideoFilePathOptional.get(); - try(TemporaryFile temporaryFile = temporaryFileStorage.createTemporaryFile()){ - ffmpegVideoEngine.extractFrameOfVideo(mediumVideoFilePath, temporaryFile.getTemporaryFilePath(), frameTimeStampInSeconds); + try (TemporaryFile temporaryFile = temporaryFileStorage.createTemporaryFile()) { + ffmpegVideoEngine.extractFrameOfVideo(mediumVideoFilePath, temporaryFile.getTemporaryFilePath(), + frameTimeStampInSeconds); mediumVideoStorage.updateThumbnailPositionMs(mediumId, frameTimeStampMs); return videoFileStorage.persistThumbnailFile(temporaryFile.getTemporaryFilePath(), mediumId); } } throw new FileNotFoundException(); - } - - public static String issueFileToken(int mediumID) { - return issueFileToken(mediumID, null); - } - public static String issueFileToken(int mediumID, ContainerRequestContext crc) { - // System.out.println("issueFileToken for id "+ mediumID); - Key key = TIMAATKeyGenerator.generateKey(); - - JwtBuilder jwtBuilder = Jwts.builder().claim("file", mediumID).setIssuer( - TIMAATApp.timaatProps.getProp(PropertyConstants.SERVER_NAME)); - if ( crc != null ) jwtBuilder - .setSubject(crc.getProperty("TIMAAT.userName").toString()) - .claim("id", Integer.parseInt(crc.getProperty("TIMAAT.userID").toString())); - String token = jwtBuilder.setIssuedAt(new Date()) - .setExpiration(EndpointAuthentication.toDate(LocalDateTime.now().plusHours(8L))) - .signWith(key, SignatureAlgorithm.HS512).compact(); - return token; - } - - public static int validateFileToken(String token) throws Exception { - // Check if the token was issued by the server and if it's not expired - // Throw an Exception if the token is invalid - - Key key = TIMAATKeyGenerator.generateKey(); - int mediumID = Jwts.parserBuilder().setSigningKey(key).build().parseClaimsJws(token).getBody().get("file", Integer.class); - - return mediumID; - } - - public static <T> List<T> castList(Class<? extends T> clazz, Collection<?> c) { - List<T> r = new ArrayList<T>(c.size()); - for(Object o: c) - r.add(clazz.cast(o)); - return r; + } + + public static String issueFileToken(int mediumID) { + return issueFileToken(mediumID, null); + } + + public static String issueFileToken(int mediumID, ContainerRequestContext crc) { + // System.out.println("issueFileToken for id "+ mediumID); + Key key = TIMAATKeyGenerator.generateKey(); + + JwtBuilder jwtBuilder = Jwts.builder().claim("file", mediumID) + .setIssuer(TIMAATApp.timaatProps.getProp(PropertyConstants.SERVER_NAME)); + if (crc != null) { + jwtBuilder.setSubject(crc.getProperty("TIMAAT.userName").toString()) + .claim("id", Integer.parseInt(crc.getProperty("TIMAAT.userID").toString())); } + String token = jwtBuilder.setIssuedAt(new Date()) + .setExpiration(EndpointAuthentication.toDate(LocalDateTime.now().plusHours(8L))) + .signWith(key, SignatureAlgorithm.HS512).compact(); + return token; + } + + public static int validateFileToken(String token) throws Exception { + // Check if the token was issued by the server and if it's not expired + // Throw an Exception if the token is invalid + + Key key = TIMAATKeyGenerator.generateKey(); + int mediumID = Jwts.parserBuilder().setSigningKey(key).build().parseClaimsJws(token).getBody() + .get("file", Integer.class); + + return mediumID; + } + + public static <T> List<T> castList(Class<? extends T> clazz, Collection<?> c) { + List<T> r = new ArrayList<T>(c.size()); + for (Object o : c) { + r.add(clazz.cast(o)); + } + return r; + } } diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/model/medium/MediumListingQueryParameter.java b/src/main/java/de/bitgilde/TIMAAT/rest/model/medium/MediumListingQueryParameter.java new file mode 100644 index 00000000..2bc32c82 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/rest/model/medium/MediumListingQueryParameter.java @@ -0,0 +1,53 @@ +package de.bitgilde.TIMAAT.rest.model.medium; + +import de.bitgilde.TIMAAT.rest.model.parameter.ListingQueryParameter; +import de.bitgilde.TIMAAT.storage.entity.medium.api.MediumFilterCriteria; +import de.bitgilde.TIMAAT.storage.entity.medium.api.MediumSortingField; +import jakarta.ws.rs.QueryParam; + +import java.util.Collection; +import java.util.Optional; + +/* + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + +/** + * Query parameter used for the listing endpoint inside {@link de.bitgilde.TIMAAT.rest.endpoint.EndpointMedium} + * + * @author Nico Kotlenga + * @since 13.12.25 + */ +public class MediumListingQueryParameter extends ListingQueryParameter<MediumSortingField> implements MediumFilterCriteria { + @QueryParam("categoryIds") + private Collection<Integer> categoryIds; + @QueryParam("categorySetIds") + private Collection<Integer> categorySetIds; + @QueryParam("search") + private String search; + + @Override + public Optional<Collection<Integer>> getCategoryIds() { + return Optional.ofNullable(categoryIds); + } + + @Override + public Optional<Collection<Integer>> getCategorySetIds() { + return Optional.ofNullable(categorySetIds); + } + + @Override + public Optional<String> getMediumNameSearch() { + return Optional.ofNullable(search); + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/MediumStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/MediumStorage.java index d543f03e..a92ad5f2 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/MediumStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/MediumStorage.java @@ -1,13 +1,25 @@ package de.bitgilde.TIMAAT.storage.entity.medium; -import de.bitgilde.TIMAAT.db.DbAccessComponent; +import de.bitgilde.TIMAAT.model.FIPOP.Category; +import de.bitgilde.TIMAAT.model.FIPOP.CategorySet; +import de.bitgilde.TIMAAT.model.FIPOP.CategorySet_; +import de.bitgilde.TIMAAT.model.FIPOP.Category_; import de.bitgilde.TIMAAT.model.FIPOP.Medium; import de.bitgilde.TIMAAT.model.FIPOP.MediumHasMusic; import de.bitgilde.TIMAAT.model.FIPOP.MediumHasMusicDetail; +import de.bitgilde.TIMAAT.model.FIPOP.Medium_; import de.bitgilde.TIMAAT.model.FIPOP.Music; +import de.bitgilde.TIMAAT.model.FIPOP.Title_; import de.bitgilde.TIMAAT.model.TimeRange; +import de.bitgilde.TIMAAT.storage.db.DbStorage; +import de.bitgilde.TIMAAT.storage.entity.medium.api.MediumFilterCriteria; +import de.bitgilde.TIMAAT.storage.entity.medium.api.MediumSortingField; import jakarta.inject.Inject; import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; import java.util.ArrayList; import java.util.Collection; @@ -36,22 +48,22 @@ * @author Nico Kotlenga * @since 27.09.25 */ -public class MediumStorage extends DbAccessComponent { +public class MediumStorage extends DbStorage<Medium, MediumFilterCriteria, MediumSortingField> { private static final Logger logger = Logger.getLogger(MediumStorage.class.getName()); @Inject public MediumStorage(EntityManagerFactory emf) { - super(emf); + super(Medium.class, MediumSortingField.ID, emf); } - public List<MediumHasMusic> updateMediumHasMusicList(int mediumId, Map<Integer, Collection<TimeRange>> timeRangesByMusicId){ + public List<MediumHasMusic> updateMediumHasMusicList(int mediumId, Map<Integer, Collection<TimeRange>> timeRangesByMusicId) { logger.log(Level.FINE, "Updating medium has music list of medium with id " + mediumId); return executeDbTransaction(entityManager -> { Medium medium = entityManager.find(Medium.class, mediumId); - entityManager.createQuery("delete from MediumHasMusic where medium.id= :mediumId").setParameter("mediumId", mediumId) - .executeUpdate(); + entityManager.createQuery("delete from MediumHasMusic where medium.id= :mediumId") + .setParameter("mediumId", mediumId).executeUpdate(); List<MediumHasMusic> updatedMediumHasMusic = new ArrayList<>(); for (Map.Entry<Integer, Collection<TimeRange>> currentTimeRangeByMediumId : timeRangesByMusicId.entrySet()) { MediumHasMusic currentMediumHasMusic = new MediumHasMusic(); @@ -79,4 +91,30 @@ public List<MediumHasMusic> updateMediumHasMusicList(int mediumId, Map<Integer, return updatedMediumHasMusic; }); } + + @Override + protected List<Predicate> createPredicates(MediumFilterCriteria filter, Root<Medium> root, CriteriaBuilder criteriaBuilder) { + List<Predicate> predicates = new ArrayList<>(); + + if (filter.getMediumNameSearch().isPresent()) { + String searchText = filter.getMediumNameSearch().get(); + predicates.add(criteriaBuilder.like(root.get(Medium_.displayTitle).get(Title_.name), "%" + searchText + "%")); + } + + if (filter.getCategoryIds().isPresent() && !filter.getCategoryIds().get().isEmpty()) { + Collection<Integer> categoryIds = filter.getCategoryIds().get(); + Join<Medium, Category> categoryJoin = root.join(Medium_.categories); + + predicates.add(categoryJoin.get(Category_.id).in(categoryIds)); + } + + if (filter.getCategorySetIds().isPresent() && !filter.getCategorySetIds().get().isEmpty()) { + Collection<Integer> categorySetIds = filter.getCategorySetIds().get(); + Join<Medium, CategorySet> categorySetJoin = root.join(Medium_.categorySets); + + predicates.add(categorySetJoin.get(CategorySet_.id).in(categorySetIds)); + } + + return predicates; + } } diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/api/MediumFilterCriteria.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/api/MediumFilterCriteria.java new file mode 100644 index 00000000..1f726c50 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/api/MediumFilterCriteria.java @@ -0,0 +1,82 @@ +package de.bitgilde.TIMAAT.storage.entity.medium.api; + +import java.util.Collection; +import java.util.Optional; + +/* + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + +/** + * Defines the filter which can be applied to the {@link de.bitgilde.TIMAAT.storage.entity.medium.MediumStorage} + * + * @author Nico Kotlenga + * @since 13.12.25 + */ +public interface MediumFilterCriteria { + /** + * @return the category ids the returning medium should belong to + */ + Optional<Collection<Integer>> getCategoryIds(); + + /** + * @return the category set ids the retuning medium should belong to + */ + Optional<Collection<Integer>> getCategorySetIds(); + + /** + * @return the search text which the medium name should match + */ + Optional<String> getMediumNameSearch(); + + class Builder { + + private Collection<Integer> categoryIds = null; + private Collection<Integer> categorySetIds = null; + private String mediumNameSearch = null; + + public MediumFilterCriteria.Builder categoryIds(Collection<Integer> categoryIds) { + this.categoryIds = categoryIds; + return this; + } + + public MediumFilterCriteria.Builder categorySetIds(Collection<Integer> categorySetIds) { + this.categorySetIds = categorySetIds; + return this; + } + + public MediumFilterCriteria.Builder mediumNameSearch(String musicNameSearch) { + this.mediumNameSearch = musicNameSearch; + return this; + } + + public MediumFilterCriteria build() { + return new MediumFilterCriteria() { + @Override + public Optional<Collection<Integer>> getCategoryIds() { + return Optional.ofNullable(categoryIds); + } + + @Override + public Optional<Collection<Integer>> getCategorySetIds() { + return Optional.ofNullable(categorySetIds); + } + + @Override + public Optional<String> getMediumNameSearch() { + return Optional.ofNullable(mediumNameSearch); + } + }; + } + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/api/MediumSortingField.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/api/MediumSortingField.java new file mode 100644 index 00000000..cba150f1 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/api/MediumSortingField.java @@ -0,0 +1,44 @@ +package de.bitgilde.TIMAAT.storage.entity.medium.api; + +import de.bitgilde.TIMAAT.model.FIPOP.Medium; +import de.bitgilde.TIMAAT.model.FIPOP.Medium_; +import de.bitgilde.TIMAAT.storage.db.DbSortingField; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Root; + +/* + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + +/** + * {@link de.bitgilde.TIMAAT.storage.api.SortingField}s used by {@link de.bitgilde.TIMAAT.storage.entity.medium.MediumStorage} + * + * @author Nico Kotlenga + * @since 13.12.25 + */ +public enum MediumSortingField implements DbSortingField<Medium> { + ID, + RELEASEDATE; + + @Override + public Path<?> getPathFromRootEntity(Root<Medium> root) { + switch (this) { + case ID: + return root.get(Medium_.id); + case RELEASEDATE: + return root.get(Medium_.releaseDate); + default: + throw new IllegalArgumentException("Unexpected enum value"); + } + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/music/MusicStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/music/MusicStorage.java index 1b7665f4..ee26ae63 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/music/MusicStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/music/MusicStorage.java @@ -90,14 +90,14 @@ protected List<Predicate> createPredicates(MusicFilterCriteria filter, Root<Musi criteriaBuilder.like(root.get(Music_.displayTitle).get(Title_.name), "%" + musicNameSearchText + "%")); } - if (filter.getCategoryIds().isPresent()) { + if (filter.getCategoryIds().isPresent() && !filter.getCategoryIds().get().isEmpty()) { Collection<Integer> categoryIds = filter.getCategoryIds().get(); Join<Music, Category> categoryJoin = root.join(Music_.categories); predicates.add(categoryJoin.get(Category_.id).in(categoryIds)); } - if (filter.getCategorySetIds().isPresent()) { + if (filter.getCategorySetIds().isPresent() && !filter.getCategorySetIds().get().isEmpty()) { Collection<Integer> categorySetIds = filter.getCategorySetIds().get(); Join<Music, CategorySet> categorySetJoin = root.join(Music_.categorySets); From 930732189a9f6b61a8e01d8fd35cbab7adfec1db Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Fri, 19 Dec 2025 08:53:52 +0100 Subject: [PATCH 20/70] TIMAAT Weiterentwicklung #9 - Showing of information message when no category or category set has been selected * Added right view to categories which will be shown when no category or category set has been selected * Added active state to table to avoid sending requests when it's not necessary --- src/main/webapp/index.html | 5 + .../webapp/js/datasets/timaat.categories.js | 429 ++++++++++-------- src/main/webapp/js/ui/timaat.table.js | 146 +++--- 3 files changed, 327 insertions(+), 253 deletions(-) diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html index 2b385573..7b9023e6 100644 --- a/src/main/webapp/index.html +++ b/src/main/webapp/index.html @@ -2408,6 +2408,11 @@ <h5 class="form-title capitalize--first-letter" id="categorySetCreateChangeFormH </div> </div> </div> + <div class="categoriesRightPanelContent px-3" id="categoriesNoSelectionPanel"> + <div class="d-flex justify-content-center"> + <div id="categoriesNoSelectionPanelText">No category selected</div> + </div> + </div> </div> </div> </div> diff --git a/src/main/webapp/js/datasets/timaat.categories.js b/src/main/webapp/js/datasets/timaat.categories.js index 23b65f51..8eb3e3a8 100644 --- a/src/main/webapp/js/datasets/timaat.categories.js +++ b/src/main/webapp/js/datasets/timaat.categories.js @@ -36,7 +36,7 @@ }(function (TIMAAT) { TIMAAT.Categories = { categoryDataTable: null, categorySetDataTable: null, relatedMusicTable: null, relatedMediumTable: null, - relatedActorTable: null, relatedAnnotationTable: null, + relatedActorTable: null, relatedAnnotationTable: null, currentItemType: null, init: function () { $('#categorySetTab').on('click', function (event) { @@ -69,7 +69,7 @@ } }) $('#categorySetCreateChangeFormDismissButton').on('click', () => { - TIMAAT.Categories.showAssignedEntitiesPanel() + TIMAAT.Categories.showEntitiesPanel() }) $('#categoriesCategorySetDeleteModalSubmitButton').on('click', async function (event) { @@ -97,7 +97,7 @@ if (event.currentTarget.checked) { TIMAAT.Categories.categoryDataTable.rows().select() } else { - TIMAAT.Categories.categoryDataTable.rows.deselect() + TIMAAT.Categories.categoryDataTable.rows().deselect() } } }) @@ -111,7 +111,7 @@ }) $('#categoryCreateChangeFormDismissButton').on('click', () => { - TIMAAT.Categories.showAssignedEntitiesPanel() + TIMAAT.Categories.showEntitiesPanel() }) @@ -130,19 +130,37 @@ * @param itemType which will be selected. Can be category or categorySet */ updateItemTypeSelection: function (itemType) { + TIMAAT.Categories.currentItemType = itemType + + const $categoryNoSelectionPanelText = $('#categoriesNoSelectionPanelText') + switch (itemType) { case 'category': TIMAAT.UI.displayComponent('category', 'categoryTab', 'categoryDataTableCard'); TIMAAT.URLHistory.setURL(null, 'Categories', '#categories/categories'); - TIMAAT.Categories.loadCategories() + $categoryNoSelectionPanelText.text("No category selected") + + if(!TIMAAT.Categories.categoryDataTable){ + TIMAAT.Categories.initCategoriesDataTable() + }else { + TIMAAT.Categories.categoryDataTable.rows().deselect() + TIMAAT.Categories.categoryDataTable.ajax.reload() + } break case 'categorySet': TIMAAT.UI.displayComponent('category', 'categorySetTab', 'categorySetDataTableCard'); TIMAAT.URLHistory.setURL(null, 'Category Sets', '#categories/categorySets'); - TIMAAT.Categories.loadCategorySets() + $categoryNoSelectionPanelText.text("No category set selected") + + if(!TIMAAT.Categories.categorySetDataTable){ + TIMAAT.Categories.initCategorySetsDataTable() + } else { + TIMAAT.Categories.categorySetDataTable.rows().deselect() + TIMAAT.Categories.categorySetDataTable.ajax.reload() + } break } - TIMAAT.Categories.showAssignedEntitiesPanel() + TIMAAT.Categories.showNoSelectionPanel() }, updateCategorySelectAllCheckboxState() { @@ -151,6 +169,14 @@ $('#categoryDataTableSelectAll').prop('checked', selectedCount === totalCount && totalCount > 0); }, + updateCategorySetSelectAllCheckboxState(){ + const selectedCategorySets = TIMAAT.Categories.categorySetDataTable.rows({selected: true}).data().toArray(); + + const selectedCount = selectedCategorySets.length; + const totalCount = TIMAAT.Categories.categorySetDataTable.rows().count(); + $('#categorySetDataTableSelectAll').prop('checked', selectedCount === totalCount && totalCount > 0); + }, + createCategorySetDropDown: function () { const categorySetsDropDown = $('#categorySetsMultiSelectDropdown') categorySetsDropDown.empty() @@ -358,7 +384,7 @@ await TIMAAT.CategoryService.createCategory(categoryName, categorySetIds) TIMAAT.Categories.categoryDataTable?.ajax.reload() - TIMAAT.Categories.showAssignedEntitiesPanel() + TIMAAT.Categories.showEntitiesPanel() } }) $categoryCreateChangeForm.show() @@ -387,6 +413,29 @@ TIMAAT.Categories.relatedAnnotationTable.draw() }, + showNoSelectionPanel() { + $('.categoriesRightPanelContent').hide() + $('#categoriesNoSelectionPanel').show() + }, + + showEntitiesPanel(){ + let count + switch (TIMAAT.Categories.currentItemType){ + case 'category': + count= TIMAAT.Categories.categoryDataTable.rows({selected: true}).count() + break + case 'categorySet': + count = TIMAAT.Categories.categoryDataTable.rows({selected: true}).count() + break + } + + if(count > 0){ + TIMAAT.Categories.showAssignedEntitiesPanel() + }else{ + TIMAAT.Categories.showNoSelectionPanel() + } + }, + showAddCategorySetPanel() { $('.categoriesRightPanelContent').hide() @@ -410,7 +459,7 @@ await TIMAAT.CategorySetService.createCategorySet(categorySetName, categoryIds) TIMAAT.Categories.categorySetDataTable?.ajax.reload() - TIMAAT.Categories.showAssignedEntitiesPanel() + TIMAAT.Categories.showEntitiesPanel() } }) $categorySetCreateChangeForm.show() @@ -446,7 +495,7 @@ await TIMAAT.CategorySetService.updateCategorySet(categorySet.id, categorySetName, categoriesIds) TIMAAT.Categories.categorySetDataTable?.ajax.reload() - TIMAAT.Categories.showAssignedEntitiesPanel() + TIMAAT.Categories.showEntitiesPanel() } }) $categorySetCreateChangeForm.show() @@ -489,7 +538,7 @@ await TIMAAT.CategoryService.updateCategory(category.id, categoryName, categorySetIds) TIMAAT.Categories.categoryDataTable?.ajax.reload() - TIMAAT.Categories.showAssignedEntitiesPanel() + TIMAAT.Categories.showEntitiesPanel() } }) $categoryCreateChangeForm.show() @@ -503,193 +552,205 @@ $categoriesCategoryDeleteModal.modal('show'); }, - loadCategorySets() { - if (!TIMAAT.Categories.categorySetDataTable) { - TIMAAT.Categories.categorySetDataTable = $('#categorySetDataTable').DataTable({ - "autoWidth": false, - "lengthMenu": [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]], - "order": [[1, 'asc']], - "pagingType": "full", - "dom": '<lf<t>ip>', - "processing": true, - "stateSave": true, - "scrollY": "60vh", - "scrollCollapse": true, - "scrollX": false, - "rowId": 'id', - "serverSide": true, - "select": { - "style": 'multi', "selector": 'td:not(.actions)' - }, - "ajax": { - "url": "api/categorySet/list", - "contentType": "application/json; charset=utf-8", - "dataType": "json", - "data": function (data) { - let serverData = { - draw: data.draw, - start: data.start, - length: data.length, - orderby: data.columns[data.order[0].column].name, - dir: data.order[0].dir, // musicSubtype: '' - } - if (data.search && data.search.value && data.search.value.length > 0) serverData.search = data.search.value; - return serverData; - }, - "beforeSend": function (xhr) { - xhr.setRequestHeader('Authorization', 'Bearer ' + TIMAAT.Service.token); + initCategorySetsDataTable() { + TIMAAT.Categories.categorySetDataTable = $('#categorySetDataTable').DataTable({ + "autoWidth": false, + "lengthMenu": [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]], + "order": [[1, 'asc']], + "pagingType": "full", + "dom": '<lf<t>ip>', + "processing": true, + "stateSave": true, + "stateLoadParams": function (settings, data) { + // Remove Select extension state + data.select = {} + }, + "scrollY": "60vh", + "scrollCollapse": true, + "scrollX": false, + "rowId": 'id', + "serverSide": true, + "select": { + "style": 'multi', "selector": 'td:not(.actions)' + }, + "ajax": { + "url": "api/categorySet/list", + "contentType": "application/json; charset=utf-8", + "dataType": "json", + "data": function (data) { + let serverData = { + draw: data.draw, + start: data.start, + length: data.length, + orderby: data.columns[data.order[0].column].name, + dir: data.order[0].dir, // musicSubtype: '' } + if (data.search && data.search.value && data.search.value.length > 0) serverData.search = data.search.value; + return serverData; }, - "columns": [{ - data: null, - orderable: false, - searchable: false, - defaultContent: '', - width: '1%', - className: "select-checkbox", - }, { - data: 'name', - name: 'name', - className: 'name', - width: '100%', - render: function (data, type, row) { - // console.log("TCL: event", event); - return `<p>` + ` ` + row.name + `</p>`; - } - }, { - data: null, - className: 'actions', - orderable: false, - searchable: false, - width: '1%', - render: function (data, type, row) { - const rowJson = encodeURIComponent(JSON.stringify(row)); - - return `<div class="d-flex justify-content-end"> + "beforeSend": function (xhr) { + xhr.setRequestHeader('Authorization', 'Bearer ' + TIMAAT.Service.token); + } + }, + "columns": [{ + data: null, + orderable: false, + searchable: false, + defaultContent: '', + width: '1%', + className: "select-checkbox", + }, { + data: 'name', + name: 'name', + className: 'name', + width: '100%', + render: function (data, type, row) { + // console.log("TCL: event", event); + return `<p>` + ` ` + row.name + `</p>`; + } + }, { + data: null, + className: 'actions', + orderable: false, + searchable: false, + width: '1%', + render: function (data, type, row) { + const rowJson = encodeURIComponent(JSON.stringify(row)); + + return `<div class="d-flex justify-content-end"> <div class="btn-group" role="group" aria-label="Category set row options"> <button type="button" class="btn btn-sm btn-outline btn-secondary categorySetEditButton" data-category-set="${rowJson}"><i class="fas fa-edit"></i></button> <button type="button" class="btn btn-sm btn-outline btn-danger categorySetDeleteButton" data-category-set="${rowJson}"><i class="fas fa-trash-alt"></i></button> </div> </div>` - } - }], - "language": { - "decimal": ",", - "thousands": ".", - "search": "Search", - "lengthMenu": "Show _MENU_ entries", - "zeroRecords": "No category set found.", - "info": "Page _PAGE_ of _PAGES_ · (_MAX_ category sets total)", - "infoEmpty": "No category set available.", - "infoFiltered": "(— _TOTAL_ of _MAX_ category sets)", - "paginate": { - "first": "<<", "previous": "<", "next": ">", "last": ">>" - }, + } + }], + "language": { + "decimal": ",", + "thousands": ".", + "search": "Search", + "lengthMenu": "Show _MENU_ entries", + "zeroRecords": "No category set found.", + "info": "Page _PAGE_ of _PAGES_ · (_MAX_ category sets total)", + "infoEmpty": "No category set available.", + "infoFiltered": "(— _TOTAL_ of _MAX_ category sets)", + "paginate": { + "first": "<<", "previous": "<", "next": ">", "last": ">>" }, - }); - TIMAAT.Categories.categorySetDataTable.on('select deselect', function () { - const selectedCategorySets = TIMAAT.Categories.categorySetDataTable.rows({selected: true}).data().toArray(); - - const selectedCount = selectedCategorySets.length; - const totalCount = TIMAAT.Categories.categorySetDataTable.rows().count(); - $('#categorySetDataTableSelectAll').prop('checked', selectedCount === totalCount && totalCount > 0); - }); - } else { - //The datatable was already initialized. We just need to reload the entries - TIMAAT.Categories.categorySetDataTable.ajax.reload(); - } + }, + }); + TIMAAT.Categories.categorySetDataTable.on('select deselect', TIMAAT.Categories.handleSelectionChanged); }, - loadCategories: function () { - if (!TIMAAT.Categories.categoryDataTable) { - TIMAAT.Categories.categoryDataTable = $('#categoryDataTable').DataTable({ - "autoWidth": false, - "lengthMenu": [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]], - "order": [[1, 'asc']], - "pagingType": "full", - "dom": '<lf<t>ip>', - "processing": true, - "stateSave": true, - "scrollY": "60vh", - "scrollCollapse": true, - "scrollX": false, - "rowId": 'id', - "serverSide": true, - "select": { - "style": 'multi', "selector": 'td:not(.actions)' - }, - "ajax": { - "url": "api/category/list", - "contentType": "application/json; charset=utf-8", - "dataType": "json", - "data": function (data) { - let serverData = { - draw: data.draw, - start: data.start, - length: data.length, - orderby: data.columns[data.order[0].column].name, - dir: data.order[0].dir, // musicSubtype: '' - } - if (data.search && data.search.value && data.search.value.length > 0) serverData.search = data.search.value; - return serverData; - }, - "beforeSend": function (xhr) { - xhr.setRequestHeader('Authorization', 'Bearer ' + TIMAAT.Service.token); + initCategoriesDataTable: function () { + TIMAAT.Categories.categoryDataTable = $('#categoryDataTable').DataTable({ + "autoWidth": false, + "lengthMenu": [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]], + "order": [[1, 'asc']], + "pagingType": "full", + "dom": '<lf<t>ip>', + "processing": true, + "stateSave": true, + "stateLoadParams": function (settings, data) { + // Remove Select extension state + data.select = {} + }, + "scrollY": "60vh", + "scrollCollapse": true, + "scrollX": false, + "rowId": 'id', + "serverSide": true, + "select": { + "style": 'multi', "selector": 'td:not(.actions)' + }, + "ajax": { + "url": "api/category/list", + "contentType": "application/json; charset=utf-8", + "dataType": "json", + "data": function (data) { + let serverData = { + draw: data.draw, + start: data.start, + length: data.length, + orderby: data.columns[data.order[0].column].name, + dir: data.order[0].dir, // musicSubtype: '' } + if (data.search && data.search.value && data.search.value.length > 0) serverData.search = data.search.value; + return serverData; }, - "columns": [{ - data: null, - orderable: false, - searchable: false, - defaultContent: '', - width: '1%', - className: "select-checkbox", - }, { - data: 'name', - name: 'name', - className: 'name', - width: '100%', - render: function (data, type, row) { - // console.log("TCL: event", event); - return `<p>` + ` ` + row.name + `</p>`; - } - }, { - data: null, - className: 'actions', - orderable: false, - searchable: false, - width: '1%', - render: function (data, type, row) { - const rowJson = encodeURIComponent(JSON.stringify(row)); - - return `<div class="d-flex justify-content-end"> - <div class="btn-group" role="group" aria-label="Categories row options"> - <button type="button" class="btn btn-sm btn-outline btn-secondary categoryEditButton" data-category="${rowJson}"><i class="fas fa-edit"></i></button> - <button type="button" class="btn btn-sm btn-outline btn-danger categoryDeleteButton" data-category="${rowJson}"><i class="fas fa-trash-alt"></i></button> - </div> - </div>` - } - }], - "language": { - "decimal": ",", - "thousands": ".", - "search": "Search", - "lengthMenu": "Show _MENU_ entries", - "zeroRecords": "No category found.", - "info": "Page _PAGE_ of _PAGES_ · (_MAX_ categories total)", - "infoEmpty": "No categories available.", - "infoFiltered": "(— _TOTAL_ of _MAX_ categories)", - "paginate": { - "first": "<<", "previous": "<", "next": ">", "last": ">>" - }, + "beforeSend": function (xhr) { + xhr.setRequestHeader('Authorization', 'Bearer ' + TIMAAT.Service.token); + } + }, + "columns": [{ + data: null, + orderable: false, + searchable: false, + defaultContent: '', + width: '1%', + className: "select-checkbox", + }, { + data: 'name', + name: 'name', + className: 'name', + width: '100%', + render: function (data, type, row) { + // console.log("TCL: event", event); + return `<p>` + ` ` + row.name + `</p>`; + } + }, { + data: null, + className: 'actions', + orderable: false, + searchable: false, + width: '1%', + render: function (data, type, row) { + const rowJson = encodeURIComponent(JSON.stringify(row)); + + return `<div class="d-flex justify-content-end"> + <div class="btn-group" role="group" aria-label="Categories row options"> + <button type="button" class="btn btn-sm btn-outline btn-secondary categoryEditButton" data-category="${rowJson}"><i class="fas fa-edit"></i></button> + <button type="button" class="btn btn-sm btn-outline btn-danger categoryDeleteButton" data-category="${rowJson}"><i class="fas fa-trash-alt"></i></button> + </div> + </div>` + } + }], + "language": { + "decimal": ",", + "thousands": ".", + "search": "Search", + "lengthMenu": "Show _MENU_ entries", + "zeroRecords": "No category found.", + "info": "Page _PAGE_ of _PAGES_ · (_MAX_ categories total)", + "infoEmpty": "No categories available.", + "infoFiltered": "(— _TOTAL_ of _MAX_ categories)", + "paginate": { + "first": "<<", "previous": "<", "next": ">", "last": ">>" }, - }); - TIMAAT.Categories.categoryDataTable.on('select deselect', function () { + }, + }); + TIMAAT.Categories.categoryDataTable.on('select deselect', TIMAAT.Categories.handleSelectionChanged); + }, + + handleSelectionChanged(){ + let selectionCount + switch (TIMAAT.Categories.currentItemType){ + case "category": TIMAAT.Categories.updateCategorySelectAllCheckboxState() - }); - } else { - //The datatable was already initialized. We just need to reload the entries - TIMAAT.Categories.categoryDataTable.ajax.reload(); + const selectedCategories = TIMAAT.Categories.categoryDataTable.rows({selected: true}).data() + selectionCount = selectedCategories.length + break + case "categorySet": + TIMAAT.Categories.updateCategorySetSelectAllCheckboxState() + const selectedCategorySets = TIMAAT.Categories.categorySetDataTable.rows({selected: true}).data() + selectionCount = selectedCategorySets.length + break + } + + if(selectionCount > 0){ + TIMAAT.Categories.showAssignedEntitiesPanel() + }else { + TIMAAT.Categories.showNoSelectionPanel() } } } diff --git a/src/main/webapp/js/ui/timaat.table.js b/src/main/webapp/js/ui/timaat.table.js index 7fb4aa5c..3f344bfe 100644 --- a/src/main/webapp/js/ui/timaat.table.js +++ b/src/main/webapp/js/ui/timaat.table.js @@ -145,6 +145,7 @@ } TIMAAT.Table.Table = class { + _active _tableColumnConfigsById _activeTableColumnIds _$container @@ -153,7 +154,7 @@ _reorderableColumns _dataTable = null; - constructor(tableId, containerSelector, tableColumnConfigs, defaultActiveTableColumnConfigs, dataUrl,reorderableColumns=true) { + constructor(tableId, containerSelector, tableColumnConfigs, defaultActiveTableColumnConfigs, dataUrl,reorderableColumns=true, active=true) { this._tableColumnConfigsById = new Map() for (let tableColumnConfig of tableColumnConfigs) { this._tableColumnConfigsById.set(tableColumnConfig.id, tableColumnConfig); @@ -163,6 +164,7 @@ this._dataUrl = dataUrl; this._tableId = tableId this._reorderableColumns = reorderableColumns; + this._active = active } /** @@ -193,6 +195,10 @@ return !active } + set active(active){ + this._active = active + } + get activeTableColumnIds() { return this._activeTableColumnIds; } @@ -206,79 +212,81 @@ this._dataTable?.clear().destroy(true) this._$container.empty() - const $table = $(`<table id="${this._tableId}" class="table table-striped table-bordered table-hover"></table>`) - const $tableHead = $(`<thead class="thead-dark"></thead>`) - const $tableBody = $(`<tbody></tbody>`) - $tableHead.appendTo($table) - $tableBody.appendTo($table) - - const $headerRow = $("<tr></tr>") - $headerRow.appendTo($tableHead) - - const columnConfigs = [] - for (let activeTableColumnId of this._activeTableColumnIds) { - const currentTableColumnConfig = this._tableColumnConfigsById.get(activeTableColumnId); - columnConfigs.push({ - title: currentTableColumnConfig.title, - data: currentTableColumnConfig.data, - render: currentTableColumnConfig.render, - orderable: currentTableColumnConfig.sortable - }); - $('<th>').text(currentTableColumnConfig.title).appendTo($headerRow); - } - $table.appendTo(this._$container) - - this._dataTable = $table.DataTable({ - "destroy": true, - "autoWidth": false, - "colReorder": { - "enable": this._reorderableColumns, - "order": Array.from(columnConfigs.keys()) - }, - "lengthMenu": [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]], - "pagingType": "full", - "dom": '<lf<t>ip>', - "processing": true, - "stateSave": true, - "scrollX": true, - "rowId": 'id', - "serverSide": true, - "ajax": { - "url": this._dataUrl, - "contentType": "application/json; charset=utf-8", - "dataType": "json", - "beforeSend": function (xhr) { - xhr.setRequestHeader('Authorization', 'Bearer ' + TIMAAT.Service.token); + if(this._active){ + const $table = $(`<table id="${this._tableId}" class="table table-striped table-bordered table-hover"></table>`) + const $tableHead = $(`<thead class="thead-dark"></thead>`) + const $tableBody = $(`<tbody></tbody>`) + $tableHead.appendTo($table) + $tableBody.appendTo($table) + + const $headerRow = $("<tr></tr>") + $headerRow.appendTo($tableHead) + + const columnConfigs = [] + for (let activeTableColumnId of this._activeTableColumnIds) { + const currentTableColumnConfig = this._tableColumnConfigsById.get(activeTableColumnId); + columnConfigs.push({ + title: currentTableColumnConfig.title, + data: currentTableColumnConfig.data, + render: currentTableColumnConfig.render, + orderable: currentTableColumnConfig.sortable + }); + $('<th>').text(currentTableColumnConfig.title).appendTo($headerRow); + } + $table.appendTo(this._$container) + + this._dataTable = $table.DataTable({ + "destroy": true, + "autoWidth": false, + "colReorder": { + "enable": this._reorderableColumns, + "order": Array.from(columnConfigs.keys()) }, - "data": function (data) { - let serverData = { - draw: data.draw, - start: data.start, - length: data.length, - orderby: data.columns[data.order[0].column].name, - dir: data.order[0].dir, // musicSubtype: '' + "lengthMenu": [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]], + "pagingType": "full", + "dom": '<lf<t>ip>', + "processing": true, + "stateSave": true, + "scrollX": true, + "rowId": 'id', + "serverSide": true, + "ajax": { + "url": this._dataUrl, + "contentType": "application/json; charset=utf-8", + "dataType": "json", + "beforeSend": function (xhr) { + xhr.setRequestHeader('Authorization', 'Bearer ' + TIMAAT.Service.token); + }, + "data": function (data) { + let serverData = { + draw: data.draw, + start: data.start, + length: data.length, + orderby: data.columns[data.order[0].column].name, + dir: data.order[0].dir, // musicSubtype: '' + } + if (data.search && data.search.value && data.search.value.length > 0) serverData.search = data.search.value; + return serverData; } - if (data.search && data.search.value && data.search.value.length > 0) serverData.search = data.search.value; - return serverData; - } - }, - "initComplete": function () { - if(self._reorderableColumns){ - self._dataTable?.colReorder.reset() - } - }, - "columns": columnConfigs - }) + }, + "initComplete": function () { + if(self._reorderableColumns){ + self._dataTable?.colReorder.reset() + } + }, + "columns": columnConfigs + }) - $table.on('column-reorder.dt', (e, settings, details) => { - if (!details || !details.mapping) return; + $table.on('column-reorder.dt', (e, settings, details) => { + if (!details || !details.mapping) return; - const newOrder = details.mapping.map(i => self._activeTableColumnIds[i]); + const newOrder = details.mapping.map(i => self._activeTableColumnIds[i]); - self._activeTableColumnIds = newOrder; - TIMAAT.Table.TableConfigurationStorage - .saveActiveColumnsForTable(newOrder, this._tableId); - }); + self._activeTableColumnIds = newOrder; + TIMAAT.Table.TableConfigurationStorage + .saveActiveColumnsForTable(newOrder, this._tableId); + }); + } } /* From bccf8ec348b973f9ba95b818e113bbf6ff499f43 Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Fri, 19 Dec 2025 13:04:13 +0100 Subject: [PATCH 21/70] TIMAAT Weiterentwicklung #9 - Usage of selected categories and category sets to create corresponding query parameter * Added field to table-class which describes the current query parameters. * The query parameters can be changed via a setter method * On each change a redraw of the table is executed * Added missing setter methods of query parameters to MediumListingQueryParameter and MusicListingQueryParameter. Changed Collection to List type, otherwise jersey will not map the values correctly. --- .../medium/MediumListingQueryParameter.java | 18 +++++- .../music/MusicListingQueryParameter.java | 18 +++++- .../bitgilde/TIMAAT/storage/db/DbStorage.java | 3 +- .../webapp/js/datasets/timaat.categories.js | 64 ++++++++++++------- src/main/webapp/js/ui/timaat.table.js | 20 +++++- 5 files changed, 93 insertions(+), 30 deletions(-) diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/model/medium/MediumListingQueryParameter.java b/src/main/java/de/bitgilde/TIMAAT/rest/model/medium/MediumListingQueryParameter.java index 2bc32c82..1fffd6da 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/model/medium/MediumListingQueryParameter.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/model/medium/MediumListingQueryParameter.java @@ -6,6 +6,7 @@ import jakarta.ws.rs.QueryParam; import java.util.Collection; +import java.util.List; import java.util.Optional; /* @@ -30,9 +31,9 @@ */ public class MediumListingQueryParameter extends ListingQueryParameter<MediumSortingField> implements MediumFilterCriteria { @QueryParam("categoryIds") - private Collection<Integer> categoryIds; + private List<Integer> categoryIds; @QueryParam("categorySetIds") - private Collection<Integer> categorySetIds; + private List<Integer> categorySetIds; @QueryParam("search") private String search; @@ -50,4 +51,17 @@ public Optional<Collection<Integer>> getCategorySetIds() { public Optional<String> getMediumNameSearch() { return Optional.ofNullable(search); } + + public void setCategorySetIds(List<Integer> categorySetIds) { + this.categorySetIds = categorySetIds; + } + + public void setCategoryIds(List<Integer> categoryIds) { + this.categoryIds = categoryIds; + } + + @Override + public void setSearch(String search) { + this.search = search; + } } diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/model/music/MusicListingQueryParameter.java b/src/main/java/de/bitgilde/TIMAAT/rest/model/music/MusicListingQueryParameter.java index 3223bd8e..ced6ae88 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/model/music/MusicListingQueryParameter.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/model/music/MusicListingQueryParameter.java @@ -6,6 +6,7 @@ import jakarta.ws.rs.QueryParam; import java.util.Collection; +import java.util.List; import java.util.Optional; /** @@ -16,9 +17,9 @@ */ public class MusicListingQueryParameter extends ListingQueryParameter<MusicSortingField> implements MusicFilterCriteria { @QueryParam("categoryIds") - private Collection<Integer> categoryIds; + private List<Integer> categoryIds; @QueryParam("categorySetIds") - private Collection<Integer> categorySetIds; + private List<Integer> categorySetIds; @QueryParam("search") private String search; @@ -36,4 +37,17 @@ public Optional<Collection<Integer>> getCategorySetIds() { public Optional<String> getMusicNameSearch() { return Optional.ofNullable(search); } + + public void setCategorySetIds(List<Integer> categorySetIds) { + this.categorySetIds = categorySetIds; + } + + @Override + public void setSearch(String search) { + this.search = search; + } + + public void setCategoryIds(List<Integer> categoryIds) { + this.categoryIds = categoryIds; + } } diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/db/DbStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/db/DbStorage.java index 33dd5127..084ee6ef 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/db/DbStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/db/DbStorage.java @@ -72,6 +72,7 @@ public Stream<ENTITY_TYPE> getEntriesAsStream(FILTER_TYPE filter, PagingParamete List<Predicate> predicates = createPredicates(filter, root, criteriaBuilder); Order sortOrder = createSortOrder(sortingParameter, root, criteriaBuilder); + criteriaQuery.distinct(true); criteriaQuery.where(predicates.toArray(new Predicate[0])); criteriaQuery.orderBy(sortOrder); criteriaQuery.select(root); @@ -93,7 +94,7 @@ public Long getNumberOfMatchingEntries(FILTER_TYPE filter) { CriteriaQuery<Long> criteriaQuery = criteriaBuilder.createQuery(Long.class); Root<ENTITY_TYPE> root = criteriaQuery.from(entityTypeClass); - criteriaQuery.select(criteriaBuilder.count(root)); + criteriaQuery.select(criteriaBuilder.countDistinct(root)); List<Predicate> predicates = createPredicates(filter, root, criteriaBuilder); criteriaQuery.where(predicates.toArray(new Predicate[0])); diff --git a/src/main/webapp/js/datasets/timaat.categories.js b/src/main/webapp/js/datasets/timaat.categories.js index 8eb3e3a8..637af3de 100644 --- a/src/main/webapp/js/datasets/timaat.categories.js +++ b/src/main/webapp/js/datasets/timaat.categories.js @@ -140,9 +140,9 @@ TIMAAT.URLHistory.setURL(null, 'Categories', '#categories/categories'); $categoryNoSelectionPanelText.text("No category selected") - if(!TIMAAT.Categories.categoryDataTable){ + if (!TIMAAT.Categories.categoryDataTable) { TIMAAT.Categories.initCategoriesDataTable() - }else { + } else { TIMAAT.Categories.categoryDataTable.rows().deselect() TIMAAT.Categories.categoryDataTable.ajax.reload() } @@ -152,7 +152,7 @@ TIMAAT.URLHistory.setURL(null, 'Category Sets', '#categories/categorySets'); $categoryNoSelectionPanelText.text("No category set selected") - if(!TIMAAT.Categories.categorySetDataTable){ + if (!TIMAAT.Categories.categorySetDataTable) { TIMAAT.Categories.initCategorySetsDataTable() } else { TIMAAT.Categories.categorySetDataTable.rows().deselect() @@ -169,7 +169,7 @@ $('#categoryDataTableSelectAll').prop('checked', selectedCount === totalCount && totalCount > 0); }, - updateCategorySetSelectAllCheckboxState(){ + updateCategorySetSelectAllCheckboxState() { const selectedCategorySets = TIMAAT.Categories.categorySetDataTable.rows({selected: true}).data().toArray(); const selectedCount = selectedCategorySets.length; @@ -226,7 +226,7 @@ new TIMAAT.Table.FieldTableColumnConfig("instrumentation", "Instrumentation", "instrumentation"), new TIMAAT.Table.FieldTableColumnConfig("tempo", "Tempo", "tempo"), new TIMAAT.Table.FieldTableColumnConfig("remark", "Remark", "remark"), new TIMAAT.Table.FieldTableColumnConfig("harmony", "Harmony", "harmony"), new TIMAAT.Table.FieldTableColumnConfig("melody", "Melody", "melody"), new TIMAAT.Table.ValueMapperTableColumnConfig("musicType", "Music Type", "musicType.id", musicTypesById)] const activeColumnIds = ["id", "title", "musicType", "beat", "instrumentation", "tempo", "remark", "harmony", "melody"] - const musicTable = new TIMAAT.Table.Table("categoriesMusicTable","#categoriesMusicTableContainer", columns, activeColumnIds, "api/music/list") + const musicTable = new TIMAAT.Table.Table("categoriesMusicTable", "#categoriesMusicTableContainer", columns, activeColumnIds, "api/music/list", true, false) $('#musicTableCollapse').on('shown.bs.collapse', (event) => { musicTable.resizeToParent() }); @@ -272,7 +272,7 @@ new TIMAAT.Table.DateTableColumnConfig("recordingEndDate", "Recording End Date", "recordingEndDate"), new TIMAAT.Table.FieldTableColumnConfig("remark", "Remark", "remark"), new TIMAAT.Table.FieldTableColumnConfig("title", "Title", "displayTitle.name"), new TIMAAT.Table.ValueMapperTableColumnConfig("mediaType", "Media Type", "mediaType.id", mediaTypesById), new MediumDurationColumnConfig(), new TIMAAT.Table.ImageDownloadTableColumnConfig("thumbnail", "Thumbnail", imageThumbnailGeneratorFunction)] const activeColumnIds = ["thumbnail", "id", "title", "mediaType", "duration", "releaseDate", 'recordingStartDate', 'recordingEndDate', "fileHash", "copyright", "remark"] - const mediumTable = new TIMAAT.Table.Table("categoriesMediumTable", "#categoriesMediumTableContainer", columns, activeColumnIds, "api/medium/list") + const mediumTable = new TIMAAT.Table.Table("categoriesMediumTable", "#categoriesMediumTableContainer", columns, activeColumnIds, "api/medium/list", true, false) $('#mediumTableCollapse').on('shown.bs.collapse', (event) => { mediumTable.resizeToParent() @@ -297,7 +297,7 @@ new TIMAAT.Table.ValueMapperTableColumnConfig("sex", "Sex", "actorPerson.sex.id", sexTypesById) ] const activeColumnIds = ["id", "name", "nameUsedFrom", "nameUsedUntil", "type", "primaryAddress", "primaryPhoneNumber", "primaryEmailAddress", "disbanded", "founded", "dateOfBirth", "dayOfDeath", "title", "citizenship", "placeOfBirth", "placeOfDeath", "sex"] - const actorTable = new TIMAAT.Table.Table("categoriesActorTable","#categoriesActorTableContainer", columns, activeColumnIds, "api/actor/list") + const actorTable = new TIMAAT.Table.Table("categoriesActorTable", "#categoriesActorTableContainer", columns, activeColumnIds, "api/actor/list", true, false) $('#actorTableCollapse').on('shown.bs.collapse', (event) => { actorTable.resizeToParent() @@ -311,7 +311,7 @@ const columns = [new TIMAAT.Table.FieldTableColumnConfig("id", "ID", "id")] const activeColumnIds = ["id"] - const annotationTable = new TIMAAT.Table.Table("categoriesAnnotationTable", "#categoriesAnnotationTableContainer", columns, activeColumnIds, "api/annotation/list") + const annotationTable = new TIMAAT.Table.Table("categoriesAnnotationTable", "#categoriesAnnotationTableContainer", columns, activeColumnIds, "api/annotation/list", true, false) $('#annotationTableCollapse').on('shown.bs.collapse', (event) => { annotationTable.resizeToParent() @@ -407,31 +407,36 @@ showAssignedEntitiesPanel() { $('.categoriesRightPanelContent').hide() $('#categoriesAssignedEntitiesPanel').show() - TIMAAT.Categories.relatedMusicTable.draw() - TIMAAT.Categories.relatedMediumTable.draw() - TIMAAT.Categories.relatedActorTable.draw() - TIMAAT.Categories.relatedAnnotationTable.draw() + TIMAAT.Categories.relatedMusicTable.active = true + TIMAAT.Categories.relatedMediumTable.active = true + TIMAAT.Categories.relatedActorTable.active = true + TIMAAT.Categories.relatedAnnotationTable.active = true }, showNoSelectionPanel() { $('.categoriesRightPanelContent').hide() $('#categoriesNoSelectionPanel').show() + + TIMAAT.Categories.relatedMusicTable.active = false + TIMAAT.Categories.relatedMediumTable.active = false + TIMAAT.Categories.relatedActorTable.active = false + TIMAAT.Categories.relatedAnnotationTable.active = false }, - showEntitiesPanel(){ + showEntitiesPanel() { let count - switch (TIMAAT.Categories.currentItemType){ + switch (TIMAAT.Categories.currentItemType) { case 'category': - count= TIMAAT.Categories.categoryDataTable.rows({selected: true}).count() + count = TIMAAT.Categories.categoryDataTable.rows({selected: true}).count() break case 'categorySet': count = TIMAAT.Categories.categoryDataTable.rows({selected: true}).count() break } - if(count > 0){ + if (count > 0) { TIMAAT.Categories.showAssignedEntitiesPanel() - }else{ + } else { TIMAAT.Categories.showNoSelectionPanel() } }, @@ -732,24 +737,37 @@ TIMAAT.Categories.categoryDataTable.on('select deselect', TIMAAT.Categories.handleSelectionChanged); }, - handleSelectionChanged(){ + handleSelectionChanged() { let selectionCount - switch (TIMAAT.Categories.currentItemType){ + let urlSearchParameters = new URLSearchParams + switch (TIMAAT.Categories.currentItemType) { case "category": TIMAAT.Categories.updateCategorySelectAllCheckboxState() - const selectedCategories = TIMAAT.Categories.categoryDataTable.rows({selected: true}).data() + const selectedCategories = TIMAAT.Categories.categoryDataTable.rows({selected: true}).data().toArray() selectionCount = selectedCategories.length + + for (let currentCategory of selectedCategories) { + urlSearchParameters.append("categoryIds", currentCategory.id) + } + break case "categorySet": TIMAAT.Categories.updateCategorySetSelectAllCheckboxState() - const selectedCategorySets = TIMAAT.Categories.categorySetDataTable.rows({selected: true}).data() + const selectedCategorySets = TIMAAT.Categories.categorySetDataTable.rows({selected: true}).data().toArray() selectionCount = selectedCategorySets.length + + for (let currentCategorySet of selectedCategorySets) { + urlSearchParameters.append("categorySetIds", currentCategorySet.id) + } + break } - if(selectionCount > 0){ + if (selectionCount > 0) { TIMAAT.Categories.showAssignedEntitiesPanel() - }else { + TIMAAT.Categories.relatedMusicTable.urlSearchParams = urlSearchParameters + TIMAAT.Categories.relatedMediumTable.urlSearchParams = urlSearchParameters + } else { TIMAAT.Categories.showNoSelectionPanel() } } diff --git a/src/main/webapp/js/ui/timaat.table.js b/src/main/webapp/js/ui/timaat.table.js index 3f344bfe..71e3a03c 100644 --- a/src/main/webapp/js/ui/timaat.table.js +++ b/src/main/webapp/js/ui/timaat.table.js @@ -152,9 +152,10 @@ _dataUrl _tableId _reorderableColumns + _urlSearchParams _dataTable = null; - constructor(tableId, containerSelector, tableColumnConfigs, defaultActiveTableColumnConfigs, dataUrl,reorderableColumns=true, active=true) { + constructor(tableId, containerSelector, tableColumnConfigs, defaultActiveTableColumnConfigs, dataUrl,reorderableColumns=true, active=true, urlSearchParams=new URLSearchParams()) { this._tableColumnConfigsById = new Map() for (let tableColumnConfig of tableColumnConfigs) { this._tableColumnConfigsById.set(tableColumnConfig.id, tableColumnConfig); @@ -165,6 +166,9 @@ this._tableId = tableId this._reorderableColumns = reorderableColumns; this._active = active + this._urlSearchParams = urlSearchParams + + this.draw() } /** @@ -196,7 +200,17 @@ } set active(active){ + const redrawNecessary = this._active !== active this._active = active + + if(redrawNecessary){ + this.draw() + } + } + + set urlSearchParams(urlSearchParams){ + this._urlSearchParams = urlSearchParams + this.draw() } get activeTableColumnIds() { @@ -235,6 +249,8 @@ } $table.appendTo(this._$container) + const ajaxUrl = this._dataUrl + "?" + this._urlSearchParams.toString() + console.log(ajaxUrl) this._dataTable = $table.DataTable({ "destroy": true, "autoWidth": false, @@ -251,7 +267,7 @@ "rowId": 'id', "serverSide": true, "ajax": { - "url": this._dataUrl, + "url": ajaxUrl, "contentType": "application/json; charset=utf-8", "dataType": "json", "beforeSend": function (xhr) { From 8f23c7ddbd522f266850f4df24a9195f0c7b0492 Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Sat, 27 Dec 2025 10:19:28 +0100 Subject: [PATCH 22/70] TIMAAT Weiterentwicklung #9 - Created database update & Refactored assingning of category sets and categories to analysis list and annotation * Removed column category_set_id from table annotation_has_category * Created storage for analysis list * refactored event handler responsible to change the assigned category sets of a analyis list * refactored event handler responsible to change the assigned categories of annotations --- docs/database.md | 6 +- .../TIMAAT/di/binder/TIMAATBinder.java | 2 + .../rest/endpoint/EndpointAnalysisList.java | 68 ++++-- .../rest/endpoint/EndpointAnnotation.java | 28 ++- .../TIMAAT/rest/model/CountResult.java | 25 +++ ...UpdateAnalysisListCategorySetsPayload.java | 26 +++ .../AnnotationListingQueryParameter.java | 46 +++- .../bitgilde/TIMAAT/storage/db/DbStorage.java | 6 +- .../analysislist/AnalysisListStorage.java | 70 ++++++ .../entity/annotation/AnnotationStorage.java | 112 +++++++--- .../api/AnnotationFilterCriteria.java | 102 +++++++++ .../storage/entity/medium/MediumStorage.java | 3 +- .../storage/entity/music/MusicStorage.java | 3 +- src/main/resources/database/db_update.sql | 23 ++ src/main/resources/database/fipop.sql | 1 - src/main/webapp/index.html | 2 +- .../js/service/timaat.service.analysislist.js | 25 ++- .../js/service/timaat.service.annotation.js | 60 +++-- src/main/webapp/js/ui/timaat.inspector.js | 205 ++++++++++++++++-- 19 files changed, 696 insertions(+), 117 deletions(-) create mode 100644 src/main/java/de/bitgilde/TIMAAT/rest/model/CountResult.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/rest/model/analysislist/UpdateAnalysisListCategorySetsPayload.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/storage/entity/analysislist/AnalysisListStorage.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/api/AnnotationFilterCriteria.java diff --git a/docs/database.md b/docs/database.md index 59c72c25..02271892 100644 --- a/docs/database.md +++ b/docs/database.md @@ -43,4 +43,8 @@ The versioning of the database schema follows the following pattern: ### 0.15.0 * Added column `thumbnail_position_ms` to table `medium_video` to persist thumbnail position of videos -* Added column `thumbnail_position_ms` to table `annotation` to persist thumbnail position of annotations \ No newline at end of file +* Added column `thumbnail_position_ms` to table `annotation` to persist thumbnail position of annotations + +### 0.15.1 + +* Removed unused column `category_set_id` from table `annotation_has_category` \ No newline at end of file diff --git a/src/main/java/de/bitgilde/TIMAAT/di/binder/TIMAATBinder.java b/src/main/java/de/bitgilde/TIMAAT/di/binder/TIMAATBinder.java index 67b31a5e..da7f42b3 100644 --- a/src/main/java/de/bitgilde/TIMAAT/di/binder/TIMAATBinder.java +++ b/src/main/java/de/bitgilde/TIMAAT/di/binder/TIMAATBinder.java @@ -9,6 +9,7 @@ import de.bitgilde.TIMAAT.rest.security.authorization.AnnotationAuthorizationVerifier; import de.bitgilde.TIMAAT.rest.security.authorization.DbAnnotationAuthorizationVerifier; import de.bitgilde.TIMAAT.sse.EntityUpdateEventService; +import de.bitgilde.TIMAAT.storage.entity.analysislist.AnalysisListStorage; import de.bitgilde.TIMAAT.storage.entity.annotation.AnnotationStorage; import de.bitgilde.TIMAAT.storage.entity.AudioAnalysisResultStorage; import de.bitgilde.TIMAAT.storage.entity.CategorySetStorage; @@ -77,6 +78,7 @@ protected void configure() { bindAsContract(AnnotationStorage.class).in(Singleton.class); bindAsContract(TagStorage.class).in(Singleton.class); bindAsContract(MediumStorage.class).in(Singleton.class); + bindAsContract(AnalysisListStorage.class).in(Singleton.class); bindAsContract(MediumVideoStorage.class).in(Singleton.class); bindAsContract(AnnotationFileStorage.class).in(Singleton.class); bindAsContract(CategoryStorage.class).in(Singleton.class); diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnalysisList.java b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnalysisList.java index 6fe0e99c..b094cd0f 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnalysisList.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnalysisList.java @@ -1,26 +1,11 @@ package de.bitgilde.TIMAAT.rest.endpoint; -import java.io.IOException; -import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.Iterator; -import java.util.List; -import java.util.Set; -import java.util.UUID; -import java.util.stream.Collectors; - import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; - -import org.jvnet.hk2.annotations.Service; - import de.bitgilde.TIMAAT.DisplayElementNameAndPermission; import de.bitgilde.TIMAAT.SelectElement; import de.bitgilde.TIMAAT.TIMAATApp; +import de.bitgilde.TIMAAT.db.exception.DbTransactionExecutionException; import de.bitgilde.TIMAAT.model.FIPOP.AnalysisAction; import de.bitgilde.TIMAAT.model.FIPOP.AnalysisActionTranslation; import de.bitgilde.TIMAAT.model.FIPOP.AnalysisScene; @@ -46,17 +31,22 @@ import de.bitgilde.TIMAAT.notification.NotificationWebSocket; import de.bitgilde.TIMAAT.rest.Secured; import de.bitgilde.TIMAAT.rest.filter.AuthenticationFilter; +import de.bitgilde.TIMAAT.rest.model.analysislist.UpdateAnalysisListCategorySetsPayload; +import de.bitgilde.TIMAAT.rest.security.authorization.AnalysisListAuthorizationVerifier; import de.bitgilde.TIMAAT.security.UserLogManager; +import de.bitgilde.TIMAAT.storage.entity.analysislist.AnalysisListStorage; +import jakarta.inject.Inject; import jakarta.persistence.EntityManager; import jakarta.persistence.EntityTransaction; import jakarta.persistence.NoResultException; import jakarta.persistence.Query; -import jakarta.servlet.ServletContext; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.ForbiddenException; import jakarta.ws.rs.GET; import jakarta.ws.rs.PATCH; import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; @@ -66,7 +56,20 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; -import jakarta.ws.rs.core.UriInfo; +import org.jvnet.hk2.annotations.Service; + +import java.io.IOException; +import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.Iterator; +import java.util.List; +import java.util.Set; +import java.util.UUID; +import java.util.stream.Collectors; /* Licensed under the Apache License, Version 2.0 (the "License"); @@ -91,12 +94,12 @@ @Path("/analysisList") public class EndpointAnalysisList { - @Context - private UriInfo uriInfo; @Context ContainerRequestContext containerRequestContext; - @Context - ServletContext ctx; + @Inject + AnalysisListStorage analysisListStorage; + @Inject + AnalysisListAuthorizationVerifier analysisListAuthorizationVerifier; @GET @Produces(MediaType.APPLICATION_JSON) @@ -2527,7 +2530,18 @@ public Response addExistingCategoryToAction(@PathParam("actionId") int actionId, return Response.ok().entity(category).build(); } - @DELETE + @PUT + @Produces(MediaType.APPLICATION_JSON) + @Consumes(MediaType.APPLICATION_JSON) + @Path("{analysisListId}/categorySets") + @Secured + public List<CategorySet> updateCategorySets(@PathParam("analysisListId") int analysisListId, UpdateAnalysisListCategorySetsPayload updateAnalysisListCategorySetsPayload) throws DbTransactionExecutionException { + verifyAuthorizationToAnalysisList(analysisListId, de.bitgilde.TIMAAT.rest.security.authorization.PermissionType.WRITE); + return analysisListStorage.updateCategorySets(analysisListId, updateAnalysisListCategorySetsPayload.getCategorySetIds()); + } + + + @DELETE @Produces(MediaType.APPLICATION_JSON) @Path("{analysisListId}/categorySet/{categorySetId}") @Secured @@ -3025,5 +3039,13 @@ public static <T> List<T> castList(Class<? extends T> clazz, Collection<?> c) { return r; } + private void verifyAuthorizationToAnalysisList(int analysisListId, de.bitgilde.TIMAAT.rest.security.authorization.PermissionType permissionType) { + UserAccount userAccount = (UserAccount) containerRequestContext.getProperty( + AuthenticationFilter.USER_ACCOUNT_PROPERTY_NAME); + if (!analysisListAuthorizationVerifier.verifyAuthorizationToAnalysisList(analysisListId, userAccount, + permissionType)) { + throw new ForbiddenException("User has no access to analysis list"); + } + } } diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnnotation.java b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnnotation.java index af3715f1..ae8be6d7 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnnotation.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnnotation.java @@ -22,6 +22,7 @@ import de.bitgilde.TIMAAT.processing.video.exception.VideoEngineException; import de.bitgilde.TIMAAT.rest.Secured; import de.bitgilde.TIMAAT.rest.filter.AuthenticationFilter; +import de.bitgilde.TIMAAT.rest.model.CountResult; import de.bitgilde.TIMAAT.rest.model.annotation.AnnotationListingQueryParameter; import de.bitgilde.TIMAAT.rest.model.annotation.CreateAnnotationPayload; import de.bitgilde.TIMAAT.rest.model.annotation.UpdateAnnotationPayload; @@ -32,7 +33,6 @@ import de.bitgilde.TIMAAT.rest.security.authorization.AnnotationAuthorizationVerifier; import de.bitgilde.TIMAAT.rest.security.authorization.PermissionType; import de.bitgilde.TIMAAT.security.UserLogManager; -import de.bitgilde.TIMAAT.storage.api.ListingResult; import de.bitgilde.TIMAAT.storage.entity.annotation.AnnotationStorage; import de.bitgilde.TIMAAT.storage.entity.annotation.AnnotationStorage.CreateAnnotation; import de.bitgilde.TIMAAT.storage.entity.annotation.AnnotationStorage.UpdateAnnotation; @@ -75,6 +75,7 @@ import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; +import java.util.stream.Collectors; /* Licensed under the Apache License, Version 2.0 (the "License"); @@ -116,6 +117,7 @@ public class EndpointAnnotation { @Inject TemporaryFileStorage temporaryFileStorage; + //TODO: Filter by permission (currently no permissions are respected) @GET @Produces @Path("list") @@ -123,11 +125,25 @@ public DataTableInfo<Annotation> getAnnotationList(@BeanParam @Valid AnnotationL UserAccount userAccount = (UserAccount) containerRequestContext.getProperty( AuthenticationFilter.USER_ACCOUNT_PROPERTY_NAME); int draw = annotationListingQueryParameter.getDraw().orElse(0); - ListingResult<Annotation> annotationListingResult = annotationStorage.getAnnotations( - annotationListingQueryParameter, annotationListingQueryParameter, annotationListingQueryParameter, - userAccount); - return new DataTableInfo<>(draw, annotationListingResult.getTotalItemCount(), - annotationListingResult.getMatchedItemsCount(), annotationListingResult.getItems()); + + List<Annotation> matchingAnnotations = annotationStorage.getEntriesAsStream(annotationListingQueryParameter, + annotationListingQueryParameter, annotationListingQueryParameter, userAccount).collect(Collectors.toList()); + long totalAnnotationsCount = annotationStorage.getNumberOfTotalEntries(); + long filteredAnnotationsCount = annotationStorage.getNumberOfMatchingEntries(annotationListingQueryParameter); + + return new DataTableInfo<>(draw, totalAnnotationsCount, + filteredAnnotationsCount, matchingAnnotations); + } + + @GET + @Produces + @Path("count") + public CountResult getCountOfAnnotations(@BeanParam @Valid AnnotationListingQueryParameter annotationListingQueryParameter) { + UserAccount userAccount = (UserAccount) containerRequestContext.getProperty( + AuthenticationFilter.USER_ACCOUNT_PROPERTY_NAME); + long filteredAnnotationsCount = annotationStorage.getNumberOfMatchingEntries(annotationListingQueryParameter); + + return new CountResult(filteredAnnotationsCount); } @GET diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/model/CountResult.java b/src/main/java/de/bitgilde/TIMAAT/rest/model/CountResult.java new file mode 100644 index 00000000..547a2dd9 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/rest/model/CountResult.java @@ -0,0 +1,25 @@ +package de.bitgilde.TIMAAT.rest.model; + +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * This DTO is used as result for counting endpoints + * + * @author Nico Kotlenga + * @since 23.12.25 + */ +public class CountResult { + + private static final String COUNT_FIELD_NAME = "count"; + + @JsonProperty(COUNT_FIELD_NAME) + private final long count; + + public CountResult(long count) { + this.count = count; + } + + public long getCount() { + return count; + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/model/analysislist/UpdateAnalysisListCategorySetsPayload.java b/src/main/java/de/bitgilde/TIMAAT/rest/model/analysislist/UpdateAnalysisListCategorySetsPayload.java new file mode 100644 index 00000000..f12c40ae --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/rest/model/analysislist/UpdateAnalysisListCategorySetsPayload.java @@ -0,0 +1,26 @@ +package de.bitgilde.TIMAAT.rest.model.analysislist; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.util.List; + +/** + * DTO used by the endpoint responsible to update the assigned category sets of an analysis list + * + * @author Nico Kotlenga + * @since 19.12.25 + */ +public class UpdateAnalysisListCategorySetsPayload { + private static final String CATEGORY_SET_IDS_FIELD_NAME = "categorySetIds"; + + @JsonProperty(CATEGORY_SET_IDS_FIELD_NAME) + private final List<Integer> categorySetIds; + + public UpdateAnalysisListCategorySetsPayload(@JsonProperty(CATEGORY_SET_IDS_FIELD_NAME) List<Integer> categorySetIds) { + this.categorySetIds = categorySetIds; + } + + public List<Integer> getCategorySetIds() { + return categorySetIds; + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/model/annotation/AnnotationListingQueryParameter.java b/src/main/java/de/bitgilde/TIMAAT/rest/model/annotation/AnnotationListingQueryParameter.java index 96fe445e..d154b86e 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/model/annotation/AnnotationListingQueryParameter.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/model/annotation/AnnotationListingQueryParameter.java @@ -1,11 +1,12 @@ package de.bitgilde.TIMAAT.rest.model.annotation; import de.bitgilde.TIMAAT.rest.model.parameter.ListingQueryParameter; -import de.bitgilde.TIMAAT.storage.entity.annotation.AnnotationStorage.AnnotationFilter; +import de.bitgilde.TIMAAT.storage.entity.annotation.api.AnnotationFilterCriteria; import de.bitgilde.TIMAAT.storage.entity.annotation.api.AnnotationSortingField; import jakarta.ws.rs.QueryParam; import java.util.Collection; +import java.util.List; import java.util.Optional; /** @@ -14,12 +15,19 @@ * @author Nico Kotlenga * @since 28.11.25 */ -public class AnnotationListingQueryParameter extends ListingQueryParameter<AnnotationSortingField> implements AnnotationFilter { +public class AnnotationListingQueryParameter extends ListingQueryParameter<AnnotationSortingField> implements AnnotationFilterCriteria { + @QueryParam("search") + private String search; @QueryParam("categoryIds") - private Collection<Integer> categoryIds; + private List<Integer> categoryIds; @QueryParam("categorySetIds") - private Collection<Integer> categorySetIds; + private List<Integer> categorySetIds; + @QueryParam("mediumAnalysisListIds") + private List<Integer> mediumAnalysisListIds; + @QueryParam("hasCategories") + private Boolean hasCategories; + public AnnotationListingQueryParameter() { @@ -41,6 +49,14 @@ public Optional<Collection<Integer>> getCategorySetIds() { return Optional.empty(); } + @Override + public Optional<Collection<Integer>> getMediumAnalysisListIds() { + if (mediumAnalysisListIds != null && !mediumAnalysisListIds.isEmpty()) { + return Optional.of(mediumAnalysisListIds); + } + return Optional.empty(); + } + @Override public Optional<String> getAnnotationNameSearch() { if (this.getSearch() != null && !this.getSearch().isEmpty()) { @@ -50,11 +66,29 @@ public Optional<String> getAnnotationNameSearch() { return Optional.empty(); } - public void setCategoryIds(Collection<Integer> categoryIds) { + @Override + public Optional<Boolean> hasCategories() { + return Optional.ofNullable(hasCategories); + } + + public void setCategoryIds(List<Integer> categoryIds) { this.categoryIds = categoryIds; } - public void setCategorySetIds(Collection<Integer> categorySetIds) { + public void setCategorySetIds(List<Integer> categorySetIds) { this.categorySetIds = categorySetIds; } + + public void setHasCategories(Boolean hasCategories) { + this.hasCategories = hasCategories; + } + + @Override + public void setSearch(String search) { + this.search = search; + } + + public void setMediumAnalysisListIds(List<Integer> mediumAnalysisListIds) { + this.mediumAnalysisListIds = mediumAnalysisListIds; + } } diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/db/DbStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/db/DbStorage.java index 084ee6ef..f72011c1 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/db/DbStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/db/DbStorage.java @@ -69,7 +69,7 @@ public Stream<ENTITY_TYPE> getEntriesAsStream(FILTER_TYPE filter, PagingParamete CriteriaQuery<ENTITY_TYPE> criteriaQuery = criteriaBuilder.createQuery(entityTypeClass); Root<ENTITY_TYPE> root = criteriaQuery.from(entityTypeClass); - List<Predicate> predicates = createPredicates(filter, root, criteriaBuilder); + List<Predicate> predicates = createPredicates(filter, root, criteriaBuilder, criteriaQuery); Order sortOrder = createSortOrder(sortingParameter, root, criteriaBuilder); criteriaQuery.distinct(true); @@ -95,7 +95,7 @@ public Long getNumberOfMatchingEntries(FILTER_TYPE filter) { Root<ENTITY_TYPE> root = criteriaQuery.from(entityTypeClass); criteriaQuery.select(criteriaBuilder.countDistinct(root)); - List<Predicate> predicates = createPredicates(filter, root, criteriaBuilder); + List<Predicate> predicates = createPredicates(filter, root, criteriaBuilder, criteriaQuery); criteriaQuery.where(predicates.toArray(new Predicate[0])); return entityManager.createQuery(criteriaQuery).getSingleResult(); @@ -125,7 +125,7 @@ public Long getNumberOfTotalEntries() { * @param criteriaBuilder which can be used the create the {@link Predicate}s * @return a {@link List} of {@link Predicate}s */ - protected abstract List<Predicate> createPredicates(FILTER_TYPE filter, Root<ENTITY_TYPE> root, CriteriaBuilder criteriaBuilder); + protected abstract List<Predicate> createPredicates(FILTER_TYPE filter, Root<ENTITY_TYPE> root, CriteriaBuilder criteriaBuilder, CriteriaQuery<?> criteriaQuery); /** * Creates the {@link Order} to match current defined {@link SortingParameter} diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/analysislist/AnalysisListStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/analysislist/AnalysisListStorage.java new file mode 100644 index 00000000..7a41f281 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/analysislist/AnalysisListStorage.java @@ -0,0 +1,70 @@ +package de.bitgilde.TIMAAT.storage.entity.analysislist; + +import de.bitgilde.TIMAAT.db.DbAccessComponent; +import de.bitgilde.TIMAAT.model.FIPOP.CategorySet; +import de.bitgilde.TIMAAT.model.FIPOP.MediumAnalysisList; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Query; + +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.stream.Collectors; + +/** + * Storage used to modify and access {@link de.bitgilde.TIMAAT.model.FIPOP.MediumAnalysisList}s + * + * @author Nico Kotlenga + * @since 19.12.25 + */ +public class AnalysisListStorage extends DbAccessComponent { + + private static final Logger logger = Logger.getLogger(AnalysisListStorage.class.getName()); + + @Inject + public AnalysisListStorage(EntityManagerFactory emf) { + super(emf); + } + + public List<CategorySet> updateCategorySets(int analysisListId, Collection<Integer> categorySetIds) { + logger.log(Level.FINE, "Update category sets of analysis list having id {0}", analysisListId); + + return executeDbTransaction(entityManager -> { + MediumAnalysisList analysisList = entityManager.find(MediumAnalysisList.class, analysisListId); + List<CategorySet> categorySets = categorySetIds.isEmpty() ? Collections.emptyList() : entityManager.createQuery( + "select categorySet from CategorySet categorySet where categorySet.id in :categorySetIds", + CategorySet.class).setParameter("categorySetIds", categorySetIds).getResultList(); + + analysisList.setCategorySets(categorySets); + + //TODO: add cleanup for segment structures + if (categorySetIds.isEmpty()) { + entityManager.createNativeQuery( + "delete from annotation_has_category where annotation_id in " + + "(select annotation.id from annotation where annotation.medium_analysis_list_id = ?)") + .setParameter(1, analysisListId).executeUpdate(); + } + else { + String placeholders = categorySetIds.stream() + .map(id -> "?") + .collect(Collectors.joining(",")); + Query query = entityManager.createNativeQuery( + "delete from annotation_has_category where annotation_id in " + + "(select annotation.id from annotation where annotation.medium_analysis_list_id = ?) " + + "and category_id not in (select categorySetHasCategory.category_id from category_set_has_category categorySetHasCategory " + + "where categorySetHasCategory.category_set_id in (" + placeholders + "))") + .setParameter(1, analysisListId); + + int index = 2; + for(Integer currentCategorySetId: categorySetIds){ + query.setParameter(index++, currentCategorySetId); + } + } + + return categorySets; + }); + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/AnnotationStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/AnnotationStorage.java index 0ba7111c..3e8b098d 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/AnnotationStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/AnnotationStorage.java @@ -1,6 +1,5 @@ package de.bitgilde.TIMAAT.storage.entity.annotation; -import de.bitgilde.TIMAAT.db.DbAccessComponent; import de.bitgilde.TIMAAT.db.exception.DbTransactionExecutionException; import de.bitgilde.TIMAAT.model.FIPOP.Annotation; import de.bitgilde.TIMAAT.model.FIPOP.AnnotationHasMusic; @@ -8,9 +7,17 @@ import de.bitgilde.TIMAAT.model.FIPOP.AnnotationHasMusicTranslationArea; import de.bitgilde.TIMAAT.model.FIPOP.AnnotationHasMusicTranslationAreaPK; import de.bitgilde.TIMAAT.model.FIPOP.AnnotationTranslation; +import de.bitgilde.TIMAAT.model.FIPOP.AnnotationTranslation_; +import de.bitgilde.TIMAAT.model.FIPOP.Annotation_; import de.bitgilde.TIMAAT.model.FIPOP.Category; +import de.bitgilde.TIMAAT.model.FIPOP.CategorySet; +import de.bitgilde.TIMAAT.model.FIPOP.CategorySetHasCategory; +import de.bitgilde.TIMAAT.model.FIPOP.CategorySetHasCategory_; +import de.bitgilde.TIMAAT.model.FIPOP.CategorySet_; +import de.bitgilde.TIMAAT.model.FIPOP.Category_; import de.bitgilde.TIMAAT.model.FIPOP.Language; import de.bitgilde.TIMAAT.model.FIPOP.MediumAnalysisList; +import de.bitgilde.TIMAAT.model.FIPOP.MediumAnalysisList_; import de.bitgilde.TIMAAT.model.FIPOP.Music; import de.bitgilde.TIMAAT.model.FIPOP.MusicTranslation; import de.bitgilde.TIMAAT.model.FIPOP.MusicTranslationPK; @@ -19,23 +26,26 @@ import de.bitgilde.TIMAAT.model.FIPOP.Tag; import de.bitgilde.TIMAAT.model.FIPOP.UserAccount; import de.bitgilde.TIMAAT.model.IndexBasedRange; -import de.bitgilde.TIMAAT.storage.api.ListingResult; -import de.bitgilde.TIMAAT.storage.api.PagingParameter; -import de.bitgilde.TIMAAT.storage.api.SortingParameter; +import de.bitgilde.TIMAAT.storage.db.DbStorage; import de.bitgilde.TIMAAT.storage.entity.TagStorage; +import de.bitgilde.TIMAAT.storage.entity.annotation.api.AnnotationFilterCriteria; import de.bitgilde.TIMAAT.storage.entity.annotation.api.AnnotationSortingField; import jakarta.inject.Inject; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Predicate; import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Subquery; import java.sql.Timestamp; import java.time.Instant; +import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; -import java.util.Optional; import java.util.logging.Level; import java.util.logging.Logger; /* @@ -58,7 +68,7 @@ * @author Nico Kotlenga * @since 03.09.25 */ -public class AnnotationStorage extends DbAccessComponent { +public class AnnotationStorage extends DbStorage<Annotation, AnnotationFilterCriteria, AnnotationSortingField> { private static final Logger logger = Logger.getLogger(AnnotationStorage.class.getName()); @@ -66,22 +76,10 @@ public class AnnotationStorage extends DbAccessComponent { @Inject public AnnotationStorage(EntityManagerFactory emf, TagStorage tagStorage) { - super(emf); + super(Annotation.class, AnnotationSortingField.ID, emf); this.tagStorage = tagStorage; } - public ListingResult<Annotation> getAnnotations(AnnotationFilter filter, PagingParameter pagingParameter, SortingParameter<AnnotationSortingField> sortingParameter, UserAccount userAccount) { - executeDbTransaction(entityManager -> { - CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder(); - CriteriaQuery<Annotation> criteriaQuery = criteriaBuilder.createQuery(Annotation.class); - Root<Annotation> root = criteriaQuery.from(Annotation.class); - - - return Void.TYPE; - }); - return new ListingResult<>(Collections.emptyList(), 0L, 0L); - } - public boolean removeTranscriptionAreaFromAnnotationHasMusicForLanguage(int annotationId, int musicId, int languageId) throws DbTransactionExecutionException { logger.log(Level.FINE, "Removing transcription area from annotation {0} for music {1} in language {2} ", new Object[]{annotationId, musicId, languageId}); @@ -111,9 +109,10 @@ public List<Tag> updateTagsOfAnnotation(int annotationId, Collection<String> tag public List<Category> updateCategoriesOfAnnotation(int annotationId, Collection<Integer> categoryIds) throws DbTransactionExecutionException { return executeDbTransaction(entityManager -> { Annotation currentAnnotation = entityManager.find(Annotation.class, annotationId); + List<Category> categories = categoryIds.isEmpty() ? Collections.emptyList() : entityManager.createQuery( - "select category from Category category where category.id in :categoryIds", Category.class).setParameter( - "categoryIds", categoryIds).getResultList(); + "select category from Category category where category.id in (select categorySetHasCategories.category.id from MediumAnalysisList mediumAnalysisList join mediumAnalysisList.categorySets categorySets join categorySets.categorySetHasCategories categorySetHasCategories where categorySetHasCategories.category.id in :categoryIds)", + Category.class).setParameter("categoryIds", categoryIds).getResultList(); currentAnnotation.setCategories(categories); return categories; @@ -279,21 +278,62 @@ public Annotation getAnnotationById(int annotationId) throws DbTransactionExecut return this.executeDbTransaction(entityManager -> entityManager.find(Annotation.class, annotationId)); } - public interface AnnotationFilter { - /** - * @return the category ids the returning annotations should belong to - */ - Optional<Collection<Integer>> getCategoryIds(); - - /** - * @return the category set ids the retuning annotations should belong to - */ - Optional<Collection<Integer>> getCategorySetIds(); - - /** - * @return the search text which the annotation name should match - */ - Optional<String> getAnnotationNameSearch(); + @Override + protected List<Predicate> createPredicates(AnnotationFilterCriteria filter, Root<Annotation> root, CriteriaBuilder criteriaBuilder, CriteriaQuery<?> criteriaQuery) { + List<Predicate> predicates = new ArrayList<>(); + + if (filter.getAnnotationNameSearch().isPresent() && !filter.getAnnotationNameSearch().get().isBlank()) { + String annotationNameSearch = filter.getAnnotationNameSearch().get(); + Join<Annotation, AnnotationTranslation> annotationTranslationJoin = root.join(Annotation_.annotationTranslations); + + predicates.add(criteriaBuilder.like(annotationTranslationJoin.get(AnnotationTranslation_.title), + "%" + annotationNameSearch + "%")); + } + + if (filter.getMediumAnalysisListIds().isPresent() && !filter.getMediumAnalysisListIds().get().isEmpty()) { + predicates.add(root.get(Annotation_.mediumAnalysisList).get(MediumAnalysisList_.id) + .in(filter.getMediumAnalysisListIds().get())); + } + + boolean categoryFilterActive = filter.getCategoryIds().isPresent() && !filter.getCategoryIds().get().isEmpty(); + boolean categorySetFilterActive = filter.getCategorySetIds().isPresent() && !filter.getCategorySetIds().get() + .isEmpty(); + boolean hasCategoryFilterActive = filter.hasCategories().isPresent(); + + if (categoryFilterActive || categorySetFilterActive || hasCategoryFilterActive) { + Join<Annotation, Category> categoryJoin = root.join(Annotation_.categories, JoinType.LEFT); + + if (hasCategoryFilterActive) { + if (filter.hasCategories().get()) { + predicates.add(categoryJoin.get(Category_.id).isNotNull()); + } + else { + predicates.add(categoryJoin.get(Category_.id).isNull()); + } + } + + if (categoryFilterActive) { + predicates.add(categoryJoin.get(Category_.id).in(filter.getCategoryIds().get())); + } + + if (categorySetFilterActive) { + Join<Category, CategorySetHasCategory> categorySetJoin = categoryJoin.join(Category_.categorySetHasCategories); + + Subquery<Integer> assignedCategorySetIdsSubquery = criteriaQuery.subquery(Integer.class); + Root<MediumAnalysisList> mediumAnalysisListRoot = assignedCategorySetIdsSubquery.from(MediumAnalysisList.class); + Join<MediumAnalysisList, CategorySet> analysisListCategorySet = mediumAnalysisListRoot.join( + MediumAnalysisList_.categorySets); + assignedCategorySetIdsSubquery.select(analysisListCategorySet.get(CategorySet_.id)); + assignedCategorySetIdsSubquery.where( + criteriaBuilder.equal(root.get(Annotation_.mediumAnalysisList).get(MediumAnalysisList_.id), + mediumAnalysisListRoot.get(MediumAnalysisList_.id))); + + predicates.add(categorySetJoin.get(CategorySetHasCategory_.categorySet).get(CategorySet_.id) + .in(assignedCategorySetIdsSubquery)); + } + } + + return predicates; } public static class CreateAnnotation { diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/api/AnnotationFilterCriteria.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/api/AnnotationFilterCriteria.java new file mode 100644 index 00000000..a766e521 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/api/AnnotationFilterCriteria.java @@ -0,0 +1,102 @@ +package de.bitgilde.TIMAAT.storage.entity.annotation.api; + +import java.util.Collection; +import java.util.Optional; + +/** + * Filters used by {@link de.bitgilde.TIMAAT.storage.entity.annotation.AnnotationStorage} + * + * @author Nico Kotlenga + * @since 19.12.25 + */ +public interface AnnotationFilterCriteria { + /** + * @return the category ids the returning annotations should belong to + */ + Optional<Collection<Integer>> getCategoryIds(); + + /** + * @return the category set ids the retuning annotation should belong to + */ + Optional<Collection<Integer>> getCategorySetIds(); + + /** + * @return the {@link de.bitgilde.TIMAAT.model.FIPOP.MediumAnalysisList} ids the returned annotations should belong to + */ + Optional<Collection<Integer>> getMediumAnalysisListIds(); + + /** + * @return the search text + */ + Optional<String> getAnnotationNameSearch(); + + /** + * @return a {@link Boolean} indicating whether only annotations which are connected or not connected to a category + * should be included inside the result set. + */ + Optional<Boolean> hasCategories(); + + class Builder { + + private Collection<Integer> categoryIds = null; + private Collection<Integer> categorySetIds = null; + private String annotationNameSearch = null; + private Collection<Integer> mediumAnalysisListIds = null; + private Boolean hasCategories = null; + + public AnnotationFilterCriteria.Builder categoryIds(Collection<Integer> categoryIds) { + this.categoryIds = categoryIds; + return this; + } + + public AnnotationFilterCriteria.Builder categorySetIds(Collection<Integer> categorySetIds) { + this.categorySetIds = categorySetIds; + return this; + } + + public AnnotationFilterCriteria.Builder annotationNameSearch(String annotationNameSearch) { + this.annotationNameSearch = annotationNameSearch; + return this; + } + + public AnnotationFilterCriteria.Builder mediumAnalysisListIds(Collection<Integer> mediumAnalysisListIds){ + this.mediumAnalysisListIds = mediumAnalysisListIds; + return this; + } + + public AnnotationFilterCriteria.Builder hasCategories(Boolean hasCategories){ + this.hasCategories = hasCategories; + return this; + } + + public AnnotationFilterCriteria build() { + return new AnnotationFilterCriteria() { + @Override + public Optional<Collection<Integer>> getCategoryIds() { + return Optional.ofNullable(categoryIds); + } + + @Override + public Optional<Collection<Integer>> getCategorySetIds() { + return Optional.ofNullable(categorySetIds); + } + + @Override + public Optional<Collection<Integer>> getMediumAnalysisListIds() { + return Optional.ofNullable(mediumAnalysisListIds); + } + + @Override + public Optional<String> getAnnotationNameSearch() { + return Optional.ofNullable(annotationNameSearch); + } + + @Override + public Optional<Boolean> hasCategories() { + return Optional.ofNullable(hasCategories); + } + + }; + } + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/MediumStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/MediumStorage.java index a92ad5f2..9a5ab840 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/MediumStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/MediumStorage.java @@ -17,6 +17,7 @@ import jakarta.inject.Inject; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Join; import jakarta.persistence.criteria.Predicate; import jakarta.persistence.criteria.Root; @@ -93,7 +94,7 @@ public List<MediumHasMusic> updateMediumHasMusicList(int mediumId, Map<Integer, } @Override - protected List<Predicate> createPredicates(MediumFilterCriteria filter, Root<Medium> root, CriteriaBuilder criteriaBuilder) { + protected List<Predicate> createPredicates(MediumFilterCriteria filter, Root<Medium> root, CriteriaBuilder criteriaBuilder, CriteriaQuery<?> criteriaQuery) { List<Predicate> predicates = new ArrayList<>(); if (filter.getMediumNameSearch().isPresent()) { diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/music/MusicStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/music/MusicStorage.java index ee26ae63..54b31d16 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/music/MusicStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/music/MusicStorage.java @@ -30,6 +30,7 @@ import jakarta.inject.Inject; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Join; import jakarta.persistence.criteria.Predicate; import jakarta.persistence.criteria.Root; @@ -81,7 +82,7 @@ public MusicStorage(EntityManagerFactory emf, TagStorage tagStorage) { } - protected List<Predicate> createPredicates(MusicFilterCriteria filter, Root<Music> root, CriteriaBuilder criteriaBuilder) { + protected List<Predicate> createPredicates(MusicFilterCriteria filter, Root<Music> root, CriteriaBuilder criteriaBuilder, CriteriaQuery<?> criteriaQuery) { List<Predicate> predicates = new ArrayList<>(); if (filter.getMusicNameSearch().isPresent()) { diff --git a/src/main/resources/database/db_update.sql b/src/main/resources/database/db_update.sql index 7a8a9b18..3ae9dd2e 100644 --- a/src/main/resources/database/db_update.sql +++ b/src/main/resources/database/db_update.sql @@ -289,6 +289,29 @@ BEGIN END $$ DELIMITER ; +DELIMITER $$ +CREATE PROCEDURE update_to_0_15_1() +BEGIN + DECLARE db_major_version int; + DECLARE db_minor_version int; + DECLARE db_patch_version int; + + SELECT major_version, minor_version, patch_version + INTO db_major_version, db_minor_version, db_patch_version + FROM db_version + LIMIT 1; + + IF db_major_version = 0 AND db_minor_version = 15 AND db_patch_version = 0 THEN + SELECT 'execute update to 0.15.1' AS log_message; + DELETE FROM db_version; + INSERT INTO db_version (major_version, minor_version, patch_version) VALUES (0, 15, 1); + + ALTER TABLE `fipop`.`annotation_has_category` + DROP COLUMN category_set_id; + END IF; +END $$ +DELIMITER ; + /** * Call update functions */ diff --git a/src/main/resources/database/fipop.sql b/src/main/resources/database/fipop.sql index 2e02d609..1bbc8b5c 100644 --- a/src/main/resources/database/fipop.sql +++ b/src/main/resources/database/fipop.sql @@ -1670,7 +1670,6 @@ CREATE TABLE IF NOT EXISTS `FIPOP`.`annotation_has_category` ( `annotation_id` INT NOT NULL, `category_id` INT NOT NULL, - `category_set_id` INT NULL, PRIMARY KEY (`annotation_id`, `category_id`), CONSTRAINT `fk_annotation_has_category_annotation1` FOREIGN KEY (`annotation_id`) diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html index 7b9023e6..1178f0e0 100644 --- a/src/main/webapp/index.html +++ b/src/main/webapp/index.html @@ -620,7 +620,7 @@ <h5 class="modal-title">Delete category set in use</h5> All associated categories in all annotations of this list will be removed as well! </div> <div class="modal-footer"> - <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button> + <button type="button" class="btn btn-secondary" id="mediumAnalysisCategorySetInUseModalCancelButton" data-dismiss="modal">Cancel</button> <button type="button" class="btn btn-danger" id="mediumAnalysisCategorySetInUseModalConfirmButton">Confirm</button> </div> </div> diff --git a/src/main/webapp/js/service/timaat.service.analysislist.js b/src/main/webapp/js/service/timaat.service.analysislist.js index 266e690c..d4551edc 100644 --- a/src/main/webapp/js/service/timaat.service.analysislist.js +++ b/src/main/webapp/js/service/timaat.service.analysislist.js @@ -187,7 +187,30 @@ console.error("ERROR responseText:", error.responseText); }); }, - + async updateAnalysisListCategorySets(analysisListId, categorySetIds){ + const updateCategorySetIdsPayload = { + categorySetIds + } + return new Promise(resolve => { + $.ajax({ + url: window.location.protocol + '//' + window.location.host + "/TIMAAT/api/analysisList/" + analysisListId + "/categorySets", + type: "PUT", + data: JSON.stringify(updateCategorySetIdsPayload), + contentType: "application/json; charset=utf-8", + dataType: "json", + beforeSend: function (xhr) { + xhr.setRequestHeader('Authorization', 'Bearer ' + TIMAAT.Service.token); + }, + }).done(function (data) { + resolve(data); + }).fail(function (error) { + console.error("ERROR: ", error); + console.error("ERROR responseText:", error.responseText); + }); + }).catch((error) => { + console.error("ERROR: ", error); + }); + }, updateAnalysisList(analysisList) { // console.log("TCL: updateAnalysisList -> analysisList", analysisList); var list = { diff --git a/src/main/webapp/js/service/timaat.service.annotation.js b/src/main/webapp/js/service/timaat.service.annotation.js index 11387570..984771fc 100644 --- a/src/main/webapp/js/service/timaat.service.annotation.js +++ b/src/main/webapp/js/service/timaat.service.annotation.js @@ -37,30 +37,46 @@ }(function (TIMAAT) { TIMAAT.AnnotationService = { + createAnnotationFilterUrlSearchParams(mediumAnalysisListIds=null, categoryIds=null, categorySetIds=null, hasCategories = null) { + const result = new URLSearchParams() + if(mediumAnalysisListIds){ + mediumAnalysisListIds.forEach(currentMediumAnalysisListId => result.append("mediumAnalysisListIds", currentMediumAnalysisListId)) + } + if(categoryIds){ + categoryIds.forEach(currentCategoryId => result.append("categoryIds", currentCategoryId)) + } + if(categorySetIds){ + categorySetIds.forEach(currentCategorySetId => result.append("categorySetIds", currentCategorySetId)) + } + if(hasCategories){ + result.append("hasCategories", hasCategories) + } - //* not in use anymore - // getAnnotations(videoId, callback) { - // // console.log("TCL: getAnnotations -> getAnnotations(videoId, callback) "); - // // console.log("TCL: getAnnotations -> videoId", videoId); - // jQuery.ajax({ - // url : window.location.protocol+'//'+window.location.host+"/TIMAAT/api/medium/"+videoId+"/annotations", - // type : "GET", - // contentType: "application/json; charset=utf-8", - // dataType : "json", - // beforeSend : function (xhr) { - // xhr.setRequestHeader('Authorization', 'Bearer '+TIMAAT.Service.token); - // }, - // }).done(function(data) { - // callback(data); - // }) - // .fail(function(error) { - // console.error("ERROR: ", error); - // }); - - // }, - + return result + }, + async getAnnotationCount(mediumAnalysisListIds=null, categoryIds = null, categorySetIds = null, hasCategories = null) { + const urlSearchParams = TIMAAT.AnnotationService.createAnnotationFilterUrlSearchParams(mediumAnalysisListIds, categoryIds, categorySetIds, hasCategories) + return new Promise(resolve => { + $.ajax({ + url: window.location.protocol + '//' + window.location.host + "/TIMAAT/api/annotation/count?" + urlSearchParams.toString() , + type: "GET", + contentType: "application/json; charset=utf-8", + dataType: "json", + beforeSend: function (xhr) { + xhr.setRequestHeader('Authorization', 'Bearer ' + TIMAAT.Service.token); + }, + }).done(function (data) { + resolve(data.count); + }) + .fail(function (error) { + console.error("ERROR responseText: ", error.responseText); + console.error("ERROR: ", error); + }); + }).catch((error) => { + console.error("ERROR: ", error); + }); + }, async getSelectedCategories(annotationId) { - // console.log("TCL: getSelectedCategories -> annotationId", annotationId); return new Promise(resolve => { $.ajax({ url: window.location.protocol + '//' + window.location.host + "/TIMAAT/api/annotation/" + annotationId + "/category/list/", diff --git a/src/main/webapp/js/ui/timaat.inspector.js b/src/main/webapp/js/ui/timaat.inspector.js index a0d34491..5013ccea 100644 --- a/src/main/webapp/js/ui/timaat.inspector.js +++ b/src/main/webapp/js/ui/timaat.inspector.js @@ -1758,21 +1758,6 @@ } }); - // $('#inspectorColorPicker').on('change', function(event) { - // if ( inspector.state.type == 'annotation' ) { - // console.log("TCL: Inspector -> inspectorColorPicker -> on change"); - // let anno = inspector.state.item; - // console.log("TCL: Inspector -> $ -> anno", anno); - // if (!anno) return; - // let color = $('#inspectorColorPicker').data("plugin_tinycolorpicker").colorHex; - // console.log("TCL: Inspector -> $ -> color", color); - // for (let item of anno.svg.items) { - // item.setStyle({color: + color }); - // }; - // // inspector.state.item = anno; // needed? - // } - // }) - $('#inspectorOpacity').on('change input', function(ev) { if ( inspector.state.type == 'annotation' ) { var anno = inspector.state.item; @@ -1900,6 +1885,196 @@ } }); + $('#analysisCategorySetFormSubmitButton').on('click', async function(event) { + event.preventDefault(); + if (TIMAAT.VideoPlayer.currentPermissionLevel < 2) { + $('#analysisListNoPermissionModal').modal('show'); + return; + } + const $mediumAnalysisListCategorySetsForm = $('#mediumAnalysisListCategorySetsForm') + if (!$mediumAnalysisListCategorySetsForm.valid()) + return false; + let mediumAnalysisList = TIMAAT.VideoPlayer.curAnalysisList; + let formDataRaw = $mediumAnalysisListCategorySetsForm.serializeArray(); + + let i = 0; + let categorySetIdList = []; + + for (; i < formDataRaw.length; i++) { + categorySetIdList.push( Number(formDataRaw[i].value)); + } + + const mediumAnalysisListAnnotationCount = await TIMAAT.AnnotationService.getAnnotationCount([mediumAnalysisList.id], null, null, true) + let annotationsUseCategorySet + if(categorySetIdList.length === 0){ + annotationsUseCategorySet = mediumAnalysisListAnnotationCount > 0 + }else{ + const mediumAnalysisListAnnotationCountAfterChangingCategorySets = await TIMAAT.AnnotationService.getAnnotationCount([mediumAnalysisList.id], null, categorySetIdList, true) + annotationsUseCategorySet = mediumAnalysisListAnnotationCountAfterChangingCategorySets < mediumAnalysisListAnnotationCount + } + + if (annotationsUseCategorySet) { + const $mediumAnalysisCategorySetInUseModal = $('#mediumAnalysisCategorySetInUseModal') + $mediumAnalysisCategorySetInUseModal.data('mediumAnalysisList', mediumAnalysisList); + $mediumAnalysisCategorySetInUseModal.data('categorySetIdList', categorySetIdList); + $mediumAnalysisCategorySetInUseModal.modal('show'); + }else { + mediumAnalysisList.categorySets = await TIMAAT.AnalysisListService.updateAnalysisListCategorySets(mediumAnalysisList.id, categorySetIdList) + } + }); + + $('#analysisCategorySetFormDismissButton,#mediumAnalysisCategorySetInUseModalCancelButton').on('click', async function(event) { + const $analysisCategorySetsMultiSelectDropdown = $('#AnalysisCategorySetsMultiSelectDropdown') + $analysisCategorySetsMultiSelectDropdown.val(null).trigger('change'); + $analysisCategorySetsMultiSelectDropdown.select2('destroy'); + $analysisCategorySetsMultiSelectDropdown.find('option').remove(); + + $analysisCategorySetsMultiSelectDropdown.select2({ + closeOnSelect: false, + scrollAfterSelect: true, + allowClear: true, + ajax: { + url: 'api/categorySet/selectList/', + type: 'GET', + dataType: 'json', + delay: 250, + headers: { + "Authorization": "Bearer "+TIMAAT.Service.token, + "Content-Type": "application/json", + }, + // additional parameters + data: function(params) { + return { + search: params.term, + page: params.page + }; + }, + processResults: function(data, params) { + params.page = params.page || 1; + return { + results: data + }; + }, + cache: false + }, + minimumInputLength: 0, + }); + TIMAAT.AnalysisListService.getCategorySetList(TIMAAT.VideoPlayer.curAnalysisList.id).then(function(data) { + var categorySetSelect = $('#AnalysisCategorySetsMultiSelectDropdown'); + if (data.length > 0) { + data.sort((a, b) => (a.name > b.name)? 1 : -1); + // create the options and append to Select2 + var i = 0; + for (; i < data.length; i++) { + var option = new Option(data[i].name, data[i].id, true, true); + categorySetSelect.append(option).trigger('change'); + } + // manually trigger the 'select2:select' event + categorySetSelect.trigger({ + type: 'select2:select', + params: { + data: data + } + }); + } + }); + + const modal = $('#mediumAnalysisCategorySetInUseModal'); + modal.hide() + }); + + $('#mediumAnalysisCategorySetInUseModalConfirmButton').on('click', async () => { + const modal = $('#mediumAnalysisCategorySetInUseModal'); + const mediumAnalysisList = modal.data('mediumAnalysisList'); + const categorySetIdList = modal.data('categorySetIdList'); + + mediumAnalysisList.categorySets = await TIMAAT.AnalysisListService.updateAnalysisListCategorySets(mediumAnalysisList.id, categorySetIdList) + modal.modal('hide'); + }); + + $('#annotationCategoryFormSubmitButton').on('click', async function(event) { + event.preventDefault(); + if (TIMAAT.VideoPlayer.currentPermissionLevel < 2) { + $('#analysisListNoPermissionModal').modal('show'); + return; + } + + const $annotationCategoriesForm = $('#annotationCategoriesForm') + + if (!$annotationCategoriesForm.valid()){ + return false; + } + + const annotation = TIMAAT.VideoPlayer.curAnnotation; + const formDataRaw = $annotationCategoriesForm.serializeArray(); + + let i = 0; + const categoryIdList = []; + for (; i < formDataRaw.length; i++) { + categoryIdList.push( Number(formDataRaw[i].value)); + } + + annotation.model.categories = await TIMAAT.AnnotationService.updateAnnotationCategories(annotation.model.id, categoryIdList) + }); + + $('#annotationCategoryFormDismissButton').on('click', async function(event) { + const $annotationCategoriesMultiSelectDropdown = $('#annotationCategoriesMultiSelectDropdown') + $annotationCategoriesMultiSelectDropdown.val(null).trigger('change'); + $annotationCategoriesMultiSelectDropdown.select2('destroy'); + $annotationCategoriesMultiSelectDropdown.find('option').remove(); + + $annotationCategoriesMultiSelectDropdown.select2({ + closeOnSelect: false, + scrollAfterSelect: true, + allowClear: true, + ajax: { + url: 'api/category/selectList/', + type: 'GET', + dataType: 'json', + delay: 250, + headers: { + "Authorization": "Bearer "+TIMAAT.Service.token, + "Content-Type": "application/json", + }, + // additional parameters + data: function(params) { + return { + search: params.term, + page: params.page + }; + }, + processResults: function(data, params) { + params.page = params.page || 1; + return { + results: data + }; + }, + cache: false + }, + minimumInputLength: 0, + }); + TIMAAT.AnnotationService.getSelectedCategories(TIMAAT.VideoPlayer.curAnnotation.model.id).then(function(data) { + // console.log("TCL: then: data", data); + var categorySelect = $('#annotationCategoriesMultiSelectDropdown'); + if (data.length > 0) { + data.sort((a, b) => (a.name > b.name)? 1 : -1); + // create the options and append to Select2 + var i = 0; + for (; i < data.length; i++) { + var option = new Option(data[i].name, data[i].id, true, true); + categorySelect.append(option).trigger('change'); + } + // manually trigger the 'select2:select' event + categorySelect.trigger({ + type: 'select2:select', + params: { + data: data + } + }); + } + }); + }); + // thumbnail const annotationThumbnailPositionSliderInput = $('.inspectorThumbnailEditSectionCustomRangeSliderInput') const annotationThumbnailSaveButton = $('#inspectorThumbnailEditSectionSaveButton') From 2968b6fcf52f3fc19d25330c537cf50ceb155d13 Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Sun, 28 Dec 2025 14:23:01 +0100 Subject: [PATCH 23/70] TIMAAT Weiterentwicklung #9 - Categories and category sets for actors * Updated database model: Added tables to related actors with category sets and categories * Added endpoints to update and read relation information between actors and categories/category sets * Updated actor listing endpoint. It now has a query parameter to filter by category and category set * Updated category content table to filter represented actors by selected category or category set --- docs/database.md | 3 +- .../TIMAAT/di/binder/TIMAATBinder.java | 2 + .../de/bitgilde/TIMAAT/model/FIPOP/Actor.java | 50 +++- .../TIMAAT/rest/endpoint/EndpointActor.java | 232 ++++++------------ .../rest/endpoint/EndpointAnnotation.java | 2 +- .../rest/endpoint/EndpointCategory.java | 7 +- .../actor/ActorListingQueryParameter.java | 69 ++++++ .../UpdateAssignedCategoriesPayload.java | 4 +- .../UpdateAssignedCategorySetsPayload.java | 29 +++ .../storage/entity/actor/ActorStorage.java | 146 +++++++++++ .../entity/actor/api/ActorFilterCriteria.java | 98 ++++++++ .../entity/actor/api/ActorSortingField.java | 41 ++++ .../entity/annotation/AnnotationStorage.java | 24 +- src/main/resources/database/db_update.sql | 45 +++- src/main/resources/database/fipop.sql | 53 +++- src/main/webapp/index.html | 42 ++++ .../webapp/js/datasets/timaat.categories.js | 18 +- .../js/datasets/timaat.datasets.actor.js | 189 ++++++++++++++ .../webapp/js/service/timaat.service.actor.js | 90 +++++++ src/main/webapp/js/ui/timaat.inspector.js | 3 - src/main/webapp/js/ui/timaat.table.js | 88 +++++-- 21 files changed, 1012 insertions(+), 223 deletions(-) create mode 100644 src/main/java/de/bitgilde/TIMAAT/rest/model/actor/ActorListingQueryParameter.java rename src/main/java/de/bitgilde/TIMAAT/rest/model/{annotation => category}/UpdateAssignedCategoriesPayload.java (87%) create mode 100644 src/main/java/de/bitgilde/TIMAAT/rest/model/categoryset/UpdateAssignedCategorySetsPayload.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/storage/entity/actor/ActorStorage.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/storage/entity/actor/api/ActorFilterCriteria.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/storage/entity/actor/api/ActorSortingField.java diff --git a/docs/database.md b/docs/database.md index 02271892..2770c8ff 100644 --- a/docs/database.md +++ b/docs/database.md @@ -47,4 +47,5 @@ The versioning of the database schema follows the following pattern: ### 0.15.1 -* Removed unused column `category_set_id` from table `annotation_has_category` \ No newline at end of file +* Removed unused column `category_set_id` from table `annotation_has_category` +* Added tables `actor_has_category_set` and `actor_has_category` to link actors with categories \ No newline at end of file diff --git a/src/main/java/de/bitgilde/TIMAAT/di/binder/TIMAATBinder.java b/src/main/java/de/bitgilde/TIMAAT/di/binder/TIMAATBinder.java index da7f42b3..21f9db56 100644 --- a/src/main/java/de/bitgilde/TIMAAT/di/binder/TIMAATBinder.java +++ b/src/main/java/de/bitgilde/TIMAAT/di/binder/TIMAATBinder.java @@ -9,6 +9,7 @@ import de.bitgilde.TIMAAT.rest.security.authorization.AnnotationAuthorizationVerifier; import de.bitgilde.TIMAAT.rest.security.authorization.DbAnnotationAuthorizationVerifier; import de.bitgilde.TIMAAT.sse.EntityUpdateEventService; +import de.bitgilde.TIMAAT.storage.entity.actor.ActorStorage; import de.bitgilde.TIMAAT.storage.entity.analysislist.AnalysisListStorage; import de.bitgilde.TIMAAT.storage.entity.annotation.AnnotationStorage; import de.bitgilde.TIMAAT.storage.entity.AudioAnalysisResultStorage; @@ -77,6 +78,7 @@ protected void configure() { bindAsContract(MusicStorage.class).in(Singleton.class); bindAsContract(AnnotationStorage.class).in(Singleton.class); bindAsContract(TagStorage.class).in(Singleton.class); + bindAsContract(ActorStorage.class).in(Singleton.class); bindAsContract(MediumStorage.class).in(Singleton.class); bindAsContract(AnalysisListStorage.class).in(Singleton.class); bindAsContract(MediumVideoStorage.class).in(Singleton.class); diff --git a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/Actor.java b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/Actor.java index 4102c00a..a244fee3 100644 --- a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/Actor.java +++ b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/Actor.java @@ -1,15 +1,9 @@ package de.bitgilde.TIMAAT.model.FIPOP; -import java.io.Serializable; -import java.sql.Timestamp; -import java.util.List; -import java.util.Objects; - import com.fasterxml.jackson.annotation.JsonBackReference; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonManagedReference; import com.fasterxml.jackson.annotation.JsonProperty; - import jakarta.persistence.CascadeType; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -25,6 +19,11 @@ import jakarta.persistence.OneToOne; import jakarta.persistence.Transient; +import java.io.Serializable; +import java.sql.Timestamp; +import java.util.List; +import java.util.Objects; + /* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -136,6 +135,30 @@ public class Actor implements Serializable { ) private List<Role> roles; + @ManyToMany + @JoinTable( + name="actor_has_category_set" + , joinColumns={ + @JoinColumn(name="actor_id") + } + , inverseJoinColumns={ + @JoinColumn(name="category_set_id") + } + ) + private List<CategorySet> categorySets; + + @ManyToMany + @JoinTable( + name="actor_has_category" + , joinColumns={ + @JoinColumn(name="actor_id") + } + , inverseJoinColumns={ + @JoinColumn(name="category_id") + } + ) + private List<Category> categories; + //bi-directional many-to-many association to Medium_Image @ManyToMany @JoinTable( @@ -568,4 +591,19 @@ public void setTags(List<Tag> tags) { this.tags = tags; } + public List<Category> getCategories() { + return categories; + } + + public void setCategories(List<Category> categories) { + this.categories = categories; + } + + public List<CategorySet> getCategorySets() { + return categorySets; + } + + public void setCategorySets(List<CategorySet> categorySets) { + this.categorySets = categorySets; + } } \ No newline at end of file diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointActor.java b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointActor.java index ca976e11..4ae1499b 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointActor.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointActor.java @@ -1,18 +1,8 @@ package de.bitgilde.TIMAAT.rest.endpoint; -import java.io.File; -import java.io.IOException; -import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; - -import org.jvnet.hk2.annotations.Service; - import de.bitgilde.TIMAAT.PropertyConstants; import de.bitgilde.TIMAAT.SelectElement; import de.bitgilde.TIMAAT.TIMAATApp; @@ -29,7 +19,8 @@ import de.bitgilde.TIMAAT.model.FIPOP.ActorType; import de.bitgilde.TIMAAT.model.FIPOP.Address; import de.bitgilde.TIMAAT.model.FIPOP.AddressType; -import de.bitgilde.TIMAAT.model.FIPOP.Annotation; +import de.bitgilde.TIMAAT.model.FIPOP.Category; +import de.bitgilde.TIMAAT.model.FIPOP.CategorySet; import de.bitgilde.TIMAAT.model.FIPOP.Citizenship; import de.bitgilde.TIMAAT.model.FIPOP.CitizenshipTranslation; import de.bitgilde.TIMAAT.model.FIPOP.EmailAddress; @@ -47,16 +38,24 @@ import de.bitgilde.TIMAAT.model.FIPOP.Tag; import de.bitgilde.TIMAAT.model.FIPOP.UserAccount; import de.bitgilde.TIMAAT.rest.Secured; +import de.bitgilde.TIMAAT.rest.filter.AuthenticationFilter; +import de.bitgilde.TIMAAT.rest.model.actor.ActorListingQueryParameter; +import de.bitgilde.TIMAAT.rest.model.category.UpdateAssignedCategoriesPayload; +import de.bitgilde.TIMAAT.rest.model.categoryset.UpdateAssignedCategorySetsPayload; import de.bitgilde.TIMAAT.security.UserLogManager; +import de.bitgilde.TIMAAT.storage.entity.actor.ActorStorage; +import jakarta.inject.Inject; import jakarta.persistence.EntityManager; import jakarta.persistence.EntityTransaction; import jakarta.persistence.Query; import jakarta.servlet.ServletContext; +import jakarta.ws.rs.BeanParam; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; import jakarta.ws.rs.PATCH; import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; @@ -66,7 +65,15 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; -import jakarta.ws.rs.core.UriInfo; +import org.jvnet.hk2.annotations.Service; + +import java.io.File; +import java.io.IOException; +import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.stream.Collectors; /* Licensed under the Apache License, Version 2.0 (the "License"); @@ -89,8 +96,8 @@ @Service @Path("/actor") public class EndpointActor { - @Context - private UriInfo uriInfo; + @Inject + private ActorStorage actorStorage; @Context ContainerRequestContext containerRequestContext; @Context @@ -100,112 +107,18 @@ public class EndpointActor { @Produces(MediaType.APPLICATION_JSON) @Secured @Path("list") - public Response getActorList(@QueryParam("draw") Integer draw, - @QueryParam("start") Integer start, - @QueryParam("length") Integer length, - @QueryParam("orderby") String orderby, - @QueryParam("dir") String direction, - @QueryParam("search") String search, - @QueryParam("exclude_annotation") Integer annotationID) + public DataTableInfo<Actor> getActorList(@BeanParam ActorListingQueryParameter queryParameter) { - // System.out.println("EndpointActor: getActorList: draw: "+draw+" start: "+start+" length: "+length+" orderby: "+orderby+" dir: "+direction+" search: "+search+" exclude: "+annotationID); - if ( draw == null ) draw = 0; - - // sanitize user input - if ( direction != null && direction.equalsIgnoreCase("desc") ) direction = "DESC"; else direction = "ASC"; - - String column = "a.displayName.name"; - if ( orderby != null ) { - if (orderby.equalsIgnoreCase("name")) column = "a.displayName.name"; - } - - // define default query strings - String actorQuery = "SELECT a FROM Actor a ORDER BY "; - String actorCountQuery = "SELECT COUNT(a) FROM Actor a"; - // String actorSearchQuery = "SELECT a FROM Actor a WHERE lower(a.displayName.name) LIKE lower(concat('%', :name,'%')) ORDER BY "; - // String actorSearchCountQuery = "SELECT COUNT(a) FROM Actor a WHERE lower(a.displayName.name) LIKE lower(concat('%', :displayTitle,'%'))"; - - // exclude actors from annotation if specified - if ( annotationID != null ) { - Annotation anno = TIMAATApp.emf.createEntityManager().find(Annotation.class, annotationID); - if ( anno != null && anno.getActors().size() > 0 ) { - actorQuery = "SELECT a FROM Actor a, Annotation anno WHERE anno.id="+annotationID+" AND a NOT MEMBER OF anno.actors ORDER BY "; - actorCountQuery = "SELECT COUNT(a) FROM Actor a, Annotation anno WHERE anno.id="+annotationID+" AND a NOT MEMBER OF anno.actors"; - // actorSearchQuery = "SELECT a FROM Actor a, Annotation anno WHERE anno.id="+annotationID+" AND a NOT MEMBER OF anno.actors AND lower(a.displayName.name) LIKE lower(concat('%', :name,'%')) ORDER BY "; - // actorSearchCountQuery = "SELECT COUNT(a) FROM Actor a, Annotation anno WHERE anno.id="+annotationID+" AND a NOT MEMBER OF anno.actors AND lower(a.displayName.name) LIKE lower(concat('%', :displayTitle,'%'))"; - } - } + UserAccount userAccount = (UserAccount) containerRequestContext.getProperty( + AuthenticationFilter.USER_ACCOUNT_PROPERTY_NAME); - // calculate total # of records - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Query countQuery = entityManager.createQuery(actorCountQuery); - long recordsTotal = (long) countQuery.getSingleResult(); - long recordsFiltered = recordsTotal; - - // search - Query query; - String sql; - List<Actor> actorList = new ArrayList<>(); - if ( search != null && search.length() > 0 ) { - // find all matching names - sql = "SELECT DISTINCT a FROM Actor a, ActorName an WHERE lower(an.name) LIKE lower(concat('%', :search, '%')) AND an.actor = a ORDER BY a.displayName.name "+direction; - query = entityManager.createQuery(sql) - .setParameter("search", search); - actorList = castList(Actor.class, query.getResultList()); - // find all media belonging to those titles - if ( start != null && start > 0 ) query.setFirstResult(start); - if ( length != null && length > 0 ) query.setMaxResults(length); - if ( length == -1 ) { // display all results - length = actorList.size(); - query.setMaxResults(length); - } - - for (Actor actor : actorList) { - if (annotationID != null) { // TODO structure needs to be reversed? - Boolean annoConnected = false; - for (Annotation annotation : actor.getAnnotations()) { - if (annotation.getId() == annotationID) { - annoConnected = true; - } - } - if (!annoConnected && !(actorList.contains(actor))) { - actorList.add(actor); - } - } - // else if (!(actorList.contains(actor))) { // TODO: should be obsolete with SELECT DISTINCT - // actorList.add(actor); - // } - } - recordsFiltered = actorList.size(); - List<Actor> filteredActorList = new ArrayList<>(); - int i = start; - int end; - if ((recordsFiltered - start) < length) { - end = (int)recordsFiltered; - } - else { - end = start + length; - } - for(; i < end; i++) { - filteredActorList.add(actorList.get(i)); - } - return Response.ok().entity(new DataTableInfo(draw, recordsTotal, recordsFiltered, filteredActorList)).build(); - // calculate search result # of records - // countQuery = entityManager.createQuery(actorSearchCountQuery); - // countQuery.setParameter("displayTitle", search); - // recordsFiltered = (long) countQuery.getSingleResult(); - // // perform search - // query = entityManager.createQuery( - // actorSearchQuery+column+" "+direction); - // query.setParameter("name", search); - } else { - query = entityManager.createQuery(actorQuery + column + " " + direction); - if ( start != null && start > 0 ) query.setFirstResult(start); - if ( length != null && length > 0 ) query.setMaxResults(length); - actorList = castList(Actor.class, query.getResultList()); - } + int draw = queryParameter.getDraw().isPresent() ? queryParameter.getDraw().get() : 0; + List<Actor> actors = actorStorage.getEntriesAsStream(queryParameter, queryParameter, queryParameter, userAccount).collect( + Collectors.toList()); + Long actorsCount = actorStorage.getNumberOfTotalEntries(); + Long matchingActorsCount = actorStorage.getNumberOfMatchingEntries(queryParameter); - return Response.ok().entity(new DataTableInfo(draw, recordsTotal, recordsFiltered, actorList)).build(); + return new DataTableInfo<>(draw, actorsCount, matchingActorsCount, actors); } @@ -213,45 +126,13 @@ public Response getActorList(@QueryParam("draw") Integer draw, @Produces(MediaType.APPLICATION_JSON) @Secured @Path("selectList") - public Response getActorSelectList(@QueryParam("start") Integer start, - @QueryParam("length") Integer length, - @QueryParam("orderby") String orderby, - @QueryParam("search") String search) + public List<SelectElement<Integer>> getActorSelectList(@BeanParam ActorListingQueryParameter queryParameter) { - // System.out.println("EndpointActor: getActorList: start: "+start+" length: "+length+" orderby: "+orderby+" search: "+search); - - // String column = "a.id"; - // if ( orderby != null ) { - // if (orderby.equalsIgnoreCase("name")) column = "a.displayName.name"; // TODO change displayName access in DB-Schema - // } - - // define default query strings - String actorQuery = "SELECT a FROM Actor a ORDER BY a.displayName.name"; - String actorSearchQuery = "SELECT a FROM Actor a WHERE lower(a.displayName.name) LIKE lower(concat('%', :name,'%')) ORDER BY a.displayName.name"; - - // search - Query query; - if ( search != null && search.length() > 0 ) { - // perform search - query = TIMAATApp.emf.createEntityManager().createQuery( - actorSearchQuery); - query.setParameter("name", search); - // query.setParameter("actorName", search); // birthName - } else { - query = TIMAATApp.emf.createEntityManager().createQuery( - actorQuery); - } - // if ( start != null && start > 0 ) query.setFirstResult(start); - // if ( length != null && length > 0 ) query.setMaxResults(length); - - List<Actor> actorList = castList(Actor.class, query.getResultList()); - List<SelectElement> actorSelectList = new ArrayList<>(); - for (Actor actor : actorList) { - actorSelectList.add(new SelectElement<Integer>(actor.getId(), actor.getDisplayName().getName())); - } - - return Response.ok().entity(actorSelectList).build(); - + UserAccount userAccount = (UserAccount) containerRequestContext.getProperty( + AuthenticationFilter.USER_ACCOUNT_PROPERTY_NAME); + return actorStorage.getEntriesAsStream(queryParameter, queryParameter, queryParameter, userAccount) + .map(currentActor -> new SelectElement<>(currentActor.getId(), currentActor.getDisplayName().getName())) + .collect(Collectors.toList()); } @GET @@ -275,6 +156,47 @@ public Response getActorSelect(@PathParam("id") int id, } + @GET + @Produces(MediaType.APPLICATION_JSON) + @Secured + @Path("{id}/categorySets") + public Collection<CategorySet> getCategorySetsOfActor(@PathParam("id") Integer id) { + return actorStorage.getCategorySetsOfActor(id); + } + + @PUT + @Produces(MediaType.APPLICATION_JSON) + @Secured + @Path("{id}/categorySets") + public Collection<CategorySet> updateCategorySetsOfActor(@PathParam("id") Integer id, UpdateAssignedCategorySetsPayload updateAssignedCategorySetsPayload){ + return actorStorage.updateAssignedCategorySetsOfActor(id, updateAssignedCategorySetsPayload.getCategorySetIds()); + } + + @GET + @Produces(MediaType.APPLICATION_JSON) + @Secured + @Path("{id}/categories") + public Collection<Category> getCategoriesOfActor(@PathParam("id") Integer id) { + return actorStorage.getCategoriesOfActor(id); + } + + @PUT + @Produces(MediaType.APPLICATION_JSON) + @Secured + @Path("{id}/categories") + public Collection<Category> updateCategoriesOfActor(@PathParam("id") Integer id, UpdateAssignedCategoriesPayload updateAssignedCategoriesPayload){ + return actorStorage.updateAssignedCategoriesOfActor(id, updateAssignedCategoriesPayload.getCategoryIds()); + } + + @GET + @Produces(MediaType.APPLICATION_JSON) + @Secured + @Path("{id}/assignableCategories/selectList") + public List<SelectElement<Integer>> getAssignableCategories(@PathParam("id") Integer id){ + return actorStorage.getAssignableCategoriesOfActor(id).map(category -> new SelectElement<>(category.getId(), category.getName())).collect( + Collectors.toList()); + } + @GET @Produces(MediaType.APPLICATION_JSON) @Secured diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnnotation.java b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnnotation.java index ae8be6d7..02f44140 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnnotation.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnnotation.java @@ -27,7 +27,7 @@ import de.bitgilde.TIMAAT.rest.model.annotation.CreateAnnotationPayload; import de.bitgilde.TIMAAT.rest.model.annotation.UpdateAnnotationPayload; import de.bitgilde.TIMAAT.rest.model.annotation.UpdateAnnotationThumbnailPayload; -import de.bitgilde.TIMAAT.rest.model.annotation.UpdateAssignedCategoriesPayload; +import de.bitgilde.TIMAAT.rest.model.category.UpdateAssignedCategoriesPayload; import de.bitgilde.TIMAAT.rest.model.tags.UpdateAssignedTagsPayload; import de.bitgilde.TIMAAT.rest.security.authorization.AnalysisListAuthorizationVerifier; import de.bitgilde.TIMAAT.rest.security.authorization.AnnotationAuthorizationVerifier; diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointCategory.java b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointCategory.java index dbcfdf22..8fa4e77d 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointCategory.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointCategory.java @@ -15,7 +15,6 @@ import jakarta.persistence.EntityManager; import jakarta.persistence.EntityTransaction; import jakarta.persistence.Query; -import jakarta.servlet.ServletContext; import jakarta.validation.Valid; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; @@ -31,7 +30,6 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; -import jakarta.ws.rs.core.UriInfo; import org.jvnet.hk2.annotations.Service; import java.util.ArrayList; @@ -62,12 +60,9 @@ @Service @Path("/category") public class EndpointCategory { - @Context - private UriInfo uriInfo; + @Context ContainerRequestContext containerRequestContext; - @Context - ServletContext servletContext; @Inject CategoryStorage categoryStorage; @Inject diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/model/actor/ActorListingQueryParameter.java b/src/main/java/de/bitgilde/TIMAAT/rest/model/actor/ActorListingQueryParameter.java new file mode 100644 index 00000000..68b1fb31 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/rest/model/actor/ActorListingQueryParameter.java @@ -0,0 +1,69 @@ +package de.bitgilde.TIMAAT.rest.model.actor; + +import de.bitgilde.TIMAAT.rest.model.parameter.ListingQueryParameter; +import de.bitgilde.TIMAAT.storage.entity.actor.api.ActorFilterCriteria; +import de.bitgilde.TIMAAT.storage.entity.actor.api.ActorSortingField; +import jakarta.ws.rs.QueryParam; + +import java.util.Collection; +import java.util.List; +import java.util.Optional; + +/** + * Defines the query parameter used by the listing endpoint of {@link de.bitgilde.TIMAAT.model.FIPOP.Annotation}s + * + * @author Nico Kotlenga + * @since 28.11.25 + */ +public class ActorListingQueryParameter extends ListingQueryParameter<ActorSortingField> implements ActorFilterCriteria { + + @QueryParam("categoryIds") + private List<Integer> categoryIds; + @QueryParam("categorySetIds") + private List<Integer> categorySetIds; + @QueryParam("exclude_annotation") + private Integer excludedAnnotationId; + + public ActorListingQueryParameter() { + + } + + @Override + public Optional<Collection<Integer>> getCategoryIds() { + if (categoryIds != null && !categoryIds.isEmpty()) { + return Optional.of(categoryIds); + } + return Optional.empty(); + } + + @Override + public Optional<Collection<Integer>> getCategorySetIds() { + if (categorySetIds != null && !categorySetIds.isEmpty()) { + return Optional.of(categorySetIds); + } + return Optional.empty(); + } + + @Override + public Optional<String> getActorNameSearch() { + return Optional.ofNullable(getSearch()); + } + + @Override + public Optional<Integer> getExcludedAnnotationId() { + return Optional.ofNullable(excludedAnnotationId); + } + + + public void setCategorySetIds(List<Integer> categorySetIds) { + this.categorySetIds = categorySetIds; + } + + public void setExcludedAnnotationId(Integer excludedAnnotationId) { + this.excludedAnnotationId = excludedAnnotationId; + } + + public void setCategoryIds(List<Integer> categoryIds) { + this.categoryIds = categoryIds; + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/model/annotation/UpdateAssignedCategoriesPayload.java b/src/main/java/de/bitgilde/TIMAAT/rest/model/category/UpdateAssignedCategoriesPayload.java similarity index 87% rename from src/main/java/de/bitgilde/TIMAAT/rest/model/annotation/UpdateAssignedCategoriesPayload.java rename to src/main/java/de/bitgilde/TIMAAT/rest/model/category/UpdateAssignedCategoriesPayload.java index b8ef5af9..7890353f 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/model/annotation/UpdateAssignedCategoriesPayload.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/model/category/UpdateAssignedCategoriesPayload.java @@ -1,4 +1,4 @@ -package de.bitgilde.TIMAAT.rest.model.annotation; +package de.bitgilde.TIMAAT.rest.model.category; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -6,7 +6,7 @@ import java.util.List; /** - * This payload is used to change the assigned categories of an {@link de.bitgilde.TIMAAT.model.FIPOP.Annotation} + * This payload is used to change the assigned categories of an entity * * @author Nico Kotlenga * @since 22.09.25 diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/model/categoryset/UpdateAssignedCategorySetsPayload.java b/src/main/java/de/bitgilde/TIMAAT/rest/model/categoryset/UpdateAssignedCategorySetsPayload.java new file mode 100644 index 00000000..a5b07881 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/rest/model/categoryset/UpdateAssignedCategorySetsPayload.java @@ -0,0 +1,29 @@ +package de.bitgilde.TIMAAT.rest.model.categoryset; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.util.List; + +/** + * This payload is used to change the assigned category sets of an entity + * + * @author Nico Kotlenga + * @since 22.09.25 + */ +public class UpdateAssignedCategorySetsPayload { + + private static final String CATEGORY_SET_IDS_FIELD_NAME = "categorySetIds"; + + @JsonProperty(CATEGORY_SET_IDS_FIELD_NAME) + private final List<Integer> categorySetIds; + + @JsonCreator + public UpdateAssignedCategorySetsPayload(@JsonProperty(CATEGORY_SET_IDS_FIELD_NAME) List<Integer> categorySetIds) { + this.categorySetIds = categorySetIds; + } + + public List<Integer> getCategorySetIds() { + return categorySetIds; + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/actor/ActorStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/actor/ActorStorage.java new file mode 100644 index 00000000..c23547ed --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/actor/ActorStorage.java @@ -0,0 +1,146 @@ +package de.bitgilde.TIMAAT.storage.entity.actor; + +/* + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + +import de.bitgilde.TIMAAT.model.FIPOP.Actor; +import de.bitgilde.TIMAAT.model.FIPOP.ActorName_; +import de.bitgilde.TIMAAT.model.FIPOP.Actor_; +import de.bitgilde.TIMAAT.model.FIPOP.Category; +import de.bitgilde.TIMAAT.model.FIPOP.CategorySet; +import de.bitgilde.TIMAAT.model.FIPOP.CategorySet_; +import de.bitgilde.TIMAAT.model.FIPOP.Category_; +import de.bitgilde.TIMAAT.storage.db.DbStorage; +import de.bitgilde.TIMAAT.storage.entity.actor.api.ActorFilterCriteria; +import de.bitgilde.TIMAAT.storage.entity.actor.api.ActorSortingField; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.LockModeType; +import jakarta.persistence.Query; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +/** + * Storage which can be used to access and edit {@link de.bitgilde.TIMAAT.model.FIPOP.Actor} information + * + * @author Nico Kotlenga + * @since 27.12.25 + */ +public class ActorStorage extends DbStorage<Actor, ActorFilterCriteria, ActorSortingField> { + + @Inject + public ActorStorage(EntityManagerFactory emf) { + super(Actor.class, ActorSortingField.ID, emf); + } + + @Override + protected List<Predicate> createPredicates(ActorFilterCriteria filter, Root<Actor> root, CriteriaBuilder criteriaBuilder, CriteriaQuery<?> criteriaQuery) { + List<Predicate> predicates = new ArrayList<>(); + + if (filter.getActorNameSearch().isPresent()) { + String searchText = filter.getActorNameSearch().get(); + predicates.add(criteriaBuilder.like(root.get(Actor_.displayName).get(ActorName_.name), "%" + searchText + "%")); + } + + if (filter.getExcludedAnnotationId().isPresent()) { + Integer excludedAnnotationId = filter.getExcludedAnnotationId().get(); + predicates.add(criteriaBuilder.notEqual(root.get(Actor_.id), excludedAnnotationId)); + } + + boolean categoryFilterActive = filter.getCategoryIds().isPresent() && !filter.getCategoryIds().get().isEmpty(); + boolean categorySetFilterActive = filter.getCategorySetIds().isPresent() && !filter.getCategorySetIds().get() + .isEmpty(); + + if (categoryFilterActive) { + Join<Actor, Category> actorCategoryJoin = root.join(Actor_.categories); + predicates.add(actorCategoryJoin.get(Category_.id).in(filter.getCategoryIds().get())); + } + + if (categorySetFilterActive) { + Join<Actor, CategorySet> actorCategorySetJoin = root.join(Actor_.categorySets); + predicates.add(actorCategorySetJoin.get(CategorySet_.id).in(filter.getCategorySetIds().get())); + } + + return predicates; + } + + public Collection<CategorySet> getCategorySetsOfActor(int actorId) { + return executeDbTransaction(entityManager -> entityManager.getReference(Actor.class, actorId).getCategorySets()); + } + + public Collection<Category> getCategoriesOfActor(int actorId) { + return executeDbTransaction(entityManager -> entityManager.getReference(Actor.class, actorId).getCategories()); + } + + public Collection<Category> updateAssignedCategoriesOfActor(int actorId, List<Integer> categoryIds) { + return executeDbTransaction(entityManager -> { + Actor actor = entityManager.find(Actor.class, actorId, LockModeType.PESSIMISTIC_WRITE); + + List<Category> categories = categoryIds.isEmpty() ? Collections.emptyList() : entityManager.createQuery( + "select category from Actor actor join actor.categorySets categorySets join categorySets.categorySetHasCategories cshc join cshc.category category where category.id in :categoryIds", + Category.class).setParameter("categoryIds", categoryIds) + .getResultList(); + actor.setCategories(categories); + return categories; + }); + } + + public Stream<Category> getAssignableCategoriesOfActor(int actorId) { + return executeStreamDbTransaction(entityManager -> entityManager.createQuery( + "select distinct category from Actor actor join actor.categorySets categorySet join categorySet.categorySetHasCategories cshc join cshc.category category where actor.id = :actorId", + Category.class).setParameter("actorId", actorId).getResultStream()); + } + + public Collection<CategorySet> updateAssignedCategorySetsOfActor(int actorId, List<Integer> categorySetIds) { + return executeDbTransaction(entityManager -> { + Actor actor = entityManager.find(Actor.class, actorId, LockModeType.PESSIMISTIC_WRITE); + + List<CategorySet> categorySets = categorySetIds.isEmpty() ? Collections.emptyList() : entityManager.createQuery( + "select categorySet from CategorySet categorySet where categorySet.id in :categorySetIds", + CategorySet.class).setParameter("categorySetIds", categorySetIds).getResultList(); + actor.setCategorySets(categorySets); + + //Delete categories not part of the new assigned category sets + if (categorySetIds.isEmpty()) { + entityManager.createNativeQuery("delete from actor_has_category where actor_id = ?").setParameter(1, actorId) + .executeUpdate(); + } + else { + String placeholders = categorySetIds.stream().map(id -> "?").collect(Collectors.joining(",")); + Query query = entityManager.createNativeQuery( + "delete from actor_has_category where actor_id = ? and not exists (select 1 from category_set_has_category cshc where cshc.category_id = actor_has_category.category_id and cshc.category_set_id in (" + placeholders + "))") + .setParameter(1, actorId); + + int index = 2; + for (Integer currentCategorySetId : categorySetIds) { + query.setParameter(index++, currentCategorySetId); + } + + query.executeUpdate(); + } + + return categorySets; + }); + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/actor/api/ActorFilterCriteria.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/actor/api/ActorFilterCriteria.java new file mode 100644 index 00000000..773f5a26 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/actor/api/ActorFilterCriteria.java @@ -0,0 +1,98 @@ +package de.bitgilde.TIMAAT.storage.entity.actor.api; + +import java.util.Collection; +import java.util.Optional; + +/* + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + +/** + * Filters which can be passed when listing items of {@link de.bitgilde.TIMAAT.storage.entity.actor.ActorStorage} + * + * @author Nico Kotlenga + * @since 27.12.25 + */ +public interface ActorFilterCriteria { + /** + * @return the category ids the returning actor should belong to + */ + Optional<Collection<Integer>> getCategoryIds(); + + /** + * @return the category set ids the retuning actor should belong to + */ + Optional<Collection<Integer>> getCategorySetIds(); + + /** + * @return the search text which the actor name should match + */ + Optional<String> getActorNameSearch(); + + /** + * @return id of the annotation which should not be included inside the listing result + */ + Optional<Integer> getExcludedAnnotationId(); + + class Builder { + + private Collection<Integer> categoryIds = null; + private Collection<Integer> categorySetIds = null; + private String actorNameSearch = null; + private Integer excludeAnnotationId = null; + + public ActorFilterCriteria.Builder categoryIds(Collection<Integer> categoryIds) { + this.categoryIds = categoryIds; + return this; + } + + public ActorFilterCriteria.Builder categorySetIds(Collection<Integer> categorySetIds) { + this.categorySetIds = categorySetIds; + return this; + } + + public ActorFilterCriteria.Builder actorNameSearch(String actorNameSearch) { + this.actorNameSearch = actorNameSearch; + return this; + } + + public ActorFilterCriteria.Builder excludeAnnotationId(Integer excludeAnnotationId) { + this.excludeAnnotationId = excludeAnnotationId; + return this; + } + + public ActorFilterCriteria build() { + return new ActorFilterCriteria() { + @Override + public Optional<Collection<Integer>> getCategoryIds() { + return Optional.ofNullable(categoryIds); + } + + @Override + public Optional<Collection<Integer>> getCategorySetIds() { + return Optional.ofNullable(categorySetIds); + } + + @Override + public Optional<String> getActorNameSearch() { + return Optional.ofNullable(actorNameSearch); + } + + @Override + public Optional<Integer> getExcludedAnnotationId() { + return Optional.ofNullable(excludeAnnotationId); + } + }; + } + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/actor/api/ActorSortingField.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/actor/api/ActorSortingField.java new file mode 100644 index 00000000..855202a1 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/actor/api/ActorSortingField.java @@ -0,0 +1,41 @@ +package de.bitgilde.TIMAAT.storage.entity.actor.api; + +import de.bitgilde.TIMAAT.model.FIPOP.Actor; +import de.bitgilde.TIMAAT.model.FIPOP.Actor_; +import de.bitgilde.TIMAAT.storage.db.DbSortingField; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Root; + +/* + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + +/** + * {@link de.bitgilde.TIMAAT.storage.api.SortingField}s used by {@link de.bitgilde.TIMAAT.storage.entity.actor.ActorStorage} + * + * @author Nico Kotlenga + * @since 13.12.25 + */ +public enum ActorSortingField implements DbSortingField<Actor> { + ID; + + @Override + public Path<?> getPathFromRootEntity(Root<Actor> root) { + switch (this) { + case ID: + return root.get(Actor_.id); + default: + throw new IllegalArgumentException("Unexpected enum value"); + } + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/AnnotationStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/AnnotationStorage.java index 3e8b098d..4c1fb8c8 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/AnnotationStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/AnnotationStorage.java @@ -11,8 +11,6 @@ import de.bitgilde.TIMAAT.model.FIPOP.Annotation_; import de.bitgilde.TIMAAT.model.FIPOP.Category; import de.bitgilde.TIMAAT.model.FIPOP.CategorySet; -import de.bitgilde.TIMAAT.model.FIPOP.CategorySetHasCategory; -import de.bitgilde.TIMAAT.model.FIPOP.CategorySetHasCategory_; import de.bitgilde.TIMAAT.model.FIPOP.CategorySet_; import de.bitgilde.TIMAAT.model.FIPOP.Category_; import de.bitgilde.TIMAAT.model.FIPOP.Language; @@ -38,7 +36,6 @@ import jakarta.persistence.criteria.JoinType; import jakarta.persistence.criteria.Predicate; import jakarta.persistence.criteria.Root; -import jakarta.persistence.criteria.Subquery; import java.sql.Timestamp; import java.time.Instant; @@ -300,7 +297,7 @@ protected List<Predicate> createPredicates(AnnotationFilterCriteria filter, Root .isEmpty(); boolean hasCategoryFilterActive = filter.hasCategories().isPresent(); - if (categoryFilterActive || categorySetFilterActive || hasCategoryFilterActive) { + if (categoryFilterActive || hasCategoryFilterActive) { Join<Annotation, Category> categoryJoin = root.join(Annotation_.categories, JoinType.LEFT); if (hasCategoryFilterActive) { @@ -315,22 +312,13 @@ protected List<Predicate> createPredicates(AnnotationFilterCriteria filter, Root if (categoryFilterActive) { predicates.add(categoryJoin.get(Category_.id).in(filter.getCategoryIds().get())); } + } - if (categorySetFilterActive) { - Join<Category, CategorySetHasCategory> categorySetJoin = categoryJoin.join(Category_.categorySetHasCategories); - - Subquery<Integer> assignedCategorySetIdsSubquery = criteriaQuery.subquery(Integer.class); - Root<MediumAnalysisList> mediumAnalysisListRoot = assignedCategorySetIdsSubquery.from(MediumAnalysisList.class); - Join<MediumAnalysisList, CategorySet> analysisListCategorySet = mediumAnalysisListRoot.join( - MediumAnalysisList_.categorySets); - assignedCategorySetIdsSubquery.select(analysisListCategorySet.get(CategorySet_.id)); - assignedCategorySetIdsSubquery.where( - criteriaBuilder.equal(root.get(Annotation_.mediumAnalysisList).get(MediumAnalysisList_.id), - mediumAnalysisListRoot.get(MediumAnalysisList_.id))); - predicates.add(categorySetJoin.get(CategorySetHasCategory_.categorySet).get(CategorySet_.id) - .in(assignedCategorySetIdsSubquery)); - } + if (categorySetFilterActive) { + Join<MediumAnalysisList, CategorySet> categorySetJoin = root.join(Annotation_.mediumAnalysisList) + .join(MediumAnalysisList_.categorySets); + predicates.add(categorySetJoin.get(CategorySet_.id).in(filter.getCategorySetIds().get())); } return predicates; diff --git a/src/main/resources/database/db_update.sql b/src/main/resources/database/db_update.sql index 3ae9dd2e..ee871467 100644 --- a/src/main/resources/database/db_update.sql +++ b/src/main/resources/database/db_update.sql @@ -308,6 +308,47 @@ BEGIN ALTER TABLE `fipop`.`annotation_has_category` DROP COLUMN category_set_id; + + CREATE TABLE `fipop`.`actor_has_category_set` + ( + `actor_id` INT NOT NULL, + `category_set_id` INT NOT NULL, + CONSTRAINT `fk_actor_has_category_set_actor` + FOREIGN KEY (`actor_id`) + REFERENCES `fipop`.`actor` (`id`) + ON DELETE CASCADE + ON UPDATE NO ACTION, + CONSTRAINT `fk_actor_has_category_set_category_set` + FOREIGN KEY (`category_set_id`) + REFERENCES `fipop`.`category_set` (`id`) + ON DELETE CASCADE + ON UPDATE NO ACTION, + CONSTRAINT `pk_actor_has_category_set` PRIMARY KEY (actor_id, category_set_id) + ); + + CREATE INDEX fk_actor_has_category_set_actor1_idx ON `fipop`.`actor_has_category_set` (actor_id ASC); + CREATE INDEX fk_actor_has_category_set_category_set1_idx ON `fipop`.`actor_has_category_set` (category_set_id ASC); + + CREATE TABLE `fipop`.`actor_has_category` + ( + `actor_id` INT NOT NULL, + `category_id` INT NOT NULL, + CONSTRAINT `fk_actor_has_category_actor` + FOREIGN KEY (`actor_id`) + REFERENCES `fipop`.`actor` (`id`) + ON DELETE CASCADE + ON UPDATE NO ACTION, + CONSTRAINT `fk_actor_has_category_category` + FOREIGN KEY (`category_id`) + REFERENCES `fipop`.`category` (`id`) + ON DELETE CASCADE + ON UPDATE NO ACTION, + CONSTRAINT `pk_actor_has_category_set` PRIMARY KEY (actor_id, category_id) + ); + + CREATE INDEX fk_actor_has_category_actor1_idx ON `fipop`.`actor_has_category` (actor_id ASC); + CREATE INDEX fk_actor_has_category_category1_idx ON `fipop`.`actor_has_category` (category_id ASC); + END IF; END $$ DELIMITER ; @@ -319,6 +360,7 @@ CALL update_to_0_14_0(); CALL update_to_0_14_1(); CALL update_to_0_14_2(); CALL update_to_0_15_0(); +CALL update_to_0_15_1(); /* * Delete update functions after finishing update script @@ -326,4 +368,5 @@ CALL update_to_0_15_0(); DROP PROCEDURE update_to_0_14_0; DROP PROCEDURE update_to_0_14_1; DROP PROCEDURE update_to_0_14_2; -DROP PROCEDURE update_to_0_15_0; \ No newline at end of file +DROP PROCEDURE update_to_0_15_0; +DROP PROCEDURE update_to_0_15_1; \ No newline at end of file diff --git a/src/main/resources/database/fipop.sql b/src/main/resources/database/fipop.sql index 1bbc8b5c..66ae46ba 100644 --- a/src/main/resources/database/fipop.sql +++ b/src/main/resources/database/fipop.sql @@ -134,8 +134,6 @@ CREATE TABLE IF NOT EXISTS `FIPOP`.`actor` ) ENGINE = InnoDB; - - -- ----------------------------------------------------- -- Table `FIPOP`.`actor_actor_relationship_type` -- ----------------------------------------------------- @@ -1668,8 +1666,8 @@ CREATE TABLE IF NOT EXISTS `FIPOP`.`annotation_has_audience` -- ----------------------------------------------------- CREATE TABLE IF NOT EXISTS `FIPOP`.`annotation_has_category` ( - `annotation_id` INT NOT NULL, - `category_id` INT NOT NULL, + `annotation_id` INT NOT NULL, + `category_id` INT NOT NULL, PRIMARY KEY (`annotation_id`, `category_id`), CONSTRAINT `fk_annotation_has_category_annotation1` FOREIGN KEY (`annotation_id`) @@ -2652,6 +2650,53 @@ CREATE TABLE IF NOT EXISTS `FIPOP`.`category_set` CREATE UNIQUE INDEX `name_UNIQUE` ON `FIPOP`.`category_set` (`name` ASC); +-- ----------------------------------------------------- +-- Table `FIPOP`.`actor_has_category_set` +-- ----------------------------------------------------- +CREATE TABLE `fipop`.`actor_has_category_set` +( + `actor_id` INT NOT NULL, + `category_set_id` INT NOT NULL, + CONSTRAINT `fk_actor_has_category_set_actor` + FOREIGN KEY (`actor_id`) + REFERENCES `fipop`.`actor` (`id`) + ON DELETE CASCADE + ON UPDATE NO ACTION, + CONSTRAINT `fk_actor_has_category_set_category_set` + FOREIGN KEY (`category_set_id`) + REFERENCES `fipop`.`category_set` (`id`) + ON DELETE CASCADE + ON UPDATE NO ACTION, + CONSTRAINT `pk_actor_has_category_set` PRIMARY KEY (actor_id, category_set_id) +) ENGINE = InnoDB; + + +CREATE INDEX fk_actor_has_category_set_actor1_idx ON `fipop`.`actor_has_category_set` (actor_id ASC); +CREATE INDEX fk_actor_has_category_set_category_set1_idx ON `fipop`.`actor_has_category_set` (category_set_id ASC); + +-- ----------------------------------------------------- +-- Table `FIPOP`.`actor_has_category` +-- ----------------------------------------------------- +CREATE TABLE `fipop`.`actor_has_category` +( + `actor_id` INT NOT NULL, + `category_id` INT NOT NULL, + CONSTRAINT `fk_actor_has_category_actor` + FOREIGN KEY (`actor_id`) + REFERENCES `fipop`.`actor` (`id`) + ON DELETE CASCADE + ON UPDATE NO ACTION, + CONSTRAINT `fk_actor_has_category_category` + FOREIGN KEY (`category_id`) + REFERENCES `fipop`.`category` (`id`) + ON DELETE CASCADE + ON UPDATE NO ACTION, + CONSTRAINT `pk_actor_has_category_set` PRIMARY KEY (actor_id, category_id) +); + +CREATE INDEX fk_actor_has_category_actor1_idx ON `fipop`.`actor_has_category` (actor_id ASC); +CREATE INDEX fk_actor_has_category_category1_idx ON `fipop`.`actor_has_category` (category_id ASC); + -- ----------------------------------------------------- -- Table `FIPOP`.`category_set_has_category` diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html index 1178f0e0..e465c93f 100644 --- a/src/main/webapp/index.html +++ b/src/main/webapp/index.html @@ -3816,6 +3816,42 @@ <h5 class="modal-title">Edit actor tags</h5> </div> </div> </div> + <div class="modal fade" id="actorDatasetsEditActorCategorySetsModal" tabindex="-1" role="dialog" aria-labelledby="actorCategorySetLabel" aria-hidden="true"> + <div class="modal-dialog modal-dialog-centered" role="document"> + <div class="modal-content"> + <div class="modal-header"> + <h5 class="modal-title">Edit actor category sets</h5> + <button type="button" class="close" data-dismiss="modal" aria-label="Close"> + <span aria-hidden="true">×</span> + </button> + </div> + <div class="modal-body"> + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button> + <button type="submit" class="btn btn-primary" id="actorDatasetsEditActorCategorySetsModalSubmitButton">Save</button> + </div> + </div> + </div> + </div> + <div class="modal fade" id="actorDatasetsEditActorCategoriesModal" tabindex="-1" role="dialog" aria-labelledby="actorCategoryLabel" > + <div class="modal-dialog modal-dialog-centered" role="document"> + <div class="modal-content"> + <div class="modal-header"> + <h5 class="modal-title">Edit actor categories</h5> + <button type="button" class="close" data-dismiss="modal" aria-label="Close"> + <span aria-hidden="true">×</span> + </button> + </div> + <div class="modal-body"> + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button> + <button type="submit" class="btn btn-primary" id="actorDatasetsEditActorCategoriesModalSubmitButton">Save</button> + </div> + </div> + </div> + </div> <div class="row pt-3"> <div class="col-md-12"> <!-- Nav bar tabs --> @@ -3938,6 +3974,12 @@ <h5 class="form-title capitalize--first-letter" id="actorFormHeader">Actor</h5> <div class="col-md-2"> <div class="btn-toolbar float-right" role="toolbar" aria-label="Toolbar with button groups"> <div class="btn-group mr-2" role="group" aria-label="Button group"> + <button type="button" class="btn btn-outline btn-secondary btn-sm formButtons" id="actorFormDataSheetCategorySetButton" title="Category sets" name="category sets"> + <i class="fas fa-sitemap"></i> + </button> + <button type="button" class="btn btn-outline btn-secondary btn-sm formButtons" id="actorFormDataSheetCategoryButton" title="Categories" name="categories"> + <i class="fas fa-archive"></i> + </button> <button type="button" class="btn btn-outline btn-secondary btn-sm formButtons" id="actorFormMetadataTag" title="Tag actor" name="tag"> <i class="fas fa-tags"></i> </button> diff --git a/src/main/webapp/js/datasets/timaat.categories.js b/src/main/webapp/js/datasets/timaat.categories.js index 637af3de..906609ea 100644 --- a/src/main/webapp/js/datasets/timaat.categories.js +++ b/src/main/webapp/js/datasets/timaat.categories.js @@ -308,8 +308,20 @@ }, initRelatedAnnotationTable: function () { - const columns = [new TIMAAT.Table.FieldTableColumnConfig("id", "ID", "id")] - const activeColumnIds = ["id"] + const annotationThumbnailGeneratorFunction = async (row) => { + if (row.layerVisual) { + const imgBlob = await TIMAAT.AnnotationService.getAnnotationThumbnailBlob() + return URL.createObjectURL(imgBlob); + } + + return null + } + + + const columns = [new TIMAAT.Table.FieldTableColumnConfig("id", "ID", "id"), new TIMAAT.Table.TimeStampTableColumnConfig("startTime", "Start time", "startTime", false), + new TIMAAT.Table.TimeStampTableColumnConfig("endTime", "End time", "endTime", false), new TIMAAT.Table.BooleanTableColumnConfig("layerAudio", "Audio", "layerAudio", false), + new TIMAAT.Table.BooleanTableColumnConfig("layerVisual", "Video", "layerVisual", false), new TIMAAT.Table.ImageDownloadTableColumnConfig("thumbnail", "Thumbnail", annotationThumbnailGeneratorFunction)] + const activeColumnIds = ["thumbnail", "startTime", "endTime", "layerAudio", "layerVisual", "id"] const annotationTable = new TIMAAT.Table.Table("categoriesAnnotationTable", "#categoriesAnnotationTableContainer", columns, activeColumnIds, "api/annotation/list", true, false) @@ -767,6 +779,8 @@ TIMAAT.Categories.showAssignedEntitiesPanel() TIMAAT.Categories.relatedMusicTable.urlSearchParams = urlSearchParameters TIMAAT.Categories.relatedMediumTable.urlSearchParams = urlSearchParameters + TIMAAT.Categories.relatedAnnotationTable.urlSearchParams = urlSearchParameters + TIMAAT.Categories.relatedActorTable.urlSearchParams = urlSearchParameters } else { TIMAAT.Categories.showNoSelectionPanel() } diff --git a/src/main/webapp/js/datasets/timaat.datasets.actor.js b/src/main/webapp/js/datasets/timaat.datasets.actor.js index 2265262a..12c68f53 100644 --- a/src/main/webapp/js/datasets/timaat.datasets.actor.js +++ b/src/main/webapp/js/datasets/timaat.datasets.actor.js @@ -538,6 +538,195 @@ } }); + // category set button handler + $('#actorFormDataSheetCategorySetButton').on('click', async function(event) { + event.stopPropagation(); + TIMAAT.UI.hidePopups(); + const $modal = $('#actorDatasetsEditActorCategorySetsModal'); + $modal.data('actor', $('#actorFormMetadata').data('actor')); + const actor = $modal.data('actor'); + $modal.find('.modal-body').html(` + <form role="form" id="actorCategorySetsForm"> + <div class="form-group"> + <div class="col-md-12"> + <select class="form-control form-control-md multi-select-dropdown" + style="width:100%;" + id="actorCategorySetsMultiSelectDropdown" + name="categorySetId" + data-role="categorySetId" + data-placeholder="Select actor category sets" + multiple="multiple"> + </select> + </div> + </div> + </form>`); + + $('#actorCategorySetsMultiSelectDropdown').select2({ + closeOnSelect: false, + scrollAfterSelect: true, + allowClear: true, + minimumResultsForSearch: 10, + ajax: { + url: 'api/categorySet/selectList/', + type: 'GET', + dataType: 'json', + delay: 250, + headers: { + "Authorization": "Bearer "+TIMAAT.Service.token, + "Content-Type": "application/json", + }, + // additional parameters + data: function(params) { + return { + search: params.term, + page: params.page + }; + }, + processResults: function(data, params) { + params.page = params.page || 1; + return { + results: data + }; + }, + cache: false + }, + minimumInputLength: 0, + }); + TIMAAT.ActorService.getActorCategorySets(actor.model.id).then(function(data) { + var categorySetSelect = $('#actorCategorySetsMultiSelectDropdown'); + if (data.length > 0) { + data.sort((a, b) => (a.name > b.name)? 1 : -1); + // create the options and append to Select2 + var i = 0; + for (; i < data.length; i++) { + var option = new Option(data[i].name, data[i].id, true, true); + categorySetSelect.append(option).trigger('change'); + } + // manually trigger the 'select2:select' event + categorySetSelect.trigger({ + type: 'select2:select', + params: { + data: data + } + }); + } + }); + $modal.modal('show'); + }); + + $('#actorDatasetsEditActorCategorySetsModalSubmitButton').on('click', async function(event) { + event.preventDefault(); + const $modal = $('#actorDatasetsEditActorCategorySetsModal'); + if (!$('#actorCategorySetsForm').valid()) + return false; + const actor = $modal.data('actor'); + + const formDataRaw = $('#actorCategorySetsForm').serializeArray(); + + let i = 0; + const categorySetIdList = []; + for (; i < formDataRaw.length; i++) { + categorySetIdList.push(Number(formDataRaw[i].value)); + } + + actor.model.categorySets = await TIMAAT.ActorService.updateActorCategorySets(actor.model.id, categorySetIdList); + $modal.modal('hide'); + }); + + // category button handler + $('#actorFormDataSheetCategoryButton').on('click', async function(event) { + event.stopPropagation(); + TIMAAT.UI.hidePopups(); + + const $modal = $('#actorDatasetsEditActorCategoriesModal'); + $modal.data('actor', $('#actorFormMetadata').data('actor')); + const actor = $modal.data('actor'); + + $modal.find('.modal-body').html(` + <form role="form" id="actorCategoriesForm"> + <div class="form-group"> + <div class="col-md-12"> + <select class="form-control form-control-md multi-select-dropdown" + style="width:100%;" + id="actorCategoriesMultiSelectDropdown" + name="categoryId" + data-role="categoryId" + data-placeholder="Select actor categories" + multiple="multiple"> + </select> + </div> + </div> + </form>`); + $('#actorCategoriesMultiSelectDropdown').select2({ + closeOnSelect: false, + scrollAfterSelect: true, + allowClear: true, + minimumResultsForSearch: 10, + ajax: { + url: 'api/actor/'+actor.model.id+'/assignableCategories/selectList', + type: 'GET', + dataType: 'json', + delay: 250, + headers: { + "Authorization": "Bearer "+TIMAAT.Service.token, + "Content-Type": "application/json", + }, + // additional parameters + data: function(params) { + return { + search: params.term, + page: params.page + }; + }, + processResults: function(data, params) { + params.page = params.page || 1; + return { + results: data + }; + }, + cache: false + }, + minimumInputLength: 0, + }); + TIMAAT.ActorService.getActorCategories(actor.model.id).then(function(data) { + const categorySelect = $('#actorCategoriesMultiSelectDropdown'); + if (data.length > 0) { + data.sort((a, b) => (a.name > b.name)? 1 : -1); + // create the options and append to Select2 + let i = 0; + for (; i < data.length; i++) { + var option = new Option(data[i].name, data[i].id, true, true); + categorySelect.append(option).trigger('change'); + } + // manually trigger the 'select2:select' event + categorySelect.trigger({ + type: 'select2:select', + params: { + data: data + } + }); + } + }); + $modal.modal('show'); + }); + + $('#actorDatasetsEditActorCategoriesModalSubmitButton').on('click', async function(event) { + event.preventDefault(); + + const $modal = $('#actorDatasetsEditActorCategoriesModal'); + if (!$('#actorCategoriesForm').valid()) + return false; + const actor = $modal.data('actor'); + const formDataRaw = $('#actorCategoriesForm').serializeArray(); + + let i = 0; + const categoryIdList = []; + for (; i < formDataRaw.length; i++) { + categoryIdList.push( Number(formDataRaw[i].value)); + } + actor.model.categories = await TIMAAT.ActorService.updateActorCategories(actor.model.id, categoryIdList); + $modal.modal('hide'); + }); }, initNames: function() { diff --git a/src/main/webapp/js/service/timaat.service.actor.js b/src/main/webapp/js/service/timaat.service.actor.js index 370a1c84..b4745825 100644 --- a/src/main/webapp/js/service/timaat.service.actor.js +++ b/src/main/webapp/js/service/timaat.service.actor.js @@ -120,6 +120,96 @@ }); }, + async getActorCategorySets(id) { + return new Promise(resolve => { + $.ajax({ + url : window.location.protocol+'//'+window.location.host+"/TIMAAT/api/actor/" +id + "/categorySets", + type : "GET", + contentType: "application/json; charset=utf-8", + dataType : "json", + beforeSend : function (xhr) { + xhr.setRequestHeader('Authorization', 'Bearer '+TIMAAT.Service.token); + }, + }).done(function(data) { + resolve(data); + }).fail(function(error) { + console.error("ERROR responseText: ", error.responseText); + console.error("ERROR: ", error); + }); + }).catch((error) => { + console.error("ERROR: ", error); + }); + }, + + async updateActorCategorySets(id, categorySetIds){ + const payload = { + categorySetIds + } + return new Promise(resolve => { + $.ajax({ + url : window.location.protocol+'//'+window.location.host+"/TIMAAT/api/actor/" +id + "/categorySets", + type : "PUT", + contentType: "application/json; charset=utf-8", + data : JSON.stringify(payload), + dataType : "json", + beforeSend : function (xhr) { + xhr.setRequestHeader('Authorization', 'Bearer '+TIMAAT.Service.token); + }, + }).done(function(data) { + resolve(data); + }).fail(function(error) { + console.error("ERROR responseText: ", error.responseText); + console.error("ERROR: ", error); + }); + }).catch((error) => { + console.error("ERROR: ", error); + }); + }, + async getActorCategories(id) { + return new Promise(resolve => { + $.ajax({ + url : window.location.protocol+'//'+window.location.host+"/TIMAAT/api/actor/" +id + "/categories", + type : "GET", + contentType: "application/json; charset=utf-8", + dataType : "json", + beforeSend : function (xhr) { + xhr.setRequestHeader('Authorization', 'Bearer '+TIMAAT.Service.token); + }, + }).done(function(data) { + resolve(data); + }).fail(function(error) { + console.error("ERROR responseText: ", error.responseText); + console.error("ERROR: ", error); + }); + }).catch((error) => { + console.error("ERROR: ", error); + }); + }, + + async updateActorCategories(id, categoryIds){ + const payload = { + categoryIds + } + return new Promise(resolve => { + $.ajax({ + url : window.location.protocol+'//'+window.location.host+"/TIMAAT/api/actor/" +id + "/categories", + type : "PUT", + contentType: "application/json; charset=utf-8", + data : JSON.stringify(payload), + dataType : "json", + beforeSend : function (xhr) { + xhr.setRequestHeader('Authorization', 'Bearer '+TIMAAT.Service.token); + }, + }).done(function(data) { + resolve(data); + }).fail(function(error) { + console.error("ERROR responseText: ", error.responseText); + console.error("ERROR: ", error); + }); + }).catch((error) => { + console.error("ERROR: ", error); + }); + }, async getActorName(id) { return new Promise(resolve => { $.ajax({ diff --git a/src/main/webapp/js/ui/timaat.inspector.js b/src/main/webapp/js/ui/timaat.inspector.js index 5013ccea..d539f325 100644 --- a/src/main/webapp/js/ui/timaat.inspector.js +++ b/src/main/webapp/js/ui/timaat.inspector.js @@ -442,7 +442,6 @@ "dataSrc": function(data) { return data.data; } }, "createdRow": function(row, data, dataIndex) { - // console.log("TCL: Inspector -> constructor -> data", data); let actorElement = $(row); let actor = data; actorElement.data('actor', actor); @@ -2357,8 +2356,6 @@ else this.updateItem(); if ( item ) { - // console.log("TCL: Inspector -> setItem -> item", item); - // thumbnail panel if ( TIMAAT.VideoPlayer.model.medium.mediumVideo){ $('#inspectorThumbnailEditSectionSaveButton').prop('disabled', true); diff --git a/src/main/webapp/js/ui/timaat.table.js b/src/main/webapp/js/ui/timaat.table.js index 71e3a03c..babcf25f 100644 --- a/src/main/webapp/js/ui/timaat.table.js +++ b/src/main/webapp/js/ui/timaat.table.js @@ -86,6 +86,44 @@ } } + TIMAAT.Table.TimeStampTableColumnConfig = class extends TIMAAT.Table.TableColumnConfig { + constructor(id, title, data, sortable = true) { + super(id, title, data, sortable); + } + + render(data, type, row) { + let cellValue + if (!data) { + cellValue = "-" + } else { + cellValue = TIMAAT.Util.formatTime(data); + } + + return `<p>${cellValue}</p>` + } + } + + TIMAAT.Table.BooleanTableColumnConfig = class extends TIMAAT.Table.TableColumnConfig { + constructor(id, title, data, sortable = true) { + super(id, title, data, sortable); + } + + render(data, type, row) { + let cellValue + if (data == null) { + cellValue = "<p>-</p>" + } else { + if (data) { + cellValue = `<span class="fas fa-check"></span>` + } else { + cellValue = `<span><strong>X</strong></span>` + } + } + + return cellValue + } + } + TIMAAT.Table.ValueMapperTableColumnConfig = class extends TIMAAT.Table.TableColumnConfig { _valueMap; @@ -115,7 +153,7 @@ * imagePathGeneratorFunction. * @param id * @param title - * @param imagePathGeneratorFunction : (row) => string | null + * @param imagePathGeneratorFunction : (row) => string | null , (row) => Promise<string | null> */ constructor(id, title, imagePathGeneratorFunction) { super(id, title, "", false); @@ -127,7 +165,7 @@ render(data, type, row) { const imagePath = this._imagePathGeneratorFunction(row); let imageSrc = imagePath ?? "img/preview-placeholder.png" - return `<img src="${imageSrc}" width="150" height="auto" alt="Image column"/>` + return `<img src="${imageSrc}" width="150" height="auto" alt="Image cell"/>` } } @@ -137,7 +175,7 @@ } render(data, type, row) { - if(data){ + if (data) { return `<p>${data.street ?? ""} ${data.streetNumber ?? ""} ${data.streetAddition ?? ""}<br/>${data.postalCode} ${data.city}</p>` } return `<p>-</p>` @@ -155,7 +193,7 @@ _urlSearchParams _dataTable = null; - constructor(tableId, containerSelector, tableColumnConfigs, defaultActiveTableColumnConfigs, dataUrl,reorderableColumns=true, active=true, urlSearchParams=new URLSearchParams()) { + constructor(tableId, containerSelector, tableColumnConfigs, defaultActiveTableColumnConfigs, dataUrl, reorderableColumns = true, active = true, urlSearchParams = new URLSearchParams()) { this._tableColumnConfigsById = new Map() for (let tableColumnConfig of tableColumnConfigs) { this._tableColumnConfigsById.set(tableColumnConfig.id, tableColumnConfig); @@ -177,21 +215,21 @@ * @param active * @return boolean indicating the new state */ - changeTableColumnActivState(columnId, active){ + changeTableColumnActivState(columnId, active) { const activeColumnIndex = this._activeTableColumnIds.indexOf(columnId); let changed = false - if(active && activeColumnIndex === -1) { + if (active && activeColumnIndex === -1) { changed = true this._activeTableColumnIds.push(columnId); this.draw() - }else if(!active && activeColumnIndex > -1 && this.activeTableColumnIds.length > 1){ + } else if (!active && activeColumnIndex > -1 && this.activeTableColumnIds.length > 1) { changed = true this._activeTableColumnIds.splice(activeColumnIndex, 1); this.draw() } - if(changed){ + if (changed) { TIMAAT.Table.TableConfigurationStorage.saveActiveColumnsForTable(this._activeTableColumnIds, this._tableId) return active } @@ -199,16 +237,16 @@ return !active } - set active(active){ + set active(active) { const redrawNecessary = this._active !== active this._active = active - if(redrawNecessary){ + if (redrawNecessary) { this.draw() } } - set urlSearchParams(urlSearchParams){ + set urlSearchParams(urlSearchParams) { this._urlSearchParams = urlSearchParams this.draw() } @@ -222,11 +260,11 @@ } draw() { - const self = this - this._dataTable?.clear().destroy(true) - this._$container.empty() + const self = this + this._dataTable?.clear().destroy(true) + this._$container.empty() - if(this._active){ + if (this._active) { const $table = $(`<table id="${this._tableId}" class="table table-striped table-bordered table-hover"></table>`) const $tableHead = $(`<thead class="thead-dark"></thead>`) const $tableBody = $(`<tbody></tbody>`) @@ -239,17 +277,18 @@ const columnConfigs = [] for (let activeTableColumnId of this._activeTableColumnIds) { const currentTableColumnConfig = this._tableColumnConfigsById.get(activeTableColumnId); + columnConfigs.push({ title: currentTableColumnConfig.title, data: currentTableColumnConfig.data, render: currentTableColumnConfig.render, - orderable: currentTableColumnConfig.sortable + orderable: currentTableColumnConfig.sortable, }); $('<th>').text(currentTableColumnConfig.title).appendTo($headerRow); } $table.appendTo(this._$container) - const ajaxUrl = this._dataUrl + "?" + this._urlSearchParams.toString() + const ajaxUrl = this._dataUrl + "?" + this._urlSearchParams.toString() console.log(ajaxUrl) this._dataTable = $table.DataTable({ "destroy": true, @@ -286,7 +325,7 @@ } }, "initComplete": function () { - if(self._reorderableColumns){ + if (self._reorderableColumns) { self._dataTable?.colReorder.reset() } }, @@ -318,6 +357,7 @@ _table _tableColumnConfigs _$columnSelectorButton + constructor(table, columnSelectorButtonSelector) { this._table = table; this._tableColumnConfigs = table.tableColumnConfigs.sort((a, b) => a.title.localeCompare(b.title)); @@ -328,7 +368,7 @@ this.createPopover(); } - createPopover(){ + createPopover() { const popoverMenuItems = this.createMenuItems(); this._$columnSelectorButton.popover({ title: "Columns", @@ -342,7 +382,7 @@ const $listGroup = $(`<ul class="list-group"></ul>`) const currentActiveTableColumnIds = this._table.activeTableColumnIds - for(const currentTableColumnConfig of this._tableColumnConfigs) { + for (const currentTableColumnConfig of this._tableColumnConfigs) { const $currentListGroupItemCheckbox = $(`<input class="ml-2" type="checkbox">`) const initialSelected = currentActiveTableColumnIds.indexOf(currentTableColumnConfig.id) > -1; @@ -364,23 +404,23 @@ } } TIMAAT.Table.TableConfigurationStorage = { - saveActiveColumnsForTable: function(activeColumns, tableId){ + saveActiveColumnsForTable: function (activeColumns, tableId) { const localStorageIdentifier = TIMAAT.Table.TableConfigurationStorage.createLocalStorageIdentifierForActiveColumns(tableId) localStorage.setItem(localStorageIdentifier, JSON.stringify(activeColumns)) }, - getActiveColumnsForTable: function (tableId){ + getActiveColumnsForTable: function (tableId) { const localStorageIdentifier = TIMAAT.Table.TableConfigurationStorage.createLocalStorageIdentifierForActiveColumns(tableId) const activeColumnsJson = localStorage.getItem(localStorageIdentifier) - if(activeColumnsJson){ + if (activeColumnsJson) { return JSON.parse(activeColumnsJson) } return null }, - createLocalStorageIdentifierForActiveColumns: function(tableId){ + createLocalStorageIdentifierForActiveColumns: function (tableId) { return `TIMAAT.Table.${tableId}.activeColumns` } } From d72472da8d5eb537d29c19811a1d4adaf9becf20 Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Sat, 10 Jan 2026 11:57:51 +0100 Subject: [PATCH 24/70] TIMAAT Weiterentwicklung #9 - Fixed setting of categories to segement structrue entities * Refactored endpoints responsible to get assigned and assignable categories of segment structure element as well as updating them * Defined working callbacks for save and cancel button of element responsible to define the categories of a segment structure element --- .../TIMAAT/di/binder/TIMAATBinder.java | 2 + .../TIMAAT/model/FIPOP/AnalysisAction.java | 22 +- .../TIMAAT/model/FIPOP/AnalysisScene.java | 20 +- .../TIMAAT/model/FIPOP/AnalysisSegment.java | 14 +- .../TIMAAT/model/FIPOP/AnalysisSequence.java | 22 +- .../TIMAAT/model/FIPOP/AnalysisTake.java | 18 +- .../model/FIPOP/SegmentStructureEntity.java | 18 + .../rest/endpoint/EndpointAnalysisList.java | 5210 ++++++++--------- .../endpoint/EndpointAnalysisSegment.java | 52 + .../AnalysisSegmentListingQueryParameter.java | 48 + .../SegmentStructureElementsStorage.java | 78 + .../api/AnalysisSegmentFilterCriteria.java | 83 + .../api/AnalysisSegmentSortingField.java | 41 + .../segment/api/SegmentStructureType.java | 15 + src/main/resources/database/db_update.sql | 3 + src/main/webapp/js/model/timaat.marker.js | 2 - .../js/service/timaat.service.analysislist.js | 29 +- src/main/webapp/js/ui/timaat.inspector.js | 125 +- 18 files changed, 2865 insertions(+), 2937 deletions(-) create mode 100644 src/main/java/de/bitgilde/TIMAAT/model/FIPOP/SegmentStructureEntity.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnalysisSegment.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/rest/model/analysissegment/AnalysisSegmentListingQueryParameter.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/SegmentStructureElementsStorage.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/AnalysisSegmentFilterCriteria.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/AnalysisSegmentSortingField.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/SegmentStructureType.java diff --git a/src/main/java/de/bitgilde/TIMAAT/di/binder/TIMAATBinder.java b/src/main/java/de/bitgilde/TIMAAT/di/binder/TIMAATBinder.java index 21f9db56..d9ffc896 100644 --- a/src/main/java/de/bitgilde/TIMAAT/di/binder/TIMAATBinder.java +++ b/src/main/java/de/bitgilde/TIMAAT/di/binder/TIMAATBinder.java @@ -19,6 +19,7 @@ import de.bitgilde.TIMAAT.storage.entity.MediumVideoStorage; import de.bitgilde.TIMAAT.storage.entity.music.MusicStorage; import de.bitgilde.TIMAAT.storage.entity.TagStorage; +import de.bitgilde.TIMAAT.storage.entity.segment.SegmentStructureElementsStorage; import de.bitgilde.TIMAAT.storage.file.AnnotationFileStorage; import de.bitgilde.TIMAAT.storage.file.AudioFileStorage; import de.bitgilde.TIMAAT.storage.file.ImageFileStorage; @@ -85,6 +86,7 @@ protected void configure() { bindAsContract(AnnotationFileStorage.class).in(Singleton.class); bindAsContract(CategoryStorage.class).in(Singleton.class); bindAsContract(CategorySetStorage.class).in(Singleton.class); + bindAsContract(SegmentStructureElementsStorage.class).in(Singleton.class); bind(DbAnnotationAuthorizationVerifier.class).to(AnnotationAuthorizationVerifier.class).in(Singleton.class); bindAsContract(AnalysisListAuthorizationVerifier.class).in(Singleton.class); diff --git a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisAction.java b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisAction.java index 05f04165..e8a87e75 100644 --- a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisAction.java +++ b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisAction.java @@ -1,11 +1,8 @@ package de.bitgilde.TIMAAT.model.FIPOP; -import java.io.Serializable; -import java.util.List; - import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; - import jakarta.persistence.CascadeType; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -21,6 +18,9 @@ import jakarta.persistence.Table; import jakarta.persistence.Transient; +import java.io.Serializable; +import java.util.List; + /* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -43,7 +43,7 @@ @Entity @Table(name="analysis_action") @NamedQuery(name="AnalysisAction.findAll", query="SELECT a FROM AnalysisAction a") -public class AnalysisAction implements Serializable { +public class AnalysisAction implements Serializable, SegmentStructureEntity { private static final long serialVersionUID = 1L; @Id @@ -118,15 +118,23 @@ public void setStartTime(long startTime) { this.startTime = startTime; } + @Override public List<Category> getCategories() { return this.categories; } - + @Override public void setCategories(List<Category> categories) { this.categories = categories; } - public AnalysisScene getAnalysisScene() { + + @JsonIgnore + @Override + public MediumAnalysisList getMediumAnalysisList() { + return getAnalysisScene().getAnalysisSegment().getMediumAnalysisList(); + } + + public AnalysisScene getAnalysisScene() { return this.analysisScene; } diff --git a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisScene.java b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisScene.java index 9dbf1217..2ddbe0fd 100644 --- a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisScene.java +++ b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisScene.java @@ -1,12 +1,9 @@ package de.bitgilde.TIMAAT.model.FIPOP; -import java.io.Serializable; -import java.util.List; - import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonManagedReference; import com.fasterxml.jackson.annotation.JsonProperty; - import jakarta.persistence.CascadeType; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -22,6 +19,9 @@ import jakarta.persistence.Table; import jakarta.persistence.Transient; +import java.io.Serializable; +import java.util.List; + /* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -44,7 +44,7 @@ @Entity @Table(name="analysis_scene") @NamedQuery(name="AnalysisScene.findAll", query="SELECT a FROM AnalysisScene a") -public class AnalysisScene implements Serializable { +public class AnalysisScene implements Serializable, SegmentStructureEntity { private static final long serialVersionUID = 1L; @Id @@ -124,15 +124,23 @@ public void setStartTime(long startTime) { this.startTime = startTime; } + @Override public List<Category> getCategories() { return this.categories; } + @Override public void setCategories(List<Category> categories) { this.categories = categories; } - public List<AnalysisAction> getAnalysisActions() { + @JsonIgnore + @Override + public MediumAnalysisList getMediumAnalysisList() { + return analysisSegment.getMediumAnalysisList(); + } + + public List<AnalysisAction> getAnalysisActions() { return this.analysisActions; } diff --git a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisSegment.java b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisSegment.java index 7d1fab49..c2163c03 100644 --- a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisSegment.java +++ b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisSegment.java @@ -1,11 +1,7 @@ package de.bitgilde.TIMAAT.model.FIPOP; -import java.io.Serializable; -import java.util.List; - import com.fasterxml.jackson.annotation.JsonBackReference; import com.fasterxml.jackson.annotation.JsonManagedReference; - import jakarta.persistence.CascadeType; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -20,6 +16,9 @@ import jakarta.persistence.OneToMany; import jakarta.persistence.Table; +import java.io.Serializable; +import java.util.List; + /* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -43,7 +42,7 @@ @Entity @Table(name="analysis_segment") @NamedQuery(name="AnalysisSegment.findAll", query="SELECT a FROM AnalysisSegment a") -public class AnalysisSegment implements Serializable { +public class AnalysisSegment implements Serializable, SegmentStructureEntity { private static final long serialVersionUID = 1L; @Id @@ -116,10 +115,11 @@ public void setStartTime(long startTime) { this.startTime = startTime; } + @Override public List<Category> getCategories() { return this.categories; } - + @Override public void setCategories(List<Category> categories) { this.categories = categories; } @@ -167,7 +167,7 @@ public AnalysisSequence removeAnalysisSequence(AnalysisSequence analysisSequence return analysisSequence; } - + @Override public MediumAnalysisList getMediumAnalysisList() { return this.mediumAnalysisList; } diff --git a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisSequence.java b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisSequence.java index 5f257961..25d3b988 100644 --- a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisSequence.java +++ b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisSequence.java @@ -1,12 +1,9 @@ package de.bitgilde.TIMAAT.model.FIPOP; -import java.io.Serializable; -import java.util.List; - import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonManagedReference; import com.fasterxml.jackson.annotation.JsonProperty; - import jakarta.persistence.CascadeType; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -22,6 +19,9 @@ import jakarta.persistence.Table; import jakarta.persistence.Transient; +import java.io.Serializable; +import java.util.List; + /* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -44,7 +44,7 @@ @Entity @Table(name="analysis_sequence") @NamedQuery(name="AnalysisSequence.findAll", query="SELECT a FROM AnalysisSequence a") -public class AnalysisSequence implements Serializable { +public class AnalysisSequence implements Serializable, SegmentStructureEntity { private static final long serialVersionUID = 1L; @Id @@ -123,16 +123,22 @@ public long getStartTime() { public void setStartTime(long startTime) { this.startTime = startTime; } - + @Override public List<Category> getCategories() { return this.categories; } - + @Override public void setCategories(List<Category> categories) { this.categories = categories; } - public AnalysisSegment getAnalysisSegment() { + @JsonIgnore + @Override + public MediumAnalysisList getMediumAnalysisList() { + return analysisSegment.getMediumAnalysisList(); + } + + public AnalysisSegment getAnalysisSegment() { return this.analysisSegment; } diff --git a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisTake.java b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisTake.java index afd8580d..c0805eb7 100644 --- a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisTake.java +++ b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisTake.java @@ -1,11 +1,8 @@ package de.bitgilde.TIMAAT.model.FIPOP; -import java.io.Serializable; -import java.util.List; - import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; - import jakarta.persistence.CascadeType; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -21,6 +18,9 @@ import jakarta.persistence.Table; import jakarta.persistence.Transient; +import java.io.Serializable; +import java.util.List; + /* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -43,7 +43,7 @@ @Entity @Table(name="analysis_take") @NamedQuery(name="AnalysisTake.findAll", query="SELECT a FROM AnalysisTake a") -public class AnalysisTake implements Serializable { +public class AnalysisTake implements Serializable, SegmentStructureEntity { private static final long serialVersionUID = 1L; @Id @@ -126,7 +126,13 @@ public void setCategories(List<Category> categories) { this.categories = categories; } - public AnalysisSequence getAnalysisSequence() { + @Override + @JsonIgnore + public MediumAnalysisList getMediumAnalysisList() { + return analysisSequence.getAnalysisSegment().getMediumAnalysisList(); + } + + public AnalysisSequence getAnalysisSequence() { return this.analysisSequence; } diff --git a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/SegmentStructureEntity.java b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/SegmentStructureEntity.java new file mode 100644 index 00000000..5f1bb981 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/SegmentStructureEntity.java @@ -0,0 +1,18 @@ +package de.bitgilde.TIMAAT.model.FIPOP; + +import java.util.List; + +/** + * Interface describing the base functionalities of an entity used for segment structure elements + * + * @author Nico Kotlenga + * @since 31.12.25 + */ +public interface SegmentStructureEntity { + + List<Category> getCategories(); + + void setCategories(List<Category> categories); + + MediumAnalysisList getMediumAnalysisList(); +} diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnalysisList.java b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnalysisList.java index b094cd0f..15ef5522 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnalysisList.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnalysisList.java @@ -32,9 +32,12 @@ import de.bitgilde.TIMAAT.rest.Secured; import de.bitgilde.TIMAAT.rest.filter.AuthenticationFilter; import de.bitgilde.TIMAAT.rest.model.analysislist.UpdateAnalysisListCategorySetsPayload; +import de.bitgilde.TIMAAT.rest.model.category.UpdateAssignedCategoriesPayload; import de.bitgilde.TIMAAT.rest.security.authorization.AnalysisListAuthorizationVerifier; import de.bitgilde.TIMAAT.security.UserLogManager; import de.bitgilde.TIMAAT.storage.entity.analysislist.AnalysisListStorage; +import de.bitgilde.TIMAAT.storage.entity.segment.SegmentStructureElementsStorage; +import de.bitgilde.TIMAAT.storage.entity.segment.api.SegmentStructureType; import jakarta.inject.Inject; import jakarta.persistence.EntityManager; import jakarta.persistence.EntityTransaction; @@ -63,7 +66,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import java.util.Collections; import java.util.Comparator; import java.util.Iterator; import java.util.List; @@ -86,2956 +88,2370 @@ */ /** -* -* @author Jens-Martin Loebel <loebel@bitgilde.de> -* @author Mirko Scherf <mscherf@uni-mainz.de> -*/ + * + * @author Jens-Martin Loebel <loebel@bitgilde.de> + * @author Mirko Scherf <mscherf@uni-mainz.de> + */ @Service @Path("/analysisList") public class EndpointAnalysisList { - @Context - ContainerRequestContext containerRequestContext; + @Context + ContainerRequestContext containerRequestContext; @Inject AnalysisListStorage analysisListStorage; @Inject AnalysisListAuthorizationVerifier analysisListAuthorizationVerifier; + @Inject + SegmentStructureElementsStorage segmentStructureElementsStorage; - @GET + @GET @Produces(MediaType.APPLICATION_JSON) - @Path("{id}/displayNames") - @Secured - public Response getDisplayNamesAndPermissions(@PathParam("id") Integer mediumAnalysisListId, - @QueryParam("authToken") String authToken) { - // System.out.println("EndpointAnalysisList: getDisplayNames - ID: "+ mediumAnalysisListId); - - // verify auth token - int userId = 0; - if (AuthenticationFilter.isTokenValid(authToken)) { - userId = AuthenticationFilter.getTokenClaimUserId(authToken); - } else { - return Response.status(Status.UNAUTHORIZED).build(); - } - // check for permission level - if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, mediumAnalysisListId) < 3) { // only mods and admins may see permission list - return Response.status(Status.FORBIDDEN).build(); - } + @Path("{id}/displayNames") + @Secured + public Response getDisplayNamesAndPermissions(@PathParam("id") Integer mediumAnalysisListId, @QueryParam("authToken") String authToken) { + // System.out.println("EndpointAnalysisList: getDisplayNames - ID: "+ mediumAnalysisListId); + + // verify auth token + int userId = 0; + if (AuthenticationFilter.isTokenValid(authToken)) { + userId = AuthenticationFilter.getTokenClaimUserId(authToken); + } + else { + return Response.status(Status.UNAUTHORIZED).build(); + } + // check for permission level + if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, + mediumAnalysisListId) < 3) { // only mods and admins may see permission list + return Response.status(Status.FORBIDDEN).build(); + } EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - MediumAnalysisList mediumAnalysisList = entityManager.find(MediumAnalysisList.class, mediumAnalysisListId); - List<UserAccountHasMediumAnalysisList> userAccountHasMediumAnalysisListList = mediumAnalysisList.getUserAccountHasMediumAnalysisLists(); - List<DisplayElementNameAndPermission> displayElementNameAndPermission = new ArrayList<>(); - for (UserAccountHasMediumAnalysisList userAccountHasMediumAnalysisList : userAccountHasMediumAnalysisListList) { - displayElementNameAndPermission.add(new DisplayElementNameAndPermission(userAccountHasMediumAnalysisList.getUserAccount().getId(), userAccountHasMediumAnalysisList.getUserAccount().getDisplayName(), userAccountHasMediumAnalysisList.getPermissionType().getId())); - } - Collections.sort(displayElementNameAndPermission, (Comparator<DisplayElementNameAndPermission>) (DisplayElementNameAndPermission d1, DisplayElementNameAndPermission d2) -> d1.getDisplayName().toLowerCase().compareTo(d2.getDisplayName().toLowerCase()) ); - return Response.ok().entity(displayElementNameAndPermission).build(); - } - - @GET - @Produces(MediaType.APPLICATION_JSON) - @Secured - @Path("{id}/hasTagList") - public Response getMediumAnalysisListTagList(@PathParam("id") Integer id) - { - // System.out.println("EndpointAnalysisList: getTagList"); - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - MediumAnalysisList mediumAnalysisList = entityManager.find(MediumAnalysisList.class, id); - if ( mediumAnalysisList == null ) return Response.status(Status.NOT_FOUND).build(); - entityManager.refresh(mediumAnalysisList); - return Response.ok().entity(mediumAnalysisList.getTags()).build(); - } - - @GET - @Produces(MediaType.APPLICATION_JSON) - @Secured - @Path("{id}/elements") - public Response getMediumAnalysisListElements(@PathParam("id") Integer id) - { - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - MediumAnalysisList mediumAnalysisList = entityManager.find(MediumAnalysisList.class, id); - List<Annotation> annotations = mediumAnalysisList.getAnnotations(); - List<AnalysisSegment> segments = mediumAnalysisList.getAnalysisSegments(); - List<Object> elementList = new ArrayList<Object>(); - elementList.addAll(annotations); - elementList.addAll(segments); - //* NB: returns an unsorted list - return Response.ok().entity(elementList).build(); - } - - @GET - @Produces(MediaType.APPLICATION_JSON) - @Secured - @Path("{id}/categorySet/list") - public Response getCategorySetList(@PathParam("id") Integer id) - { - // System.out.println("EndpointAnalysisList: getCategorySetList - ID: "+ id); - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - MediumAnalysisList mediumAnalysisList = entityManager.find(MediumAnalysisList.class, id); - List<CategorySet> categorySetList = mediumAnalysisList.getCategorySets(); - - return Response.ok().entity(categorySetList).build(); - } - - @GET - @Produces(MediaType.APPLICATION_JSON) - @Secured - @Path("segment/{id}/category/list") - public Response getSegmentSelectedCategories(@PathParam("id") Integer id) - { - // System.out.println("EndPointAnalysisList: getSegmentSelectedCategories - Id: "+ id); - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisSegment segment = entityManager.find(AnalysisSegment.class, id); - List<Category> categoryList = segment.getCategories(); - Collections.sort(categoryList, (Comparator<Category>) (Category c1, Category c2) -> c1.getName().toLowerCase().compareTo(c2.getName().toLowerCase())); - - return Response.ok().entity(categoryList).build(); - } - - @GET - @Produces(MediaType.APPLICATION_JSON) - @Secured - @Path("segment/{id}/category/selectList") - public Response getSegmentCategorySelectList(@PathParam("id") Integer id, - @QueryParam("start") Integer start, - @QueryParam("length") Integer length, - @QueryParam("orderby") String orderby, - @QueryParam("dir") String direction, - @QueryParam("search") String search) - { - // System.out.println("EndpointAnalysisList: getSegmentCategorySelectList - Id: "+ id); - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisSegment segment = entityManager.find(AnalysisSegment.class, id); - MediumAnalysisList mediumAnalysisList = segment.getMediumAnalysisList(); - List<CategorySet> categorySetList = mediumAnalysisList.getCategorySets(); - List<Category> categoryList = new ArrayList<>(); - List<SelectElement> categorySelectList = new ArrayList<>(); - - for (CategorySet categorySet : categorySetList) { - Set<CategorySetHasCategory> cshc = categorySet.getCategorySetHasCategories(); - Iterator<CategorySetHasCategory> itr = cshc.iterator(); - while (itr.hasNext()) { - categoryList.add(itr.next().getCategory()); - } - } - - // search - Query query; - String sql; - if (search != null && search.length() > 0) { - // find all matching names - sql = "SELECT c FROM Category c WHERE lower(c.name) LIKE lower(concat('%', :name,'%')) ORDER BY c.name ASC"; - query = entityManager.createQuery(sql) - .setParameter("name", search); - // find all categories belonging to those names - if ( start != null && start > 0 ) query.setFirstResult(start); - if ( length != null && length > 0 ) query.setMaxResults(length); - List<Category> searchCategoryList = castList(Category.class, query.getResultList()); - for (Category category : searchCategoryList) { - if (categoryList.contains(category)) { - categorySelectList.add(new SelectElement<Integer>(category.getId(), category.getName())); - } - } - } else { - // System.out.println("EndpointCategory: getCategorySelectList - no search string"); - Collections.sort(categoryList, (Comparator<Category>) (Category c1, Category c2) -> c1.getName().toLowerCase().compareTo(c2.getName().toLowerCase())); - for (Category category : categoryList) { - categorySelectList.add(new SelectElement<Integer>(category.getId(), category.getName())); - } - } - - return Response.ok().entity(categorySelectList).build(); - } - - @GET - @Produces(MediaType.APPLICATION_JSON) - @Secured - @Path("sequence/{id}/category/list") - public Response getSequenceSelectedCategories(@PathParam("id") Integer id) - { - // System.out.println("EndPointAnalysisList: getSequenceSelectedCategories - Id: "+ id); - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisSequence sequence = entityManager.find(AnalysisSequence.class, id); - List<Category> categoryList = sequence.getCategories(); - return Response.ok().entity(categoryList).build(); - } - - @GET - @Produces(MediaType.APPLICATION_JSON) - @Secured - @Path("sequence/{id}/category/selectList") - public Response getSequenceCategorySelectList(@PathParam("id") Integer id, - @QueryParam("start") Integer start, - @QueryParam("length") Integer length, - @QueryParam("orderby") String orderby, - @QueryParam("dir") String direction, - @QueryParam("search") String search) - { - // System.out.println("EndpointAnalysisList: getSequenceCategorySelectList - Id: "+ id); - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisSequence sequence = entityManager.find(AnalysisSequence.class, id); - MediumAnalysisList mediumAnalysisList = sequence.getAnalysisSegment().getMediumAnalysisList(); - List<CategorySet> categorySetList = mediumAnalysisList.getCategorySets(); - List<Category> categoryList = new ArrayList<>(); - List<SelectElement> categorySelectList = new ArrayList<>(); - - for (CategorySet categorySet : categorySetList) { - Set<CategorySetHasCategory> cshc = categorySet.getCategorySetHasCategories(); - Iterator<CategorySetHasCategory> itr = cshc.iterator(); - while (itr.hasNext()) { - categoryList.add(itr.next().getCategory()); - } - } - - // search - Query query; - String sql; - if (search != null && search.length() > 0) { - // find all matching names - sql = "SELECT c FROM Category c WHERE lower(c.name) LIKE lower(concat('%', :name,'%')) ORDER BY c.name ASC"; - query = entityManager.createQuery(sql) - .setParameter("name", search); - // find all categories belonging to those names - if ( start != null && start > 0 ) query.setFirstResult(start); - if ( length != null && length > 0 ) query.setMaxResults(length); - List<Category> searchCategoryList = castList(Category.class, query.getResultList()); - for (Category category : searchCategoryList) { - if (categoryList.contains(category)) { - categorySelectList.add(new SelectElement<Integer>(category.getId(), category.getName())); - } - } - } else { - Collections.sort(categoryList, (Comparator<Category>) (Category c1, Category c2) -> c1.getName().toLowerCase().compareTo(c2.getName().toLowerCase())); - for (Category category : categoryList) { - categorySelectList.add(new SelectElement<Integer>(category.getId(), category.getName())); - } - } - - return Response.ok().entity(categorySelectList).build(); - } - - @GET - @Produces(MediaType.APPLICATION_JSON) - @Secured - @Path("scene/{id}/category/list") - public Response getSceneSelectedCategories(@PathParam("id") Integer id) - { - // System.out.println("EndPointAnalysisList: getSceneSelectedCategories - Id: "+ id); - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisScene scene = entityManager.find(AnalysisScene.class, id); - List<Category> categoryList = scene.getCategories(); - return Response.ok().entity(categoryList).build(); - } - - @GET - @Produces(MediaType.APPLICATION_JSON) - @Secured - @Path("scene/{id}/category/selectList") - public Response getSceneCategorySelectList(@PathParam("id") Integer id, - @QueryParam("start") Integer start, - @QueryParam("length") Integer length, - @QueryParam("orderby") String orderby, - @QueryParam("dir") String direction, - @QueryParam("search") String search) - { - // System.out.println("EndpointAnalysisList: getSceneCategorySelectList - Id: "+ id); - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisScene scene = entityManager.find(AnalysisScene.class, id); - MediumAnalysisList mediumAnalysisList = scene.getAnalysisSegment().getMediumAnalysisList(); - List<CategorySet> categorySetList = mediumAnalysisList.getCategorySets(); - List<Category> categoryList = new ArrayList<>(); - List<SelectElement> categorySelectList = new ArrayList<>(); - - for (CategorySet categorySet : categorySetList) { - Set<CategorySetHasCategory> cshc = categorySet.getCategorySetHasCategories(); - Iterator<CategorySetHasCategory> itr = cshc.iterator(); - while (itr.hasNext()) { - categoryList.add(itr.next().getCategory()); - } - } - - // search - Query query; - String sql; - if (search != null && search.length() > 0) { - // find all matching names - sql = "SELECT c FROM Category c WHERE lower(c.name) LIKE lower(concat('%', :name,'%')) ORDER BY c.name ASC"; - query = entityManager.createQuery(sql) - .setParameter("name", search); - // find all categories belonging to those names - if ( start != null && start > 0 ) query.setFirstResult(start); - if ( length != null && length > 0 ) query.setMaxResults(length); - List<Category> searchCategoryList = castList(Category.class, query.getResultList()); - for (Category category : searchCategoryList) { - if (categoryList.contains(category)) { - categorySelectList.add(new SelectElement<Integer>(category.getId(), category.getName())); - } - } - } else { - Collections.sort(categoryList, (Comparator<Category>) (Category c1, Category c2) -> c1.getName().toLowerCase().compareTo(c2.getName().toLowerCase())); - for (Category category : categoryList) { - categorySelectList.add(new SelectElement<Integer>(category.getId(), category.getName())); - } - } - - return Response.ok().entity(categorySelectList).build(); - } - - @POST - @Produces(MediaType.APPLICATION_JSON) - @Consumes(MediaType.APPLICATION_JSON) - @Secured - @Path("medium/{mediumId}") - public Response createAnalysisList(@PathParam("mediumId") int mediumId, - String jsonData) { - ObjectMapper mapper = new ObjectMapper(); - MediumAnalysisList newList = null; - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - Medium medium = entityManager.find(Medium.class, mediumId); - if ( medium == null ) return Response.status(Status.NOT_FOUND).build(); - // parse JSON data - try { - newList = mapper.readValue(jsonData, MediumAnalysisList.class); - } catch (IOException e) { - e.printStackTrace(); - return Response.status(Status.BAD_REQUEST).build(); - } - if ( newList == null ) return Response.status(Status.BAD_REQUEST).build(); - // sanitize object data - newList.setId(0); - newList.setMedium(medium); - newList.setAnalysisSegments(new ArrayList<AnalysisSegment>()); - newList.setAnnotations(new ArrayList<Annotation>()); - newList.setUuid(UUID.randomUUID().toString()); - newList.getMediumAnalysisListTranslations().get(0).setId(0); - newList.getMediumAnalysisListTranslations().get(0).setLanguage(entityManager.find(Language.class, 1)); - newList.getMediumAnalysisListTranslations().get(0).setMediumAnalysisList(newList); - if ( containerRequestContext.getProperty("TIMAAT.userID") != null ) { - newList.setCreatedByUserAccount(entityManager.find(UserAccount.class, containerRequestContext.getProperty("TIMAAT.userID"))); - newList.setLastEditedByUserAccount((entityManager.find(UserAccount.class, containerRequestContext.getProperty("TIMAAT.userID")))); - } else { - // DEBUG do nothing - production system should abort with internal server error - return Response.serverError().build(); - } - Timestamp creationDate = new Timestamp(System.currentTimeMillis()); - newList.setCreatedAt(creationDate); - newList.setLastEditedAt(creationDate); - - // persist analysisList and polygons - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.persist(newList.getMediumAnalysisListTranslations().get(0)); - entityManager.persist(newList); - medium.addMediumAnalysisList(newList); - entityManager.persist(medium); - entityManager.flush(); - entityTransaction.commit(); - entityManager.refresh(newList); - entityManager.refresh(medium); - - // set initial permission for newly created analysis list - UserAccount userAccount = entityManager.find(UserAccount.class, containerRequestContext.getProperty("TIMAAT.userID")); - UserAccountHasMediumAnalysisList uahmal = new UserAccountHasMediumAnalysisList(userAccount, newList); - PermissionType permissionType = entityManager.find(PermissionType.class, 4); // List creator becomes list admin - uahmal.setPermissionType(permissionType); - entityTransaction.begin(); - userAccount.getUserAccountHasMediumAnalysisLists().add(uahmal); - newList.getUserAccountHasMediumAnalysisLists().add(uahmal); - entityManager.merge(userAccount); - entityManager.merge(newList); - entityManager.persist(userAccount); - entityManager.persist(newList); - entityTransaction.commit(); - entityManager.refresh(userAccount); - entityManager.refresh(newList); - - // add log entry - UserLogManager.getLogger().addLogEntry(newList.getCreatedByUserAccount().getId(), UserLogManager.LogEvents.ANALYSISLISTCREATED); - - return Response.ok().entity(newList).build(); - } - - @GET - @Produces(MediaType.APPLICATION_JSON) - @Secured - @Path("action/{id}/category/list") - public Response getActionSelectedCategories(@PathParam("id") Integer id) - { - // System.out.println("EndPointAnalysisList: getActionSelectedCategories - Id: "+ id); - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisAction action = entityManager.find(AnalysisAction.class, id); - List<Category> categoryList = action.getCategories(); - return Response.ok().entity(categoryList).build(); - } - - @GET - @Produces(MediaType.APPLICATION_JSON) - @Secured - @Path("action/{id}/category/selectList") - public Response getActionCategorySelectList(@PathParam("id") Integer id, - @QueryParam("start") Integer start, - @QueryParam("length") Integer length, - @QueryParam("orderby") String orderby, - @QueryParam("dir") String direction, - @QueryParam("search") String search) - { - // System.out.println("EndpointAnalysisList: getActionCategorySelectList - Id: "+ id); - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisAction action = entityManager.find(AnalysisAction.class, id); - MediumAnalysisList mediumAnalysisList = action.getAnalysisScene().getAnalysisSegment().getMediumAnalysisList(); - List<CategorySet> categorySetList = mediumAnalysisList.getCategorySets(); - List<Category> categoryList = new ArrayList<>(); - List<SelectElement> categorySelectList = new ArrayList<>(); - - for (CategorySet categorySet : categorySetList) { - Set<CategorySetHasCategory> cshc = categorySet.getCategorySetHasCategories(); - Iterator<CategorySetHasCategory> itr = cshc.iterator(); - while (itr.hasNext()) { - categoryList.add(itr.next().getCategory()); - } - } - - // search - Query query; - String sql; - if (search != null && search.length() > 0) { - // find all matching names - sql = "SELECT c FROM Category c WHERE lower(c.name) LIKE lower(concat('%', :name,'%')) ORDER BY c.name ASC"; - query = entityManager.createQuery(sql) - .setParameter("name", search); - // find all categories belonging to those names - if ( start != null && start > 0 ) query.setFirstResult(start); - if ( length != null && length > 0 ) query.setMaxResults(length); - List<Category> searchCategoryList = castList(Category.class, query.getResultList()); - for (Category category : searchCategoryList) { - if (categoryList.contains(category)) { - categorySelectList.add(new SelectElement<Integer>(category.getId(), category.getName())); - } - } - } else { - Collections.sort(categoryList, (Comparator<Category>) (Category c1, Category c2) -> c1.getName().toLowerCase().compareTo(c2.getName().toLowerCase())); - for (Category category : categoryList) { - categorySelectList.add(new SelectElement<Integer>(category.getId(), category.getName())); - } - } - - return Response.ok().entity(categorySelectList).build(); - } - - @GET - @Produces(MediaType.APPLICATION_JSON) - @Secured - @Path("take/{id}/category/list") - public Response getTakeSelectedCategories(@PathParam("id") Integer id) - { - // System.out.println("EndPointAnalysisList: getTakeSelectedCategories - Id: "+ id); - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisTake take = entityManager.find(AnalysisTake.class, id); - List<Category> categoryList = take.getCategories(); - return Response.ok().entity(categoryList).build(); - } - - @GET - @Produces(MediaType.APPLICATION_JSON) - @Secured - @Path("take/{id}/category/selectList") - public Response getTakeCategorySelectList(@PathParam("id") Integer id, - @QueryParam("start") Integer start, - @QueryParam("length") Integer length, - @QueryParam("orderby") String orderby, - @QueryParam("dir") String direction, - @QueryParam("search") String search) - { - // System.out.println("EndpointAnalysisList: getTakeCategorySelectList - Id: "+ id); - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisTake take = entityManager.find(AnalysisTake.class, id); - MediumAnalysisList mediumAnalysisList = take.getAnalysisSequence().getAnalysisSegment().getMediumAnalysisList(); - List<CategorySet> categorySetList = mediumAnalysisList.getCategorySets(); - List<Category> categoryList = new ArrayList<>(); - List<SelectElement> categorySelectList = new ArrayList<>(); - - for (CategorySet categorySet : categorySetList) { - Set<CategorySetHasCategory> cshc = categorySet.getCategorySetHasCategories(); - Iterator<CategorySetHasCategory> itr = cshc.iterator(); - while (itr.hasNext()) { - categoryList.add(itr.next().getCategory()); - } - } - - // search - Query query; - String sql; - if (search != null && search.length() > 0) { - // find all matching names - sql = "SELECT c FROM Category c WHERE lower(c.name) LIKE lower(concat('%', :name,'%')) ORDER BY c.name ASC"; - query = entityManager.createQuery(sql) - .setParameter("name", search); - // find all categories belonging to those names - if ( start != null && start > 0 ) query.setFirstResult(start); - if ( length != null && length > 0 ) query.setMaxResults(length); - List<Category> searchCategoryList = castList(Category.class, query.getResultList()); - for (Category category : searchCategoryList) { - if (categoryList.contains(category)) { - categorySelectList.add(new SelectElement<Integer>(category.getId(), category.getName())); - } - } - } else { - Collections.sort(categoryList, (Comparator<Category>) (Category c1, Category c2) -> c1.getName().toLowerCase().compareTo(c2.getName().toLowerCase())); - for (Category category : categoryList) { - categorySelectList.add(new SelectElement<Integer>(category.getId(), category.getName())); - } - } - - return Response.ok().entity(categorySelectList).build(); - } - - @GET - @Produces(MediaType.APPLICATION_JSON) - @Secured - @Path("{id}") - public Response getAnalysisList(@PathParam("id") Integer id) - { - // System.out.println("EndpointAnalysisList: getAnalysisList - ID: "+ id); - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - MediumAnalysisList mediumAnalysisList = entityManager.find(MediumAnalysisList.class, id); - - return Response.ok().entity(mediumAnalysisList).build(); - } - - @PATCH - @Produces(MediaType.APPLICATION_JSON) - @Consumes(MediaType.APPLICATION_JSON) - @Path("{id}") - @Secured - public Response updateAnalysisList(@PathParam("id") int mediumAnalysisListId, - String jsonData, - @QueryParam("authToken") String authToken) { - - // System.out.println("EndpointAnalysisList: updateAnalysisList "+ jsonData); - - // verify auth token - int userId = 0; - if (AuthenticationFilter.isTokenValid(authToken)) { - userId = AuthenticationFilter.getTokenClaimUserId(authToken); - } else { - return Response.status(Status.UNAUTHORIZED).build(); - } - // check for permission level - if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, mediumAnalysisListId) < 2) { - return Response.status(Status.FORBIDDEN).build(); - } - - ObjectMapper mapper = new ObjectMapper(); - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - MediumAnalysisList updatedList = null; - MediumAnalysisList mediumAnalysisList = entityManager.find(MediumAnalysisList.class, mediumAnalysisListId); - if ( mediumAnalysisList == null ) return Response.status(Status.NOT_FOUND).build(); + MediumAnalysisList mediumAnalysisList = entityManager.find(MediumAnalysisList.class, mediumAnalysisListId); + List<UserAccountHasMediumAnalysisList> userAccountHasMediumAnalysisListList = mediumAnalysisList.getUserAccountHasMediumAnalysisLists(); + List<DisplayElementNameAndPermission> displayElementNameAndPermission = new ArrayList<>(); + for (UserAccountHasMediumAnalysisList userAccountHasMediumAnalysisList : userAccountHasMediumAnalysisListList) { + displayElementNameAndPermission.add( + new DisplayElementNameAndPermission(userAccountHasMediumAnalysisList.getUserAccount().getId(), + userAccountHasMediumAnalysisList.getUserAccount().getDisplayName(), + userAccountHasMediumAnalysisList.getPermissionType().getId())); + } + displayElementNameAndPermission.sort( + Comparator.comparing((DisplayElementNameAndPermission d) -> d.getDisplayName().toLowerCase())); + return Response.ok().entity(displayElementNameAndPermission).build(); + } - // parse JSON data - try { - mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); - updatedList = mapper.readValue(jsonData, MediumAnalysisList.class); - } catch (IOException e) { - e.printStackTrace(); - return Response.status(Status.BAD_REQUEST).build(); - } - if ( updatedList == null ) return Response.notModified().build(); + @GET + @Produces(MediaType.APPLICATION_JSON) + @Secured + @Path("{id}/hasTagList") + public Response getMediumAnalysisListTagList(@PathParam("id") Integer id) { + // System.out.println("EndpointAnalysisList: getTagList"); + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + MediumAnalysisList mediumAnalysisList = entityManager.find(MediumAnalysisList.class, id); + if (mediumAnalysisList == null) { + return Response.status(Status.NOT_FOUND).build(); + } + entityManager.refresh(mediumAnalysisList); + return Response.ok().entity(mediumAnalysisList.getTags()).build(); + } - // update analysisList - if ( updatedList.getMediumAnalysisListTranslations() != null ) - for ( MediumAnalysisListTranslation trans : updatedList.getMediumAnalysisListTranslations() ) { - mediumAnalysisList.setTitle(trans.getTitle(), trans.getLanguage().getCode()); - mediumAnalysisList.setText(trans.getText(), trans.getLanguage().getCode()); - } - List<CategorySet> oldCategorySets = mediumAnalysisList.getCategorySets(); - mediumAnalysisList.setCategorySets(updatedList.getCategorySets()); - List<Tag> oldTags = mediumAnalysisList.getTags(); - mediumAnalysisList.setTags(updatedList.getTags()); - mediumAnalysisList.setGlobalPermission(updatedList.getGlobalPermission()); - if (updatedList.getUuid() == null) mediumAnalysisList.setUuid(UUID.randomUUID().toString()); // update entries that existed before uuid became a string - - if ( containerRequestContext.getProperty("TIMAAT.userID") != null ) { - mediumAnalysisList.setLastEditedByUserAccount((entityManager.find(UserAccount.class, containerRequestContext.getProperty("TIMAAT.userID")))); - } else { - // DEBUG do nothing - production system should abort with internal server error - return Response.serverError().build(); - } - mediumAnalysisList.setLastEditedAt(new Timestamp(System.currentTimeMillis())); - - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.merge(mediumAnalysisList); - entityManager.persist(mediumAnalysisList); - entityTransaction.commit(); - entityManager.refresh(mediumAnalysisList); - for (CategorySet categorySet : mediumAnalysisList.getCategorySets()) { - entityManager.refresh(categorySet); - } - for (CategorySet categorySet : oldCategorySets) { - entityManager.refresh(categorySet); - } - for (Tag tag : mediumAnalysisList.getTags()) { - entityManager.refresh(tag); - } - for (Tag tag : oldTags) { - entityManager.refresh(tag); - } - - - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), UserLogManager.LogEvents.ANALYSISLISTEDITED); - - return Response.ok().entity(mediumAnalysisList).build(); - } - - @DELETE - @Produces(MediaType.APPLICATION_JSON) - @Path("{id}") - @Secured - public Response deleteAnalysisList(@PathParam("id") int mediumAnalysisListId, - @QueryParam("authToken") String authToken) { - - // verify auth token - int userId = 0; - if (AuthenticationFilter.isTokenValid(authToken)) { - userId = AuthenticationFilter.getTokenClaimUserId(authToken); - } else { - return Response.status(Status.UNAUTHORIZED).build(); - } - // check for permission level - if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, mediumAnalysisListId) < 4) { - return Response.status(Status.FORBIDDEN).build(); - } - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - MediumAnalysisList mediumAnalysisList = entityManager.find(MediumAnalysisList.class, mediumAnalysisListId); - if ( mediumAnalysisList == null ) return Response.status(Status.NOT_FOUND).build(); - - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - // remove all associated annotations - for (Annotation anno : mediumAnalysisList.getAnnotations()) entityManager.remove(anno); - mediumAnalysisList.getAnnotations().clear(); - // remove all associated segments - for (AnalysisSegment segment : mediumAnalysisList.getAnalysisSegments()) entityManager.remove(segment); - mediumAnalysisList.getAnalysisSegments().clear(); - entityManager.remove(mediumAnalysisList); - entityTransaction.commit(); - - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), UserLogManager.LogEvents.ANALYSISLISTDELETED); - - return Response.ok().build(); - } - - @POST + @GET @Produces(MediaType.APPLICATION_JSON) - @Path("{analysisListId}/userAccount/{userAccountId}/withPermission/{permissionId}") - @Secured - public Response addUserAccountHasMediumAnalysisListWithPermission(@PathParam("analysisListId") int mediumAnalysisListId, - @PathParam("userAccountId") int userAccountId, - @PathParam("permissionId") int permissionTypeId, - @QueryParam("authToken") String authToken) { - // System.out.println("EndpointMediumAnalysisList: addUserAccountHasMediumAnalysisListWithPermission"); - - // verify auth token - int userId = 0; - if (AuthenticationFilter.isTokenValid(authToken)) { - userId = AuthenticationFilter.getTokenClaimUserId(authToken); - } else { - return Response.status(Status.UNAUTHORIZED).build(); - } - // check for permission level - // only users with administrate permission level may add users with moderate or administrate permission - int permissionLevel = EndpointUserAccount.getPermissionLevelForAnalysisList(userId, mediumAnalysisListId); - // IF user is not sys admin AND ( - // user is without high enough permission level to set others to moderate or administrate - // OR user is without high enough permission level to set any permission levels) - if ((userId != 1) && ((permissionLevel != 4 && (permissionTypeId == 3 || permissionTypeId == 4)) || - (permissionLevel != 3 && permissionLevel != 4))) { - return Response.status(Status.FORBIDDEN).build(); - } // else user has permission for requested change - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - MediumAnalysisList mediumAnalysisList = entityManager.find(MediumAnalysisList.class, mediumAnalysisListId); - if (mediumAnalysisList == null) return Response.status(Status.NOT_FOUND).build(); - UserAccount userAccount = entityManager.find(UserAccount.class, userAccountId); - if (userAccount == null) return Response.status(Status.NOT_FOUND).build(); - PermissionType permissionType = entityManager.find(PermissionType.class, permissionTypeId); - if (permissionType == null) return Response.status(Status.NOT_FOUND).build(); - - UserAccountHasMediumAnalysisList uahmal = null; - try { - Query countQuery = entityManager.createQuery("SELECT COUNT(uahmal) FROM UserAccountHasMediumAnalysisList uahmal WHERE uahmal.mediumAnalysisList=:mediumAnalysisList AND uahmal.userAccount=:userAccount") - .setParameter("mediumAnalysisList", mediumAnalysisList) - .setParameter("userAccount", userAccount); - // .setParameter("permissionType", permissionType); - long recordsTotal = (long) countQuery.getSingleResult(); - if (recordsTotal >= 1) { - return Response.status(Status.FORBIDDEN).build(); // an entry already exists, do not create a new one - // uahmal = (UserAccountHasMediumAnalysisList) entityManager.createQuery( - // "SELECT uahmal FROM UserAccountHasMediumAnalysisList uahmal WHERE uahmal.mediumAnalysisList=:mediumAnalysisList AND uahmal.userAccount=:userAccount") - // .setParameter("mediumAnalysisList", mediumAnalysisList) - // .setParameter("userAccount", userAccount) - // // .setParameter("permissionType", permissionType) - // .getSingleResult(); - } - } catch (Exception e) { - e.printStackTrace(); - // doesn't matter - } - if ( uahmal == null ) { - // System.out.println("EndpointMediumAnalysisList: UserAccountHasMediumAnalysisList - create new entry"); - uahmal = new UserAccountHasMediumAnalysisList(); - uahmal.setMediumAnalysisList(mediumAnalysisList); - uahmal.setUserAccount(userAccount); - uahmal.setPermissionType(permissionType); - try { - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.persist(uahmal); - entityTransaction.commit(); - entityManager.refresh(mediumAnalysisList); - entityManager.refresh(userAccount); - entityManager.refresh(permissionType); - entityManager.refresh(uahmal); - } catch (Exception e) { - e.printStackTrace(); - return Response.notModified().build(); - } - } - - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), UserLogManager.LogEvents.ANALYSISLISTEDITED); - - return Response.ok().entity(uahmal).build(); - } - - @PATCH + @Secured + @Path("{id}/elements") + public Response getMediumAnalysisListElements(@PathParam("id") Integer id) { + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + MediumAnalysisList mediumAnalysisList = entityManager.find(MediumAnalysisList.class, id); + List<Annotation> annotations = mediumAnalysisList.getAnnotations(); + List<AnalysisSegment> segments = mediumAnalysisList.getAnalysisSegments(); + List<Object> elementList = new ArrayList<Object>(); + elementList.addAll(annotations); + elementList.addAll(segments); + //* NB: returns an unsorted list + return Response.ok().entity(elementList).build(); + } + + @GET @Produces(MediaType.APPLICATION_JSON) - @Path("{analysisListId}/userAccount/{userAccountId}/withPermission/{permissionId}") - @Secured - public Response updateUserAccountHasMediumAnalysisListWithPermission(@PathParam("analysisListId") int mediumAnalysisListId, - @PathParam("userAccountId") int userAccountId, - @PathParam("permissionId") int permissionTypeId, - @QueryParam("authToken") String authToken) { - // System.out.println("EndpointMediumAnalysisList: updateUserAccountHasMediumAnalysisListWithPermission"); - - // verify auth token - int userId = 0; - if (AuthenticationFilter.isTokenValid(authToken)) { - userId = AuthenticationFilter.getTokenClaimUserId(authToken); - } else { - return Response.status(Status.UNAUTHORIZED).build(); - } - // check for permission level - // only users with administrate permission level may add users with moderate or administrate permission - int permissionLevel = EndpointUserAccount.getPermissionLevelForAnalysisList(userId, mediumAnalysisListId); - // IF user is not sys admin AND ( - // user is without high enough permission level to set others to moderate or administrate - // OR user is without high enough permission level to set any permission levels) - if ((userId != 1) && ((permissionLevel != 4 && (permissionTypeId == 3 || permissionTypeId == 4)) || - (permissionLevel != 3 && permissionLevel != 4))) { - return Response.status(Status.FORBIDDEN).build(); - } // else user has permission for requested change - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - MediumAnalysisList mediumAnalysisList = entityManager.find(MediumAnalysisList.class, mediumAnalysisListId); - if (mediumAnalysisList == null) return Response.status(Status.NOT_FOUND).build(); - UserAccount userAccount = entityManager.find(UserAccount.class, userAccountId); - if (userAccount == null) return Response.status(Status.NOT_FOUND).build(); - PermissionType permissionType = entityManager.find(PermissionType.class, permissionTypeId); - if (permissionType == null) return Response.status(Status.NOT_FOUND).build(); - UserAccountHasMediumAnalysisList uahmalKey = new UserAccountHasMediumAnalysisList(userAccount, mediumAnalysisList); - UserAccountHasMediumAnalysisList uahmal = entityManager.find(UserAccountHasMediumAnalysisList.class, uahmalKey.getId()); + @Secured + @Path("{id}/categorySet/list") + public Response getCategorySetList(@PathParam("id") Integer id) { + // System.out.println("EndpointAnalysisList: getCategorySetList - ID: "+ id); + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + MediumAnalysisList mediumAnalysisList = entityManager.find(MediumAnalysisList.class, id); + List<CategorySet> categorySetList = mediumAnalysisList.getCategorySets(); - uahmal.setPermissionType(permissionType); + return Response.ok().entity(categorySetList).build(); + } - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.merge(uahmal); - entityManager.persist(uahmal); - entityTransaction.commit(); - entityManager.refresh(uahmal); - - - // add log entry - UserLogManager.getLogger() - .addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.ANALYSISLISTEDITED); - - return Response.ok().entity(uahmal).build(); - } - - @DELETE - @Produces(MediaType.APPLICATION_JSON) - @Path("{analysisListId}/userAccount/{userAccountId}") - @Secured - public Response deleteUserAccountHasMediumAnalysisListWithPermission(@PathParam("analysisListId") int mediumAnalysisListId, - @PathParam("userAccountId") int userAccountId, - @QueryParam("authToken") String authToken) { - // verify auth token - int userId = 0; - if (AuthenticationFilter.isTokenValid(authToken)) { - userId = AuthenticationFilter.getTokenClaimUserId(authToken); - } else { - return Response.status(Status.UNAUTHORIZED).build(); - } - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - UserAccountHasMediumAnalysisList userToBeRemoved = null; - try { - userToBeRemoved = (UserAccountHasMediumAnalysisList) entityManager.createQuery("SELECT uahmal FROM UserAccountHasMediumAnalysisList uahmal WHERE uahmal.mediumAnalysisList.id=:mediumAnalysisListId AND uahmal.userAccount.id=:userAccountId") - .setParameter("mediumAnalysisListId", mediumAnalysisListId) - .setParameter("userAccountId", userAccountId) - .getSingleResult(); - } catch (NoResultException nre) { - nre.printStackTrace(); - return Response.status(Status.NOT_FOUND).build(); - } - // check for permission level - // only users with administrate permission level may add users with moderate or administrate permission - int permissionLevel = EndpointUserAccount.getPermissionLevelForAnalysisList(userId, mediumAnalysisListId); - // IF user is not sys admin AND ( - // user is without high enough permission level to set others to moderate or administrate - // OR user is without high enough permission level to set any permission levels) - if ((userId != 1) && ((permissionLevel != 4 && (userToBeRemoved.getPermissionType().getId() == 3 || userToBeRemoved.getPermissionType().getId() == 4)) || - (permissionLevel != 3 && permissionLevel != 4))) { - return Response.status(Status.FORBIDDEN).build(); - } // else user has permission for requested change - - MediumAnalysisList mediumAnalysisList = entityManager.find(MediumAnalysisList.class, mediumAnalysisListId); - if ( mediumAnalysisList == null ) return Response.status(Status.NOT_FOUND).build(); - UserAccount userAccount = entityManager.find(UserAccount.class, userAccountId); - if ( userAccount == null ) return Response.status(Status.NOT_FOUND).build(); - UserAccountHasMediumAnalysisList uahmalKey = new UserAccountHasMediumAnalysisList(userAccount, mediumAnalysisList); - UserAccountHasMediumAnalysisList uahmal = entityManager.find(UserAccountHasMediumAnalysisList.class, uahmalKey.getId()); - - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.remove(uahmal); - entityTransaction.commit(); - entityManager.refresh(mediumAnalysisList); - entityManager.refresh(userAccount); - - // add log entry - UserLogManager.getLogger() - .addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.ANALYSISLISTEDITED); - - return Response.ok().build(); - } - - @POST - @Produces(MediaType.APPLICATION_JSON) - @Consumes(MediaType.APPLICATION_JSON) - @Secured - @Path("{analysisListId}/segment") - public Response createAnalysisSegment(@PathParam("analysisListId") int mediumAnalysisListId, - String jsonData, - @QueryParam("authToken") String authToken) { - - // System.out.println("createAnalysisSegment - jsonData: "+ jsonData); - // verify auth token - int userId = 0; - if (AuthenticationFilter.isTokenValid(authToken)) { - userId = AuthenticationFilter.getTokenClaimUserId(authToken); - } else { - return Response.status(Status.UNAUTHORIZED).build(); - } - // check for permission level - if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, mediumAnalysisListId) < 2) { - return Response.status(Status.FORBIDDEN).build(); - } - - ObjectMapper mapper = new ObjectMapper(); - AnalysisSegment analysisSegment = null; - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - MediumAnalysisList mediumAnalysisList = entityManager.find(MediumAnalysisList.class, mediumAnalysisListId); - if ( mediumAnalysisList == null ) return Response.status(Status.NOT_FOUND).build(); - - // parse JSON data - try { - analysisSegment = mapper.readValue(jsonData, AnalysisSegment.class); - } catch (IOException e) { - e.printStackTrace(); - return Response.status(Status.BAD_REQUEST).build(); - } - if ( analysisSegment == null ) return Response.status(Status.BAD_REQUEST).build(); - - // sanitize object data - analysisSegment.setId(0); - mediumAnalysisList.addAnalysisSegment(analysisSegment); - analysisSegment.getAnalysisSegmentTranslations().get(0).setId(0); - analysisSegment.getAnalysisSegmentTranslations().get(0).setAnalysisSegment(analysisSegment); - analysisSegment.getAnalysisSegmentTranslations().get(0).setLanguage(entityManager.find(Language.class, 1)); - - // persist analysisSegment and list - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.persist(analysisSegment.getAnalysisSegmentTranslations().get(0)); - entityManager.persist(analysisSegment); - entityManager.flush(); - analysisSegment.setMediumAnalysisList(mediumAnalysisList); - entityManager.persist(mediumAnalysisList); - entityTransaction.commit(); - entityManager.refresh(analysisSegment); - entityManager.refresh(mediumAnalysisList); - - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.ANALYSISSEGMENTCREATED); - - // send notification action - NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), - "addSegment", - analysisSegment.getMediumAnalysisList().getId(), - analysisSegment); - - return Response.ok().entity(analysisSegment).build(); - } - - @PATCH - @Produces(MediaType.APPLICATION_JSON) - @Consumes(MediaType.APPLICATION_JSON) - @Path("segment/{id}") - @Secured - public Response updateAnalysisSegment(@PathParam("id") int segmentId, - String jsonData, - @QueryParam("authToken") String authToken) { - // System.out.println("EndpointAnalysisList: updateAnalysisSegment "+ jsonData); - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisSegment analysisSegment = entityManager.find(AnalysisSegment.class, segmentId); - if ( analysisSegment == null ) return Response.status(Status.NOT_FOUND).build(); - - // verify auth token - int userId = 0; - if (AuthenticationFilter.isTokenValid(authToken)) { - userId = AuthenticationFilter.getTokenClaimUserId(authToken); - } else { - return Response.status(Status.UNAUTHORIZED).build(); - } - // check for permission level - if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, analysisSegment.getMediumAnalysisList().getId()) < 2) { - return Response.status(Status.FORBIDDEN).build(); - } - - ObjectMapper mapper = new ObjectMapper(); - AnalysisSegment updatedSegment = null; - - // parse JSON data - try { - updatedSegment = mapper.readValue(jsonData, AnalysisSegment.class); - } catch (IOException e) { - return Response.status(Status.BAD_REQUEST).build(); - } - if ( updatedSegment == null ) return Response.notModified().build(); - - // update segment - if ( updatedSegment.getAnalysisSegmentTranslations().get(0).getName() != null ) analysisSegment.getAnalysisSegmentTranslations().get(0).setName(updatedSegment.getAnalysisSegmentTranslations().get(0).getName()); - if ( updatedSegment.getAnalysisSegmentTranslations().get(0).getShortDescription() != null ) analysisSegment.getAnalysisSegmentTranslations().get(0).setShortDescription(updatedSegment.getAnalysisSegmentTranslations().get(0).getShortDescription()); - if ( updatedSegment.getAnalysisSegmentTranslations().get(0).getComment() != null ) analysisSegment.getAnalysisSegmentTranslations().get(0).setComment(updatedSegment.getAnalysisSegmentTranslations().get(0).getComment()); - if ( updatedSegment.getAnalysisSegmentTranslations().get(0).getTranscript() != null ) analysisSegment.getAnalysisSegmentTranslations().get(0).setTranscript(updatedSegment.getAnalysisSegmentTranslations().get(0).getTranscript()); - analysisSegment.setStartTime(updatedSegment.getStartTime()); - analysisSegment.setEndTime(updatedSegment.getEndTime()); - analysisSegment.setCategories(updatedSegment.getCategories()); - - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.merge(analysisSegment); - entityManager.persist(analysisSegment); - entityTransaction.commit(); - entityManager.refresh(analysisSegment); - - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.ANALYSISSEGMENTEDITED); - // send notification action - NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), - "editSegment", - analysisSegment.getMediumAnalysisList().getId(), - analysisSegment); - - return Response.ok().entity(analysisSegment).build(); - } - - @DELETE + @GET @Produces(MediaType.APPLICATION_JSON) - @Path("segment/{id}") - @Secured - public Response deleteAnalysisSegment(@PathParam("id") int segmentId, - @QueryParam("authToken") String authToken) { - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisSegment analysisSegment = entityManager.find(AnalysisSegment.class, segmentId); - if ( analysisSegment == null ) return Response.status(Status.NOT_FOUND).build(); - - // verify auth token - int userId = 0; - if (AuthenticationFilter.isTokenValid(authToken)) { - userId = AuthenticationFilter.getTokenClaimUserId(authToken); - } else { - return Response.status(Status.UNAUTHORIZED).build(); - } - // check for permission level - if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, analysisSegment.getMediumAnalysisList().getId()) < 2) { - return Response.status(Status.FORBIDDEN).build(); - } - - MediumAnalysisList mediumAnalysisList = analysisSegment.getMediumAnalysisList(); - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.remove(analysisSegment); - entityTransaction.commit(); - entityManager.refresh(mediumAnalysisList); - - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.ANALYSISSEGMENTDELETED); - - // send notification action - NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), - "removeSegment", - mediumAnalysisList.getId(), - analysisSegment); - - return Response.ok().build(); - } - - @POST - @Produces(MediaType.APPLICATION_JSON) - @Consumes(MediaType.APPLICATION_JSON) - @Secured - @Path("{segmentId}/sequence") - public Response createAnalysisSequence(@PathParam("segmentId") int segmentId, - String jsonData, - @QueryParam("authToken") String authToken) { - // System.out.println("EndpointAnalysisList: createAnalysisSequence - jsonData: "+ jsonData); - - ObjectMapper mapper = new ObjectMapper(); - AnalysisSequence analysisSequence = null; - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisSegment analysisSegment = entityManager.find(AnalysisSegment.class, segmentId); - if ( analysisSegment == null ) return Response.status(Status.NOT_FOUND).build(); - - // verify auth token - int userId = 0; - if (AuthenticationFilter.isTokenValid(authToken)) { - userId = AuthenticationFilter.getTokenClaimUserId(authToken); - } else { - return Response.status(Status.UNAUTHORIZED).build(); - } - // check for permission level - if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, analysisSegment.getMediumAnalysisList().getId()) < 2) { - return Response.status(Status.FORBIDDEN).build(); - } - - // parse JSON data - try { - analysisSequence = mapper.readValue(jsonData, AnalysisSequence.class); - } catch (IOException e) { - e.printStackTrace(); - return Response.status(Status.BAD_REQUEST).build(); - } - if ( analysisSequence == null ) return Response.status(Status.BAD_REQUEST).build(); - - // sanitize object data - analysisSequence.setId(0); - analysisSegment.addAnalysisSequence(analysisSequence); - analysisSequence.getAnalysisSequenceTranslations().get(0).setId(0); - analysisSequence.getAnalysisSequenceTranslations().get(0).setAnalysisSequence(analysisSequence); - analysisSequence.getAnalysisSequenceTranslations().get(0).setLanguage(entityManager.find(Language.class, 1)); - - - // persist analysisSequence and list - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.persist(analysisSequence); - entityManager.flush(); - analysisSequence.setAnalysisSegment(analysisSegment); - entityManager.persist(analysisSegment); - entityTransaction.commit(); - entityManager.refresh(analysisSequence); - entityManager.refresh(analysisSegment); - - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.ANALYSISSEQUENCECREATED); - - // send notification action - NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), - "add-sequence", - analysisSequence.getAnalysisSegment().getId(), - analysisSequence); - - return Response.ok().entity(analysisSequence).build(); - } - - @PATCH - @Produces(MediaType.APPLICATION_JSON) - @Consumes(MediaType.APPLICATION_JSON) - @Path("sequence/{id}") - @Secured - public Response updateAnalysisSequence(@PathParam("id") int sequenceId, - String jsonData, - @QueryParam("authToken") String authToken) { - // System.out.println("EndpointAnalysisList: updateAnalysisSegment "+ jsonData); - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisSequence analysisSequence = entityManager.find(AnalysisSequence.class, sequenceId); - if ( analysisSequence == null ) return Response.status(Status.NOT_FOUND).build(); - - // verify auth token - int userId = 0; - if (AuthenticationFilter.isTokenValid(authToken)) { - userId = AuthenticationFilter.getTokenClaimUserId(authToken); - } else { - return Response.status(Status.UNAUTHORIZED).build(); - } - // check for permission level - if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, analysisSequence.getAnalysisSegment().getMediumAnalysisList().getId()) < 2) { - return Response.status(Status.FORBIDDEN).build(); - } - - ObjectMapper mapper = new ObjectMapper(); - AnalysisSequence updatedSequence = null; - - // parse JSON data - try { - updatedSequence = mapper.readValue(jsonData, AnalysisSequence.class); - } catch (IOException e) { - return Response.status(Status.BAD_REQUEST).build(); - } - if ( updatedSequence == null ) return Response.notModified().build(); + @Secured + @Path("{segmentType}/{id}/category/list") + public List<Category> getSegmentStructureElementCategories(@PathParam("id") int id, @PathParam("segmentType") SegmentStructureType segmentStructureType) { + return segmentStructureElementsStorage.getAssignedCategories(id, segmentStructureType); + } - // update sequence - analysisSequence.setStartTime(updatedSequence.getStartTime()); - analysisSequence.setEndTime(updatedSequence.getEndTime()); - analysisSequence.setCategories(updatedSequence.getCategories()); - - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.merge(analysisSequence); - entityManager.persist(analysisSequence); - entityTransaction.commit(); - entityManager.refresh(analysisSequence); - - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.ANALYSISSEQUENCEEDITED); - // send notification action - NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), - "edit-sequence", - analysisSequence.getAnalysisSegment().getId(), - analysisSequence); - - return Response.ok().entity(analysisSequence).build(); - } - - @DELETE + @GET @Produces(MediaType.APPLICATION_JSON) - @Path("sequence/{id}") - @Secured - public Response deleteAnalysisSequence(@PathParam("id") int id, - @QueryParam("authToken") String authToken) { - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisSequence analysisSequence = entityManager.find(AnalysisSequence.class, id); - if ( analysisSequence == null ) return Response.status(Status.NOT_FOUND).build(); - - // verify auth token - int userId = 0; - if (AuthenticationFilter.isTokenValid(authToken)) { - userId = AuthenticationFilter.getTokenClaimUserId(authToken); - } else { - return Response.status(Status.UNAUTHORIZED).build(); - } - // check for permission level - if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, analysisSequence.getAnalysisSegment().getMediumAnalysisList().getId()) < 2) { - return Response.status(Status.FORBIDDEN).build(); - } - - AnalysisSegment analysisSegment = analysisSequence.getAnalysisSegment(); - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.remove(analysisSequence); - entityTransaction.commit(); - entityManager.refresh(analysisSegment); - - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.ANALYSISSEQUENCEDELETED); - - // send notification action - NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), - "remove-sequence", - analysisSegment.getId(), - analysisSequence); - - return Response.ok().build(); - } - - @POST - @Produces(MediaType.APPLICATION_JSON) - @Consumes(MediaType.APPLICATION_JSON) - @Secured - @Path("sequence/{sequenceId}/translation") - public Response createAnalysisSequenceTranslation(@PathParam("sequenceId") int sequenceId, - String jsonData) { - ObjectMapper mapper = new ObjectMapper(); - AnalysisSequenceTranslation newTranslation = null; - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisSequence analysisSequence = entityManager.find(AnalysisSequence.class, sequenceId); - - if ( analysisSequence == null ) return Response.status(Status.NOT_FOUND).build(); - // parse JSON data - try { - newTranslation = mapper.readValue(jsonData, AnalysisSequenceTranslation.class); - } catch (IOException e) { - e.printStackTrace(); - return Response.status(Status.BAD_REQUEST).build(); - } - if ( newTranslation == null ) return Response.status(Status.BAD_REQUEST).build(); - - // sanitize object data - newTranslation.setId(0); - newTranslation.setAnalysisSequence(analysisSequence); - Language language = entityManager.find(Language.class, newTranslation.getLanguage().getId()); - newTranslation.setLanguage(language); - analysisSequence.addAnalysisSequenceTranslation(newTranslation); - - // persist analysisSequence and list - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.persist(newTranslation); - entityManager.flush(); - newTranslation.setAnalysisSequence(analysisSequence); - entityManager.persist(analysisSequence); - entityTransaction.commit(); - entityManager.refresh(newTranslation); - entityManager.refresh(analysisSequence); - - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.ANALYSISSEQUENCECREATED); - - // send notification action - NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), - "add-sequence-translation", - newTranslation.getAnalysisSequence().getId(), - newTranslation); - - return Response.ok().entity(newTranslation).build(); - } - - @PATCH - @Produces(MediaType.APPLICATION_JSON) - @Consumes(MediaType.APPLICATION_JSON) - @Path("sequence/translation/{translationId}") - @Secured - public Response updateAnalysisSequenceTranslation(@PathParam("translationId") int translationId, - String jsonData) { - // System.out.println("updateAnalysisSequenceTranslation - jsonData: "+ jsonData); - ObjectMapper mapper = new ObjectMapper(); - AnalysisSequenceTranslation updatedTranslation = null; - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisSequenceTranslation analysisSequenceTranslation = entityManager.find(AnalysisSequenceTranslation.class, translationId); - - if ( analysisSequenceTranslation == null ) return Response.status(Status.NOT_FOUND).build(); - // parse JSON data - try { - updatedTranslation = mapper.readValue(jsonData, AnalysisSequenceTranslation.class); - } catch (IOException e) { - return Response.status(Status.BAD_REQUEST).build(); - } - if ( updatedTranslation == null ) return Response.notModified().build(); - - // update sequence translation - if ( updatedTranslation.getName() != null ) analysisSequenceTranslation.setName(updatedTranslation.getName()); - analysisSequenceTranslation.setShortDescription(updatedTranslation.getShortDescription()); - analysisSequenceTranslation.setComment(updatedTranslation.getComment()); - analysisSequenceTranslation.setTranscript(updatedTranslation.getTranscript()); - - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.merge(analysisSequenceTranslation); - entityManager.persist(analysisSequenceTranslation); - entityTransaction.commit(); - entityManager.refresh(analysisSequenceTranslation); - - // add log entry - // UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), UserLogManager.LogEvents.ANALYSISSEQUENCEEDITED); - - // send notification action - NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), "edit-sequence", analysisSequenceTranslation.getAnalysisSequence().getId(), analysisSequenceTranslation); - - return Response.ok().entity(analysisSequenceTranslation).build(); - } - - @DELETE - @Produces(MediaType.APPLICATION_JSON) - @Path("sequence/translation/{translationId}") - @Secured - public Response deleteAnalysisSequenceTranslation(@PathParam("translationId") int translationId, - String jsonData) { - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisSequenceTranslation analysisSequenceTranslation = entityManager.find(AnalysisSequenceTranslation.class, translationId); - - if ( analysisSequenceTranslation == null ) return Response.status(Status.NOT_FOUND).build(); - - AnalysisSequence analysisSequence = analysisSequenceTranslation.getAnalysisSequence(); - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.remove(analysisSequenceTranslation); - entityTransaction.commit(); - entityManager.refresh(analysisSequence); - - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), UserLogManager.LogEvents.ANALYSISSEQUENCEDELETED); - - // send notification action - NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), "remove-sequence", analysisSequence.getId(), analysisSequenceTranslation); - - return Response.ok().build(); - } - - @POST - @Produces(MediaType.APPLICATION_JSON) - @Consumes(MediaType.APPLICATION_JSON) - @Secured - @Path("{segmentId}/scene") - public Response createAnalysisScene(@PathParam("segmentId") int segmentId, - String jsonData, - @QueryParam("authToken") String authToken) { - ObjectMapper mapper = new ObjectMapper(); - AnalysisScene newScene = null; - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisSegment analysisSegment = entityManager.find(AnalysisSegment.class, segmentId); - if ( analysisSegment == null ) return Response.status(Status.NOT_FOUND).build(); - - // verify auth token - int userId = 0; - if (AuthenticationFilter.isTokenValid(authToken)) { - userId = AuthenticationFilter.getTokenClaimUserId(authToken); - } else { - return Response.status(Status.UNAUTHORIZED).build(); - } - // check for permission level - if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, analysisSegment.getMediumAnalysisList().getId()) < 2) { - return Response.status(Status.FORBIDDEN).build(); - } - - // parse JSON data - try { - newScene = mapper.readValue(jsonData, AnalysisScene.class); - } catch (IOException e) { - e.printStackTrace(); - return Response.status(Status.BAD_REQUEST).build(); - } - if ( newScene == null ) return Response.status(Status.BAD_REQUEST).build(); - - // sanitize object data - newScene.setId(0); - analysisSegment.addAnalysisScene(newScene); - newScene.getAnalysisSceneTranslations().get(0).setId(0); - newScene.getAnalysisSceneTranslations().get(0).setAnalysisScene(newScene); - newScene.getAnalysisSceneTranslations().get(0).setLanguage(entityManager.find(Language.class, 1)); - - // persist analysisScene and list - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.persist(newScene); - entityManager.flush(); - newScene.setAnalysisSegment(analysisSegment); - entityManager.persist(analysisSegment); - entityTransaction.commit(); - entityManager.refresh(newScene); - entityManager.refresh(analysisSegment); - - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.ANALYSISSCENECREATED); - - // send notification action - NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), - "add-scene", - newScene.getAnalysisSegment().getId(), - newScene); - - return Response.ok().entity(newScene).build(); - } - - @PATCH - @Produces(MediaType.APPLICATION_JSON) - @Consumes(MediaType.APPLICATION_JSON) - @Path("scene/{id}") - @Secured - public Response updateAnalysisScene(@PathParam("id") int id, - String jsonData, - @QueryParam("authToken") String authToken) { - // System.out.println("EndpointAnalysisList: updateAnalysisScene "+ jsonData); - - ObjectMapper mapper = new ObjectMapper(); - AnalysisScene updatedScene = null; - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisScene analysisScene = entityManager.find(AnalysisScene.class, id); - if ( analysisScene == null ) return Response.status(Status.NOT_FOUND).build(); - - // verify auth token - int userId = 0; - if (AuthenticationFilter.isTokenValid(authToken)) { - userId = AuthenticationFilter.getTokenClaimUserId(authToken); - } else { - return Response.status(Status.UNAUTHORIZED).build(); - } - // check for permission level - if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, analysisScene.getAnalysisSegment().getMediumAnalysisList().getId()) < 2) { - return Response.status(Status.FORBIDDEN).build(); - } - - // parse JSON data - try { - updatedScene = mapper.readValue(jsonData, AnalysisScene.class); - } catch (IOException e) { - return Response.status(Status.BAD_REQUEST).build(); - } - if ( updatedScene == null ) return Response.notModified().build(); + @Secured + @Path("{segmentType}/{id}/category/selectList") + public List<SelectElement<Integer>> getSegmentStructureElementCategoriesSelectList(@PathParam("id") int id, @PathParam("segmentType") SegmentStructureType segmentStructureType) { + return segmentStructureElementsStorage.getAssignableCategories(id, segmentStructureType).stream().map(currentCategory -> new SelectElement<>(currentCategory.getId(), currentCategory.getName())).collect( + Collectors.toList()); + } - // update scene - analysisScene.setStartTime(updatedScene.getStartTime()); - analysisScene.setEndTime(updatedScene.getEndTime()); - analysisScene.setCategories(updatedScene.getCategories()); - - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.merge(analysisScene); - entityManager.persist(analysisScene); - entityTransaction.commit(); - entityManager.refresh(analysisScene); - - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.ANALYSISSCENEEDITED); - // send notification action - NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), - "edit-scene", - analysisScene.getAnalysisSegment().getId(), - analysisScene); - - return Response.ok().entity(analysisScene).build(); - } - - @DELETE - @Produces(MediaType.APPLICATION_JSON) - @Path("scene/{id}") - @Secured - public Response deleteAnalysisScene(@PathParam("id") int id, - @QueryParam("authToken") String authToken) { - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisScene analysisScene = entityManager.find(AnalysisScene.class, id); - if ( analysisScene == null ) return Response.status(Status.NOT_FOUND).build(); - - // verify auth token - int userId = 0; - if (AuthenticationFilter.isTokenValid(authToken)) { - userId = AuthenticationFilter.getTokenClaimUserId(authToken); - } else { - return Response.status(Status.UNAUTHORIZED).build(); - } - // check for permission level - if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, analysisScene.getAnalysisSegment().getMediumAnalysisList().getId()) < 2) { - return Response.status(Status.FORBIDDEN).build(); - } - - AnalysisSegment analysisSegment = analysisScene.getAnalysisSegment(); - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.remove(analysisScene); - entityTransaction.commit(); - entityManager.refresh(analysisSegment); - - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.ANALYSISSCENEDELETED); - - // send notification action - NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), - "remove-scene", - analysisSegment.getId(), - analysisScene); - - return Response.ok().build(); - } - - @POST - @Produces(MediaType.APPLICATION_JSON) - @Consumes(MediaType.APPLICATION_JSON) - @Secured - @Path("scene/{sceneId}/translation") - public Response createAnalysisSceneTranslation(@PathParam("sceneId") int sceneId, String jsonData) { - ObjectMapper mapper = new ObjectMapper(); - AnalysisSceneTranslation newTranslation = null; - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisScene analysisScene = entityManager.find(AnalysisScene.class, sceneId); - - if ( analysisScene == null ) return Response.status(Status.NOT_FOUND).build(); - // parse JSON data - try { - newTranslation = mapper.readValue(jsonData, AnalysisSceneTranslation.class); - } catch (IOException e) { - e.printStackTrace(); - return Response.status(Status.BAD_REQUEST).build(); - } - if ( newTranslation == null ) return Response.status(Status.BAD_REQUEST).build(); - - // sanitize object data - newTranslation.setId(0); - newTranslation.setAnalysisScene(analysisScene); - Language language = entityManager.find(Language.class, newTranslation.getLanguage().getId()); - newTranslation.setLanguage(language); - analysisScene.addAnalysisSceneTranslation(newTranslation); - - // persist analysisScene and list - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.persist(newTranslation); - entityManager.flush(); - newTranslation.setAnalysisScene(analysisScene); - entityManager.persist(analysisScene); - entityTransaction.commit(); - entityManager.refresh(newTranslation); - entityManager.refresh(analysisScene); - - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.ANALYSISSCENECREATED); - - // send notification action - NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), - "add-scene-translation", - newTranslation.getAnalysisScene().getId(), - newTranslation); - - return Response.ok().entity(newTranslation).build(); - } - - @PATCH - @Produces(MediaType.APPLICATION_JSON) - @Consumes(MediaType.APPLICATION_JSON) - @Path("scene/translation/{translationId}") - @Secured - public Response updateAnalysisSceneTranslation(@PathParam("translationId") int translationId, - String jsonData) { - // System.out.println("updateAnalysisSceneTranslation - jsonData: "+ jsonData); - ObjectMapper mapper = new ObjectMapper(); - AnalysisSceneTranslation updatedTranslation = null; - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisSceneTranslation analysisSceneTranslation = entityManager.find(AnalysisSceneTranslation.class, translationId); - - if ( analysisSceneTranslation == null ) return Response.status(Status.NOT_FOUND).build(); - // parse JSON data - try { - updatedTranslation = mapper.readValue(jsonData, AnalysisSceneTranslation.class); - } catch (IOException e) { - return Response.status(Status.BAD_REQUEST).build(); - } - if ( updatedTranslation == null ) return Response.notModified().build(); - - // update scene translation - if ( updatedTranslation.getName() != null ) analysisSceneTranslation.setName(updatedTranslation.getName()); - analysisSceneTranslation.setShortDescription(updatedTranslation.getShortDescription()); - analysisSceneTranslation.setComment(updatedTranslation.getComment()); - analysisSceneTranslation.setTranscript(updatedTranslation.getTranscript()); - - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.merge(analysisSceneTranslation); - entityManager.persist(analysisSceneTranslation); - entityTransaction.commit(); - entityManager.refresh(analysisSceneTranslation); - - // add log entry - // UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), UserLogManager.LogEvents.ANALYSISSCENEEDITED); - - // send notification action - NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), "edit-scene", analysisSceneTranslation.getAnalysisScene().getId(), analysisSceneTranslation); - - return Response.ok().entity(analysisSceneTranslation).build(); - } - - @DELETE + @PUT @Produces(MediaType.APPLICATION_JSON) - @Path("scene/translation/{translationId}") - @Secured - public Response deleteAnalysisSceneTranslation(@PathParam("translationId") int translationId) { - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisSceneTranslation analysisSceneTranslation = entityManager.find(AnalysisSceneTranslation.class, translationId); - - if ( analysisSceneTranslation == null ) return Response.status(Status.NOT_FOUND).build(); - - AnalysisScene analysisScene = analysisSceneTranslation.getAnalysisScene(); - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.remove(analysisSceneTranslation); - entityTransaction.commit(); - entityManager.refresh(analysisScene); - - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), UserLogManager.LogEvents.ANALYSISSCENEDELETED); - - // send notification action - NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), "remove-scene", analysisScene.getId(), analysisSceneTranslation); - - return Response.ok().build(); - } - - @POST - @Produces(MediaType.APPLICATION_JSON) - @Consumes(MediaType.APPLICATION_JSON) - @Secured - @Path("{sequenceId}/take") - public Response createAnalysisTake(@PathParam("sequenceId") int sequenceId, - String jsonData, - @QueryParam("authToken") String authToken) { - ObjectMapper mapper = new ObjectMapper(); - AnalysisTake newTake = null; - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisSequence analysisSequence = entityManager.find(AnalysisSequence.class, sequenceId); - if ( analysisSequence == null ) return Response.status(Status.NOT_FOUND).build(); - - // verify auth token - int userId = 0; - if (AuthenticationFilter.isTokenValid(authToken)) { - userId = AuthenticationFilter.getTokenClaimUserId(authToken); - } else { - return Response.status(Status.UNAUTHORIZED).build(); - } - // check for permission level - if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, analysisSequence.getAnalysisSegment().getMediumAnalysisList().getId()) < 2) { - return Response.status(Status.FORBIDDEN).build(); - } - - // parse JSON data - try { - newTake = mapper.readValue(jsonData, AnalysisTake.class); - } catch (IOException e) { - e.printStackTrace(); - return Response.status(Status.BAD_REQUEST).build(); - } - if ( newTake == null ) return Response.status(Status.BAD_REQUEST).build(); - - // sanitize object data - newTake.setId(0); - analysisSequence.addAnalysisTake(newTake); - newTake.getAnalysisTakeTranslations().get(0).setId(0); - newTake.getAnalysisTakeTranslations().get(0).setAnalysisTake(newTake); - newTake.getAnalysisTakeTranslations().get(0).setLanguage(entityManager.find(Language.class, 1)); - - - // persist analysisTake and list - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.persist(newTake); - entityManager.flush(); - newTake.setAnalysisSequence(analysisSequence); - entityManager.persist(analysisSequence); - entityTransaction.commit(); - entityManager.refresh(newTake); - entityManager.refresh(analysisSequence); - - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.ANALYSISTAKECREATED); - - // send notification action - NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), - "add-take", - newTake.getAnalysisSequence().getId(), - newTake); - - return Response.ok().entity(newTake).build(); - } - - @PATCH - @Produces(MediaType.APPLICATION_JSON) - @Consumes(MediaType.APPLICATION_JSON) - @Path("take/{id}") - @Secured - public Response updateAnalysisTake(@PathParam("id") int id, - String jsonData, - @QueryParam("authToken") String authToken) { - // System.out.println("EndpointAnalysisList: updateAnalysisTake "+ jsonData); - ObjectMapper mapper = new ObjectMapper(); - AnalysisTake updatedTake = null; - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisTake analysisTake = entityManager.find(AnalysisTake.class, id); - if ( analysisTake == null ) return Response.status(Status.NOT_FOUND).build(); - - // verify auth token - int userId = 0; - if (AuthenticationFilter.isTokenValid(authToken)) { - userId = AuthenticationFilter.getTokenClaimUserId(authToken); - } else { - return Response.status(Status.UNAUTHORIZED).build(); - } - // check for permission level - if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, analysisTake.getAnalysisSequence().getAnalysisSegment().getMediumAnalysisList().getId()) < 2) { - return Response.status(Status.FORBIDDEN).build(); - } - - // parse JSON data - try { - updatedTake = mapper.readValue(jsonData, AnalysisTake.class); - } catch (IOException e) { - return Response.status(Status.BAD_REQUEST).build(); - } - if ( updatedTake == null ) return Response.notModified().build(); + @Secured + @Path("{segmentType}/{id}/categories") + public List<Category> updateSegmentStructureElementCategories(@PathParam("id") int id, @PathParam("segmentType") SegmentStructureType segmentStructureType, UpdateAssignedCategoriesPayload updateAssignedCategoriesPayload) { + return segmentStructureElementsStorage.updateCategories(id, segmentStructureType, + updateAssignedCategoriesPayload.getCategoryIds()); + } - // update take - analysisTake.setStartTime(updatedTake.getStartTime()); - analysisTake.setEndTime(updatedTake.getEndTime()); - analysisTake.setCategories(updatedTake.getCategories()); - - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.merge(analysisTake); - entityManager.persist(analysisTake); - entityTransaction.commit(); - entityManager.refresh(analysisTake); - - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.ANALYSISTAKEEDITED); - // send notification action - NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), - "edit-take", - analysisTake.getAnalysisSequence().getId(), - analysisTake); - - return Response.ok().entity(analysisTake).build(); - } - - @DELETE - @Produces(MediaType.APPLICATION_JSON) - @Path("take/{id}") - @Secured - public Response deleteAnalysisTake(@PathParam("id") int id, - @QueryParam("authToken") String authToken) { - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisTake analysisTake = entityManager.find(AnalysisTake.class, id); - if ( analysisTake == null ) return Response.status(Status.NOT_FOUND).build(); - - // verify auth token - int userId = 0; - if (AuthenticationFilter.isTokenValid(authToken)) { - userId = AuthenticationFilter.getTokenClaimUserId(authToken); - } else { - return Response.status(Status.UNAUTHORIZED).build(); - } - // check for permission level - if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, analysisTake.getAnalysisSequence().getAnalysisSegment().getMediumAnalysisList().getId()) < 2) { - return Response.status(Status.FORBIDDEN).build(); - } - - AnalysisSequence analysisSequence = analysisTake.getAnalysisSequence(); - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.remove(analysisTake); - entityTransaction.commit(); - entityManager.refresh(analysisSequence); - - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.ANALYSISTAKEDELETED); - - // send notification action - NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), - "remove-take", - analysisSequence.getId(), - analysisTake); - - return Response.ok().build(); - } - - @POST - @Produces(MediaType.APPLICATION_JSON) - @Consumes(MediaType.APPLICATION_JSON) - @Secured - @Path("take/{takeId}/translation") - public Response createAnalysisTakeTranslation(@PathParam("takeId") int takeId, String jsonData) { - ObjectMapper mapper = new ObjectMapper(); - AnalysisTakeTranslation newTranslation = null; - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisTake analysisTake = entityManager.find(AnalysisTake.class, takeId); - - if ( analysisTake == null ) return Response.status(Status.NOT_FOUND).build(); - // parse JSON data - try { - newTranslation = mapper.readValue(jsonData, AnalysisTakeTranslation.class); - } catch (IOException e) { - e.printStackTrace(); - return Response.status(Status.BAD_REQUEST).build(); - } - if ( newTranslation == null ) return Response.status(Status.BAD_REQUEST).build(); - - // sanitize object data - newTranslation.setId(0); - newTranslation.setAnalysisTake(analysisTake); - Language language = entityManager.find(Language.class, newTranslation.getLanguage().getId()); - newTranslation.setLanguage(language); - analysisTake.addAnalysisTakeTranslation(newTranslation); - - // persist analysisTake and list - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.persist(newTranslation); - entityManager.flush(); - newTranslation.setAnalysisTake(analysisTake); - entityManager.persist(analysisTake); - entityTransaction.commit(); - entityManager.refresh(newTranslation); - entityManager.refresh(analysisTake); - - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.ANALYSISTAKECREATED); - - // send notification action - NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), - "add-take-translation", - newTranslation.getAnalysisTake().getId(), - newTranslation); - - return Response.ok().entity(newTranslation).build(); - } - - @PATCH - @Produces(MediaType.APPLICATION_JSON) - @Consumes(MediaType.APPLICATION_JSON) - @Path("take/translation/{translationId}") - @Secured - public Response updateAnalysisTakeTranslation(@PathParam("translationId") int translationId, - String jsonData) { - // System.out.println("updateAnalysisTakeTranslation - jsonData: "+ jsonData); - ObjectMapper mapper = new ObjectMapper(); - AnalysisTakeTranslation updatedTranslation = null; - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisTakeTranslation analysisTakeTranslation = entityManager.find(AnalysisTakeTranslation.class, translationId); - - if ( analysisTakeTranslation == null ) return Response.status(Status.NOT_FOUND).build(); - // parse JSON data - try { - updatedTranslation = mapper.readValue(jsonData, AnalysisTakeTranslation.class); - } catch (IOException e) { - return Response.status(Status.BAD_REQUEST).build(); - } - if ( updatedTranslation == null ) return Response.notModified().build(); - - // update take translation - if ( updatedTranslation.getName() != null ) analysisTakeTranslation.setName(updatedTranslation.getName()); - analysisTakeTranslation.setShortDescription(updatedTranslation.getShortDescription()); - analysisTakeTranslation.setComment(updatedTranslation.getComment()); - analysisTakeTranslation.setTranscript(updatedTranslation.getTranscript()); - - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.merge(analysisTakeTranslation); - entityManager.persist(analysisTakeTranslation); - entityTransaction.commit(); - entityManager.refresh(analysisTakeTranslation); - - // add log entry - // UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), UserLogManager.LogEvents.ANALYSISTAKEEDITED); - - // send notification action - NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), "edit-take", analysisTakeTranslation.getAnalysisTake().getId(), analysisTakeTranslation); - - return Response.ok().entity(analysisTakeTranslation).build(); - } - - @DELETE + @POST @Produces(MediaType.APPLICATION_JSON) - @Path("take/translation/{translationId}") - @Secured - public Response deleteAnalysisTakeTranslation(@PathParam("translationId") int translationId) { - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisTakeTranslation analysisTakeTranslation = entityManager.find(AnalysisTakeTranslation.class, translationId); - - if ( analysisTakeTranslation == null ) return Response.status(Status.NOT_FOUND).build(); - - AnalysisTake analysisTake = analysisTakeTranslation.getAnalysisTake(); - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.remove(analysisTakeTranslation); - entityTransaction.commit(); - entityManager.refresh(analysisTake); - - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), UserLogManager.LogEvents.ANALYSISTAKEDELETED); - - // send notification action - NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), "remove-take", analysisTake.getId(), analysisTakeTranslation); - - return Response.ok().build(); - } - - @POST - @Produces(MediaType.APPLICATION_JSON) - @Consumes(MediaType.APPLICATION_JSON) - @Secured - @Path("{sceneId}/action") - public Response createAnalysisAction(@PathParam("sceneId") int sceneId, - String jsonData, - @QueryParam("authToken") String authToken) { - ObjectMapper mapper = new ObjectMapper(); - AnalysisAction newAction = null; - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisScene analysisScene = entityManager.find(AnalysisScene.class, sceneId); - if ( analysisScene == null ) return Response.status(Status.NOT_FOUND).build(); - - // verify auth token - int userId = 0; - if (AuthenticationFilter.isTokenValid(authToken)) { - userId = AuthenticationFilter.getTokenClaimUserId(authToken); - } else { - return Response.status(Status.UNAUTHORIZED).build(); - } - // check for permission level - if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, analysisScene.getAnalysisSegment().getMediumAnalysisList().getId()) < 2) { - return Response.status(Status.FORBIDDEN).build(); - } - - // parse JSON data - try { - newAction = mapper.readValue(jsonData, AnalysisAction.class); - } catch (IOException e) { - e.printStackTrace(); - return Response.status(Status.BAD_REQUEST).build(); - } - if ( newAction == null ) return Response.status(Status.BAD_REQUEST).build(); - - // sanitize object data - newAction.setId(0); - analysisScene.addAnalysisAction(newAction); - newAction.getAnalysisActionTranslations().get(0).setId(0); - newAction.getAnalysisActionTranslations().get(0).setAnalysisAction(newAction); - newAction.getAnalysisActionTranslations().get(0).setLanguage(entityManager.find(Language.class, 1)); - - // persist analysisAction and list - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.persist(newAction); - entityManager.flush(); - newAction.setAnalysisScene(analysisScene); - entityManager.persist(analysisScene); - entityTransaction.commit(); - entityManager.refresh(newAction); - entityManager.refresh(analysisScene); - - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.ANALYSISACTIONCREATED); - - // send notification action - NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), - "add-action", - newAction.getAnalysisScene().getId(), - newAction); - - return Response.ok().entity(newAction).build(); - } - - @PATCH - @Produces(MediaType.APPLICATION_JSON) - @Consumes(MediaType.APPLICATION_JSON) - @Path("action/{id}") - @Secured - public Response updateAnalysisAction(@PathParam("id") int id, - String jsonData, - @QueryParam("authToken") String authToken) { - // System.out.println("EndpointAnalysisList: updateAnalysisAction "+ jsonData); - ObjectMapper mapper = new ObjectMapper(); - AnalysisAction updatedAction = null; - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisAction analysisAction = entityManager.find(AnalysisAction.class, id); - if ( analysisAction == null ) return Response.status(Status.NOT_FOUND).build(); - - // verify auth token - int userId = 0; - if (AuthenticationFilter.isTokenValid(authToken)) { - userId = AuthenticationFilter.getTokenClaimUserId(authToken); - } else { - return Response.status(Status.UNAUTHORIZED).build(); - } - // check for permission level - if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, analysisAction.getAnalysisScene().getAnalysisSegment().getMediumAnalysisList().getId()) < 2) { - return Response.status(Status.FORBIDDEN).build(); - } - - // parse JSON data - try { - updatedAction = mapper.readValue(jsonData, AnalysisAction.class); - } catch (IOException e) { - return Response.status(Status.BAD_REQUEST).build(); - } - if ( updatedAction == null ) return Response.notModified().build(); + @Consumes(MediaType.APPLICATION_JSON) + @Secured + @Path("medium/{mediumId}") + public Response createAnalysisList(@PathParam("mediumId") int mediumId, String jsonData) { + ObjectMapper mapper = new ObjectMapper(); + MediumAnalysisList newList = null; + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + Medium medium = entityManager.find(Medium.class, mediumId); + if (medium == null) { + return Response.status(Status.NOT_FOUND).build(); + } + // parse JSON data + try { + newList = mapper.readValue(jsonData, MediumAnalysisList.class); + } catch (IOException e) { + e.printStackTrace(); + return Response.status(Status.BAD_REQUEST).build(); + } + if (newList == null) { + return Response.status(Status.BAD_REQUEST).build(); + } + // sanitize object data + newList.setId(0); + newList.setMedium(medium); + newList.setAnalysisSegments(new ArrayList<AnalysisSegment>()); + newList.setAnnotations(new ArrayList<Annotation>()); + newList.setUuid(UUID.randomUUID().toString()); + newList.getMediumAnalysisListTranslations().get(0).setId(0); + newList.getMediumAnalysisListTranslations().get(0).setLanguage(entityManager.find(Language.class, 1)); + newList.getMediumAnalysisListTranslations().get(0).setMediumAnalysisList(newList); + if (containerRequestContext.getProperty("TIMAAT.userID") != null) { + newList.setCreatedByUserAccount( + entityManager.find(UserAccount.class, containerRequestContext.getProperty("TIMAAT.userID"))); + newList.setLastEditedByUserAccount( + (entityManager.find(UserAccount.class, containerRequestContext.getProperty("TIMAAT.userID")))); + } + else { + // DEBUG do nothing - production system should abort with internal server error + return Response.serverError().build(); + } + Timestamp creationDate = new Timestamp(System.currentTimeMillis()); + newList.setCreatedAt(creationDate); + newList.setLastEditedAt(creationDate); + + // persist analysisList and polygons + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.persist(newList.getMediumAnalysisListTranslations().get(0)); + entityManager.persist(newList); + medium.addMediumAnalysisList(newList); + entityManager.persist(medium); + entityManager.flush(); + entityTransaction.commit(); + entityManager.refresh(newList); + entityManager.refresh(medium); + + // set initial permission for newly created analysis list + UserAccount userAccount = entityManager.find(UserAccount.class, + containerRequestContext.getProperty("TIMAAT.userID")); + UserAccountHasMediumAnalysisList uahmal = new UserAccountHasMediumAnalysisList(userAccount, newList); + PermissionType permissionType = entityManager.find(PermissionType.class, 4); // List creator becomes list admin + uahmal.setPermissionType(permissionType); + entityTransaction.begin(); + userAccount.getUserAccountHasMediumAnalysisLists().add(uahmal); + newList.getUserAccountHasMediumAnalysisLists().add(uahmal); + entityManager.merge(userAccount); + entityManager.merge(newList); + entityManager.persist(userAccount); + entityManager.persist(newList); + entityTransaction.commit(); + entityManager.refresh(userAccount); + entityManager.refresh(newList); + + // add log entry + UserLogManager.getLogger() + .addLogEntry(newList.getCreatedByUserAccount().getId(), UserLogManager.LogEvents.ANALYSISLISTCREATED); + + return Response.ok().entity(newList).build(); + } - // update action - analysisAction.setStartTime(updatedAction.getStartTime()); - analysisAction.setEndTime(updatedAction.getEndTime()); - analysisAction.setCategories(updatedAction.getCategories()); - - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.merge(analysisAction); - entityManager.persist(analysisAction); - entityTransaction.commit(); - entityManager.refresh(analysisAction); - - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.ANALYSISACTIONEDITED); - // send notification action - NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), - "edit-action", - analysisAction.getAnalysisScene().getId(), - analysisAction); - - return Response.ok().entity(analysisAction).build(); - } - - @DELETE + @GET @Produces(MediaType.APPLICATION_JSON) - @Path("action/{id}") - @Secured - public Response deleteAnalysisAction(@PathParam("id") int id, - @QueryParam("authToken") String authToken) { - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisAction analysisAction = entityManager.find(AnalysisAction.class, id); - if ( analysisAction == null ) return Response.status(Status.NOT_FOUND).build(); - - // verify auth token - int userId = 0; - if (AuthenticationFilter.isTokenValid(authToken)) { - userId = AuthenticationFilter.getTokenClaimUserId(authToken); - } else { - return Response.status(Status.UNAUTHORIZED).build(); - } - // check for permission level - if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, analysisAction.getAnalysisScene().getAnalysisSegment().getMediumAnalysisList().getId()) < 2) { - return Response.status(Status.FORBIDDEN).build(); - } - - AnalysisScene analysisScene = analysisAction.getAnalysisScene(); - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.remove(analysisAction); - entityTransaction.commit(); - entityManager.refresh(analysisScene); - - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.ANALYSISACTIONDELETED); - - // send notification action - NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), - "remove-action", - analysisScene.getId(), - analysisAction); - - return Response.ok().build(); - } - - @POST - @Produces(MediaType.APPLICATION_JSON) - @Consumes(MediaType.APPLICATION_JSON) - @Secured - @Path("action/{actionId}/translation") - public Response createAnalysisActionTranslation(@PathParam("actionId") int actionId, String jsonData) { - ObjectMapper mapper = new ObjectMapper(); - AnalysisActionTranslation newTranslation = null; - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisAction analysisAction = entityManager.find(AnalysisAction.class, actionId); - - if ( analysisAction == null ) return Response.status(Status.NOT_FOUND).build(); - // parse JSON data - try { - newTranslation = mapper.readValue(jsonData, AnalysisActionTranslation.class); - } catch (IOException e) { - e.printStackTrace(); - return Response.status(Status.BAD_REQUEST).build(); - } - if ( newTranslation == null ) return Response.status(Status.BAD_REQUEST).build(); - - // sanitize object data - newTranslation.setId(0); - newTranslation.setAnalysisAction(analysisAction); - Language language = entityManager.find(Language.class, newTranslation.getLanguage().getId()); - newTranslation.setLanguage(language); - analysisAction.addAnalysisActionTranslation(newTranslation); - - // persist analysisAction and list - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.persist(newTranslation); - entityManager.flush(); - newTranslation.setAnalysisAction(analysisAction); - entityManager.persist(analysisAction); - entityTransaction.commit(); - entityManager.refresh(newTranslation); - entityManager.refresh(analysisAction); - - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.ANALYSISACTIONCREATED); - - // send notification action - NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), - "add-action-translation", - newTranslation.getAnalysisAction().getId(), - newTranslation); - - return Response.ok().entity(newTranslation).build(); - } - - @PATCH - @Produces(MediaType.APPLICATION_JSON) - @Consumes(MediaType.APPLICATION_JSON) - @Path("action/translation/{translationId}") - @Secured - public Response updateAnalysisActionTranslation(@PathParam("translationId") int translationId, - String jsonData) { - // System.out.println("updateAnalysisActionTranslation - jsonData: "+ jsonData); - ObjectMapper mapper = new ObjectMapper(); - AnalysisActionTranslation updatedTranslation = null; - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisActionTranslation analysisActionTranslation = entityManager.find(AnalysisActionTranslation.class, translationId); - - if ( analysisActionTranslation == null ) return Response.status(Status.NOT_FOUND).build(); - // parse JSON data - try { - updatedTranslation = mapper.readValue(jsonData, AnalysisActionTranslation.class); - } catch (IOException e) { - return Response.status(Status.BAD_REQUEST).build(); - } - if ( updatedTranslation == null ) return Response.notModified().build(); - - // update action translation - if ( updatedTranslation.getName() != null ) analysisActionTranslation.setName(updatedTranslation.getName()); - analysisActionTranslation.setShortDescription(updatedTranslation.getShortDescription()); - analysisActionTranslation.setComment(updatedTranslation.getComment()); - analysisActionTranslation.setTranscript(updatedTranslation.getTranscript()); - - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.merge(analysisActionTranslation); - entityManager.persist(analysisActionTranslation); - entityTransaction.commit(); - entityManager.refresh(analysisActionTranslation); - - // add log entry - // UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), UserLogManager.LogEvents.ANALYSISACTIONEDITED); - - // send notification action - NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), "edit-action", analysisActionTranslation.getAnalysisAction().getId(), analysisActionTranslation); - - return Response.ok().entity(analysisActionTranslation).build(); - } - - @DELETE + @Secured + @Path("{id}") + public Response getAnalysisList(@PathParam("id") Integer id) { + // System.out.println("EndpointAnalysisList: getAnalysisList - ID: "+ id); + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + MediumAnalysisList mediumAnalysisList = entityManager.find(MediumAnalysisList.class, id); + + return Response.ok().entity(mediumAnalysisList).build(); + } + + @PATCH @Produces(MediaType.APPLICATION_JSON) - @Path("action/translation/{translationId}") - @Secured - public Response deleteAnalysisActionTranslation(@PathParam("translationId") int translationId) { + @Consumes(MediaType.APPLICATION_JSON) + @Path("{id}") + @Secured + public Response updateAnalysisList(@PathParam("id") int mediumAnalysisListId, String jsonData, @QueryParam("authToken") String authToken) { + + // System.out.println("EndpointAnalysisList: updateAnalysisList "+ jsonData); + + // verify auth token + int userId = 0; + if (AuthenticationFilter.isTokenValid(authToken)) { + userId = AuthenticationFilter.getTokenClaimUserId(authToken); + } + else { + return Response.status(Status.UNAUTHORIZED).build(); + } + // check for permission level + if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, mediumAnalysisListId) < 2) { + return Response.status(Status.FORBIDDEN).build(); + } + + ObjectMapper mapper = new ObjectMapper(); + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + MediumAnalysisList updatedList = null; + MediumAnalysisList mediumAnalysisList = entityManager.find(MediumAnalysisList.class, mediumAnalysisListId); + if (mediumAnalysisList == null) { + return Response.status(Status.NOT_FOUND).build(); + } - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisActionTranslation analysisActionTranslation = entityManager.find(AnalysisActionTranslation.class, translationId); + // parse JSON data + try { + mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); + updatedList = mapper.readValue(jsonData, MediumAnalysisList.class); + } catch (IOException e) { + e.printStackTrace(); + return Response.status(Status.BAD_REQUEST).build(); + } + if (updatedList == null) { + return Response.notModified().build(); + } - if ( analysisActionTranslation == null ) return Response.status(Status.NOT_FOUND).build(); + // update analysisList + if (updatedList.getMediumAnalysisListTranslations() != null) { + for (MediumAnalysisListTranslation trans : updatedList.getMediumAnalysisListTranslations()) { + mediumAnalysisList.setTitle(trans.getTitle(), trans.getLanguage().getCode()); + mediumAnalysisList.setText(trans.getText(), trans.getLanguage().getCode()); + } + } + List<CategorySet> oldCategorySets = mediumAnalysisList.getCategorySets(); + mediumAnalysisList.setCategorySets(updatedList.getCategorySets()); + List<Tag> oldTags = mediumAnalysisList.getTags(); + mediumAnalysisList.setTags(updatedList.getTags()); + mediumAnalysisList.setGlobalPermission(updatedList.getGlobalPermission()); + if (updatedList.getUuid() == null) { + mediumAnalysisList.setUuid( + UUID.randomUUID().toString()); // update entries that existed before uuid became a string + } - AnalysisAction analysisAction = analysisActionTranslation.getAnalysisAction(); - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - entityManager.remove(analysisActionTranslation); - entityTransaction.commit(); - entityManager.refresh(analysisAction); + if (containerRequestContext.getProperty("TIMAAT.userID") != null) { + mediumAnalysisList.setLastEditedByUserAccount( + (entityManager.find(UserAccount.class, containerRequestContext.getProperty("TIMAAT.userID")))); + } + else { + // DEBUG do nothing - production system should abort with internal server error + return Response.serverError().build(); + } + mediumAnalysisList.setLastEditedAt(new Timestamp(System.currentTimeMillis())); + + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.merge(mediumAnalysisList); + entityManager.persist(mediumAnalysisList); + entityTransaction.commit(); + entityManager.refresh(mediumAnalysisList); + for (CategorySet categorySet : mediumAnalysisList.getCategorySets()) { + entityManager.refresh(categorySet); + } + for (CategorySet categorySet : oldCategorySets) { + entityManager.refresh(categorySet); + } + for (Tag tag : mediumAnalysisList.getTags()) { + entityManager.refresh(tag); + } + for (Tag tag : oldTags) { + entityManager.refresh(tag); + } - // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), UserLogManager.LogEvents.ANALYSISACTIONDELETED); - // send notification action - NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), "remove-action", analysisAction.getId(), analysisActionTranslation); + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.ANALYSISLISTEDITED); - return Response.ok().build(); - } + return Response.ok().entity(mediumAnalysisList).build(); + } - @POST - @Produces(MediaType.APPLICATION_JSON) - @Path("{analysisListId}/categorySet/{categorySetId}") - @Secured - public Response addExistingCategorySet(@PathParam("analysisListId") int mediumAnalysisListId, - @PathParam("categorySetId") int categorySetId, - @QueryParam("authToken") String authToken) { - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - MediumAnalysisList mediumAnalysisList = entityManager.find(MediumAnalysisList.class, mediumAnalysisListId); - if ( mediumAnalysisList == null ) return Response.status(Status.NOT_FOUND).build(); - CategorySet categorySet = entityManager.find(CategorySet.class, categorySetId); - if ( categorySet == null ) return Response.status(Status.NOT_FOUND).build(); - - // verify auth token - int userId = 0; - if (AuthenticationFilter.isTokenValid(authToken)) { - userId = AuthenticationFilter.getTokenClaimUserId(authToken); - } else { - return Response.status(Status.UNAUTHORIZED).build(); - } - // check for permission level - if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, mediumAnalysisListId) < 2) { - return Response.status(Status.FORBIDDEN).build(); - } - - // attach categorySet to annotation and vice versa - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - mediumAnalysisList.getCategorySets().add(categorySet); - categorySet.getMediumAnalysisLists().add(mediumAnalysisList); - entityManager.merge(categorySet); - entityManager.merge(mediumAnalysisList); - entityManager.persist(mediumAnalysisList); - entityManager.persist(categorySet); - entityTransaction.commit(); - entityManager.refresh(mediumAnalysisList); - - return Response.ok().entity(categorySet).build(); - } - - @POST - @Produces(MediaType.APPLICATION_JSON) - @Path("segment/{segmentId}/category/{categoryId}") - @Secured - public Response addExistingCategoryToSegment(@PathParam("segmentId") int segmentId, - @PathParam("categoryId") int categoryId, - @QueryParam("authToken") String authToken) { - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisSegment analysisSegment = entityManager.find(AnalysisSegment.class, segmentId); - if ( analysisSegment == null ) return Response.status(Status.NOT_FOUND).build(); - Category category = entityManager.find(Category.class, categoryId); - if ( category == null ) return Response.status(Status.NOT_FOUND).build(); - - // verify auth token - int userId = 0; - if (AuthenticationFilter.isTokenValid(authToken)) { - userId = AuthenticationFilter.getTokenClaimUserId(authToken); - } else { - return Response.status(Status.UNAUTHORIZED).build(); - } - // check for permission level - if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, analysisSegment.getMediumAnalysisList().getId()) < 2) { - return Response.status(Status.FORBIDDEN).build(); - } - - // attach categorySet to annotation and vice versa - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - analysisSegment.getCategories().add(category); - category.getAnalysisSegments().add(analysisSegment); - entityManager.merge(category); - entityManager.merge(analysisSegment); - entityManager.persist(analysisSegment); - entityManager.persist(category); - entityTransaction.commit(); - entityManager.refresh(analysisSegment); - - return Response.ok().entity(category).build(); - } - - @POST + @DELETE @Produces(MediaType.APPLICATION_JSON) - @Path("sequence/{sequenceId}/category/{categoryId}") - @Secured - public Response addExistingCategoryToSequence(@PathParam("sequenceId") int sequenceId, - @PathParam("categoryId") int categoryId, - @QueryParam("authToken") String authToken) { - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisSequence analysisSequence = entityManager.find(AnalysisSequence.class, sequenceId); - if ( analysisSequence == null ) return Response.status(Status.NOT_FOUND).build(); - Category category = entityManager.find(Category.class, categoryId); - if ( category == null ) return Response.status(Status.NOT_FOUND).build(); - - // verify auth token - int userId = 0; - if (AuthenticationFilter.isTokenValid(authToken)) { - userId = AuthenticationFilter.getTokenClaimUserId(authToken); - } else { - return Response.status(Status.UNAUTHORIZED).build(); - } - // check for permission level - if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, analysisSequence.getAnalysisSegment().getMediumAnalysisList().getId()) < 2) { - return Response.status(Status.FORBIDDEN).build(); - } - - // attach categorySet to annotation and vice versa - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - analysisSequence.getCategories().add(category); - category.getAnalysisSequences().add(analysisSequence); - entityManager.merge(category); - entityManager.merge(analysisSequence); - entityManager.persist(analysisSequence); - entityManager.persist(category); - entityTransaction.commit(); - entityManager.refresh(analysisSequence); - - return Response.ok().entity(category).build(); - } - - @POST + @Path("{id}") + @Secured + public Response deleteAnalysisList(@PathParam("id") int mediumAnalysisListId, @QueryParam("authToken") String authToken) { + + // verify auth token + int userId = 0; + if (AuthenticationFilter.isTokenValid(authToken)) { + userId = AuthenticationFilter.getTokenClaimUserId(authToken); + } + else { + return Response.status(Status.UNAUTHORIZED).build(); + } + // check for permission level + if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, mediumAnalysisListId) < 4) { + return Response.status(Status.FORBIDDEN).build(); + } + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + MediumAnalysisList mediumAnalysisList = entityManager.find(MediumAnalysisList.class, mediumAnalysisListId); + if (mediumAnalysisList == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + // remove all associated annotations + for (Annotation anno : mediumAnalysisList.getAnnotations()) { + entityManager.remove(anno); + } + mediumAnalysisList.getAnnotations().clear(); + // remove all associated segments + for (AnalysisSegment segment : mediumAnalysisList.getAnalysisSegments()) { + entityManager.remove(segment); + } + mediumAnalysisList.getAnalysisSegments().clear(); + entityManager.remove(mediumAnalysisList); + entityTransaction.commit(); + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.ANALYSISLISTDELETED); + + return Response.ok().build(); + } + + @POST @Produces(MediaType.APPLICATION_JSON) - @Path("take/{takeId}/category/{categoryId}") - @Secured - public Response addExistingCategoryToTake(@PathParam("takeId") int takeId, - @PathParam("categoryId") int categoryId, - @QueryParam("authToken") String authToken) { - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisTake analysisTake = entityManager.find(AnalysisTake.class, takeId); - if ( analysisTake == null ) return Response.status(Status.NOT_FOUND).build(); - Category category = entityManager.find(Category.class, categoryId); - if ( category == null ) return Response.status(Status.NOT_FOUND).build(); - - // verify auth token - int userId = 0; - if (AuthenticationFilter.isTokenValid(authToken)) { - userId = AuthenticationFilter.getTokenClaimUserId(authToken); - } else { - return Response.status(Status.UNAUTHORIZED).build(); - } - // check for permission level - if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, analysisTake.getAnalysisSequence().getAnalysisSegment().getMediumAnalysisList().getId()) < 2) { - return Response.status(Status.FORBIDDEN).build(); - } - - // attach categorySet to annotation and vice versa - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - analysisTake.getCategories().add(category); - category.getAnalysisTakes().add(analysisTake); - entityManager.merge(category); - entityManager.merge(analysisTake); - entityManager.persist(analysisTake); - entityManager.persist(category); - entityTransaction.commit(); - entityManager.refresh(analysisTake); - - return Response.ok().entity(category).build(); - } - - @POST + @Path("{analysisListId}/userAccount/{userAccountId}/withPermission/{permissionId}") + @Secured + public Response addUserAccountHasMediumAnalysisListWithPermission(@PathParam("analysisListId") int mediumAnalysisListId, @PathParam("userAccountId") int userAccountId, @PathParam("permissionId") int permissionTypeId, @QueryParam("authToken") String authToken) { + // System.out.println("EndpointMediumAnalysisList: addUserAccountHasMediumAnalysisListWithPermission"); + + // verify auth token + int userId = 0; + if (AuthenticationFilter.isTokenValid(authToken)) { + userId = AuthenticationFilter.getTokenClaimUserId(authToken); + } + else { + return Response.status(Status.UNAUTHORIZED).build(); + } + // check for permission level + // only users with administrate permission level may add users with moderate or administrate permission + int permissionLevel = EndpointUserAccount.getPermissionLevelForAnalysisList(userId, mediumAnalysisListId); + // IF user is not sys admin AND ( + // user is without high enough permission level to set others to moderate or administrate + // OR user is without high enough permission level to set any permission levels) + if ((userId != 1) && ((permissionLevel != 4 && (permissionTypeId == 3 || permissionTypeId == 4)) || (permissionLevel != 3 && permissionLevel != 4))) { + return Response.status(Status.FORBIDDEN).build(); + } // else user has permission for requested change + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + MediumAnalysisList mediumAnalysisList = entityManager.find(MediumAnalysisList.class, mediumAnalysisListId); + if (mediumAnalysisList == null) { + return Response.status(Status.NOT_FOUND).build(); + } + UserAccount userAccount = entityManager.find(UserAccount.class, userAccountId); + if (userAccount == null) { + return Response.status(Status.NOT_FOUND).build(); + } + PermissionType permissionType = entityManager.find(PermissionType.class, permissionTypeId); + if (permissionType == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + UserAccountHasMediumAnalysisList uahmal = null; + try { + Query countQuery = entityManager.createQuery( + "SELECT COUNT(uahmal) FROM UserAccountHasMediumAnalysisList uahmal WHERE uahmal.mediumAnalysisList=:mediumAnalysisList AND uahmal.userAccount=:userAccount") + .setParameter("mediumAnalysisList", mediumAnalysisList) + .setParameter("userAccount", userAccount); + // .setParameter("permissionType", permissionType); + long recordsTotal = (long) countQuery.getSingleResult(); + if (recordsTotal >= 1) { + return Response.status(Status.FORBIDDEN).build(); // an entry already exists, do not create a new one + // uahmal = (UserAccountHasMediumAnalysisList) entityManager.createQuery( + // "SELECT uahmal FROM UserAccountHasMediumAnalysisList uahmal WHERE uahmal.mediumAnalysisList=:mediumAnalysisList AND uahmal.userAccount=:userAccount") + // .setParameter("mediumAnalysisList", mediumAnalysisList) + // .setParameter("userAccount", userAccount) + // // .setParameter("permissionType", permissionType) + // .getSingleResult(); + } + } catch (Exception e) { + e.printStackTrace(); + // doesn't matter + } + if (uahmal == null) { + // System.out.println("EndpointMediumAnalysisList: UserAccountHasMediumAnalysisList - create new entry"); + uahmal = new UserAccountHasMediumAnalysisList(); + uahmal.setMediumAnalysisList(mediumAnalysisList); + uahmal.setUserAccount(userAccount); + uahmal.setPermissionType(permissionType); + try { + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.persist(uahmal); + entityTransaction.commit(); + entityManager.refresh(mediumAnalysisList); + entityManager.refresh(userAccount); + entityManager.refresh(permissionType); + entityManager.refresh(uahmal); + } catch (Exception e) { + e.printStackTrace(); + return Response.notModified().build(); + } + } + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.ANALYSISLISTEDITED); + + return Response.ok().entity(uahmal).build(); + } + + @PATCH @Produces(MediaType.APPLICATION_JSON) - @Path("scene/{sceneId}/category/{categoryId}") - @Secured - public Response addExistingCategoryToScene(@PathParam("sceneId") int sceneId, - @PathParam("categoryId") int categoryId, - @QueryParam("authToken") String authToken) { - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisScene analysisScene = entityManager.find(AnalysisScene.class, sceneId); - if ( analysisScene == null ) return Response.status(Status.NOT_FOUND).build(); - Category category = entityManager.find(Category.class, categoryId); - if ( category == null ) return Response.status(Status.NOT_FOUND).build(); - - // verify auth token - int userId = 0; - if (AuthenticationFilter.isTokenValid(authToken)) { - userId = AuthenticationFilter.getTokenClaimUserId(authToken); - } else { - return Response.status(Status.UNAUTHORIZED).build(); - } - // check for permission level - if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, analysisScene.getAnalysisSegment().getMediumAnalysisList().getId()) < 2) { - return Response.status(Status.FORBIDDEN).build(); - } - - // attach categorySet to annotation and vice versa - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - analysisScene.getCategories().add(category); - category.getAnalysisScenes().add(analysisScene); - entityManager.merge(category); - entityManager.merge(analysisScene); - entityManager.persist(analysisScene); - entityManager.persist(category); - entityTransaction.commit(); - entityManager.refresh(analysisScene); - - return Response.ok().entity(category).build(); - } - - @POST + @Path("{analysisListId}/userAccount/{userAccountId}/withPermission/{permissionId}") + @Secured + public Response updateUserAccountHasMediumAnalysisListWithPermission(@PathParam("analysisListId") int mediumAnalysisListId, @PathParam("userAccountId") int userAccountId, @PathParam("permissionId") int permissionTypeId, @QueryParam("authToken") String authToken) { + // System.out.println("EndpointMediumAnalysisList: updateUserAccountHasMediumAnalysisListWithPermission"); + + // verify auth token + int userId = 0; + if (AuthenticationFilter.isTokenValid(authToken)) { + userId = AuthenticationFilter.getTokenClaimUserId(authToken); + } + else { + return Response.status(Status.UNAUTHORIZED).build(); + } + // check for permission level + // only users with administrate permission level may add users with moderate or administrate permission + int permissionLevel = EndpointUserAccount.getPermissionLevelForAnalysisList(userId, mediumAnalysisListId); + // IF user is not sys admin AND ( + // user is without high enough permission level to set others to moderate or administrate + // OR user is without high enough permission level to set any permission levels) + if ((userId != 1) && ((permissionLevel != 4 && (permissionTypeId == 3 || permissionTypeId == 4)) || (permissionLevel != 3 && permissionLevel != 4))) { + return Response.status(Status.FORBIDDEN).build(); + } // else user has permission for requested change + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + MediumAnalysisList mediumAnalysisList = entityManager.find(MediumAnalysisList.class, mediumAnalysisListId); + if (mediumAnalysisList == null) { + return Response.status(Status.NOT_FOUND).build(); + } + UserAccount userAccount = entityManager.find(UserAccount.class, userAccountId); + if (userAccount == null) { + return Response.status(Status.NOT_FOUND).build(); + } + PermissionType permissionType = entityManager.find(PermissionType.class, permissionTypeId); + if (permissionType == null) { + return Response.status(Status.NOT_FOUND).build(); + } + UserAccountHasMediumAnalysisList uahmalKey = new UserAccountHasMediumAnalysisList(userAccount, mediumAnalysisList); + UserAccountHasMediumAnalysisList uahmal = entityManager.find(UserAccountHasMediumAnalysisList.class, + uahmalKey.getId()); + + uahmal.setPermissionType(permissionType); + + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.merge(uahmal); + entityManager.persist(uahmal); + entityTransaction.commit(); + entityManager.refresh(uahmal); + + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.ANALYSISLISTEDITED); + + return Response.ok().entity(uahmal).build(); + } + + @DELETE @Produces(MediaType.APPLICATION_JSON) - @Path("action/{actionId}/category/{categoryId}") - @Secured - public Response addExistingCategoryToAction(@PathParam("actionId") int actionId, - @PathParam("categoryId") int categoryId, - @QueryParam("authToken") String authToken) { - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisAction analysisAction = entityManager.find(AnalysisAction.class, actionId); - if ( analysisAction == null ) return Response.status(Status.NOT_FOUND).build(); - Category category = entityManager.find(Category.class, categoryId); - if ( category == null ) return Response.status(Status.NOT_FOUND).build(); - - // verify auth token - int userId = 0; - if (AuthenticationFilter.isTokenValid(authToken)) { - userId = AuthenticationFilter.getTokenClaimUserId(authToken); - } else { - return Response.status(Status.UNAUTHORIZED).build(); - } - // check for permission level - if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, analysisAction.getAnalysisScene().getAnalysisSegment().getMediumAnalysisList().getId()) < 2) { - return Response.status(Status.FORBIDDEN).build(); - } - - - // attach categorySet to annotation and vice versa - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - analysisAction.getCategories().add(category); - category.getAnalysisActions().add(analysisAction); - entityManager.merge(category); - entityManager.merge(analysisAction); - entityManager.persist(analysisAction); - entityManager.persist(category); - entityTransaction.commit(); - entityManager.refresh(analysisAction); - - return Response.ok().entity(category).build(); - } + @Path("{analysisListId}/userAccount/{userAccountId}") + @Secured + public Response deleteUserAccountHasMediumAnalysisListWithPermission(@PathParam("analysisListId") int mediumAnalysisListId, @PathParam("userAccountId") int userAccountId, @QueryParam("authToken") String authToken) { + // verify auth token + int userId = 0; + if (AuthenticationFilter.isTokenValid(authToken)) { + userId = AuthenticationFilter.getTokenClaimUserId(authToken); + } + else { + return Response.status(Status.UNAUTHORIZED).build(); + } - @PUT + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + UserAccountHasMediumAnalysisList userToBeRemoved = null; + try { + userToBeRemoved = (UserAccountHasMediumAnalysisList) entityManager.createQuery( + "SELECT uahmal FROM UserAccountHasMediumAnalysisList uahmal WHERE uahmal.mediumAnalysisList.id=:mediumAnalysisListId AND uahmal.userAccount.id=:userAccountId") + .setParameter("mediumAnalysisListId", + mediumAnalysisListId) + .setParameter("userAccountId", userAccountId) + .getSingleResult(); + } catch (NoResultException nre) { + nre.printStackTrace(); + return Response.status(Status.NOT_FOUND).build(); + } + // check for permission level + // only users with administrate permission level may add users with moderate or administrate permission + int permissionLevel = EndpointUserAccount.getPermissionLevelForAnalysisList(userId, mediumAnalysisListId); + // IF user is not sys admin AND ( + // user is without high enough permission level to set others to moderate or administrate + // OR user is without high enough permission level to set any permission levels) + if ((userId != 1) && ((permissionLevel != 4 && (userToBeRemoved.getPermissionType() + .getId() == 3 || userToBeRemoved.getPermissionType() + .getId() == 4)) || (permissionLevel != 3 && permissionLevel != 4))) { + return Response.status(Status.FORBIDDEN).build(); + } // else user has permission for requested change + + MediumAnalysisList mediumAnalysisList = entityManager.find(MediumAnalysisList.class, mediumAnalysisListId); + if (mediumAnalysisList == null) { + return Response.status(Status.NOT_FOUND).build(); + } + UserAccount userAccount = entityManager.find(UserAccount.class, userAccountId); + if (userAccount == null) { + return Response.status(Status.NOT_FOUND).build(); + } + UserAccountHasMediumAnalysisList uahmalKey = new UserAccountHasMediumAnalysisList(userAccount, mediumAnalysisList); + UserAccountHasMediumAnalysisList uahmal = entityManager.find(UserAccountHasMediumAnalysisList.class, + uahmalKey.getId()); + + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.remove(uahmal); + entityTransaction.commit(); + entityManager.refresh(mediumAnalysisList); + entityManager.refresh(userAccount); + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.ANALYSISLISTEDITED); + + return Response.ok().build(); + } + + @POST @Produces(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON) - @Path("{analysisListId}/categorySets") @Secured - public List<CategorySet> updateCategorySets(@PathParam("analysisListId") int analysisListId, UpdateAnalysisListCategorySetsPayload updateAnalysisListCategorySetsPayload) throws DbTransactionExecutionException { - verifyAuthorizationToAnalysisList(analysisListId, de.bitgilde.TIMAAT.rest.security.authorization.PermissionType.WRITE); - return analysisListStorage.updateCategorySets(analysisListId, updateAnalysisListCategorySetsPayload.getCategorySetIds()); + @Path("{analysisListId}/segment") + public Response createAnalysisSegment(@PathParam("analysisListId") int mediumAnalysisListId, String jsonData, @QueryParam("authToken") String authToken) { + + // System.out.println("createAnalysisSegment - jsonData: "+ jsonData); + // verify auth token + int userId = 0; + if (AuthenticationFilter.isTokenValid(authToken)) { + userId = AuthenticationFilter.getTokenClaimUserId(authToken); + } + else { + return Response.status(Status.UNAUTHORIZED).build(); + } + // check for permission level + if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, mediumAnalysisListId) < 2) { + return Response.status(Status.FORBIDDEN).build(); + } + + ObjectMapper mapper = new ObjectMapper(); + AnalysisSegment analysisSegment = null; + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + MediumAnalysisList mediumAnalysisList = entityManager.find(MediumAnalysisList.class, mediumAnalysisListId); + if (mediumAnalysisList == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + // parse JSON data + try { + analysisSegment = mapper.readValue(jsonData, AnalysisSegment.class); + } catch (IOException e) { + e.printStackTrace(); + return Response.status(Status.BAD_REQUEST).build(); + } + if (analysisSegment == null) { + return Response.status(Status.BAD_REQUEST).build(); + } + + // sanitize object data + analysisSegment.setId(0); + mediumAnalysisList.addAnalysisSegment(analysisSegment); + analysisSegment.getAnalysisSegmentTranslations().get(0).setId(0); + analysisSegment.getAnalysisSegmentTranslations().get(0).setAnalysisSegment(analysisSegment); + analysisSegment.getAnalysisSegmentTranslations().get(0).setLanguage(entityManager.find(Language.class, 1)); + + // persist analysisSegment and list + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.persist(analysisSegment.getAnalysisSegmentTranslations().get(0)); + entityManager.persist(analysisSegment); + entityManager.flush(); + analysisSegment.setMediumAnalysisList(mediumAnalysisList); + entityManager.persist(mediumAnalysisList); + entityTransaction.commit(); + entityManager.refresh(analysisSegment); + entityManager.refresh(mediumAnalysisList); + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.ANALYSISSEGMENTCREATED); + + // send notification action + NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), + "addSegment", analysisSegment.getMediumAnalysisList().getId(), analysisSegment); + + return Response.ok().entity(analysisSegment).build(); } + @PATCH + @Produces(MediaType.APPLICATION_JSON) + @Consumes(MediaType.APPLICATION_JSON) + @Path("segment/{id}") + @Secured + public Response updateAnalysisSegment(@PathParam("id") int segmentId, String jsonData, @QueryParam("authToken") String authToken) { + // System.out.println("EndpointAnalysisList: updateAnalysisSegment "+ jsonData); + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + AnalysisSegment analysisSegment = entityManager.find(AnalysisSegment.class, segmentId); + if (analysisSegment == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + // verify auth token + int userId = 0; + if (AuthenticationFilter.isTokenValid(authToken)) { + userId = AuthenticationFilter.getTokenClaimUserId(authToken); + } + else { + return Response.status(Status.UNAUTHORIZED).build(); + } + // check for permission level + if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, + analysisSegment.getMediumAnalysisList().getId()) < 2) { + return Response.status(Status.FORBIDDEN).build(); + } + + ObjectMapper mapper = new ObjectMapper(); + AnalysisSegment updatedSegment = null; + + // parse JSON data + try { + updatedSegment = mapper.readValue(jsonData, AnalysisSegment.class); + } catch (IOException e) { + return Response.status(Status.BAD_REQUEST).build(); + } + if (updatedSegment == null) { + return Response.notModified().build(); + } + + // update segment + if (updatedSegment.getAnalysisSegmentTranslations().get(0).getName() != null) { + analysisSegment.getAnalysisSegmentTranslations().get(0) + .setName(updatedSegment.getAnalysisSegmentTranslations().get(0).getName()); + } + if (updatedSegment.getAnalysisSegmentTranslations().get(0).getShortDescription() != null) { + analysisSegment.getAnalysisSegmentTranslations().get(0) + .setShortDescription(updatedSegment.getAnalysisSegmentTranslations().get(0).getShortDescription()); + } + if (updatedSegment.getAnalysisSegmentTranslations().get(0).getComment() != null) { + analysisSegment.getAnalysisSegmentTranslations().get(0) + .setComment(updatedSegment.getAnalysisSegmentTranslations().get(0).getComment()); + } + if (updatedSegment.getAnalysisSegmentTranslations().get(0).getTranscript() != null) { + analysisSegment.getAnalysisSegmentTranslations().get(0) + .setTranscript(updatedSegment.getAnalysisSegmentTranslations().get(0).getTranscript()); + } + analysisSegment.setStartTime(updatedSegment.getStartTime()); + analysisSegment.setEndTime(updatedSegment.getEndTime()); + analysisSegment.setCategories(updatedSegment.getCategories()); + + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.merge(analysisSegment); + entityManager.persist(analysisSegment); + entityTransaction.commit(); + entityManager.refresh(analysisSegment); + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.ANALYSISSEGMENTEDITED); + // send notification action + NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), + "editSegment", analysisSegment.getMediumAnalysisList().getId(), analysisSegment); + + return Response.ok().entity(analysisSegment).build(); + } @DELETE @Produces(MediaType.APPLICATION_JSON) - @Path("{analysisListId}/categorySet/{categorySetId}") - @Secured - public Response removeCategorySet(@PathParam("analysisListId") int mediumAnalysisListId, - @PathParam("categorySetId") int categorySetId, - @QueryParam("authToken") String authToken) { - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - MediumAnalysisList mediumAnalysisList = entityManager.find(MediumAnalysisList.class, mediumAnalysisListId); - if ( mediumAnalysisList == null ) return Response.status(Status.NOT_FOUND).build(); - CategorySet categorySet = entityManager.find(CategorySet.class, categorySetId); - if ( categorySet == null ) return Response.status(Status.NOT_FOUND).build(); - - // verify auth token - int userId = 0; - if (AuthenticationFilter.isTokenValid(authToken)) { - userId = AuthenticationFilter.getTokenClaimUserId(authToken); - } else { - return Response.status(Status.UNAUTHORIZED).build(); - } - // check for permission level - if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, mediumAnalysisListId) < 2) { - return Response.status(Status.FORBIDDEN).build(); - } - - // delete categories of matching categorySets from annotations and segment structure elements - List<Category> categoryList = new ArrayList<>(); - Set<CategorySetHasCategory> cshc = categorySet.getCategorySetHasCategories(); - Iterator<CategorySetHasCategory> itr = cshc.iterator(); - EntityTransaction entityTransaction = entityManager.getTransaction(); - - // fill categoryList will all categories of the category set that will be deleted - while (itr.hasNext()) { - categoryList.add(itr.next().getCategory()); - } - - // remove categories from removed category set from all associated annotations of the analysis list the category set is removed from - for (Annotation annotation : mediumAnalysisList.getAnnotations()) { - List<Category> annotationCategoryList = annotation.getCategories(); - List<Category> categoriesToRemove = categoryList.stream() - .distinct() - .filter(annotationCategoryList::contains) - .collect(Collectors.toList()); - entityTransaction.begin(); - for (Category category : categoriesToRemove) { - annotation.getCategories().remove(category); - } - entityManager.merge(annotation); - entityManager.persist(annotation); - entityTransaction.commit(); - entityManager.refresh(annotation); - } - - // remove categories from removed category set from all associated segments of the analysis list the category set is removed from - for (AnalysisSegment analysisSegment : mediumAnalysisList.getAnalysisSegments()) { - List<Category> analysisSegmentCategoryList = analysisSegment.getCategories(); - List<Category> segmentCategoriesToRemove = categoryList.stream() - .distinct() - .filter(analysisSegmentCategoryList::contains) - .collect(Collectors.toList()); - entityTransaction.begin(); - for (Category category : segmentCategoriesToRemove) { - analysisSegment.getCategories().remove(category); - } - entityManager.merge(analysisSegment); - entityManager.persist(analysisSegment); - entityTransaction.commit(); - entityManager.refresh(analysisSegment); - - // remove categories from removed category set from all associated sequences of the analysis list the category set is removed from - for (AnalysisSequence analysisSequence : analysisSegment.getAnalysisSequences()) { - List<Category> analysisSequenceCategoryList = analysisSequence.getCategories(); - List<Category> sequenceCategoriesToRemove = categoryList.stream() - .distinct() - .filter(analysisSequenceCategoryList::contains) - .collect(Collectors.toList()); - entityTransaction.begin(); - for (Category category : sequenceCategoriesToRemove) { - analysisSequence.getCategories().remove(category); - } - entityManager.merge(analysisSequence); - entityManager.persist(analysisSequence); - entityTransaction.commit(); - entityManager.refresh(analysisSequence); - - // remove categories from removed category set from all associated takes of the analysis list the category set is removed from - for (AnalysisTake analysisTake : analysisSequence.getAnalysisTakes()) { - List<Category> analysisTakeCategoryList = analysisTake.getCategories(); - List<Category> takeCategoriesToRemove = categoryList.stream() - .distinct() - .filter(analysisTakeCategoryList::contains) - .collect(Collectors.toList()); - entityTransaction.begin(); - for (Category category : takeCategoriesToRemove) { - analysisTake.getCategories().remove(category); - } - entityManager.merge(analysisTake); - entityManager.persist(analysisTake); - entityTransaction.commit(); - entityManager.refresh(analysisTake); - } - } - - // remove categories from removed category set from all associated scenes of the analysis list the category set is removed from - for (AnalysisScene analysisScene : analysisSegment.getAnalysisScenes()) { - List<Category> analysisSceneCategoryList = analysisScene.getCategories(); - List<Category> sceneCategoriesToRemove = categoryList.stream() - .distinct() - .filter(analysisSceneCategoryList::contains) - .collect(Collectors.toList()); - entityTransaction.begin(); - for (Category category : sceneCategoriesToRemove) { - analysisScene.getCategories().remove(category); - } - entityManager.merge(analysisScene); - entityManager.persist(analysisScene); - entityTransaction.commit(); - entityManager.refresh(analysisScene); - - // remove categories from removed category set from all associated actions of the analysis list the category set is removed from - for (AnalysisAction analysisAction : analysisScene.getAnalysisActions()) { - List<Category> analysisActionCategoryList = analysisAction.getCategories(); - List<Category> actionCategoriesToRemove = categoryList.stream() - .distinct() - .filter(analysisActionCategoryList::contains) - .collect(Collectors.toList()); - entityTransaction.begin(); - for (Category category : actionCategoriesToRemove) { - analysisAction.getCategories().remove(category); - } - entityManager.merge(analysisAction); - entityManager.persist(analysisAction); - entityTransaction.commit(); - entityManager.refresh(analysisAction); - } - } - } - - - - // attach categorySet to annotation and vice versa - entityTransaction.begin(); - mediumAnalysisList.getCategorySets().remove(categorySet); - categorySet.getMediumAnalysisLists().remove(mediumAnalysisList); - entityManager.merge(categorySet); - entityManager.merge(mediumAnalysisList); - entityManager.persist(mediumAnalysisList); - entityManager.persist(categorySet); - entityTransaction.commit(); - entityManager.refresh(mediumAnalysisList); - - return Response.ok().build(); - } - - @DELETE - @Produces(MediaType.APPLICATION_JSON) - @Path("segment/{segmentId}/category/{categoryId}") - @Secured - public Response removeSegmentCategory(@PathParam("segmentId") int segmentId, - @PathParam("categoryId") int categoryId, - @QueryParam("authToken") String authToken) { - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisSegment analysisSegment = entityManager.find(AnalysisSegment.class, segmentId); - if ( analysisSegment == null ) return Response.status(Status.NOT_FOUND).build(); - Category category = entityManager.find(Category.class, categoryId); - if ( category == null ) return Response.status(Status.NOT_FOUND).build(); - - // verify auth token - int userId = 0; - if (AuthenticationFilter.isTokenValid(authToken)) { - userId = AuthenticationFilter.getTokenClaimUserId(authToken); - } else { - return Response.status(Status.UNAUTHORIZED).build(); - } - // check for permission level - if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, analysisSegment.getMediumAnalysisList().getId()) < 2) { - return Response.status(Status.FORBIDDEN).build(); - } - - // attach categorySet to annotation and vice versa - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - analysisSegment.getCategories().remove(category); - category.getAnalysisSegments().remove(analysisSegment); - entityManager.merge(category); - entityManager.merge(analysisSegment); - entityManager.persist(analysisSegment); - entityManager.persist(category); - entityTransaction.commit(); - entityManager.refresh(analysisSegment); - - return Response.ok().build(); - } - - @DELETE - @Produces(MediaType.APPLICATION_JSON) - @Path("sequence/{sequenceId}/category/{categoryId}") - @Secured - public Response removeSequenceCategory(@PathParam("sequenceId") int sequenceId, - @PathParam("categoryId") int categoryId, - @QueryParam("authToken") String authToken) { - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisSequence analysisSequence = entityManager.find(AnalysisSequence.class, sequenceId); - if ( analysisSequence == null ) return Response.status(Status.NOT_FOUND).build(); - Category category = entityManager.find(Category.class, categoryId); - if ( category == null ) return Response.status(Status.NOT_FOUND).build(); - - // verify auth token - int userId = 0; - if (AuthenticationFilter.isTokenValid(authToken)) { - userId = AuthenticationFilter.getTokenClaimUserId(authToken); - } else { - return Response.status(Status.UNAUTHORIZED).build(); - } - // check for permission level - if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, analysisSequence.getAnalysisSegment().getMediumAnalysisList().getId()) < 2) { - return Response.status(Status.FORBIDDEN).build(); - } - - // attach categorySet to annotation and vice versa - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - analysisSequence.getCategories().remove(category); - category.getAnalysisSequences().remove(analysisSequence); - entityManager.merge(category); - entityManager.merge(analysisSequence); - entityManager.persist(analysisSequence); - entityManager.persist(category); - entityTransaction.commit(); - entityManager.refresh(analysisSequence); - - return Response.ok().build(); - } - - @DELETE - @Produces(MediaType.APPLICATION_JSON) - @Path("take/{takeId}/category/{categoryId}") - @Secured - public Response removeTakeCategory(@PathParam("takeId") int takeId, - @PathParam("categoryId") int categoryId, - @QueryParam("authToken") String authToken) { - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisTake analysisTake = entityManager.find(AnalysisTake.class, takeId); - if ( analysisTake == null ) return Response.status(Status.NOT_FOUND).build(); - Category category = entityManager.find(Category.class, categoryId); - if ( category == null ) return Response.status(Status.NOT_FOUND).build(); - - // verify auth token - int userId = 0; - if (AuthenticationFilter.isTokenValid(authToken)) { - userId = AuthenticationFilter.getTokenClaimUserId(authToken); - } else { - return Response.status(Status.UNAUTHORIZED).build(); - } - // check for permission level - if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, analysisTake.getAnalysisSequence().getAnalysisSegment().getMediumAnalysisList().getId()) < 2) { - return Response.status(Status.FORBIDDEN).build(); - } - - // attach categorySet to annotation and vice versa - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - analysisTake.getCategories().remove(category); - category.getAnalysisTakes().remove(analysisTake); - entityManager.merge(category); - entityManager.merge(analysisTake); - entityManager.persist(analysisTake); - entityManager.persist(category); - entityTransaction.commit(); - entityManager.refresh(analysisTake); - - return Response.ok().build(); - } - - @DELETE - @Produces(MediaType.APPLICATION_JSON) - @Path("scene/{sceneId}/category/{categoryId}") - @Secured - public Response removeSceneCategory(@PathParam("sceneId") int sceneId, - @PathParam("categoryId") int categoryId, - @QueryParam("authToken") String authToken) { - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisScene analysisScene = entityManager.find(AnalysisScene.class, sceneId); - if ( analysisScene == null ) return Response.status(Status.NOT_FOUND).build(); - Category category = entityManager.find(Category.class, categoryId); - if ( category == null ) return Response.status(Status.NOT_FOUND).build(); - - // verify auth token - int userId = 0; - if (AuthenticationFilter.isTokenValid(authToken)) { - userId = AuthenticationFilter.getTokenClaimUserId(authToken); - } else { - return Response.status(Status.UNAUTHORIZED).build(); - } - // check for permission level - if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, analysisScene.getAnalysisSegment().getMediumAnalysisList().getId()) < 2) { - return Response.status(Status.FORBIDDEN).build(); - } - - // attach categorySet to annotation and vice versa - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - analysisScene.getCategories().remove(category); - category.getAnalysisScenes().remove(analysisScene); - entityManager.merge(category); - entityManager.merge(analysisScene); - entityManager.persist(analysisScene); - entityManager.persist(category); - entityTransaction.commit(); - entityManager.refresh(analysisScene); - - return Response.ok().build(); - } - - @DELETE + @Path("segment/{id}") + @Secured + public Response deleteAnalysisSegment(@PathParam("id") int segmentId, @QueryParam("authToken") String authToken) { + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + AnalysisSegment analysisSegment = entityManager.find(AnalysisSegment.class, segmentId); + if (analysisSegment == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + // verify auth token + int userId = 0; + if (AuthenticationFilter.isTokenValid(authToken)) { + userId = AuthenticationFilter.getTokenClaimUserId(authToken); + } + else { + return Response.status(Status.UNAUTHORIZED).build(); + } + // check for permission level + if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, + analysisSegment.getMediumAnalysisList().getId()) < 2) { + return Response.status(Status.FORBIDDEN).build(); + } + + MediumAnalysisList mediumAnalysisList = analysisSegment.getMediumAnalysisList(); + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.remove(analysisSegment); + entityTransaction.commit(); + entityManager.refresh(mediumAnalysisList); + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.ANALYSISSEGMENTDELETED); + + // send notification action + NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), + "removeSegment", mediumAnalysisList.getId(), analysisSegment); + + return Response.ok().build(); + } + + @POST @Produces(MediaType.APPLICATION_JSON) - @Path("action/{actionId}/category/{categoryId}") - @Secured - public Response removeActionCategory(@PathParam("actionId") int actionId, - @PathParam("categoryId") int categoryId, - @QueryParam("authToken") String authToken) { - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - AnalysisAction analysisAction = entityManager.find(AnalysisAction.class, actionId); - if ( analysisAction == null ) return Response.status(Status.NOT_FOUND).build(); - Category category = entityManager.find(Category.class, categoryId); - if ( category == null ) return Response.status(Status.NOT_FOUND).build(); - - // verify auth token - int userId = 0; - if (AuthenticationFilter.isTokenValid(authToken)) { - userId = AuthenticationFilter.getTokenClaimUserId(authToken); - } else { - return Response.status(Status.UNAUTHORIZED).build(); - } - // check for permission level - if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, analysisAction.getAnalysisScene().getAnalysisSegment().getMediumAnalysisList().getId()) < 2) { - return Response.status(Status.FORBIDDEN).build(); - } - - // attach categorySet to annotation and vice versa - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - analysisAction.getCategories().remove(category); - category.getAnalysisActions().remove(analysisAction); - entityManager.merge(category); - entityManager.merge(analysisAction); - entityManager.persist(analysisAction); - entityManager.persist(category); - entityTransaction.commit(); - entityManager.refresh(analysisAction); - - return Response.ok().build(); - } - - @POST + @Consumes(MediaType.APPLICATION_JSON) + @Secured + @Path("{segmentId}/sequence") + public Response createAnalysisSequence(@PathParam("segmentId") int segmentId, String jsonData, @QueryParam("authToken") String authToken) { + // System.out.println("EndpointAnalysisList: createAnalysisSequence - jsonData: "+ jsonData); + + ObjectMapper mapper = new ObjectMapper(); + AnalysisSequence analysisSequence = null; + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + AnalysisSegment analysisSegment = entityManager.find(AnalysisSegment.class, segmentId); + if (analysisSegment == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + // verify auth token + int userId = 0; + if (AuthenticationFilter.isTokenValid(authToken)) { + userId = AuthenticationFilter.getTokenClaimUserId(authToken); + } + else { + return Response.status(Status.UNAUTHORIZED).build(); + } + // check for permission level + if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, + analysisSegment.getMediumAnalysisList().getId()) < 2) { + return Response.status(Status.FORBIDDEN).build(); + } + + // parse JSON data + try { + analysisSequence = mapper.readValue(jsonData, AnalysisSequence.class); + } catch (IOException e) { + e.printStackTrace(); + return Response.status(Status.BAD_REQUEST).build(); + } + if (analysisSequence == null) { + return Response.status(Status.BAD_REQUEST).build(); + } + + // sanitize object data + analysisSequence.setId(0); + analysisSegment.addAnalysisSequence(analysisSequence); + analysisSequence.getAnalysisSequenceTranslations().get(0).setId(0); + analysisSequence.getAnalysisSequenceTranslations().get(0).setAnalysisSequence(analysisSequence); + analysisSequence.getAnalysisSequenceTranslations().get(0).setLanguage(entityManager.find(Language.class, 1)); + + + // persist analysisSequence and list + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.persist(analysisSequence); + entityManager.flush(); + analysisSequence.setAnalysisSegment(analysisSegment); + entityManager.persist(analysisSegment); + entityTransaction.commit(); + entityManager.refresh(analysisSequence); + entityManager.refresh(analysisSegment); + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.ANALYSISSEQUENCECREATED); + + // send notification action + NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), + "add-sequence", analysisSequence.getAnalysisSegment().getId(), analysisSequence); + + return Response.ok().entity(analysisSequence).build(); + } + + @PATCH @Produces(MediaType.APPLICATION_JSON) - @Path("{analysisListId}/tag/{tagId}") - @Secured - public Response addExistingTag(@PathParam("analysisListId") int analysisListId, - @PathParam("tagId") int tagId) { - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - MediumAnalysisList analysisList = entityManager.find(MediumAnalysisList.class, analysisListId); - if ( analysisList == null ) return Response.status(Status.NOT_FOUND).build(); - Tag tag = entityManager.find(Tag.class, tagId); - if ( tag == null ) return Response.status(Status.NOT_FOUND).build(); - - // attach tag to annotation and vice versa - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - analysisList.getTags().add(tag); - tag.getMediumAnalysisLists().add(analysisList); - entityManager.merge(tag); - entityManager.merge(analysisList); - entityManager.persist(analysisList); - entityManager.persist(tag); - entityTransaction.commit(); - entityManager.refresh(analysisList); - - return Response.ok().entity(tag).build(); - } - - @DELETE + @Consumes(MediaType.APPLICATION_JSON) + @Path("sequence/{id}") + @Secured + public Response updateAnalysisSequence(@PathParam("id") int sequenceId, String jsonData, @QueryParam("authToken") String authToken) { + // System.out.println("EndpointAnalysisList: updateAnalysisSegment "+ jsonData); + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + AnalysisSequence analysisSequence = entityManager.find(AnalysisSequence.class, sequenceId); + if (analysisSequence == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + // verify auth token + int userId = 0; + if (AuthenticationFilter.isTokenValid(authToken)) { + userId = AuthenticationFilter.getTokenClaimUserId(authToken); + } + else { + return Response.status(Status.UNAUTHORIZED).build(); + } + // check for permission level + if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, + analysisSequence.getAnalysisSegment().getMediumAnalysisList().getId()) < 2) { + return Response.status(Status.FORBIDDEN).build(); + } + + ObjectMapper mapper = new ObjectMapper(); + AnalysisSequence updatedSequence = null; + + // parse JSON data + try { + updatedSequence = mapper.readValue(jsonData, AnalysisSequence.class); + } catch (IOException e) { + return Response.status(Status.BAD_REQUEST).build(); + } + if (updatedSequence == null) { + return Response.notModified().build(); + } + + // update sequence + analysisSequence.setStartTime(updatedSequence.getStartTime()); + analysisSequence.setEndTime(updatedSequence.getEndTime()); + analysisSequence.setCategories(updatedSequence.getCategories()); + + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.merge(analysisSequence); + entityManager.persist(analysisSequence); + entityTransaction.commit(); + entityManager.refresh(analysisSequence); + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.ANALYSISSEQUENCEEDITED); + // send notification action + NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), + "edit-sequence", analysisSequence.getAnalysisSegment().getId(), analysisSequence); + + return Response.ok().entity(analysisSequence).build(); + } + + @DELETE @Produces(MediaType.APPLICATION_JSON) - @Path("{analysisListId}/tag/{tagId}") - @Secured - public Response removeTag(@PathParam("analysisListId") int analysisListId, - @PathParam("tagId") int tagId) { - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - MediumAnalysisList analysisList = entityManager.find(MediumAnalysisList.class, analysisListId); - if ( analysisList == null ) return Response.status(Status.NOT_FOUND).build(); - Tag tag = entityManager.find(Tag.class, tagId); - if ( tag == null ) return Response.status(Status.NOT_FOUND).build(); - - // attach tag to annotation and vice versa - EntityTransaction entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); - analysisList.getTags().remove(tag); - tag.getMediumAnalysisLists().remove(analysisList); - entityManager.merge(tag); - entityManager.merge(analysisList); - entityManager.persist(analysisList); - entityManager.persist(tag); - entityTransaction.commit(); - entityManager.refresh(analysisList); - - return Response.ok().build(); - } - - @GET - @Produces(MediaType.APPLICATION_JSON) - @Path("keyframeFix") - @Secured - public Response getOldKeyframeTimestamps(@QueryParam("authToken") String authToken) { - // verify auth token - int userId = 0; - if (AuthenticationFilter.isTokenValid(authToken)) { - userId = AuthenticationFilter.getTokenClaimUserId(authToken); - } else { - return Response.status(Status.UNAUTHORIZED).build(); - } - if (userId != 1) { // only Admin may update file lengths - return Response.status(Status.FORBIDDEN).build(); - } - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - String exclude1 = "\"\""; - String exclude2 = "\"{\"keyframes\":[{\"time\":0,\"shapes\":[]}]}\""; - String exclude3 = "\"[]\""; - String sql = "SELECT s FROM SelectorSvg s WHERE s.svgData <> :exclude1 AND s.svgData <> :exclude2 AND s.svgData <> :exclude3"; - Query query = entityManager.createQuery(sql) - .setParameter("exclude1", exclude1) - .setParameter("exclude2", exclude2) - .setParameter("exclude3", exclude3); - List<SelectorSvg> selectorSvgList = castList(SelectorSvg.class, query.getResultList()); - - return Response.ok(selectorSvgList).build(); - } - - @PATCH + @Path("sequence/{id}") + @Secured + public Response deleteAnalysisSequence(@PathParam("id") int id, @QueryParam("authToken") String authToken) { + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + AnalysisSequence analysisSequence = entityManager.find(AnalysisSequence.class, id); + if (analysisSequence == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + // verify auth token + int userId = 0; + if (AuthenticationFilter.isTokenValid(authToken)) { + userId = AuthenticationFilter.getTokenClaimUserId(authToken); + } + else { + return Response.status(Status.UNAUTHORIZED).build(); + } + // check for permission level + if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, + analysisSequence.getAnalysisSegment().getMediumAnalysisList().getId()) < 2) { + return Response.status(Status.FORBIDDEN).build(); + } + + AnalysisSegment analysisSegment = analysisSequence.getAnalysisSegment(); + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.remove(analysisSequence); + entityTransaction.commit(); + entityManager.refresh(analysisSegment); + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.ANALYSISSEQUENCEDELETED); + + // send notification action + NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), + "remove-sequence", analysisSegment.getId(), analysisSequence); + + return Response.ok().build(); + } + + @POST @Produces(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON) - @Path("keyframeFix") - @Secured - public Response updateOldKeyframeTimestamps(@QueryParam("authToken") String authToken, - String jsonData) { - // verify auth token - int userId = 0; - if (AuthenticationFilter.isTokenValid(authToken)) { - userId = AuthenticationFilter.getTokenClaimUserId(authToken); - } else { - return Response.status(Status.UNAUTHORIZED).build(); - } - if (userId != 1) { // only Admin may update file lengths - return Response.status(Status.FORBIDDEN).build(); - } - - ObjectMapper mapper = new ObjectMapper(); - List<SelectorSvg> selectorSvgList = null; - try { - selectorSvgList = Arrays.asList(mapper.readValue(jsonData, SelectorSvg[].class)); - } catch (IOException e) { - e.printStackTrace(); - return Response.status(Status.BAD_REQUEST).build(); - } - if ( selectorSvgList == null ) return Response.notModified().build(); - - EntityManager entityManager = TIMAATApp.emf.createEntityManager(); - EntityTransaction entityTransaction = entityManager.getTransaction(); - SelectorSvg selectorSvg; - for (SelectorSvg updatedSelectorSvg : selectorSvgList) { - selectorSvg = entityManager.find(SelectorSvg.class, updatedSelectorSvg.getId()); - if (selectorSvg == null) continue; // step over invalid entries (which shouldn't occur) - selectorSvg.setSvgData(updatedSelectorSvg.getSvgData()); - entityTransaction.begin(); - entityManager.merge(selectorSvg); - entityManager.persist(selectorSvg); - entityTransaction.commit(); - entityManager.refresh(selectorSvg); - } - - return Response.ok().build(); -} + @Secured + @Path("sequence/{sequenceId}/translation") + public Response createAnalysisSequenceTranslation(@PathParam("sequenceId") int sequenceId, String jsonData) { + ObjectMapper mapper = new ObjectMapper(); + AnalysisSequenceTranslation newTranslation = null; + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + AnalysisSequence analysisSequence = entityManager.find(AnalysisSequence.class, sequenceId); - public static <T> List<T> castList(Class<? extends T> clazz, Collection<?> c) { - List<T> r = new ArrayList<T>(c.size()); - for(Object o: c) - r.add(clazz.cast(o)); + if (analysisSequence == null) { + return Response.status(Status.NOT_FOUND).build(); + } + // parse JSON data + try { + newTranslation = mapper.readValue(jsonData, AnalysisSequenceTranslation.class); + } catch (IOException e) { + e.printStackTrace(); + return Response.status(Status.BAD_REQUEST).build(); + } + if (newTranslation == null) { + return Response.status(Status.BAD_REQUEST).build(); + } + + // sanitize object data + newTranslation.setId(0); + newTranslation.setAnalysisSequence(analysisSequence); + Language language = entityManager.find(Language.class, newTranslation.getLanguage().getId()); + newTranslation.setLanguage(language); + analysisSequence.addAnalysisSequenceTranslation(newTranslation); + + // persist analysisSequence and list + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.persist(newTranslation); + entityManager.flush(); + newTranslation.setAnalysisSequence(analysisSequence); + entityManager.persist(analysisSequence); + entityTransaction.commit(); + entityManager.refresh(newTranslation); + entityManager.refresh(analysisSequence); + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.ANALYSISSEQUENCECREATED); + + // send notification action + NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), + "add-sequence-translation", newTranslation.getAnalysisSequence().getId(), newTranslation); + + return Response.ok().entity(newTranslation).build(); + } + + @PATCH + @Produces(MediaType.APPLICATION_JSON) + @Consumes(MediaType.APPLICATION_JSON) + @Path("sequence/translation/{translationId}") + @Secured + public Response updateAnalysisSequenceTranslation(@PathParam("translationId") int translationId, String jsonData) { + // System.out.println("updateAnalysisSequenceTranslation - jsonData: "+ jsonData); + ObjectMapper mapper = new ObjectMapper(); + AnalysisSequenceTranslation updatedTranslation = null; + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + AnalysisSequenceTranslation analysisSequenceTranslation = entityManager.find(AnalysisSequenceTranslation.class, + translationId); + + if (analysisSequenceTranslation == null) { + return Response.status(Status.NOT_FOUND).build(); + } + // parse JSON data + try { + updatedTranslation = mapper.readValue(jsonData, AnalysisSequenceTranslation.class); + } catch (IOException e) { + return Response.status(Status.BAD_REQUEST).build(); + } + if (updatedTranslation == null) { + return Response.notModified().build(); + } + + // update sequence translation + if (updatedTranslation.getName() != null) { + analysisSequenceTranslation.setName(updatedTranslation.getName()); + } + analysisSequenceTranslation.setShortDescription(updatedTranslation.getShortDescription()); + analysisSequenceTranslation.setComment(updatedTranslation.getComment()); + analysisSequenceTranslation.setTranscript(updatedTranslation.getTranscript()); + + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.merge(analysisSequenceTranslation); + entityManager.persist(analysisSequenceTranslation); + entityTransaction.commit(); + entityManager.refresh(analysisSequenceTranslation); + + // add log entry + // UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), UserLogManager.LogEvents.ANALYSISSEQUENCEEDITED); + + // send notification action + NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), + "edit-sequence", analysisSequenceTranslation.getAnalysisSequence().getId(), analysisSequenceTranslation); + + return Response.ok().entity(analysisSequenceTranslation).build(); + } + + @DELETE + @Produces(MediaType.APPLICATION_JSON) + @Path("sequence/translation/{translationId}") + @Secured + public Response deleteAnalysisSequenceTranslation(@PathParam("translationId") int translationId, String jsonData) { + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + AnalysisSequenceTranslation analysisSequenceTranslation = entityManager.find(AnalysisSequenceTranslation.class, + translationId); + + if (analysisSequenceTranslation == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + AnalysisSequence analysisSequence = analysisSequenceTranslation.getAnalysisSequence(); + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.remove(analysisSequenceTranslation); + entityTransaction.commit(); + entityManager.refresh(analysisSequence); + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.ANALYSISSEQUENCEDELETED); + + // send notification action + NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), + "remove-sequence", analysisSequence.getId(), analysisSequenceTranslation); + + return Response.ok().build(); + } + + @POST + @Produces(MediaType.APPLICATION_JSON) + @Consumes(MediaType.APPLICATION_JSON) + @Secured + @Path("{segmentId}/scene") + public Response createAnalysisScene(@PathParam("segmentId") int segmentId, String jsonData, @QueryParam("authToken") String authToken) { + ObjectMapper mapper = new ObjectMapper(); + AnalysisScene newScene = null; + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + AnalysisSegment analysisSegment = entityManager.find(AnalysisSegment.class, segmentId); + if (analysisSegment == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + // verify auth token + int userId = 0; + if (AuthenticationFilter.isTokenValid(authToken)) { + userId = AuthenticationFilter.getTokenClaimUserId(authToken); + } + else { + return Response.status(Status.UNAUTHORIZED).build(); + } + // check for permission level + if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, + analysisSegment.getMediumAnalysisList().getId()) < 2) { + return Response.status(Status.FORBIDDEN).build(); + } + + // parse JSON data + try { + newScene = mapper.readValue(jsonData, AnalysisScene.class); + } catch (IOException e) { + e.printStackTrace(); + return Response.status(Status.BAD_REQUEST).build(); + } + if (newScene == null) { + return Response.status(Status.BAD_REQUEST).build(); + } + + // sanitize object data + newScene.setId(0); + analysisSegment.addAnalysisScene(newScene); + newScene.getAnalysisSceneTranslations().get(0).setId(0); + newScene.getAnalysisSceneTranslations().get(0).setAnalysisScene(newScene); + newScene.getAnalysisSceneTranslations().get(0).setLanguage(entityManager.find(Language.class, 1)); + + // persist analysisScene and list + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.persist(newScene); + entityManager.flush(); + newScene.setAnalysisSegment(analysisSegment); + entityManager.persist(analysisSegment); + entityTransaction.commit(); + entityManager.refresh(newScene); + entityManager.refresh(analysisSegment); + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.ANALYSISSCENECREATED); + + // send notification action + NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), "add-scene", + newScene.getAnalysisSegment().getId(), newScene); + + return Response.ok().entity(newScene).build(); + } + + @PATCH + @Produces(MediaType.APPLICATION_JSON) + @Consumes(MediaType.APPLICATION_JSON) + @Path("scene/{id}") + @Secured + public Response updateAnalysisScene(@PathParam("id") int id, String jsonData, @QueryParam("authToken") String authToken) { + // System.out.println("EndpointAnalysisList: updateAnalysisScene "+ jsonData); + + ObjectMapper mapper = new ObjectMapper(); + AnalysisScene updatedScene = null; + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + AnalysisScene analysisScene = entityManager.find(AnalysisScene.class, id); + if (analysisScene == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + // verify auth token + int userId = 0; + if (AuthenticationFilter.isTokenValid(authToken)) { + userId = AuthenticationFilter.getTokenClaimUserId(authToken); + } + else { + return Response.status(Status.UNAUTHORIZED).build(); + } + // check for permission level + if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, + analysisScene.getAnalysisSegment().getMediumAnalysisList().getId()) < 2) { + return Response.status(Status.FORBIDDEN).build(); + } + + // parse JSON data + try { + updatedScene = mapper.readValue(jsonData, AnalysisScene.class); + } catch (IOException e) { + return Response.status(Status.BAD_REQUEST).build(); + } + if (updatedScene == null) { + return Response.notModified().build(); + } + + // update scene + analysisScene.setStartTime(updatedScene.getStartTime()); + analysisScene.setEndTime(updatedScene.getEndTime()); + analysisScene.setCategories(updatedScene.getCategories()); + + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.merge(analysisScene); + entityManager.persist(analysisScene); + entityTransaction.commit(); + entityManager.refresh(analysisScene); + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.ANALYSISSCENEEDITED); + // send notification action + NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), + "edit-scene", analysisScene.getAnalysisSegment().getId(), analysisScene); + + return Response.ok().entity(analysisScene).build(); + } + + @DELETE + @Produces(MediaType.APPLICATION_JSON) + @Path("scene/{id}") + @Secured + public Response deleteAnalysisScene(@PathParam("id") int id, @QueryParam("authToken") String authToken) { + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + AnalysisScene analysisScene = entityManager.find(AnalysisScene.class, id); + if (analysisScene == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + // verify auth token + int userId = 0; + if (AuthenticationFilter.isTokenValid(authToken)) { + userId = AuthenticationFilter.getTokenClaimUserId(authToken); + } + else { + return Response.status(Status.UNAUTHORIZED).build(); + } + // check for permission level + if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, + analysisScene.getAnalysisSegment().getMediumAnalysisList().getId()) < 2) { + return Response.status(Status.FORBIDDEN).build(); + } + + AnalysisSegment analysisSegment = analysisScene.getAnalysisSegment(); + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.remove(analysisScene); + entityTransaction.commit(); + entityManager.refresh(analysisSegment); + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.ANALYSISSCENEDELETED); + + // send notification action + NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), + "remove-scene", analysisSegment.getId(), analysisScene); + + return Response.ok().build(); + } + + @POST + @Produces(MediaType.APPLICATION_JSON) + @Consumes(MediaType.APPLICATION_JSON) + @Secured + @Path("scene/{sceneId}/translation") + public Response createAnalysisSceneTranslation(@PathParam("sceneId") int sceneId, String jsonData) { + ObjectMapper mapper = new ObjectMapper(); + AnalysisSceneTranslation newTranslation = null; + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + AnalysisScene analysisScene = entityManager.find(AnalysisScene.class, sceneId); + + if (analysisScene == null) { + return Response.status(Status.NOT_FOUND).build(); + } + // parse JSON data + try { + newTranslation = mapper.readValue(jsonData, AnalysisSceneTranslation.class); + } catch (IOException e) { + e.printStackTrace(); + return Response.status(Status.BAD_REQUEST).build(); + } + if (newTranslation == null) { + return Response.status(Status.BAD_REQUEST).build(); + } + + // sanitize object data + newTranslation.setId(0); + newTranslation.setAnalysisScene(analysisScene); + Language language = entityManager.find(Language.class, newTranslation.getLanguage().getId()); + newTranslation.setLanguage(language); + analysisScene.addAnalysisSceneTranslation(newTranslation); + + // persist analysisScene and list + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.persist(newTranslation); + entityManager.flush(); + newTranslation.setAnalysisScene(analysisScene); + entityManager.persist(analysisScene); + entityTransaction.commit(); + entityManager.refresh(newTranslation); + entityManager.refresh(analysisScene); + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.ANALYSISSCENECREATED); + + // send notification action + NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), + "add-scene-translation", newTranslation.getAnalysisScene().getId(), newTranslation); + + return Response.ok().entity(newTranslation).build(); + } + + @PATCH + @Produces(MediaType.APPLICATION_JSON) + @Consumes(MediaType.APPLICATION_JSON) + @Path("scene/translation/{translationId}") + @Secured + public Response updateAnalysisSceneTranslation(@PathParam("translationId") int translationId, String jsonData) { + // System.out.println("updateAnalysisSceneTranslation - jsonData: "+ jsonData); + ObjectMapper mapper = new ObjectMapper(); + AnalysisSceneTranslation updatedTranslation = null; + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + AnalysisSceneTranslation analysisSceneTranslation = entityManager.find(AnalysisSceneTranslation.class, + translationId); + + if (analysisSceneTranslation == null) { + return Response.status(Status.NOT_FOUND).build(); + } + // parse JSON data + try { + updatedTranslation = mapper.readValue(jsonData, AnalysisSceneTranslation.class); + } catch (IOException e) { + return Response.status(Status.BAD_REQUEST).build(); + } + if (updatedTranslation == null) { + return Response.notModified().build(); + } + + // update scene translation + if (updatedTranslation.getName() != null) { + analysisSceneTranslation.setName(updatedTranslation.getName()); + } + analysisSceneTranslation.setShortDescription(updatedTranslation.getShortDescription()); + analysisSceneTranslation.setComment(updatedTranslation.getComment()); + analysisSceneTranslation.setTranscript(updatedTranslation.getTranscript()); + + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.merge(analysisSceneTranslation); + entityManager.persist(analysisSceneTranslation); + entityTransaction.commit(); + entityManager.refresh(analysisSceneTranslation); + + // add log entry + // UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), UserLogManager.LogEvents.ANALYSISSCENEEDITED); + + // send notification action + NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), + "edit-scene", analysisSceneTranslation.getAnalysisScene().getId(), analysisSceneTranslation); + + return Response.ok().entity(analysisSceneTranslation).build(); + } + + @DELETE + @Produces(MediaType.APPLICATION_JSON) + @Path("scene/translation/{translationId}") + @Secured + public Response deleteAnalysisSceneTranslation(@PathParam("translationId") int translationId) { + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + AnalysisSceneTranslation analysisSceneTranslation = entityManager.find(AnalysisSceneTranslation.class, + translationId); + + if (analysisSceneTranslation == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + AnalysisScene analysisScene = analysisSceneTranslation.getAnalysisScene(); + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.remove(analysisSceneTranslation); + entityTransaction.commit(); + entityManager.refresh(analysisScene); + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.ANALYSISSCENEDELETED); + + // send notification action + NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), + "remove-scene", analysisScene.getId(), analysisSceneTranslation); + + return Response.ok().build(); + } + + @POST + @Produces(MediaType.APPLICATION_JSON) + @Consumes(MediaType.APPLICATION_JSON) + @Secured + @Path("{sequenceId}/take") + public Response createAnalysisTake(@PathParam("sequenceId") int sequenceId, String jsonData, @QueryParam("authToken") String authToken) { + ObjectMapper mapper = new ObjectMapper(); + AnalysisTake newTake = null; + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + AnalysisSequence analysisSequence = entityManager.find(AnalysisSequence.class, sequenceId); + if (analysisSequence == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + // verify auth token + int userId = 0; + if (AuthenticationFilter.isTokenValid(authToken)) { + userId = AuthenticationFilter.getTokenClaimUserId(authToken); + } + else { + return Response.status(Status.UNAUTHORIZED).build(); + } + // check for permission level + if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, + analysisSequence.getAnalysisSegment().getMediumAnalysisList().getId()) < 2) { + return Response.status(Status.FORBIDDEN).build(); + } + + // parse JSON data + try { + newTake = mapper.readValue(jsonData, AnalysisTake.class); + } catch (IOException e) { + e.printStackTrace(); + return Response.status(Status.BAD_REQUEST).build(); + } + if (newTake == null) { + return Response.status(Status.BAD_REQUEST).build(); + } + + // sanitize object data + newTake.setId(0); + analysisSequence.addAnalysisTake(newTake); + newTake.getAnalysisTakeTranslations().get(0).setId(0); + newTake.getAnalysisTakeTranslations().get(0).setAnalysisTake(newTake); + newTake.getAnalysisTakeTranslations().get(0).setLanguage(entityManager.find(Language.class, 1)); + + + // persist analysisTake and list + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.persist(newTake); + entityManager.flush(); + newTake.setAnalysisSequence(analysisSequence); + entityManager.persist(analysisSequence); + entityTransaction.commit(); + entityManager.refresh(newTake); + entityManager.refresh(analysisSequence); + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.ANALYSISTAKECREATED); + + // send notification action + NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), "add-take", + newTake.getAnalysisSequence().getId(), newTake); + + return Response.ok().entity(newTake).build(); + } + + @PATCH + @Produces(MediaType.APPLICATION_JSON) + @Consumes(MediaType.APPLICATION_JSON) + @Path("take/{id}") + @Secured + public Response updateAnalysisTake(@PathParam("id") int id, String jsonData, @QueryParam("authToken") String authToken) { + // System.out.println("EndpointAnalysisList: updateAnalysisTake "+ jsonData); + ObjectMapper mapper = new ObjectMapper(); + AnalysisTake updatedTake = null; + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + AnalysisTake analysisTake = entityManager.find(AnalysisTake.class, id); + if (analysisTake == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + // verify auth token + int userId = 0; + if (AuthenticationFilter.isTokenValid(authToken)) { + userId = AuthenticationFilter.getTokenClaimUserId(authToken); + } + else { + return Response.status(Status.UNAUTHORIZED).build(); + } + // check for permission level + if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, + analysisTake.getAnalysisSequence().getAnalysisSegment().getMediumAnalysisList().getId()) < 2) { + return Response.status(Status.FORBIDDEN).build(); + } + + // parse JSON data + try { + updatedTake = mapper.readValue(jsonData, AnalysisTake.class); + } catch (IOException e) { + return Response.status(Status.BAD_REQUEST).build(); + } + if (updatedTake == null) { + return Response.notModified().build(); + } + + // update take + analysisTake.setStartTime(updatedTake.getStartTime()); + analysisTake.setEndTime(updatedTake.getEndTime()); + analysisTake.setCategories(updatedTake.getCategories()); + + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.merge(analysisTake); + entityManager.persist(analysisTake); + entityTransaction.commit(); + entityManager.refresh(analysisTake); + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.ANALYSISTAKEEDITED); + // send notification action + NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), "edit-take", + analysisTake.getAnalysisSequence().getId(), analysisTake); + + return Response.ok().entity(analysisTake).build(); + } + + @DELETE + @Produces(MediaType.APPLICATION_JSON) + @Path("take/{id}") + @Secured + public Response deleteAnalysisTake(@PathParam("id") int id, @QueryParam("authToken") String authToken) { + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + AnalysisTake analysisTake = entityManager.find(AnalysisTake.class, id); + if (analysisTake == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + // verify auth token + int userId = 0; + if (AuthenticationFilter.isTokenValid(authToken)) { + userId = AuthenticationFilter.getTokenClaimUserId(authToken); + } + else { + return Response.status(Status.UNAUTHORIZED).build(); + } + // check for permission level + if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, + analysisTake.getAnalysisSequence().getAnalysisSegment().getMediumAnalysisList().getId()) < 2) { + return Response.status(Status.FORBIDDEN).build(); + } + + AnalysisSequence analysisSequence = analysisTake.getAnalysisSequence(); + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.remove(analysisTake); + entityTransaction.commit(); + entityManager.refresh(analysisSequence); + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.ANALYSISTAKEDELETED); + + // send notification action + NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), + "remove-take", analysisSequence.getId(), analysisTake); + + return Response.ok().build(); + } + + @POST + @Produces(MediaType.APPLICATION_JSON) + @Consumes(MediaType.APPLICATION_JSON) + @Secured + @Path("take/{takeId}/translation") + public Response createAnalysisTakeTranslation(@PathParam("takeId") int takeId, String jsonData) { + ObjectMapper mapper = new ObjectMapper(); + AnalysisTakeTranslation newTranslation = null; + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + AnalysisTake analysisTake = entityManager.find(AnalysisTake.class, takeId); + + if (analysisTake == null) { + return Response.status(Status.NOT_FOUND).build(); + } + // parse JSON data + try { + newTranslation = mapper.readValue(jsonData, AnalysisTakeTranslation.class); + } catch (IOException e) { + e.printStackTrace(); + return Response.status(Status.BAD_REQUEST).build(); + } + if (newTranslation == null) { + return Response.status(Status.BAD_REQUEST).build(); + } + + // sanitize object data + newTranslation.setId(0); + newTranslation.setAnalysisTake(analysisTake); + Language language = entityManager.find(Language.class, newTranslation.getLanguage().getId()); + newTranslation.setLanguage(language); + analysisTake.addAnalysisTakeTranslation(newTranslation); + + // persist analysisTake and list + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.persist(newTranslation); + entityManager.flush(); + newTranslation.setAnalysisTake(analysisTake); + entityManager.persist(analysisTake); + entityTransaction.commit(); + entityManager.refresh(newTranslation); + entityManager.refresh(analysisTake); + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.ANALYSISTAKECREATED); + + // send notification action + NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), + "add-take-translation", newTranslation.getAnalysisTake().getId(), newTranslation); + + return Response.ok().entity(newTranslation).build(); + } + + @PATCH + @Produces(MediaType.APPLICATION_JSON) + @Consumes(MediaType.APPLICATION_JSON) + @Path("take/translation/{translationId}") + @Secured + public Response updateAnalysisTakeTranslation(@PathParam("translationId") int translationId, String jsonData) { + // System.out.println("updateAnalysisTakeTranslation - jsonData: "+ jsonData); + ObjectMapper mapper = new ObjectMapper(); + AnalysisTakeTranslation updatedTranslation = null; + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + AnalysisTakeTranslation analysisTakeTranslation = entityManager.find(AnalysisTakeTranslation.class, translationId); + + if (analysisTakeTranslation == null) { + return Response.status(Status.NOT_FOUND).build(); + } + // parse JSON data + try { + updatedTranslation = mapper.readValue(jsonData, AnalysisTakeTranslation.class); + } catch (IOException e) { + return Response.status(Status.BAD_REQUEST).build(); + } + if (updatedTranslation == null) { + return Response.notModified().build(); + } + + // update take translation + if (updatedTranslation.getName() != null) { + analysisTakeTranslation.setName(updatedTranslation.getName()); + } + analysisTakeTranslation.setShortDescription(updatedTranslation.getShortDescription()); + analysisTakeTranslation.setComment(updatedTranslation.getComment()); + analysisTakeTranslation.setTranscript(updatedTranslation.getTranscript()); + + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.merge(analysisTakeTranslation); + entityManager.persist(analysisTakeTranslation); + entityTransaction.commit(); + entityManager.refresh(analysisTakeTranslation); + + // add log entry + // UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), UserLogManager.LogEvents.ANALYSISTAKEEDITED); + + // send notification action + NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), "edit-take", + analysisTakeTranslation.getAnalysisTake().getId(), analysisTakeTranslation); + + return Response.ok().entity(analysisTakeTranslation).build(); + } + + @DELETE + @Produces(MediaType.APPLICATION_JSON) + @Path("take/translation/{translationId}") + @Secured + public Response deleteAnalysisTakeTranslation(@PathParam("translationId") int translationId) { + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + AnalysisTakeTranslation analysisTakeTranslation = entityManager.find(AnalysisTakeTranslation.class, translationId); + + if (analysisTakeTranslation == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + AnalysisTake analysisTake = analysisTakeTranslation.getAnalysisTake(); + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.remove(analysisTakeTranslation); + entityTransaction.commit(); + entityManager.refresh(analysisTake); + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.ANALYSISTAKEDELETED); + + // send notification action + NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), + "remove-take", analysisTake.getId(), analysisTakeTranslation); + + return Response.ok().build(); + } + + @POST + @Produces(MediaType.APPLICATION_JSON) + @Consumes(MediaType.APPLICATION_JSON) + @Secured + @Path("{sceneId}/action") + public Response createAnalysisAction(@PathParam("sceneId") int sceneId, String jsonData, @QueryParam("authToken") String authToken) { + ObjectMapper mapper = new ObjectMapper(); + AnalysisAction newAction = null; + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + AnalysisScene analysisScene = entityManager.find(AnalysisScene.class, sceneId); + if (analysisScene == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + // verify auth token + int userId = 0; + if (AuthenticationFilter.isTokenValid(authToken)) { + userId = AuthenticationFilter.getTokenClaimUserId(authToken); + } + else { + return Response.status(Status.UNAUTHORIZED).build(); + } + // check for permission level + if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, + analysisScene.getAnalysisSegment().getMediumAnalysisList().getId()) < 2) { + return Response.status(Status.FORBIDDEN).build(); + } + + // parse JSON data + try { + newAction = mapper.readValue(jsonData, AnalysisAction.class); + } catch (IOException e) { + e.printStackTrace(); + return Response.status(Status.BAD_REQUEST).build(); + } + if (newAction == null) { + return Response.status(Status.BAD_REQUEST).build(); + } + + // sanitize object data + newAction.setId(0); + analysisScene.addAnalysisAction(newAction); + newAction.getAnalysisActionTranslations().get(0).setId(0); + newAction.getAnalysisActionTranslations().get(0).setAnalysisAction(newAction); + newAction.getAnalysisActionTranslations().get(0).setLanguage(entityManager.find(Language.class, 1)); + + // persist analysisAction and list + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.persist(newAction); + entityManager.flush(); + newAction.setAnalysisScene(analysisScene); + entityManager.persist(analysisScene); + entityTransaction.commit(); + entityManager.refresh(newAction); + entityManager.refresh(analysisScene); + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.ANALYSISACTIONCREATED); + + // send notification action + NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), + "add-action", newAction.getAnalysisScene().getId(), newAction); + + return Response.ok().entity(newAction).build(); + } + + @PATCH + @Produces(MediaType.APPLICATION_JSON) + @Consumes(MediaType.APPLICATION_JSON) + @Path("action/{id}") + @Secured + public Response updateAnalysisAction(@PathParam("id") int id, String jsonData, @QueryParam("authToken") String authToken) { + // System.out.println("EndpointAnalysisList: updateAnalysisAction "+ jsonData); + ObjectMapper mapper = new ObjectMapper(); + AnalysisAction updatedAction = null; + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + AnalysisAction analysisAction = entityManager.find(AnalysisAction.class, id); + if (analysisAction == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + // verify auth token + int userId = 0; + if (AuthenticationFilter.isTokenValid(authToken)) { + userId = AuthenticationFilter.getTokenClaimUserId(authToken); + } + else { + return Response.status(Status.UNAUTHORIZED).build(); + } + // check for permission level + if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, + analysisAction.getAnalysisScene().getAnalysisSegment().getMediumAnalysisList().getId()) < 2) { + return Response.status(Status.FORBIDDEN).build(); + } + + // parse JSON data + try { + updatedAction = mapper.readValue(jsonData, AnalysisAction.class); + } catch (IOException e) { + return Response.status(Status.BAD_REQUEST).build(); + } + if (updatedAction == null) { + return Response.notModified().build(); + } + + // update action + analysisAction.setStartTime(updatedAction.getStartTime()); + analysisAction.setEndTime(updatedAction.getEndTime()); + analysisAction.setCategories(updatedAction.getCategories()); + + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.merge(analysisAction); + entityManager.persist(analysisAction); + entityTransaction.commit(); + entityManager.refresh(analysisAction); + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.ANALYSISACTIONEDITED); + // send notification action + NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), + "edit-action", analysisAction.getAnalysisScene().getId(), analysisAction); + + return Response.ok().entity(analysisAction).build(); + } + + @DELETE + @Produces(MediaType.APPLICATION_JSON) + @Path("action/{id}") + @Secured + public Response deleteAnalysisAction(@PathParam("id") int id, @QueryParam("authToken") String authToken) { + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + AnalysisAction analysisAction = entityManager.find(AnalysisAction.class, id); + if (analysisAction == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + // verify auth token + int userId = 0; + if (AuthenticationFilter.isTokenValid(authToken)) { + userId = AuthenticationFilter.getTokenClaimUserId(authToken); + } + else { + return Response.status(Status.UNAUTHORIZED).build(); + } + // check for permission level + if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, + analysisAction.getAnalysisScene().getAnalysisSegment().getMediumAnalysisList().getId()) < 2) { + return Response.status(Status.FORBIDDEN).build(); + } + + AnalysisScene analysisScene = analysisAction.getAnalysisScene(); + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.remove(analysisAction); + entityTransaction.commit(); + entityManager.refresh(analysisScene); + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.ANALYSISACTIONDELETED); + + // send notification action + NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), + "remove-action", analysisScene.getId(), analysisAction); + + return Response.ok().build(); + } + + @POST + @Produces(MediaType.APPLICATION_JSON) + @Consumes(MediaType.APPLICATION_JSON) + @Secured + @Path("action/{actionId}/translation") + public Response createAnalysisActionTranslation(@PathParam("actionId") int actionId, String jsonData) { + ObjectMapper mapper = new ObjectMapper(); + AnalysisActionTranslation newTranslation = null; + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + AnalysisAction analysisAction = entityManager.find(AnalysisAction.class, actionId); + + if (analysisAction == null) { + return Response.status(Status.NOT_FOUND).build(); + } + // parse JSON data + try { + newTranslation = mapper.readValue(jsonData, AnalysisActionTranslation.class); + } catch (IOException e) { + e.printStackTrace(); + return Response.status(Status.BAD_REQUEST).build(); + } + if (newTranslation == null) { + return Response.status(Status.BAD_REQUEST).build(); + } + + // sanitize object data + newTranslation.setId(0); + newTranslation.setAnalysisAction(analysisAction); + Language language = entityManager.find(Language.class, newTranslation.getLanguage().getId()); + newTranslation.setLanguage(language); + analysisAction.addAnalysisActionTranslation(newTranslation); + + // persist analysisAction and list + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.persist(newTranslation); + entityManager.flush(); + newTranslation.setAnalysisAction(analysisAction); + entityManager.persist(analysisAction); + entityTransaction.commit(); + entityManager.refresh(newTranslation); + entityManager.refresh(analysisAction); + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.ANALYSISACTIONCREATED); + + // send notification action + NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), + "add-action-translation", newTranslation.getAnalysisAction().getId(), newTranslation); + + return Response.ok().entity(newTranslation).build(); + } + + @PATCH + @Produces(MediaType.APPLICATION_JSON) + @Consumes(MediaType.APPLICATION_JSON) + @Path("action/translation/{translationId}") + @Secured + public Response updateAnalysisActionTranslation(@PathParam("translationId") int translationId, String jsonData) { + // System.out.println("updateAnalysisActionTranslation - jsonData: "+ jsonData); + ObjectMapper mapper = new ObjectMapper(); + AnalysisActionTranslation updatedTranslation = null; + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + AnalysisActionTranslation analysisActionTranslation = entityManager.find(AnalysisActionTranslation.class, + translationId); + + if (analysisActionTranslation == null) { + return Response.status(Status.NOT_FOUND).build(); + } + // parse JSON data + try { + updatedTranslation = mapper.readValue(jsonData, AnalysisActionTranslation.class); + } catch (IOException e) { + return Response.status(Status.BAD_REQUEST).build(); + } + if (updatedTranslation == null) { + return Response.notModified().build(); + } + + // update action translation + if (updatedTranslation.getName() != null) { + analysisActionTranslation.setName(updatedTranslation.getName()); + } + analysisActionTranslation.setShortDescription(updatedTranslation.getShortDescription()); + analysisActionTranslation.setComment(updatedTranslation.getComment()); + analysisActionTranslation.setTranscript(updatedTranslation.getTranscript()); + + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.merge(analysisActionTranslation); + entityManager.persist(analysisActionTranslation); + entityTransaction.commit(); + entityManager.refresh(analysisActionTranslation); + + // add log entry + // UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), UserLogManager.LogEvents.ANALYSISACTIONEDITED); + + // send notification action + NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), + "edit-action", analysisActionTranslation.getAnalysisAction().getId(), analysisActionTranslation); + + return Response.ok().entity(analysisActionTranslation).build(); + } + + @DELETE + @Produces(MediaType.APPLICATION_JSON) + @Path("action/translation/{translationId}") + @Secured + public Response deleteAnalysisActionTranslation(@PathParam("translationId") int translationId) { + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + AnalysisActionTranslation analysisActionTranslation = entityManager.find(AnalysisActionTranslation.class, + translationId); + + if (analysisActionTranslation == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + AnalysisAction analysisAction = analysisActionTranslation.getAnalysisAction(); + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + entityManager.remove(analysisActionTranslation); + entityTransaction.commit(); + entityManager.refresh(analysisAction); + + // add log entry + UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), + UserLogManager.LogEvents.ANALYSISACTIONDELETED); + + // send notification action + NotificationWebSocket.notifyUserAction((String) containerRequestContext.getProperty("TIMAAT.userName"), + "remove-action", analysisAction.getId(), analysisActionTranslation); + + return Response.ok().build(); + } + + @POST + @Produces(MediaType.APPLICATION_JSON) + @Path("{analysisListId}/categorySet/{categorySetId}") + @Secured + public Response addExistingCategorySet(@PathParam("analysisListId") int mediumAnalysisListId, @PathParam("categorySetId") int categorySetId, @QueryParam("authToken") String authToken) { + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + MediumAnalysisList mediumAnalysisList = entityManager.find(MediumAnalysisList.class, mediumAnalysisListId); + if (mediumAnalysisList == null) { + return Response.status(Status.NOT_FOUND).build(); + } + CategorySet categorySet = entityManager.find(CategorySet.class, categorySetId); + if (categorySet == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + // verify auth token + int userId = 0; + if (AuthenticationFilter.isTokenValid(authToken)) { + userId = AuthenticationFilter.getTokenClaimUserId(authToken); + } + else { + return Response.status(Status.UNAUTHORIZED).build(); + } + // check for permission level + if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, mediumAnalysisListId) < 2) { + return Response.status(Status.FORBIDDEN).build(); + } + + // attach categorySet to annotation and vice versa + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + mediumAnalysisList.getCategorySets().add(categorySet); + categorySet.getMediumAnalysisLists().add(mediumAnalysisList); + entityManager.merge(categorySet); + entityManager.merge(mediumAnalysisList); + entityManager.persist(mediumAnalysisList); + entityManager.persist(categorySet); + entityTransaction.commit(); + entityManager.refresh(mediumAnalysisList); + + return Response.ok().entity(categorySet).build(); + } + + @PUT + @Produces(MediaType.APPLICATION_JSON) + @Consumes(MediaType.APPLICATION_JSON) + @Path("{analysisListId}/categorySets") + @Secured + public List<CategorySet> updateCategorySets(@PathParam("analysisListId") int analysisListId, UpdateAnalysisListCategorySetsPayload updateAnalysisListCategorySetsPayload) throws DbTransactionExecutionException { + verifyAuthorizationToAnalysisList(analysisListId, + de.bitgilde.TIMAAT.rest.security.authorization.PermissionType.WRITE); + return analysisListStorage.updateCategorySets(analysisListId, + updateAnalysisListCategorySetsPayload.getCategorySetIds()); + } + + + @DELETE + @Produces(MediaType.APPLICATION_JSON) + @Path("{analysisListId}/categorySet/{categorySetId}") + @Secured + public Response removeCategorySet(@PathParam("analysisListId") int mediumAnalysisListId, @PathParam("categorySetId") int categorySetId, @QueryParam("authToken") String authToken) { + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + MediumAnalysisList mediumAnalysisList = entityManager.find(MediumAnalysisList.class, mediumAnalysisListId); + if (mediumAnalysisList == null) { + return Response.status(Status.NOT_FOUND).build(); + } + CategorySet categorySet = entityManager.find(CategorySet.class, categorySetId); + if (categorySet == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + // verify auth token + int userId = 0; + if (AuthenticationFilter.isTokenValid(authToken)) { + userId = AuthenticationFilter.getTokenClaimUserId(authToken); + } + else { + return Response.status(Status.UNAUTHORIZED).build(); + } + // check for permission level + if (EndpointUserAccount.getPermissionLevelForAnalysisList(userId, mediumAnalysisListId) < 2) { + return Response.status(Status.FORBIDDEN).build(); + } + + // delete categories of matching categorySets from annotations and segment structure elements + List<Category> categoryList = new ArrayList<>(); + Set<CategorySetHasCategory> cshc = categorySet.getCategorySetHasCategories(); + Iterator<CategorySetHasCategory> itr = cshc.iterator(); + EntityTransaction entityTransaction = entityManager.getTransaction(); + + // fill categoryList will all categories of the category set that will be deleted + while (itr.hasNext()) { + categoryList.add(itr.next().getCategory()); + } + + // remove categories from removed category set from all associated annotations of the analysis list the category set is removed from + for (Annotation annotation : mediumAnalysisList.getAnnotations()) { + List<Category> annotationCategoryList = annotation.getCategories(); + List<Category> categoriesToRemove = categoryList.stream().distinct().filter(annotationCategoryList::contains) + .collect(Collectors.toList()); + entityTransaction.begin(); + for (Category category : categoriesToRemove) { + annotation.getCategories().remove(category); + } + entityManager.merge(annotation); + entityManager.persist(annotation); + entityTransaction.commit(); + entityManager.refresh(annotation); + } + + // remove categories from removed category set from all associated segments of the analysis list the category set is removed from + for (AnalysisSegment analysisSegment : mediumAnalysisList.getAnalysisSegments()) { + List<Category> analysisSegmentCategoryList = analysisSegment.getCategories(); + List<Category> segmentCategoriesToRemove = categoryList.stream().distinct() + .filter(analysisSegmentCategoryList::contains) + .collect(Collectors.toList()); + entityTransaction.begin(); + for (Category category : segmentCategoriesToRemove) { + analysisSegment.getCategories().remove(category); + } + entityManager.merge(analysisSegment); + entityManager.persist(analysisSegment); + entityTransaction.commit(); + entityManager.refresh(analysisSegment); + + // remove categories from removed category set from all associated sequences of the analysis list the category set is removed from + for (AnalysisSequence analysisSequence : analysisSegment.getAnalysisSequences()) { + List<Category> analysisSequenceCategoryList = analysisSequence.getCategories(); + List<Category> sequenceCategoriesToRemove = categoryList.stream().distinct() + .filter(analysisSequenceCategoryList::contains) + .collect(Collectors.toList()); + entityTransaction.begin(); + for (Category category : sequenceCategoriesToRemove) { + analysisSequence.getCategories().remove(category); + } + entityManager.merge(analysisSequence); + entityManager.persist(analysisSequence); + entityTransaction.commit(); + entityManager.refresh(analysisSequence); + + // remove categories from removed category set from all associated takes of the analysis list the category set is removed from + for (AnalysisTake analysisTake : analysisSequence.getAnalysisTakes()) { + List<Category> analysisTakeCategoryList = analysisTake.getCategories(); + List<Category> takeCategoriesToRemove = categoryList.stream().distinct() + .filter(analysisTakeCategoryList::contains) + .collect(Collectors.toList()); + entityTransaction.begin(); + for (Category category : takeCategoriesToRemove) { + analysisTake.getCategories().remove(category); + } + entityManager.merge(analysisTake); + entityManager.persist(analysisTake); + entityTransaction.commit(); + entityManager.refresh(analysisTake); + } + } + + // remove categories from removed category set from all associated scenes of the analysis list the category set is removed from + for (AnalysisScene analysisScene : analysisSegment.getAnalysisScenes()) { + List<Category> analysisSceneCategoryList = analysisScene.getCategories(); + List<Category> sceneCategoriesToRemove = categoryList.stream().distinct() + .filter(analysisSceneCategoryList::contains) + .collect(Collectors.toList()); + entityTransaction.begin(); + for (Category category : sceneCategoriesToRemove) { + analysisScene.getCategories().remove(category); + } + entityManager.merge(analysisScene); + entityManager.persist(analysisScene); + entityTransaction.commit(); + entityManager.refresh(analysisScene); + + // remove categories from removed category set from all associated actions of the analysis list the category set is removed from + for (AnalysisAction analysisAction : analysisScene.getAnalysisActions()) { + List<Category> analysisActionCategoryList = analysisAction.getCategories(); + List<Category> actionCategoriesToRemove = categoryList.stream().distinct() + .filter(analysisActionCategoryList::contains) + .collect(Collectors.toList()); + entityTransaction.begin(); + for (Category category : actionCategoriesToRemove) { + analysisAction.getCategories().remove(category); + } + entityManager.merge(analysisAction); + entityManager.persist(analysisAction); + entityTransaction.commit(); + entityManager.refresh(analysisAction); + } + } + } + + + // attach categorySet to annotation and vice versa + entityTransaction.begin(); + mediumAnalysisList.getCategorySets().remove(categorySet); + categorySet.getMediumAnalysisLists().remove(mediumAnalysisList); + entityManager.merge(categorySet); + entityManager.merge(mediumAnalysisList); + entityManager.persist(mediumAnalysisList); + entityManager.persist(categorySet); + entityTransaction.commit(); + entityManager.refresh(mediumAnalysisList); + + return Response.ok().build(); + } + + @POST + @Produces(MediaType.APPLICATION_JSON) + @Path("{analysisListId}/tag/{tagId}") + @Secured + public Response addExistingTag(@PathParam("analysisListId") int analysisListId, @PathParam("tagId") int tagId) { + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + MediumAnalysisList analysisList = entityManager.find(MediumAnalysisList.class, analysisListId); + if (analysisList == null) { + return Response.status(Status.NOT_FOUND).build(); + } + Tag tag = entityManager.find(Tag.class, tagId); + if (tag == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + // attach tag to annotation and vice versa + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + analysisList.getTags().add(tag); + tag.getMediumAnalysisLists().add(analysisList); + entityManager.merge(tag); + entityManager.merge(analysisList); + entityManager.persist(analysisList); + entityManager.persist(tag); + entityTransaction.commit(); + entityManager.refresh(analysisList); + + return Response.ok().entity(tag).build(); + } + + @DELETE + @Produces(MediaType.APPLICATION_JSON) + @Path("{analysisListId}/tag/{tagId}") + @Secured + public Response removeTag(@PathParam("analysisListId") int analysisListId, @PathParam("tagId") int tagId) { + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + MediumAnalysisList analysisList = entityManager.find(MediumAnalysisList.class, analysisListId); + if (analysisList == null) { + return Response.status(Status.NOT_FOUND).build(); + } + Tag tag = entityManager.find(Tag.class, tagId); + if (tag == null) { + return Response.status(Status.NOT_FOUND).build(); + } + + // attach tag to annotation and vice versa + EntityTransaction entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + analysisList.getTags().remove(tag); + tag.getMediumAnalysisLists().remove(analysisList); + entityManager.merge(tag); + entityManager.merge(analysisList); + entityManager.persist(analysisList); + entityManager.persist(tag); + entityTransaction.commit(); + entityManager.refresh(analysisList); + + return Response.ok().build(); + } + + @GET + @Produces(MediaType.APPLICATION_JSON) + @Path("keyframeFix") + @Secured + public Response getOldKeyframeTimestamps(@QueryParam("authToken") String authToken) { + // verify auth token + int userId = 0; + if (AuthenticationFilter.isTokenValid(authToken)) { + userId = AuthenticationFilter.getTokenClaimUserId(authToken); + } + else { + return Response.status(Status.UNAUTHORIZED).build(); + } + if (userId != 1) { // only Admin may update file lengths + return Response.status(Status.FORBIDDEN).build(); + } + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + String exclude1 = "\"\""; + String exclude2 = "\"{\"keyframes\":[{\"time\":0,\"shapes\":[]}]}\""; + String exclude3 = "\"[]\""; + String sql = "SELECT s FROM SelectorSvg s WHERE s.svgData <> :exclude1 AND s.svgData <> :exclude2 AND s.svgData <> :exclude3"; + Query query = entityManager.createQuery(sql).setParameter("exclude1", exclude1).setParameter("exclude2", exclude2) + .setParameter("exclude3", exclude3); + List<SelectorSvg> selectorSvgList = castList(SelectorSvg.class, query.getResultList()); + + return Response.ok(selectorSvgList).build(); + } + + @PATCH + @Produces(MediaType.APPLICATION_JSON) + @Consumes(MediaType.APPLICATION_JSON) + @Path("keyframeFix") + @Secured + public Response updateOldKeyframeTimestamps(@QueryParam("authToken") String authToken, String jsonData) { + // verify auth token + int userId = 0; + if (AuthenticationFilter.isTokenValid(authToken)) { + userId = AuthenticationFilter.getTokenClaimUserId(authToken); + } + else { + return Response.status(Status.UNAUTHORIZED).build(); + } + if (userId != 1) { // only Admin may update file lengths + return Response.status(Status.FORBIDDEN).build(); + } + + ObjectMapper mapper = new ObjectMapper(); + List<SelectorSvg> selectorSvgList = null; + try { + selectorSvgList = Arrays.asList(mapper.readValue(jsonData, SelectorSvg[].class)); + } catch (IOException e) { + e.printStackTrace(); + return Response.status(Status.BAD_REQUEST).build(); + } + if (selectorSvgList == null) { + return Response.notModified().build(); + } + + EntityManager entityManager = TIMAATApp.emf.createEntityManager(); + EntityTransaction entityTransaction = entityManager.getTransaction(); + SelectorSvg selectorSvg; + for (SelectorSvg updatedSelectorSvg : selectorSvgList) { + selectorSvg = entityManager.find(SelectorSvg.class, updatedSelectorSvg.getId()); + if (selectorSvg == null) { + continue; // step over invalid entries (which shouldn't occur) + } + selectorSvg.setSvgData(updatedSelectorSvg.getSvgData()); + entityTransaction.begin(); + entityManager.merge(selectorSvg); + entityManager.persist(selectorSvg); + entityTransaction.commit(); + entityManager.refresh(selectorSvg); + } + + return Response.ok().build(); + } + + public static <T> List<T> castList(Class<? extends T> clazz, Collection<?> c) { + List<T> r = new ArrayList<T>(c.size()); + for (Object o : c) { + r.add(clazz.cast(o)); + } return r; } diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnalysisSegment.java b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnalysisSegment.java new file mode 100644 index 00000000..c748778a --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnalysisSegment.java @@ -0,0 +1,52 @@ +package de.bitgilde.TIMAAT.rest.endpoint; + +import de.bitgilde.TIMAAT.model.DataTableInfo; +import de.bitgilde.TIMAAT.model.FIPOP.AnalysisSegment; +import de.bitgilde.TIMAAT.rest.model.analysissegment.AnalysisSegmentListingQueryParameter; +import de.bitgilde.TIMAAT.storage.entity.segment.SegmentStructureElementsStorage; +import jakarta.inject.Inject; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.Context; +import org.jvnet.hk2.annotations.Service; + +import java.util.Collections; + +/* + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + +/** + * Endpoint class to access information of analysis segments + * + * @author Nico Kotlenga + * @since 31.12.25 + */ +@Service +@Path("/analysis-segments") +public class EndpointAnalysisSegment { + @Inject + SegmentStructureElementsStorage segmentStructureElements; + @Context + ContainerRequestContext containerRequestContext; + + @GET + @Produces + @Path("list") + public DataTableInfo<AnalysisSegment> listAnalysisSegments(@BeanParam AnalysisSegmentListingQueryParameter queryParameter) { + return new DataTableInfo<>(0, 0, 0, Collections.emptyList()); + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/model/analysissegment/AnalysisSegmentListingQueryParameter.java b/src/main/java/de/bitgilde/TIMAAT/rest/model/analysissegment/AnalysisSegmentListingQueryParameter.java new file mode 100644 index 00000000..39dd5ea8 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/rest/model/analysissegment/AnalysisSegmentListingQueryParameter.java @@ -0,0 +1,48 @@ +package de.bitgilde.TIMAAT.rest.model.analysissegment; + +import de.bitgilde.TIMAAT.rest.model.parameter.ListingQueryParameter; +import de.bitgilde.TIMAAT.storage.entity.segment.api.AnalysisSegmentFilterCriteria; +import de.bitgilde.TIMAAT.storage.entity.segment.api.AnalysisSegmentSortingField; +import jakarta.ws.rs.QueryParam; + +import java.util.Collection; +import java.util.List; +import java.util.Optional; + +/** + * Query parameter offered by the listing endpoint of {@link de.bitgilde.TIMAAT.model.FIPOP.AnalysisSegment}s + * + * @author Nico Kotlenga + * @since 31.12.25 + */ +public class AnalysisSegmentListingQueryParameter extends ListingQueryParameter<AnalysisSegmentSortingField> implements AnalysisSegmentFilterCriteria { + + @QueryParam("categoryIds") + private List<Integer> categoryIds; + @QueryParam("categorySetIds") + private List<Integer> categorySetIds; + + + @Override + public Optional<Collection<Integer>> getCategoryIds() { + return Optional.ofNullable(categoryIds); + } + + @Override + public Optional<Collection<Integer>> getCategorySetIds() { + return Optional.ofNullable(categorySetIds); + } + + @Override + public Optional<String> getAnalysisSegmentNameSearch() { + return Optional.ofNullable(this.getSearch()); + } + + public void setCategoryIds(List<Integer> categoryIds) { + this.categoryIds = categoryIds; + } + + public void setCategorySetIds(List<Integer> categorySetIds) { + this.categorySetIds = categorySetIds; + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/SegmentStructureElementsStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/SegmentStructureElementsStorage.java new file mode 100644 index 00000000..6cd93faa --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/SegmentStructureElementsStorage.java @@ -0,0 +1,78 @@ +package de.bitgilde.TIMAAT.storage.entity.segment; + +import de.bitgilde.TIMAAT.db.DbAccessComponent; +import de.bitgilde.TIMAAT.model.FIPOP.AnalysisAction; +import de.bitgilde.TIMAAT.model.FIPOP.AnalysisScene; +import de.bitgilde.TIMAAT.model.FIPOP.AnalysisSegment; +import de.bitgilde.TIMAAT.model.FIPOP.AnalysisSequence; +import de.bitgilde.TIMAAT.model.FIPOP.AnalysisTake; +import de.bitgilde.TIMAAT.model.FIPOP.Category; +import de.bitgilde.TIMAAT.model.FIPOP.CategorySetHasCategory; +import de.bitgilde.TIMAAT.model.FIPOP.SegmentStructureEntity; +import de.bitgilde.TIMAAT.storage.entity.segment.api.SegmentStructureType; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManagerFactory; + +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * Storage responsible to access and modify {@link AnalysisSegment}s + * + * @author Nico Kotlenga + * @since 31.12.25 + */ +public class SegmentStructureElementsStorage extends DbAccessComponent { + + private static final Map<SegmentStructureType, Class<? extends SegmentStructureEntity>> SEGMENT_STRUCTURE_ENTITY_CLASS_BY_SEGMENT_STRUCTURE_TYPE = Map.of( + SegmentStructureType.SEGMENT, AnalysisSegment.class, SegmentStructureType.SEQUENCE, AnalysisSequence.class, + SegmentStructureType.TAKE, AnalysisTake.class, SegmentStructureType.SCENE, AnalysisScene.class, + SegmentStructureType.ACTION, AnalysisAction.class); + + + @Inject + public SegmentStructureElementsStorage(EntityManagerFactory emf) { + super(emf); + } + + public List<Category> updateCategories(int segmentStructureId, SegmentStructureType segmentStructureType, Collection<Integer> categoryIds) { + return executeDbTransaction(entityManager -> { + Class<? extends SegmentStructureEntity> segmentTypeEntityClass = SEGMENT_STRUCTURE_ENTITY_CLASS_BY_SEGMENT_STRUCTURE_TYPE.get( + segmentStructureType); + + SegmentStructureEntity segmentStructureEntity = entityManager.find(segmentTypeEntityClass, segmentStructureId); + int mediumAnalysisListId = segmentStructureEntity.getMediumAnalysisList().getId(); + + List<Category> categories = categoryIds.isEmpty() ? Collections.emptyList() : entityManager.createQuery( + "select category from Category category where category.id in (select cshs.category.id from MediumAnalysisList mediumAnalysisList join mediumAnalysisList.categorySets categorySets join categorySets.categorySetHasCategories cshs where mediumAnalysisList.id = :mediumAnalysisListId and cshs.category.id in :categoryIds)", + Category.class).setParameter("categoryIds", categoryIds).setParameter("mediumAnalysisListId", + mediumAnalysisListId).getResultList(); + + segmentStructureEntity.setCategories(categories); + return categories; + }); + } + + public List<Category> getAssignedCategories(int segmentStructureId, SegmentStructureType segmentStructureType) { + return executeDbTransaction(entityManager -> { + Class<? extends SegmentStructureEntity> segmentTypeEntityClass = SEGMENT_STRUCTURE_ENTITY_CLASS_BY_SEGMENT_STRUCTURE_TYPE.get( + segmentStructureType); + SegmentStructureEntity segmentStructureEntity = entityManager.find(segmentTypeEntityClass, segmentStructureId); + return segmentStructureEntity.getCategories(); + }); + } + + public List<Category> getAssignableCategories(int segmentStructureId, SegmentStructureType segmentStructureType) { + return executeDbTransaction(entityManager -> { + Class<? extends SegmentStructureEntity> segmentTypeEntityClass = SEGMENT_STRUCTURE_ENTITY_CLASS_BY_SEGMENT_STRUCTURE_TYPE.get( + segmentStructureType); + SegmentStructureEntity segmentStructureEntity = entityManager.find(segmentTypeEntityClass, segmentStructureId); + return segmentStructureEntity.getMediumAnalysisList().getCategorySets().stream() + .flatMap(categorySet -> categorySet.getCategorySetHasCategories().stream()) + .map(CategorySetHasCategory::getCategory).collect(Collectors.toList()); + }); + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/AnalysisSegmentFilterCriteria.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/AnalysisSegmentFilterCriteria.java new file mode 100644 index 00000000..e686dd92 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/AnalysisSegmentFilterCriteria.java @@ -0,0 +1,83 @@ +package de.bitgilde.TIMAAT.storage.entity.segment.api; + +import java.util.Collection; +import java.util.Optional; + +/* + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + +/** + * Filters which can be passed when listing items of {@link de.bitgilde.TIMAAT.storage.entity.actor.ActorStorage} + * + * @author Nico Kotlenga + * @since 27.12.25 + */ +public interface AnalysisSegmentFilterCriteria { + /** + * @return the category ids the returning actor should belong to + */ + Optional<Collection<Integer>> getCategoryIds(); + + /** + * @return the category set ids the retuning actor should belong to + */ + Optional<Collection<Integer>> getCategorySetIds(); + + /** + * @return the search text which the actor name should match + */ + Optional<String> getAnalysisSegmentNameSearch(); + + class Builder { + + private Collection<Integer> categoryIds = null; + private Collection<Integer> categorySetIds = null; + private String analysisSegmentNameSearch = null; + + public AnalysisSegmentFilterCriteria.Builder categoryIds(Collection<Integer> categoryIds) { + this.categoryIds = categoryIds; + return this; + } + + public AnalysisSegmentFilterCriteria.Builder categorySetIds(Collection<Integer> categorySetIds) { + this.categorySetIds = categorySetIds; + return this; + } + + public AnalysisSegmentFilterCriteria.Builder analysisSegmentNameSearch(String actorNameSearch) { + this.analysisSegmentNameSearch = actorNameSearch; + return this; + } + + public AnalysisSegmentFilterCriteria build() { + return new AnalysisSegmentFilterCriteria() { + @Override + public Optional<Collection<Integer>> getCategoryIds() { + return Optional.ofNullable(categoryIds); + } + + @Override + public Optional<Collection<Integer>> getCategorySetIds() { + return Optional.ofNullable(categorySetIds); + } + + @Override + public Optional<String> getAnalysisSegmentNameSearch() { + return Optional.ofNullable(analysisSegmentNameSearch); + } + + }; + } + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/AnalysisSegmentSortingField.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/AnalysisSegmentSortingField.java new file mode 100644 index 00000000..3083ad2c --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/AnalysisSegmentSortingField.java @@ -0,0 +1,41 @@ +package de.bitgilde.TIMAAT.storage.entity.segment.api; + +import de.bitgilde.TIMAAT.model.FIPOP.AnalysisSegment; +import de.bitgilde.TIMAAT.model.FIPOP.AnalysisSegment_; +import de.bitgilde.TIMAAT.storage.db.DbSortingField; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Root; + +/* + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + +/** + * Fields which can be used to sort the listing results of {@link AnalysisSegment}s + * + * @author Nico Kotlenga + * @since 31.12.25 + */ +public enum AnalysisSegmentSortingField implements DbSortingField<AnalysisSegment> { + ID; + + @Override + public Path<?> getPathFromRootEntity(Root<AnalysisSegment> root) { + switch (this) { + case ID: + return root.get(AnalysisSegment_.id); + default: + throw new IllegalArgumentException("Unexpected sorting field"); + } + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/SegmentStructureType.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/SegmentStructureType.java new file mode 100644 index 00000000..6788f689 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/SegmentStructureType.java @@ -0,0 +1,15 @@ +package de.bitgilde.TIMAAT.storage.entity.segment.api; + +/** + * Enum describes the different types of segment structures + * + * @author Nico Kotlenga + * @since 31.12.25 + */ +public enum SegmentStructureType { + SEGMENT, + SEQUENCE, + TAKE, + SCENE, + ACTION +} diff --git a/src/main/resources/database/db_update.sql b/src/main/resources/database/db_update.sql index ee871467..1b9cef27 100644 --- a/src/main/resources/database/db_update.sql +++ b/src/main/resources/database/db_update.sql @@ -349,6 +349,9 @@ BEGIN CREATE INDEX fk_actor_has_category_actor1_idx ON `fipop`.`actor_has_category` (actor_id ASC); CREATE INDEX fk_actor_has_category_category1_idx ON `fipop`.`actor_has_category` (category_id ASC); + + + END IF; END $$ DELIMITER ; diff --git a/src/main/webapp/js/model/timaat.marker.js b/src/main/webapp/js/model/timaat.marker.js index 9b01c173..fcc2dce1 100644 --- a/src/main/webapp/js/model/timaat.marker.js +++ b/src/main/webapp/js/model/timaat.marker.js @@ -312,8 +312,6 @@ this.uiElement.remove(); this.resizeObserver.disconnect(); $(document).off('timaat.timelineSortableSectionsUpdate', this.updateConnection) - - console.log("Remove marker connection") } } TIMAAT.TemporaryWaveformMarker = class TemporaryWaveformMarker { diff --git a/src/main/webapp/js/service/timaat.service.analysislist.js b/src/main/webapp/js/service/timaat.service.analysislist.js index d4551edc..643d71fc 100644 --- a/src/main/webapp/js/service/timaat.service.analysislist.js +++ b/src/main/webapp/js/service/timaat.service.analysislist.js @@ -107,8 +107,35 @@ }); }, + async updateCategoriesOfSegmentStructureElement(segmentStructureId, segmentStructureType, categoryIds){ + const payload = { + categoryIds + } + + return new Promise(resolve => { + $.ajax({ + url : window.location.protocol+'//'+window.location.host+"/TIMAAT/api/analysisList/"+segmentStructureType+"/"+segmentStructureId+"/categories", + type : "PUT", + contentType: "application/json; charset=utf-8", + data: JSON.stringify(payload), + dataType : "json", + beforeSend : function (xhr) { + xhr.setRequestHeader('Authorization', 'Bearer '+TIMAAT.Service.token); + }, + }).done(function(data) { + // console.log("TCL: getSelectedCategories -> data", data); + resolve(data); + }) + .fail(function(error) { + console.error("ERROR responseText: ", error.responseText); + console.error("ERROR: ", error); + }); + }).catch((error) => { + console.error("ERROR: ", error); + }); + }, + async getSelectedCategories(typeId, type) { - // console.log("TCL: getSelectedCategories -> typeId, type", typeId, type); return new Promise(resolve => { $.ajax({ url : window.location.protocol+'//'+window.location.host+"/TIMAAT/api/analysisList/"+type+"/"+typeId+"/category/list/", diff --git a/src/main/webapp/js/ui/timaat.inspector.js b/src/main/webapp/js/ui/timaat.inspector.js index d539f325..c955bce3 100644 --- a/src/main/webapp/js/ui/timaat.inspector.js +++ b/src/main/webapp/js/ui/timaat.inspector.js @@ -2022,12 +2022,14 @@ $annotationCategoriesMultiSelectDropdown.select2('destroy'); $annotationCategoriesMultiSelectDropdown.find('option').remove(); + const annotation = TIMAAT.VideoPlayer.curAnnotation; + $annotationCategoriesMultiSelectDropdown.select2({ closeOnSelect: false, scrollAfterSelect: true, allowClear: true, ajax: { - url: 'api/category/selectList/', + url: 'api/annotation/'+annotation.model.id+'/category/selectList/', type: 'GET', dataType: 'json', delay: 250, @@ -2052,8 +2054,7 @@ }, minimumInputLength: 0, }); - TIMAAT.AnnotationService.getSelectedCategories(TIMAAT.VideoPlayer.curAnnotation.model.id).then(function(data) { - // console.log("TCL: then: data", data); + TIMAAT.AnnotationService.getSelectedCategories(TIMAAT.VideoPlayer.curAnnotation.model.id).then(function(data) {; var categorySelect = $('#annotationCategoriesMultiSelectDropdown'); if (data.length > 0) { data.sort((a, b) => (a.name > b.name)? 1 : -1); @@ -2073,6 +2074,124 @@ } }); }); + $('#segmentElementCategoryFormSubmitButton').on('click', async function(event) { + event.preventDefault(); + if (TIMAAT.VideoPlayer.currentPermissionLevel < 2) { + $('#analysisListNoPermissionModal').modal('show'); + return; + } + const $segmentElementCategoriesForm = $('#segmentElementCategoriesForm') + + let type = $segmentElementCategoriesForm.data('type'); + // var modal = $('#segmentDatasetsSegmentCategories'); + if (!$segmentElementCategoriesForm.valid()) return false; + let segmentElement; + switch (type) { + case 'segment': + segmentElement= TIMAAT.VideoPlayer.curSegment; + break; + case 'sequence': + segmentElement= TIMAAT.VideoPlayer.curSequence; + break; + case 'take': + segmentElement= TIMAAT.VideoPlayer.curTake; + break; + case 'scene': + segmentElement= TIMAAT.VideoPlayer.curScene; + break; + case 'action': + segmentElement= TIMAAT.VideoPlayer.curAction; + break; + } + + const formDataRaw = $segmentElementCategoriesForm.serializeArray(); + + let i = 0; + const categoryIdList = []; + for (; i < formDataRaw.length; i++) { + categoryIdList.push(Number(formDataRaw[i].value)); + } + + segmentElement.model.categories = await TIMAAT.AnalysisListService.updateCategoriesOfSegmentStructureElement(segmentElement.model.id, type, categoryIdList) + }); + + $('#segmentElementCategoryFormDismissButton').on('click', function(event) { + const $segmentElementCategoriesMultiSelectDropdown = $('#segmentElementCategoriesMultiSelectDropdown') + $segmentElementCategoriesMultiSelectDropdown.val(null).trigger('change'); + $segmentElementCategoriesMultiSelectDropdown.select2('destroy'); + $segmentElementCategoriesMultiSelectDropdown.find('option').remove(); + let type = $('#segmentElementCategoriesForm').data('type'); + + let segmentElementId; + switch (type) { + case 'segment': + segmentElementId = TIMAAT.VideoPlayer.curSegment.model.id + break; + case 'sequence': + segmentElementId = TIMAAT.VideoPlayer.curSequence.model.id + break; + case 'take': + segmentElementId = TIMAAT.VideoPlayer.curTake.model.id + break; + case 'scene': + segmentElementId = TIMAAT.VideoPlayer.curScene.model.id + break; + case 'action': + segmentElementId = TIMAAT.VideoPlayer.curAction.model.id + break; + } + + $segmentElementCategoriesMultiSelectDropdown.select2({ + closeOnSelect: false, + scrollAfterSelect: true, + allowClear: true, + minimumResultsForSearch: 10, + ajax: { + url: 'api/analysisList/'+type+'/'+segmentElementId+'/category/selectList/', + type: 'GET', + dataType: 'json', + delay: 250, + headers: { + "Authorization": "Bearer "+TIMAAT.Service.token, + "Content-Type": "application/json", + }, + // additional parameters + data: function(params) { + return { + search: params.term, + page: params.page + }; + }, + processResults: function(data, params) { + params.page = params.page || 1; + return { + results: data + }; + }, + cache: false + }, + minimumInputLength: 0, + }); + + TIMAAT.AnalysisListService.getSelectedCategories(segmentElementId, type).then(function(data) {; + if (data.length > 0) { + data.sort((a, b) => (a.name > b.name)? 1 : -1); + // create the options and append to Select2 + let i = 0; + for (; i < data.length; i++) { + const option = new Option(data[i].name, data[i].id, true, true); + $segmentElementCategoriesMultiSelectDropdown.append(option).trigger('change'); + } + // manually trigger the 'select2:select' event + $segmentElementCategoriesMultiSelectDropdown.trigger({ + type: 'select2:select', + params: { + data: data + } + }); + } + }); + }) // thumbnail const annotationThumbnailPositionSliderInput = $('.inspectorThumbnailEditSectionCustomRangeSliderInput') From 643f5c63f10dde6ae427510b54a0524793944cb4 Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Sat, 10 Jan 2026 18:33:30 +0100 Subject: [PATCH 25/70] TIMAAT Weiterentwicklung #9 - Implemented endpoint segment structure element * Added endpoint to get segment structure elements * Added views which are combining information of segment structure elements into one table --- docs/database.md | 3 +- .../TIMAAT/model/FIPOP/AnalysisAction.java | 8 +- .../TIMAAT/model/FIPOP/AnalysisScene.java | 8 +- .../TIMAAT/model/FIPOP/AnalysisSegment.java | 9 +- .../AnalysisSegmentStructureElement.java | 82 +++++++++++++ .../AnalysisSegmentStructureElementId.java | 55 +++++++++ .../TIMAAT/model/FIPOP/AnalysisSequence.java | 8 +- .../TIMAAT/model/FIPOP/AnalysisTake.java | 8 +- .../model/FIPOP/SegmentStructureEntity.java | 8 ++ .../rest/endpoint/EndpointAnalysisList.java | 14 +-- ...a => EndpointSegmentStructureElement.java} | 25 ++-- ...tructureElementListingQueryParameter.java} | 8 +- .../segment/SegmentStructureElement.java | 74 ++++++++++++ .../TIMAAT/storage/api/EntityStorage.java | 36 ++++++ .../bitgilde/TIMAAT/storage/db/DbStorage.java | 3 +- .../SegmentStructureElementsStorage.java | 73 +++++++++--- ...egmentStructureElementFilterCriteria.java} | 18 +-- ....java => SegmentStructureElementType.java} | 2 +- ...java => SegmentStructureSortingField.java} | 9 +- src/main/resources/database/db_update.sql | 101 +++++++++++++++- src/main/resources/database/fipop.sql | 108 ++++++++++++++++++ 21 files changed, 602 insertions(+), 58 deletions(-) create mode 100644 src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisSegmentStructureElement.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisSegmentStructureElementId.java rename src/main/java/de/bitgilde/TIMAAT/rest/endpoint/{EndpointAnalysisSegment.java => EndpointSegmentStructureElement.java} (50%) rename src/main/java/de/bitgilde/TIMAAT/rest/model/analysissegment/{AnalysisSegmentListingQueryParameter.java => SegmentStructureElementListingQueryParameter.java} (72%) create mode 100644 src/main/java/de/bitgilde/TIMAAT/rest/model/segment/SegmentStructureElement.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/storage/api/EntityStorage.java rename src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/{AnalysisSegmentFilterCriteria.java => SegmentStructureElementFilterCriteria.java} (73%) rename src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/{SegmentStructureType.java => SegmentStructureElementType.java} (84%) rename src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/{AnalysisSegmentSortingField.java => SegmentStructureSortingField.java} (73%) diff --git a/docs/database.md b/docs/database.md index 2770c8ff..806b4fa0 100644 --- a/docs/database.md +++ b/docs/database.md @@ -48,4 +48,5 @@ The versioning of the database schema follows the following pattern: ### 0.15.1 * Removed unused column `category_set_id` from table `annotation_has_category` -* Added tables `actor_has_category_set` and `actor_has_category` to link actors with categories \ No newline at end of file +* Added tables `actor_has_category_set` and `actor_has_category` to link actors with categories +* Added view `analysis_segment_structure_element` which combines information of all segment structure type tables \ No newline at end of file diff --git a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisAction.java b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisAction.java index e8a87e75..a3c8e9d0 100644 --- a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisAction.java +++ b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisAction.java @@ -114,7 +114,13 @@ public long getStartTime() { return this.startTime; } - public void setStartTime(long startTime) { + @JsonIgnore + @Override + public String getName() { + return analysisActionTranslations.get(0).getName(); + } + + public void setStartTime(long startTime) { this.startTime = startTime; } diff --git a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisScene.java b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisScene.java index 2ddbe0fd..9368a3ec 100644 --- a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisScene.java +++ b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisScene.java @@ -120,7 +120,13 @@ public long getStartTime() { return this.startTime; } - public void setStartTime(long startTime) { + @JsonIgnore + @Override + public String getName() { + return analysisSceneTranslations.get(0).getName(); + } + + public void setStartTime(long startTime) { this.startTime = startTime; } diff --git a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisSegment.java b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisSegment.java index c2163c03..45a8e92b 100644 --- a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisSegment.java +++ b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisSegment.java @@ -1,6 +1,7 @@ package de.bitgilde.TIMAAT.model.FIPOP; import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonManagedReference; import jakarta.persistence.CascadeType; import jakarta.persistence.Column; @@ -111,7 +112,13 @@ public long getStartTime() { return this.startTime; } - public void setStartTime(long startTime) { + @JsonIgnore + @Override + public String getName() { + return analysisSegmentTranslations.get(0).getName(); + } + + public void setStartTime(long startTime) { this.startTime = startTime; } diff --git a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisSegmentStructureElement.java b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisSegmentStructureElement.java new file mode 100644 index 00000000..ca629aec --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisSegmentStructureElement.java @@ -0,0 +1,82 @@ +package de.bitgilde.TIMAAT.model.FIPOP; + +import jakarta.persistence.Column; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; + +import java.util.List; + +@Entity +@Table(name = "analysis_segment_structure_element") +public class AnalysisSegmentStructureElement { + @EmbeddedId + private AnalysisSegmentStructureElementId id; + + @NotNull + @Column(name = "start_time", nullable = false, insertable = false, updatable = false) + private Integer startTime; + + @NotNull + @Column(name = "end_time", nullable = false, insertable = false, updatable = false) + private Integer endTime; + + @Size(max = 255) + @NotNull + @Column(name = "name", nullable = false, insertable = false, updatable = false) + private String name; + + @ManyToOne + @JoinColumn(name = "analysis_list_id") + private MediumAnalysisList mediumAnalysisList; + + @ManyToMany + @JoinTable(name = "analysis_segment_structure_element_has_category", inverseJoinColumns = {@JoinColumn(name = "category_id")}, joinColumns = {@JoinColumn(name = "id"), @JoinColumn(name = "structure_element_type")}) + private List<Category> categories; + + public AnalysisSegmentStructureElementId getId() { + return id; + } + + public Integer getStartTime() { + return startTime; + } + + public Integer getEndTime() { + return endTime; + } + + public String getName() { + return name; + } + + public MediumAnalysisList getMediumAnalysisList() { + return mediumAnalysisList; + } + + public void setMediumAnalysisList(MediumAnalysisList mediumAnalysisList) { + this.mediumAnalysisList = mediumAnalysisList; + } + + public void setName(String name) { + this.name = name; + } + + public void setEndTime(Integer endTime) { + this.endTime = endTime; + } + + public void setStartTime(Integer startTime) { + this.startTime = startTime; + } + + public void setId(AnalysisSegmentStructureElementId id) { + this.id = id; + } +} \ No newline at end of file diff --git a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisSegmentStructureElementId.java b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisSegmentStructureElementId.java new file mode 100644 index 00000000..90151cca --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisSegmentStructureElementId.java @@ -0,0 +1,55 @@ +package de.bitgilde.TIMAAT.model.FIPOP; + +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; + +import java.io.Serializable; +import java.util.Objects; + +@Embeddable +public class AnalysisSegmentStructureElementId implements Serializable { + private static final long serialVersionUID = -4328732809826830350L; + @Size(max = 8) + @NotNull + @Column(name = "structure_element_type", nullable = false, length = 8) + private String structureElementType; + + @NotNull + @Column(name = "id", nullable = false) + private Integer id; + + public String getStructureElementType() { + return structureElementType; + } + + public void setStructureElementType(String structureElementType) { + this.structureElementType = structureElementType; + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AnalysisSegmentStructureElementId entity = (AnalysisSegmentStructureElementId) o; + return Objects.equals(this.structureElementType, entity.structureElementType) && Objects.equals(this.id, entity.id); + } + + @Override + public int hashCode() { + return Objects.hash(structureElementType, id); + } +} \ No newline at end of file diff --git a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisSequence.java b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisSequence.java index 25d3b988..8120a6df 100644 --- a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisSequence.java +++ b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisSequence.java @@ -120,7 +120,13 @@ public long getStartTime() { return this.startTime; } - public void setStartTime(long startTime) { + @JsonIgnore + @Override + public String getName() { + return analysisSequenceTranslations.get(0).getName(); + } + + public void setStartTime(long startTime) { this.startTime = startTime; } @Override diff --git a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisTake.java b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisTake.java index c0805eb7..d608997b 100644 --- a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisTake.java +++ b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisTake.java @@ -114,7 +114,13 @@ public long getStartTime() { return this.startTime; } - public void setStartTime(long startTime) { + @JsonIgnore + @Override + public String getName() { + return analysisTakeTranslations.get(0).getName(); + } + + public void setStartTime(long startTime) { this.startTime = startTime; } diff --git a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/SegmentStructureEntity.java b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/SegmentStructureEntity.java index 5f1bb981..71c7d2f4 100644 --- a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/SegmentStructureEntity.java +++ b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/SegmentStructureEntity.java @@ -10,6 +10,14 @@ */ public interface SegmentStructureEntity { + int getId(); + + long getEndTime(); + + long getStartTime(); + + String getName(); + List<Category> getCategories(); void setCategories(List<Category> categories); diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnalysisList.java b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnalysisList.java index 15ef5522..7c9a8e17 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnalysisList.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnalysisList.java @@ -37,7 +37,7 @@ import de.bitgilde.TIMAAT.security.UserLogManager; import de.bitgilde.TIMAAT.storage.entity.analysislist.AnalysisListStorage; import de.bitgilde.TIMAAT.storage.entity.segment.SegmentStructureElementsStorage; -import de.bitgilde.TIMAAT.storage.entity.segment.api.SegmentStructureType; +import de.bitgilde.TIMAAT.storage.entity.segment.api.SegmentStructureElementType; import jakarta.inject.Inject; import jakarta.persistence.EntityManager; import jakarta.persistence.EntityTransaction; @@ -189,16 +189,16 @@ public Response getCategorySetList(@PathParam("id") Integer id) { @Produces(MediaType.APPLICATION_JSON) @Secured @Path("{segmentType}/{id}/category/list") - public List<Category> getSegmentStructureElementCategories(@PathParam("id") int id, @PathParam("segmentType") SegmentStructureType segmentStructureType) { - return segmentStructureElementsStorage.getAssignedCategories(id, segmentStructureType); + public List<Category> getSegmentStructureElementCategories(@PathParam("id") int id, @PathParam("segmentType") SegmentStructureElementType segmentStructureElementType) { + return segmentStructureElementsStorage.getAssignedCategories(id, segmentStructureElementType); } @GET @Produces(MediaType.APPLICATION_JSON) @Secured @Path("{segmentType}/{id}/category/selectList") - public List<SelectElement<Integer>> getSegmentStructureElementCategoriesSelectList(@PathParam("id") int id, @PathParam("segmentType") SegmentStructureType segmentStructureType) { - return segmentStructureElementsStorage.getAssignableCategories(id, segmentStructureType).stream().map(currentCategory -> new SelectElement<>(currentCategory.getId(), currentCategory.getName())).collect( + public List<SelectElement<Integer>> getSegmentStructureElementCategoriesSelectList(@PathParam("id") int id, @PathParam("segmentType") SegmentStructureElementType segmentStructureElementType) { + return segmentStructureElementsStorage.getAssignableCategories(id, segmentStructureElementType).stream().map(currentCategory -> new SelectElement<>(currentCategory.getId(), currentCategory.getName())).collect( Collectors.toList()); } @@ -206,8 +206,8 @@ public List<SelectElement<Integer>> getSegmentStructureElementCategoriesSelectLi @Produces(MediaType.APPLICATION_JSON) @Secured @Path("{segmentType}/{id}/categories") - public List<Category> updateSegmentStructureElementCategories(@PathParam("id") int id, @PathParam("segmentType") SegmentStructureType segmentStructureType, UpdateAssignedCategoriesPayload updateAssignedCategoriesPayload) { - return segmentStructureElementsStorage.updateCategories(id, segmentStructureType, + public List<Category> updateSegmentStructureElementCategories(@PathParam("id") int id, @PathParam("segmentType") SegmentStructureElementType segmentStructureElementType, UpdateAssignedCategoriesPayload updateAssignedCategoriesPayload) { + return segmentStructureElementsStorage.updateCategories(id, segmentStructureElementType, updateAssignedCategoriesPayload.getCategoryIds()); } diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnalysisSegment.java b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointSegmentStructureElement.java similarity index 50% rename from src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnalysisSegment.java rename to src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointSegmentStructureElement.java index c748778a..0e0dc7f1 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnalysisSegment.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointSegmentStructureElement.java @@ -1,8 +1,10 @@ package de.bitgilde.TIMAAT.rest.endpoint; import de.bitgilde.TIMAAT.model.DataTableInfo; -import de.bitgilde.TIMAAT.model.FIPOP.AnalysisSegment; -import de.bitgilde.TIMAAT.rest.model.analysissegment.AnalysisSegmentListingQueryParameter; +import de.bitgilde.TIMAAT.model.FIPOP.UserAccount; +import de.bitgilde.TIMAAT.rest.filter.AuthenticationFilter; +import de.bitgilde.TIMAAT.rest.model.analysissegment.SegmentStructureElementListingQueryParameter; +import de.bitgilde.TIMAAT.rest.model.segment.SegmentStructureElement; import de.bitgilde.TIMAAT.storage.entity.segment.SegmentStructureElementsStorage; import jakarta.inject.Inject; import jakarta.ws.rs.BeanParam; @@ -13,7 +15,8 @@ import jakarta.ws.rs.core.Context; import org.jvnet.hk2.annotations.Service; -import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; /* Licensed under the Apache License, Version 2.0 (the "License"); @@ -36,8 +39,8 @@ * @since 31.12.25 */ @Service -@Path("/analysis-segments") -public class EndpointAnalysisSegment { +@Path("/segment-structure-elements") +public class EndpointSegmentStructureElement { @Inject SegmentStructureElementsStorage segmentStructureElements; @Context @@ -46,7 +49,15 @@ public class EndpointAnalysisSegment { @GET @Produces @Path("list") - public DataTableInfo<AnalysisSegment> listAnalysisSegments(@BeanParam AnalysisSegmentListingQueryParameter queryParameter) { - return new DataTableInfo<>(0, 0, 0, Collections.emptyList()); + public DataTableInfo<SegmentStructureElement> listSegmentStructureElements(@BeanParam SegmentStructureElementListingQueryParameter queryParameter) { + int draw = queryParameter.getDraw().orElse(0); + + UserAccount userAccount = (UserAccount) containerRequestContext.getProperty( + AuthenticationFilter.USER_ACCOUNT_PROPERTY_NAME); + List<SegmentStructureElement> matchingEntries = segmentStructureElements.getEntriesAsStream(queryParameter, + queryParameter, queryParameter, userAccount).map(SegmentStructureElement::new).collect(Collectors.toList()); + long countOfMatchingEntries = segmentStructureElements.getNumberOfMatchingEntries(queryParameter); + long totalCount = segmentStructureElements.getNumberOfTotalEntries(); + return new DataTableInfo<>(draw, totalCount, countOfMatchingEntries, matchingEntries); } } diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/model/analysissegment/AnalysisSegmentListingQueryParameter.java b/src/main/java/de/bitgilde/TIMAAT/rest/model/analysissegment/SegmentStructureElementListingQueryParameter.java similarity index 72% rename from src/main/java/de/bitgilde/TIMAAT/rest/model/analysissegment/AnalysisSegmentListingQueryParameter.java rename to src/main/java/de/bitgilde/TIMAAT/rest/model/analysissegment/SegmentStructureElementListingQueryParameter.java index 39dd5ea8..9a58ad3d 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/model/analysissegment/AnalysisSegmentListingQueryParameter.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/model/analysissegment/SegmentStructureElementListingQueryParameter.java @@ -1,8 +1,8 @@ package de.bitgilde.TIMAAT.rest.model.analysissegment; import de.bitgilde.TIMAAT.rest.model.parameter.ListingQueryParameter; -import de.bitgilde.TIMAAT.storage.entity.segment.api.AnalysisSegmentFilterCriteria; -import de.bitgilde.TIMAAT.storage.entity.segment.api.AnalysisSegmentSortingField; +import de.bitgilde.TIMAAT.storage.entity.segment.api.SegmentStructureElementFilterCriteria; +import de.bitgilde.TIMAAT.storage.entity.segment.api.SegmentStructureSortingField; import jakarta.ws.rs.QueryParam; import java.util.Collection; @@ -15,7 +15,7 @@ * @author Nico Kotlenga * @since 31.12.25 */ -public class AnalysisSegmentListingQueryParameter extends ListingQueryParameter<AnalysisSegmentSortingField> implements AnalysisSegmentFilterCriteria { +public class SegmentStructureElementListingQueryParameter extends ListingQueryParameter<SegmentStructureSortingField> implements SegmentStructureElementFilterCriteria { @QueryParam("categoryIds") private List<Integer> categoryIds; @@ -34,7 +34,7 @@ public Optional<Collection<Integer>> getCategorySetIds() { } @Override - public Optional<String> getAnalysisSegmentNameSearch() { + public Optional<String> getSegmentStructureElementNameSearch() { return Optional.ofNullable(this.getSearch()); } diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/model/segment/SegmentStructureElement.java b/src/main/java/de/bitgilde/TIMAAT/rest/model/segment/SegmentStructureElement.java new file mode 100644 index 00000000..d41b81ac --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/rest/model/segment/SegmentStructureElement.java @@ -0,0 +1,74 @@ +package de.bitgilde.TIMAAT.rest.model.segment; + +/* + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + +import com.fasterxml.jackson.annotation.JsonProperty; +import de.bitgilde.TIMAAT.model.FIPOP.AnalysisSegmentStructureElement; +import de.bitgilde.TIMAAT.storage.entity.segment.api.SegmentStructureElementType; + +/** + * Combined type providing all shared information of segment structure entities + * + * @author Nico Kotlenga + * @since 10.01.26 + */ +public class SegmentStructureElement { + + private static final String ID_FIELD_NAME = "id"; + private static final String END_TIME_FIELD_NAME = "endTime"; + private static final String START_TIME_FIELD_NAME = "startTime"; + private static final String NAME_FIELD_NAME = "name"; + private static final String SEGMENT_STRUCTURE_ELEMENT_TYPE = "segmentStructureElementType"; + + @JsonProperty(ID_FIELD_NAME) + private final int id; + @JsonProperty(END_TIME_FIELD_NAME) + private final long endTime; + @JsonProperty(START_TIME_FIELD_NAME) + private final long startTime; + @JsonProperty(NAME_FIELD_NAME) + private final String name; + @JsonProperty(SEGMENT_STRUCTURE_ELEMENT_TYPE) + private final SegmentStructureElementType segmentStructureElementType; + + public SegmentStructureElement(AnalysisSegmentStructureElement segmentStructureElementEntity) { + this.id = segmentStructureElementEntity.getId().getId(); + this.endTime = segmentStructureElementEntity.getEndTime(); + this.startTime = segmentStructureElementEntity.getStartTime(); + this.name = segmentStructureElementEntity.getName(); + this.segmentStructureElementType = SegmentStructureElementType.valueOf( + segmentStructureElementEntity.getId().getStructureElementType()); + } + + public int getId() { + return id; + } + + public long getEndTime() { + return endTime; + } + + public long getStartTime() { + return startTime; + } + + public String getName() { + return name; + } + + public SegmentStructureElementType getSegmentStructureElementType() { + return segmentStructureElementType; + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/api/EntityStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/api/EntityStorage.java new file mode 100644 index 00000000..fe42a3d3 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/storage/api/EntityStorage.java @@ -0,0 +1,36 @@ +package de.bitgilde.TIMAAT.storage.api; + +import de.bitgilde.TIMAAT.model.FIPOP.UserAccount; + +import java.util.stream.Stream; + +/** + * Interface describing the functionalities an entity storage will provide + * + * @author Nico Kotlenga + * @since 10.01.26 + */ +public interface EntityStorage<ENTITY_TYPE, FILTER_TYPE, SORTING_FIELD_TYPE extends SortingField> { + + /** + * Loads the entries as stream matching the specified criteria. + * @param filter which the entities have to match + * @param pagingParameter used to limit the size of the resulting stream + * @param sortingParameter used to determine the order of entries inside the stream + * @param userAccount used to filter entries by authorization + * @return the resulting {@link Stream} + */ + Stream<ENTITY_TYPE> getEntriesAsStream(FILTER_TYPE filter, PagingParameter pagingParameter, SortingParameter<SORTING_FIELD_TYPE> sortingParameter, UserAccount userAccount); + + /** + * Loads the count of entities matching the specified filters + * @param filter which the items will match + * @return the number of matching entries + */ + Long getNumberOfMatchingEntries(FILTER_TYPE filter); + + /** + * @return the number of total entries inside the storage + */ + Long getNumberOfTotalEntries(); +} diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/db/DbStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/db/DbStorage.java index f72011c1..92671a71 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/db/DbStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/db/DbStorage.java @@ -3,6 +3,7 @@ import de.bitgilde.TIMAAT.db.DbAccessComponent; import de.bitgilde.TIMAAT.model.FIPOP.Music; import de.bitgilde.TIMAAT.model.FIPOP.UserAccount; +import de.bitgilde.TIMAAT.storage.api.EntityStorage; import de.bitgilde.TIMAAT.storage.api.PagingParameter; import de.bitgilde.TIMAAT.storage.api.SortOrder; import de.bitgilde.TIMAAT.storage.api.SortingParameter; @@ -41,7 +42,7 @@ * @author Nico Kotlenga * @since 13.12.25 */ -public abstract class DbStorage<ENTITY_TYPE, FILTER_TYPE, SORTING_FIELD_TYPE extends DbSortingField<ENTITY_TYPE>> extends DbAccessComponent { +public abstract class DbStorage<ENTITY_TYPE, FILTER_TYPE, SORTING_FIELD_TYPE extends DbSortingField<ENTITY_TYPE>> extends DbAccessComponent implements EntityStorage<ENTITY_TYPE, FILTER_TYPE, SORTING_FIELD_TYPE> { private static final Logger logger = Logger.getLogger(DbStorage.class.getName()); diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/SegmentStructureElementsStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/SegmentStructureElementsStorage.java index 6cd93faa..7226d2a6 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/SegmentStructureElementsStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/SegmentStructureElementsStorage.java @@ -1,18 +1,33 @@ package de.bitgilde.TIMAAT.storage.entity.segment; -import de.bitgilde.TIMAAT.db.DbAccessComponent; import de.bitgilde.TIMAAT.model.FIPOP.AnalysisAction; import de.bitgilde.TIMAAT.model.FIPOP.AnalysisScene; import de.bitgilde.TIMAAT.model.FIPOP.AnalysisSegment; +import de.bitgilde.TIMAAT.model.FIPOP.AnalysisSegmentStructureElement; +import de.bitgilde.TIMAAT.model.FIPOP.AnalysisSegmentStructureElement_; import de.bitgilde.TIMAAT.model.FIPOP.AnalysisSequence; import de.bitgilde.TIMAAT.model.FIPOP.AnalysisTake; import de.bitgilde.TIMAAT.model.FIPOP.Category; +import de.bitgilde.TIMAAT.model.FIPOP.CategorySet; import de.bitgilde.TIMAAT.model.FIPOP.CategorySetHasCategory; +import de.bitgilde.TIMAAT.model.FIPOP.CategorySet_; +import de.bitgilde.TIMAAT.model.FIPOP.Category_; +import de.bitgilde.TIMAAT.model.FIPOP.MediumAnalysisList; +import de.bitgilde.TIMAAT.model.FIPOP.MediumAnalysisList_; import de.bitgilde.TIMAAT.model.FIPOP.SegmentStructureEntity; -import de.bitgilde.TIMAAT.storage.entity.segment.api.SegmentStructureType; +import de.bitgilde.TIMAAT.storage.db.DbStorage; +import de.bitgilde.TIMAAT.storage.entity.segment.api.SegmentStructureElementFilterCriteria; +import de.bitgilde.TIMAAT.storage.entity.segment.api.SegmentStructureElementType; +import de.bitgilde.TIMAAT.storage.entity.segment.api.SegmentStructureSortingField; import jakarta.inject.Inject; import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; +import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; @@ -25,23 +40,24 @@ * @author Nico Kotlenga * @since 31.12.25 */ -public class SegmentStructureElementsStorage extends DbAccessComponent { +public class SegmentStructureElementsStorage extends DbStorage<AnalysisSegmentStructureElement, SegmentStructureElementFilterCriteria, SegmentStructureSortingField> { - private static final Map<SegmentStructureType, Class<? extends SegmentStructureEntity>> SEGMENT_STRUCTURE_ENTITY_CLASS_BY_SEGMENT_STRUCTURE_TYPE = Map.of( - SegmentStructureType.SEGMENT, AnalysisSegment.class, SegmentStructureType.SEQUENCE, AnalysisSequence.class, - SegmentStructureType.TAKE, AnalysisTake.class, SegmentStructureType.SCENE, AnalysisScene.class, - SegmentStructureType.ACTION, AnalysisAction.class); + private static final Map<SegmentStructureElementType, Class<? extends SegmentStructureEntity>> SEGMENT_STRUCTURE_ENTITY_CLASS_BY_SEGMENT_STRUCTURE_TYPE = Map.of( + SegmentStructureElementType.SEGMENT, AnalysisSegment.class, SegmentStructureElementType.SEQUENCE, + AnalysisSequence.class, SegmentStructureElementType.TAKE, AnalysisTake.class, + SegmentStructureElementType.SCENE, AnalysisScene.class, SegmentStructureElementType.ACTION, + AnalysisAction.class); @Inject public SegmentStructureElementsStorage(EntityManagerFactory emf) { - super(emf); + super(AnalysisSegmentStructureElement.class, SegmentStructureSortingField.ID, emf); } - public List<Category> updateCategories(int segmentStructureId, SegmentStructureType segmentStructureType, Collection<Integer> categoryIds) { + public List<Category> updateCategories(int segmentStructureId, SegmentStructureElementType segmentStructureElementType, Collection<Integer> categoryIds) { return executeDbTransaction(entityManager -> { Class<? extends SegmentStructureEntity> segmentTypeEntityClass = SEGMENT_STRUCTURE_ENTITY_CLASS_BY_SEGMENT_STRUCTURE_TYPE.get( - segmentStructureType); + segmentStructureElementType); SegmentStructureEntity segmentStructureEntity = entityManager.find(segmentTypeEntityClass, segmentStructureId); int mediumAnalysisListId = segmentStructureEntity.getMediumAnalysisList().getId(); @@ -56,23 +72,52 @@ public List<Category> updateCategories(int segmentStructureId, SegmentStructureT }); } - public List<Category> getAssignedCategories(int segmentStructureId, SegmentStructureType segmentStructureType) { + public List<Category> getAssignedCategories(int segmentStructureId, SegmentStructureElementType segmentStructureElementType) { return executeDbTransaction(entityManager -> { Class<? extends SegmentStructureEntity> segmentTypeEntityClass = SEGMENT_STRUCTURE_ENTITY_CLASS_BY_SEGMENT_STRUCTURE_TYPE.get( - segmentStructureType); + segmentStructureElementType); SegmentStructureEntity segmentStructureEntity = entityManager.find(segmentTypeEntityClass, segmentStructureId); return segmentStructureEntity.getCategories(); }); } - public List<Category> getAssignableCategories(int segmentStructureId, SegmentStructureType segmentStructureType) { + public List<Category> getAssignableCategories(int segmentStructureId, SegmentStructureElementType segmentStructureElementType) { return executeDbTransaction(entityManager -> { Class<? extends SegmentStructureEntity> segmentTypeEntityClass = SEGMENT_STRUCTURE_ENTITY_CLASS_BY_SEGMENT_STRUCTURE_TYPE.get( - segmentStructureType); + segmentStructureElementType); SegmentStructureEntity segmentStructureEntity = entityManager.find(segmentTypeEntityClass, segmentStructureId); return segmentStructureEntity.getMediumAnalysisList().getCategorySets().stream() .flatMap(categorySet -> categorySet.getCategorySetHasCategories().stream()) .map(CategorySetHasCategory::getCategory).collect(Collectors.toList()); }); } + + @Override + protected List<Predicate> createPredicates(SegmentStructureElementFilterCriteria filter, Root<AnalysisSegmentStructureElement> root, CriteriaBuilder criteriaBuilder, CriteriaQuery<?> criteriaQuery) { + List<Predicate> predicates = new ArrayList<>(); + + if (filter.getSegmentStructureElementNameSearch().isPresent()) { + String searchText = filter.getSegmentStructureElementNameSearch().get(); + predicates.add(criteriaBuilder.like(root.get(AnalysisSegmentStructureElement_.name), "%" + searchText + "%")); + } + + boolean categoryFilterActive = filter.getCategoryIds().isPresent() && !filter.getCategoryIds().get().isEmpty(); + if (categoryFilterActive) { + Join<AnalysisSegmentStructureElement, Category> categoryJoin = root.join( + AnalysisSegmentStructureElement_.categories); + predicates.add(categoryJoin.get(Category_.id).in(filter.getCategoryIds().get())); + } + + boolean categorySetFilterActive = filter.getCategorySetIds().isPresent() && !filter.getCategorySetIds().get() + .isEmpty(); + if (categorySetFilterActive) { + Join<AnalysisSegmentStructureElement, MediumAnalysisList> mediumAnalysisListJoin = root.join( + AnalysisSegmentStructureElement_.mediumAnalysisList); + Join<MediumAnalysisList, CategorySet> categorySetJoin = mediumAnalysisListJoin.join( + MediumAnalysisList_.categorySets); + predicates.add(categorySetJoin.get(CategorySet_.id).in(filter.getCategorySetIds().get())); + } + + return predicates; + } } diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/AnalysisSegmentFilterCriteria.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/SegmentStructureElementFilterCriteria.java similarity index 73% rename from src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/AnalysisSegmentFilterCriteria.java rename to src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/SegmentStructureElementFilterCriteria.java index e686dd92..d85a1383 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/AnalysisSegmentFilterCriteria.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/SegmentStructureElementFilterCriteria.java @@ -18,12 +18,12 @@ */ /** - * Filters which can be passed when listing items of {@link de.bitgilde.TIMAAT.storage.entity.actor.ActorStorage} + * Filters which can be passed when listing items of {@link de.bitgilde.TIMAAT.storage.entity.segment.SegmentStructureElementsStorage} * * @author Nico Kotlenga * @since 27.12.25 */ -public interface AnalysisSegmentFilterCriteria { +public interface SegmentStructureElementFilterCriteria { /** * @return the category ids the returning actor should belong to */ @@ -37,7 +37,7 @@ public interface AnalysisSegmentFilterCriteria { /** * @return the search text which the actor name should match */ - Optional<String> getAnalysisSegmentNameSearch(); + Optional<String> getSegmentStructureElementNameSearch(); class Builder { @@ -45,23 +45,23 @@ class Builder { private Collection<Integer> categorySetIds = null; private String analysisSegmentNameSearch = null; - public AnalysisSegmentFilterCriteria.Builder categoryIds(Collection<Integer> categoryIds) { + public SegmentStructureElementFilterCriteria.Builder categoryIds(Collection<Integer> categoryIds) { this.categoryIds = categoryIds; return this; } - public AnalysisSegmentFilterCriteria.Builder categorySetIds(Collection<Integer> categorySetIds) { + public SegmentStructureElementFilterCriteria.Builder categorySetIds(Collection<Integer> categorySetIds) { this.categorySetIds = categorySetIds; return this; } - public AnalysisSegmentFilterCriteria.Builder analysisSegmentNameSearch(String actorNameSearch) { + public SegmentStructureElementFilterCriteria.Builder analysisSegmentNameSearch(String actorNameSearch) { this.analysisSegmentNameSearch = actorNameSearch; return this; } - public AnalysisSegmentFilterCriteria build() { - return new AnalysisSegmentFilterCriteria() { + public SegmentStructureElementFilterCriteria build() { + return new SegmentStructureElementFilterCriteria() { @Override public Optional<Collection<Integer>> getCategoryIds() { return Optional.ofNullable(categoryIds); @@ -73,7 +73,7 @@ public Optional<Collection<Integer>> getCategorySetIds() { } @Override - public Optional<String> getAnalysisSegmentNameSearch() { + public Optional<String> getSegmentStructureElementNameSearch() { return Optional.ofNullable(analysisSegmentNameSearch); } diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/SegmentStructureType.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/SegmentStructureElementType.java similarity index 84% rename from src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/SegmentStructureType.java rename to src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/SegmentStructureElementType.java index 6788f689..8d572311 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/SegmentStructureType.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/SegmentStructureElementType.java @@ -6,7 +6,7 @@ * @author Nico Kotlenga * @since 31.12.25 */ -public enum SegmentStructureType { +public enum SegmentStructureElementType { SEGMENT, SEQUENCE, TAKE, diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/AnalysisSegmentSortingField.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/SegmentStructureSortingField.java similarity index 73% rename from src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/AnalysisSegmentSortingField.java rename to src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/SegmentStructureSortingField.java index 3083ad2c..d0a77863 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/AnalysisSegmentSortingField.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/SegmentStructureSortingField.java @@ -1,7 +1,8 @@ package de.bitgilde.TIMAAT.storage.entity.segment.api; import de.bitgilde.TIMAAT.model.FIPOP.AnalysisSegment; -import de.bitgilde.TIMAAT.model.FIPOP.AnalysisSegment_; +import de.bitgilde.TIMAAT.model.FIPOP.AnalysisSegmentStructureElement; +import de.bitgilde.TIMAAT.model.FIPOP.AnalysisSegmentStructureElement_; import de.bitgilde.TIMAAT.storage.db.DbSortingField; import jakarta.persistence.criteria.Path; import jakarta.persistence.criteria.Root; @@ -26,14 +27,14 @@ * @author Nico Kotlenga * @since 31.12.25 */ -public enum AnalysisSegmentSortingField implements DbSortingField<AnalysisSegment> { +public enum SegmentStructureSortingField implements DbSortingField<AnalysisSegmentStructureElement> { ID; @Override - public Path<?> getPathFromRootEntity(Root<AnalysisSegment> root) { + public Path<?> getPathFromRootEntity(Root<AnalysisSegmentStructureElement> root) { switch (this) { case ID: - return root.get(AnalysisSegment_.id); + return root.get(AnalysisSegmentStructureElement_.id); default: throw new IllegalArgumentException("Unexpected sorting field"); } diff --git a/src/main/resources/database/db_update.sql b/src/main/resources/database/db_update.sql index 1b9cef27..b3885c8f 100644 --- a/src/main/resources/database/db_update.sql +++ b/src/main/resources/database/db_update.sql @@ -311,7 +311,7 @@ BEGIN CREATE TABLE `fipop`.`actor_has_category_set` ( - `actor_id` INT NOT NULL, + `actor_id` INT NOT NULL, `category_set_id` INT NOT NULL, CONSTRAINT `fk_actor_has_category_set_actor` FOREIGN KEY (`actor_id`) @@ -331,7 +331,7 @@ BEGIN CREATE TABLE `fipop`.`actor_has_category` ( - `actor_id` INT NOT NULL, + `actor_id` INT NOT NULL, `category_id` INT NOT NULL, CONSTRAINT `fk_actor_has_category_actor` FOREIGN KEY (`actor_id`) @@ -350,10 +350,101 @@ BEGIN CREATE INDEX fk_actor_has_category_category1_idx ON `fipop`.`actor_has_category` (category_id ASC); - - + create view `fipop`.`analysis_segment_structure_element` as + (select 'SEGMENT' as structure_element_type, + analysisSegment.id as id, + analysisSegment.analysis_list_id as analysis_list_id, + analysisSegment.start_time as start_time, + analysisSegment.end_time as end_time, + translation.name as name + from analysis_segment analysisSegment + join analysis_segment_translation translation + on analysisSegment.id = translation.analysis_segment_id) + UNION + (select 'SEQUENCE' as structure_element_type, + analysisSequence.id as id, + analysisSegment.analysis_list_id as analysis_list_id, + analysisSequence.start_time as start_time, + analysisSequence.end_time as end_time, + translation.name as name + from analysis_sequence analysisSequence + join analysis_segment analysisSegment on analysisSequence.analysis_segment_id = analysisSegment.id + join analysis_sequence_translation translation + on analysisSequence.id = translation.analysis_sequence_id) + UNION + (select 'TAKE' as structure_element_type, + analysisTake.id as id, + analysisSegment.analysis_list_id as analysis_list_id, + analysisTake.start_time as start_time, + analysisTake.end_time as end_time, + translation.name as name + from analysis_take analysisTake + join analysis_sequence analysisSequence on analysisTake.analysis_sequence_id = analysisSequence.id + join analysis_segment analysisSegment on analysisSequence.analysis_segment_id = analysisSegment.id + join analysis_take_translation translation + on analysisTake.id = translation.analysis_take_id) + UNION + (select 'SCENE' as structure_element_type, + analysisScene.id as id, + analysisSegment.analysis_list_id as analysis_list_id, + analysisScene.start_time as start_time, + analysisScene.end_time as end_time, + translation.name as name + from analysis_scene analysisScene + join analysis_segment analysisSegment on analysisScene.analysis_segment_id = analysisSegment.id + join analysis_scene_translation translation + on analysisScene.id = translation.analysis_scene_id) + UNION + (select 'ACTION' as structure_element_type, + analysisAction.id as id, + analysisSegment.analysis_list_id as analysis_list_id, + analysisAction.start_time as start_time, + analysisAction.end_time as end_time, + translation.name as name + from analysis_action analysisAction + join analysis_scene analysisScene on analysisAction.analysis_scene_id = analysisScene.id + join analysis_segment analysisSegment on analysisScene.analysis_segment_id = analysisSegment.id + join analysis_action_translation translation + on analysisAction.id = translation.analysis_action_id); + + create view `fipop`.`analysis_segment_structure_element_has_category` as + (select structureElement.id as id, + structureElement.structure_element_type as structure_element_type, + hasCategory.category_id as category_id + from analysis_segment_structure_element structureElement + join analysis_segment_has_category hasCategory on structureElement.id = hasCategory.analysis_segment_id + where structure_element_type = 'SEGMENT') + UNION + (select structureElement.id as id, + structureElement.structure_element_type as structure_element_type, + hasCategory.category_id as category_id + from analysis_segment_structure_element structureElement + join analysis_sequence_has_category hasCategory on structureElement.id = hasCategory.analysis_sequence_id + where structure_element_type = 'SEQUENCE') + UNION + (select structureElement.id as id, + structureElement.structure_element_type as structure_element_type, + hasCategory.category_id as category_id + from analysis_segment_structure_element structureElement + join analysis_take_has_category hasCategory on structureElement.id = hasCategory.analysis_take_id + where structure_element_type = 'TAKE') + UNION + (select structureElement.id as id, + structureElement.structure_element_type as structure_element_type, + hasCategory.category_id as category_id + from analysis_segment_structure_element structureElement + join analysis_scene_has_category hasCategory on structureElement.id = hasCategory.analysis_scene_id + where structure_element_type = 'SCENE') + UNION + (select structureElement.id as id, + structureElement.structure_element_type as structure_element_type, + hasCategory.category_id as category_id + from analysis_segment_structure_element structureElement + join analysis_action_has_category hasCategory on structureElement.id = hasCategory.analysis_action_id + where structure_element_type = 'ACTION'); END IF; -END $$ +END +$$ DELIMITER ; /** diff --git a/src/main/resources/database/fipop.sql b/src/main/resources/database/fipop.sql index 66ae46ba..720ef561 100644 --- a/src/main/resources/database/fipop.sql +++ b/src/main/resources/database/fipop.sql @@ -8787,6 +8787,114 @@ INSERT INTO `FIPOP`.`db_version` (major_version, minor_version, patch_version) VALUES (0, 14, 2); COMMIT; + +-- ----------------------------------------------------- +-- view analysis_segment_structure_element +-- ----------------------------------------------------- + +START TRANSACTION; +USE `FIPOP`; +create view `fipop`.`analysis_segment_structure_element` as +(select 'SEGMENT' as structure_element_type, + analysisSegment.id as id, + analysisSegment.analysis_list_id as analysis_list_id, + analysisSegment.start_time as start_time, + analysisSegment.end_time as end_time, + translation.name as name + from analysis_segment analysisSegment + join analysis_segment_translation translation + on analysisSegment.id = translation.analysis_segment_id) +UNION +(select 'SEQUENCE' as structure_element_type, + analysisSequence.id as id, + analysisSegment.analysis_list_id as analysis_list_id, + analysisSequence.start_time as start_time, + analysisSequence.end_time as end_time, + translation.name as name + from analysis_sequence analysisSequence + join analysis_segment analysisSegment on analysisSequence.analysis_segment_id = analysisSegment.id + join analysis_sequence_translation translation + on analysisSequence.id = translation.analysis_sequence_id) +UNION +(select 'TAKE' as structure_element_type, + analysisTake.id as id, + analysisSegment.analysis_list_id as analysis_list_id, + analysisTake.start_time as start_time, + analysisTake.end_time as end_time, + translation.name as name + from analysis_take analysisTake + join analysis_sequence analysisSequence on analysisTake.analysis_sequence_id = analysisSequence.id + join analysis_segment analysisSegment on analysisSequence.analysis_segment_id = analysisSegment.id + join analysis_take_translation translation + on analysisTake.id = translation.analysis_take_id) +UNION +(select 'SCENE' as structure_element_type, + analysisScene.id as id, + analysisSegment.analysis_list_id as analysis_list_id, + analysisScene.start_time as start_time, + analysisScene.end_time as end_time, + translation.name as name + from analysis_scene analysisScene + join analysis_segment analysisSegment on analysisScene.analysis_segment_id = analysisSegment.id + join analysis_scene_translation translation + on analysisScene.id = translation.analysis_scene_id) +UNION +(select 'ACTION' as structure_element_type, + analysisAction.id as id, + analysisSegment.analysis_list_id as analysis_list_id, + analysisAction.start_time as start_time, + analysisAction.end_time as end_time, + translation.name as name + from analysis_action analysisAction + join analysis_scene analysisScene on analysisAction.analysis_scene_id = analysisScene.id + join analysis_segment analysisSegment on analysisScene.analysis_segment_id = analysisSegment.id + join analysis_action_translation translation + on analysisAction.id = translation.analysis_action_id); +COMMIT; + + +-- ----------------------------------------------------- +-- view analysis_segment_structure_element_has_category +-- ---------------------------------------------------- +START TRANSACTION; +USE `FIPOP`; +create view `fipop`.`analysis_segment_structure_element_has_category` as +(select structureElement.id as id, + structureElement.structure_element_type as structure_element_type, + hasCategory.category_id as category_id + from analysis_segment_structure_element structureElement + join analysis_segment_has_category hasCategory on structureElement.id = hasCategory.analysis_segment_id + where structure_element_type = 'SEGMENT') +UNION +(select structureElement.id as id, + structureElement.structure_element_type as structure_element_type, + hasCategory.category_id as category_id + from analysis_segment_structure_element structureElement + join analysis_sequence_has_category hasCategory on structureElement.id = hasCategory.analysis_sequence_id + where structure_element_type = 'SEQUENCE') +UNION +(select structureElement.id as id, + structureElement.structure_element_type as structure_element_type, + hasCategory.category_id as category_id + from analysis_segment_structure_element structureElement + join analysis_take_has_category hasCategory on structureElement.id = hasCategory.analysis_take_id + where structure_element_type = 'TAKE') +UNION +(select structureElement.id as id, + structureElement.structure_element_type as structure_element_type, + hasCategory.category_id as category_id + from analysis_segment_structure_element structureElement + join analysis_scene_has_category hasCategory on structureElement.id = hasCategory.analysis_scene_id + where structure_element_type = 'SCENE') +UNION +(select structureElement.id as id, + structureElement.structure_element_type as structure_element_type, + hasCategory.category_id as category_id + from analysis_segment_structure_element structureElement + join analysis_action_has_category hasCategory on structureElement.id = hasCategory.analysis_action_id + where structure_element_type = 'ACTION'); +COMMIT; + -- ----------------------------------------------------- -- Data for table `FIPOP`.`analysis_method_type` -- ----------------------------------------------------- From e36a65227ed055c5302c20ddaf00af0729efaf6b Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Sat, 10 Jan 2026 19:39:24 +0100 Subject: [PATCH 26/70] TIMAAT Weiterentwicklung #9 - segment structure category table * Implemented initialization of table which is representing the segment structures of selected categories or category sets * Fixed some jpa errors --- .../AnalysisSegmentStructureElement.java | 2 +- src/main/resources/META-INF/persistence.xml | 1 + .../webapp/js/datasets/timaat.categories.js | 35 ++++++++++++++++--- 3 files changed, 33 insertions(+), 5 deletions(-) diff --git a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisSegmentStructureElement.java b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisSegmentStructureElement.java index ca629aec..5a4c51bd 100644 --- a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisSegmentStructureElement.java +++ b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/AnalysisSegmentStructureElement.java @@ -37,7 +37,7 @@ public class AnalysisSegmentStructureElement { private MediumAnalysisList mediumAnalysisList; @ManyToMany - @JoinTable(name = "analysis_segment_structure_element_has_category", inverseJoinColumns = {@JoinColumn(name = "category_id")}, joinColumns = {@JoinColumn(name = "id"), @JoinColumn(name = "structure_element_type")}) + @JoinTable(name = "analysis_segment_structure_element_has_category", inverseJoinColumns = {@JoinColumn(name = "category_id")}, joinColumns = {@JoinColumn(name = "id", referencedColumnName = "id"), @JoinColumn(name = "structure_element_type", referencedColumnName = "structure_element_type")}) private List<Category> categories; public AnalysisSegmentStructureElementId getId() { diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index aa45900d..57437c1c 100644 --- a/src/main/resources/META-INF/persistence.xml +++ b/src/main/resources/META-INF/persistence.xml @@ -43,6 +43,7 @@ <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisScene</class> <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisSceneTranslation</class> <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisSegment</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisSegmentStructureElement</class> <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisSegmentTranslation</class> <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisSequence</class> <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisSequenceTranslation</class> diff --git a/src/main/webapp/js/datasets/timaat.categories.js b/src/main/webapp/js/datasets/timaat.categories.js index 906609ea..4568cdd4 100644 --- a/src/main/webapp/js/datasets/timaat.categories.js +++ b/src/main/webapp/js/datasets/timaat.categories.js @@ -35,8 +35,14 @@ }(function (TIMAAT) { TIMAAT.Categories = { - categoryDataTable: null, categorySetDataTable: null, relatedMusicTable: null, relatedMediumTable: null, - relatedActorTable: null, relatedAnnotationTable: null, currentItemType: null, + categoryDataTable: null, + categorySetDataTable: null, + relatedMusicTable: null, + relatedMediumTable: null, + relatedActorTable: null, + relatedAnnotationTable: null, + relatedSegmentStructureTable: null, + currentItemType: null, init: function () { $('#categorySetTab').on('click', function (event) { @@ -120,7 +126,10 @@ TIMAAT.Categories.relatedMediumTable = TIMAAT.Categories.initRelatedMediumTable() TIMAAT.Categories.relatedActorTable = TIMAAT.Categories.initRelatedActorTable() TIMAAT.Categories.relatedAnnotationTable = TIMAAT.Categories.initRelatedAnnotationTable() - }, initCategoriesComponent: function () { + TIMAAT.Categories.relatedSegmentStructureTable = TIMAAT.Categories.initRelatedSegmentStructureTable() + + }, + initCategoriesComponent: function () { TIMAAT.UI.showComponent('categories'); $('#categoryTab').trigger('click'); }, @@ -235,8 +244,23 @@ return musicTable }, + initRelatedSegmentStructureTable: function () { + const segmentStructureTypeByEnumTypeName = new Map([["SEGMENT", "Segment"], ["SEQUENCE", "Sequence"], ["TAKE", "Take"], ["SCENE", "Scene"], ["ACTION", "Action"]]) + + const columns = [new TIMAAT.Table.FieldTableColumnConfig("id", "ID", "id"), new TIMAAT.Table.FieldTableColumnConfig("name", "Name", "name"), + new TIMAAT.Table.ValueMapperTableColumnConfig("type", "Type", "segmentStructureElementType", segmentStructureTypeByEnumTypeName, true), + new TIMAAT.Table.TimeStampTableColumnConfig("startTime", "Start time", "startTime"), new TIMAAT.Table.TimeStampTableColumnConfig("endTime", "End time", "endTime")] + const activeColumnIds = ["id", "name", "type", "startTime", "endTime"] + const segmentStructureTable = new TIMAAT.Table.Table("categoriesSegmentStructureTable", "#categoriesSegmentStructureTableContainer", columns, activeColumnIds, "api/segment-structure-elements/list", true, false) + $('#segmentStructureTableCollapse').on('shown.bs.collapse', (event) => { + segmentStructureTable.resizeToParent() + }); + + new TIMAAT.Table.ColumnSelectorPopover(segmentStructureTable, "#categoriesSegmentStructureColumnButton") + return segmentStructureTable + }, + initRelatedMediumTable: function () { - //TODO: Check subtypes const mediaTypesById = new Map([[1, "Audio"], [2, "Document"], [3, "Image"], [4, "Software"], [5, "Text"], [6, " Video"], [7, "Videogame"]]) const MediumDurationColumnConfig = class MediumDurationColumnConfig extends TIMAAT.Table.TableColumnConfig { @@ -423,6 +447,7 @@ TIMAAT.Categories.relatedMediumTable.active = true TIMAAT.Categories.relatedActorTable.active = true TIMAAT.Categories.relatedAnnotationTable.active = true + TIMAAT.Categories.relatedSegmentStructureTable.active = true }, showNoSelectionPanel() { @@ -433,6 +458,7 @@ TIMAAT.Categories.relatedMediumTable.active = false TIMAAT.Categories.relatedActorTable.active = false TIMAAT.Categories.relatedAnnotationTable.active = false + TIMAAT.Categories.relatedSegmentStructureTable.active = false }, showEntitiesPanel() { @@ -781,6 +807,7 @@ TIMAAT.Categories.relatedMediumTable.urlSearchParams = urlSearchParameters TIMAAT.Categories.relatedAnnotationTable.urlSearchParams = urlSearchParameters TIMAAT.Categories.relatedActorTable.urlSearchParams = urlSearchParameters + TIMAAT.Categories.relatedSegmentStructureTable.urlSearchParams = urlSearchParameters } else { TIMAAT.Categories.showNoSelectionPanel() } From 5556fa27459a6162aea4a5d81cc1116f61741e93 Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Sun, 11 Jan 2026 13:58:13 +0100 Subject: [PATCH 27/70] TIMAAT Weiterentwicklung #9 - Added entity type filter buttons * Added filter popover which can be used to select the specific entity types which should be included inside the data tables. --- src/main/webapp/index.html | 5 ++ .../webapp/js/datasets/timaat.categories.js | 37 +++++++++++- src/main/webapp/js/ui/timaat.table.js | 60 +++++++++++++++++++ src/main/webapp/js/ui/timaat.ui.js | 1 - 4 files changed, 99 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html index e465c93f..337153d0 100644 --- a/src/main/webapp/index.html +++ b/src/main/webapp/index.html @@ -2333,6 +2333,7 @@ <h5 class="form-title capitalize--first-letter" id="categorySetCreateChangeFormH <button class="btn btn-block text-left" type="button" data-toggle="collapse" data-target="#musicTableCollapse"> <span class="fas fa-music mr-1"></span>Music </button> + <button class="btn btn-sm btn-outline btn-secondary fas fa-shapes mr-1" id="categoriesMusicTableTypeButton"></button> <button class="btn btn-sm btn-outline btn-secondary fas fa-columns" id="categoriesMusicTableColumnButton"></button> </div> </div> @@ -2350,6 +2351,7 @@ <h5 class="form-title capitalize--first-letter" id="categorySetCreateChangeFormH <button class="btn btn-block text-left" type="button" data-toggle="collapse" data-target="#mediumTableCollapse"> <span class="fas fa-photo-video mr-1"></span>Medium </button> + <button class="btn btn-sm btn-outline btn-secondary fas fa-shapes mr-1" id="categoriesMediumTableTypeButton"></button> <button class="btn btn-sm btn-outline btn-secondary fas fa-columns" id="categoriesMediumTableColumnButton"></button> </div> </div> @@ -2366,6 +2368,7 @@ <h5 class="form-title capitalize--first-letter" id="categorySetCreateChangeFormH <button class="btn btn-block text-left" type="button" data-toggle="collapse" data-target="#actorTableCollapse"> <span class="fas fa-users mr-1"></span>Actor </button> + <button class="btn btn-sm btn-outline btn-secondary fas fa-shapes mr-1" id="categoriesActorTableTypeButton"></button> <button class="btn btn-sm btn-outline btn-secondary fas fa-columns" id="categoriesActorTableColumnButton"></button> </div> </div> @@ -2382,6 +2385,7 @@ <h5 class="form-title capitalize--first-letter" id="categorySetCreateChangeFormH <button class="btn btn-block text-left" type="button" data-toggle="collapse" data-target="#annotationTableCollapse"> <span class="fas fa-draw-polygon mr-1"></span>Annotation </button> + <button class="btn btn-sm btn-outline btn-secondary fas fa-shapes mr-1" id="categoriesAnnotationTableTypeButton"></button> <button class="btn btn-sm btn-outline btn-secondary fas fa-columns" id="categoriesAnnotationTableColumnButton"></button> </div> </div> @@ -2398,6 +2402,7 @@ <h5 class="form-title capitalize--first-letter" id="categorySetCreateChangeFormH <button class="btn btn-block text-left" type="button" data-toggle="collapse" data-target="#segmentStructureTableCollapse"> <span class="fas fa-layer-group mr-1"></span>Segment Structure </button> + <button class="btn btn-sm btn-outline btn-secondary fas fa-shapes mr-1" id="categoriesSegmentStructureTableTypeButton"></button> <button class="btn btn-sm btn-outline btn-secondary fas fa-columns" id="categoriesSegmentStructureColumnButton"></button> </div> </div> diff --git a/src/main/webapp/js/datasets/timaat.categories.js b/src/main/webapp/js/datasets/timaat.categories.js index 4568cdd4..442d1d78 100644 --- a/src/main/webapp/js/datasets/timaat.categories.js +++ b/src/main/webapp/js/datasets/timaat.categories.js @@ -231,6 +231,13 @@ initRelatedMusicTable: function () { const musicTypesById = new Map([[1, "Anashid"], [2, "Church music"]]) + const musicTypesQueryParameterValues = musicTypesById.entries().map(entry => { + return { + title: entry[1], + value: entry[0] + } + }).toArray() + const columns = [new TIMAAT.Table.FieldTableColumnConfig("title", "Title", "displayTitle.name"), new TIMAAT.Table.FieldTableColumnConfig("id", "ID", "id"), new TIMAAT.Table.FieldTableColumnConfig("beat", "Beat", "beat"), new TIMAAT.Table.FieldTableColumnConfig("instrumentation", "Instrumentation", "instrumentation"), new TIMAAT.Table.FieldTableColumnConfig("tempo", "Tempo", "tempo"), new TIMAAT.Table.FieldTableColumnConfig("remark", "Remark", "remark"), new TIMAAT.Table.FieldTableColumnConfig("harmony", "Harmony", "harmony"), new TIMAAT.Table.FieldTableColumnConfig("melody", "Melody", "melody"), new TIMAAT.Table.ValueMapperTableColumnConfig("musicType", "Music Type", "musicType.id", musicTypesById)] @@ -241,15 +248,23 @@ }); new TIMAAT.Table.ColumnSelectorPopover(musicTable, "#categoriesMusicTableColumnButton") + new TIMAAT.Table.QueryParameterSelectorPopover("Type", musicTable, "typeId", musicTypesQueryParameterValues, "#categoriesMusicTableTypeButton") return musicTable }, initRelatedSegmentStructureTable: function () { const segmentStructureTypeByEnumTypeName = new Map([["SEGMENT", "Segment"], ["SEQUENCE", "Sequence"], ["TAKE", "Take"], ["SCENE", "Scene"], ["ACTION", "Action"]]) + const segmentStructureTypeQueryParameterValues = segmentStructureTypeByEnumTypeName.entries().map(entry => { + return { + title: entry[1], + value: entry[0] + } + }).toArray() + const columns = [new TIMAAT.Table.FieldTableColumnConfig("id", "ID", "id"), new TIMAAT.Table.FieldTableColumnConfig("name", "Name", "name"), - new TIMAAT.Table.ValueMapperTableColumnConfig("type", "Type", "segmentStructureElementType", segmentStructureTypeByEnumTypeName, true), - new TIMAAT.Table.TimeStampTableColumnConfig("startTime", "Start time", "startTime"), new TIMAAT.Table.TimeStampTableColumnConfig("endTime", "End time", "endTime")] + new TIMAAT.Table.ValueMapperTableColumnConfig("type", "Type", "segmentStructureElementType", segmentStructureTypeByEnumTypeName, true), + new TIMAAT.Table.TimeStampTableColumnConfig("startTime", "Start time", "startTime"), new TIMAAT.Table.TimeStampTableColumnConfig("endTime", "End time", "endTime")] const activeColumnIds = ["id", "name", "type", "startTime", "endTime"] const segmentStructureTable = new TIMAAT.Table.Table("categoriesSegmentStructureTable", "#categoriesSegmentStructureTableContainer", columns, activeColumnIds, "api/segment-structure-elements/list", true, false) $('#segmentStructureTableCollapse').on('shown.bs.collapse', (event) => { @@ -257,11 +272,18 @@ }); new TIMAAT.Table.ColumnSelectorPopover(segmentStructureTable, "#categoriesSegmentStructureColumnButton") + new TIMAAT.Table.QueryParameterSelectorPopover("Type", segmentStructureTable, "type", segmentStructureTypeQueryParameterValues, "#categoriesSegmentStructureTableTypeButton") return segmentStructureTable }, initRelatedMediumTable: function () { const mediaTypesById = new Map([[1, "Audio"], [2, "Document"], [3, "Image"], [4, "Software"], [5, "Text"], [6, " Video"], [7, "Videogame"]]) + const mediaTypesQueryParameterValues = mediaTypesById.entries().map(entry => { + return { + title: entry[1], + value: entry[0] + } + }).toArray() const MediumDurationColumnConfig = class MediumDurationColumnConfig extends TIMAAT.Table.TableColumnConfig { constructor() { @@ -303,11 +325,18 @@ }); new TIMAAT.Table.ColumnSelectorPopover(mediumTable, "#categoriesMediumTableColumnButton") + new TIMAAT.Table.QueryParameterSelectorPopover("Type", mediumTable, "type", mediaTypesQueryParameterValues, "#categoriesMediumTableTypeButton") return mediumTable }, initRelatedActorTable: function () { const actorTypesById = new Map([[1, "Person"], [2, "Collective"]]) + const actorTypesQueryParameters = actorTypesById.entries().map(entry => { + return { + title: entry[1], + value: entry[0] + } + }).toArray() const sexTypesById = new Map([[1, "Female"], [2, "Male"], [3, "Other"], [4, "Unknown"]]) const columns = [new TIMAAT.Table.FieldTableColumnConfig("id", "ID", "id"), new TIMAAT.Table.ValueMapperTableColumnConfig("type", "Type", "actorType.id", actorTypesById), @@ -328,6 +357,7 @@ }); new TIMAAT.Table.ColumnSelectorPopover(actorTable, "#categoriesActorTableColumnButton") + new TIMAAT.Table.QueryParameterSelectorPopover("Type", actorTable, "type", actorTypesQueryParameters, "#categoriesActorTableTypeButton") return actorTable }, @@ -340,7 +370,7 @@ return null } - + const annotationTypeQueryParameters = [{title: "Video", value: "VIDEO"}, {title: "Audio", value: "AUDIO"}] const columns = [new TIMAAT.Table.FieldTableColumnConfig("id", "ID", "id"), new TIMAAT.Table.TimeStampTableColumnConfig("startTime", "Start time", "startTime", false), new TIMAAT.Table.TimeStampTableColumnConfig("endTime", "End time", "endTime", false), new TIMAAT.Table.BooleanTableColumnConfig("layerAudio", "Audio", "layerAudio", false), @@ -354,6 +384,7 @@ }); new TIMAAT.Table.ColumnSelectorPopover(annotationTable, "#categoriesAnnotationTableColumnButton") + new TIMAAT.Table.QueryParameterSelectorPopover("Type", annotationTable, "type", annotationTypeQueryParameters, "#categoriesAnnotationTableTypeButton") return annotationTable }, diff --git a/src/main/webapp/js/ui/timaat.table.js b/src/main/webapp/js/ui/timaat.table.js index babcf25f..f6e8ee75 100644 --- a/src/main/webapp/js/ui/timaat.table.js +++ b/src/main/webapp/js/ui/timaat.table.js @@ -352,6 +352,65 @@ this._dataTable?.columns.adjust().draw() } } + /** + * This component opens a popover when clicking on the target button showing a list menu + * which can be used to select specific values used as query parameter of a list + */ + TIMAAT.Table.QueryParameterSelectorPopover = class { + _table + _queryParameterName + _title + _queryParameterValues + _$queryParameterSelectorButton + + constructor(title, table, queryParameterName, queryParameterValues, queryParameterSelectorButtonSelector) { + this._table = table; + this._queryParameterValues = queryParameterValues.sort((a,b) => a.title.localeCompare(b.title)) + this._queryParameterName = queryParameterName + this._$queryParameterSelectorButton = $(queryParameterSelectorButtonSelector) + this._title = title + + this._$queryParameterSelectorButton.on('click', this.openPopover); + this._$queryParameterSelectorButton.prop("title", this._title) + + this.createPopover(); + } + + createPopover() { + const popoverMenuItems = this.createMenuItems(); + this._$queryParameterSelectorButton.popover({ + title: this._title, + content: popoverMenuItems, + html: true, + placement: "bottom" + }) + } + + createMenuItems() { + const $listGroup = $(`<ul class="list-group"></ul>`) + + for (const currentQueryParameterValue of this._queryParameterValues) { + const $currentListGroupItemCheckbox = $(`<input class="ml-2" type="checkbox">`) + // const initialSelected = currentActiveTableColumnIds.indexOf(currentTableColumnConfig.id) > -1; + //$currentListGroupItemCheckbox.prop("checked", initialSelected) + + const table = this._table + $currentListGroupItemCheckbox.on("change", (e) => { + console.log(currentTableColumnConfig) + //const newState = table.changeTableColumnActivState(currentTableColumnConfig.id, e.target.checked); + //$currentListGroupItemCheckbox.prop("checked", e.target.checked) + }) + + const $currentListGroupItem = $(`<li class="list-group-item d-flex justify-content-between align-items-center">${currentQueryParameterValue.title}</li>`) + $currentListGroupItem.append($currentListGroupItemCheckbox) + + $listGroup.append($currentListGroupItem) + } + + return $listGroup + } + } + TIMAAT.Table.ColumnSelectorPopover = class { _table @@ -364,6 +423,7 @@ this._$columnSelectorButton = $(columnSelectorButtonSelector) this._$columnSelectorButton.on('click', this.openPopover); + this._$columnSelectorButton.prop("title", "Columns") this.createPopover(); } diff --git a/src/main/webapp/js/ui/timaat.ui.js b/src/main/webapp/js/ui/timaat.ui.js index 53ed1357..4d68c624 100644 --- a/src/main/webapp/js/ui/timaat.ui.js +++ b/src/main/webapp/js/ui/timaat.ui.js @@ -1288,7 +1288,6 @@ break; } }, - } }, window)); From 45303a6028edf0ebc18f811daa14cf0c60119f04 Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Sun, 11 Jan 2026 15:03:03 +0100 Subject: [PATCH 28/70] TIMAAT Weiterentwicklung #9 - Added types filter to entity endpoints * Added new filter to define the types of entities which should be returned by a listing operation --- .../actor/ActorListingQueryParameter.java | 10 ++++++++++ ...StructureElementListingQueryParameter.java | 12 +++++++++++ .../AnnotationListingQueryParameter.java | 19 +++++++++++------- .../medium/MediumListingQueryParameter.java | 17 ++++++++++------ .../music/MusicListingQueryParameter.java | 20 +++++++++++-------- .../storage/entity/actor/ActorStorage.java | 12 ++++++++--- .../entity/actor/api/ActorFilterCriteria.java | 16 +++++++++++++++ .../entity/annotation/AnnotationStorage.java | 12 +++++++++++ .../api/AnnotationFilterCriteria.java | 20 +++++++++++++++++-- .../entity/annotation/api/AnnotationType.java | 12 +++++++++++ .../storage/entity/medium/MediumStorage.java | 9 +++++++++ .../medium/api/MediumFilterCriteria.java | 16 +++++++++++++++ .../storage/entity/music/MusicStorage.java | 8 ++++++++ .../entity/music/api/MusicFilterCriteria.java | 16 +++++++++++++++ .../SegmentStructureElementsStorage.java | 8 ++++++++ ...SegmentStructureElementFilterCriteria.java | 13 ++++++++++++ 16 files changed, 194 insertions(+), 26 deletions(-) create mode 100644 src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/api/AnnotationType.java diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/model/actor/ActorListingQueryParameter.java b/src/main/java/de/bitgilde/TIMAAT/rest/model/actor/ActorListingQueryParameter.java index 68b1fb31..045484e4 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/model/actor/ActorListingQueryParameter.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/model/actor/ActorListingQueryParameter.java @@ -23,6 +23,8 @@ public class ActorListingQueryParameter extends ListingQueryParameter<ActorSorti private List<Integer> categorySetIds; @QueryParam("exclude_annotation") private Integer excludedAnnotationId; + @QueryParam("actorTypeIds") + private List<Integer> actorTypeIds; public ActorListingQueryParameter() { @@ -54,6 +56,14 @@ public Optional<Integer> getExcludedAnnotationId() { return Optional.ofNullable(excludedAnnotationId); } + @Override + public Optional<Collection<Integer>> getActorTypeIds() { + return Optional.ofNullable(actorTypeIds); + } + + public void setActorTypeIds(List<Integer> actorTypeIds) { + this.actorTypeIds = actorTypeIds; + } public void setCategorySetIds(List<Integer> categorySetIds) { this.categorySetIds = categorySetIds; diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/model/analysissegment/SegmentStructureElementListingQueryParameter.java b/src/main/java/de/bitgilde/TIMAAT/rest/model/analysissegment/SegmentStructureElementListingQueryParameter.java index 9a58ad3d..ce0d3913 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/model/analysissegment/SegmentStructureElementListingQueryParameter.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/model/analysissegment/SegmentStructureElementListingQueryParameter.java @@ -2,6 +2,7 @@ import de.bitgilde.TIMAAT.rest.model.parameter.ListingQueryParameter; import de.bitgilde.TIMAAT.storage.entity.segment.api.SegmentStructureElementFilterCriteria; +import de.bitgilde.TIMAAT.storage.entity.segment.api.SegmentStructureElementType; import de.bitgilde.TIMAAT.storage.entity.segment.api.SegmentStructureSortingField; import jakarta.ws.rs.QueryParam; @@ -21,6 +22,8 @@ public class SegmentStructureElementListingQueryParameter extends ListingQueryPa private List<Integer> categoryIds; @QueryParam("categorySetIds") private List<Integer> categorySetIds; + @QueryParam("segmentStructureElementTypes") + private List<SegmentStructureElementType> segmentStructureElementTypes; @Override @@ -38,6 +41,11 @@ public Optional<String> getSegmentStructureElementNameSearch() { return Optional.ofNullable(this.getSearch()); } + @Override + public Optional<Collection<SegmentStructureElementType>> getSegmentStructureElementTypes() { + return Optional.ofNullable(segmentStructureElementTypes); + } + public void setCategoryIds(List<Integer> categoryIds) { this.categoryIds = categoryIds; } @@ -45,4 +53,8 @@ public void setCategoryIds(List<Integer> categoryIds) { public void setCategorySetIds(List<Integer> categorySetIds) { this.categorySetIds = categorySetIds; } + + public void setSegmentStructureElementTypes(List<SegmentStructureElementType> segmentStructureElementTypes) { + this.segmentStructureElementTypes = segmentStructureElementTypes; + } } diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/model/annotation/AnnotationListingQueryParameter.java b/src/main/java/de/bitgilde/TIMAAT/rest/model/annotation/AnnotationListingQueryParameter.java index d154b86e..e8d2f489 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/model/annotation/AnnotationListingQueryParameter.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/model/annotation/AnnotationListingQueryParameter.java @@ -3,6 +3,7 @@ import de.bitgilde.TIMAAT.rest.model.parameter.ListingQueryParameter; import de.bitgilde.TIMAAT.storage.entity.annotation.api.AnnotationFilterCriteria; import de.bitgilde.TIMAAT.storage.entity.annotation.api.AnnotationSortingField; +import de.bitgilde.TIMAAT.storage.entity.annotation.api.AnnotationType; import jakarta.ws.rs.QueryParam; import java.util.Collection; @@ -17,8 +18,6 @@ */ public class AnnotationListingQueryParameter extends ListingQueryParameter<AnnotationSortingField> implements AnnotationFilterCriteria { - @QueryParam("search") - private String search; @QueryParam("categoryIds") private List<Integer> categoryIds; @QueryParam("categorySetIds") @@ -27,6 +26,8 @@ public class AnnotationListingQueryParameter extends ListingQueryParameter<Annot private List<Integer> mediumAnalysisListIds; @QueryParam("hasCategories") private Boolean hasCategories; + @QueryParam("annotationTypes") + private List<AnnotationType> annotationTypes; public AnnotationListingQueryParameter() { @@ -71,6 +72,11 @@ public Optional<Boolean> hasCategories() { return Optional.ofNullable(hasCategories); } + @Override + public Optional<Collection<AnnotationType>> getAnnotationTypes() { + return Optional.ofNullable(annotationTypes); + } + public void setCategoryIds(List<Integer> categoryIds) { this.categoryIds = categoryIds; } @@ -83,12 +89,11 @@ public void setHasCategories(Boolean hasCategories) { this.hasCategories = hasCategories; } - @Override - public void setSearch(String search) { - this.search = search; - } - public void setMediumAnalysisListIds(List<Integer> mediumAnalysisListIds) { this.mediumAnalysisListIds = mediumAnalysisListIds; } + + public void setAnnotationTypes(List<AnnotationType> annotationTypes) { + this.annotationTypes = annotationTypes; + } } diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/model/medium/MediumListingQueryParameter.java b/src/main/java/de/bitgilde/TIMAAT/rest/model/medium/MediumListingQueryParameter.java index 1fffd6da..d200a3e0 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/model/medium/MediumListingQueryParameter.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/model/medium/MediumListingQueryParameter.java @@ -34,8 +34,9 @@ public class MediumListingQueryParameter extends ListingQueryParameter<MediumSor private List<Integer> categoryIds; @QueryParam("categorySetIds") private List<Integer> categorySetIds; - @QueryParam("search") - private String search; + @QueryParam("mediaTypeIds") + private List<Integer> mediaTypeIds; + @Override public Optional<Collection<Integer>> getCategoryIds() { @@ -49,7 +50,12 @@ public Optional<Collection<Integer>> getCategorySetIds() { @Override public Optional<String> getMediumNameSearch() { - return Optional.ofNullable(search); + return Optional.ofNullable(getSearch()); + } + + @Override + public Optional<Collection<Integer>> getMediaTypeIds() { + return Optional.ofNullable(mediaTypeIds); } public void setCategorySetIds(List<Integer> categorySetIds) { @@ -60,8 +66,7 @@ public void setCategoryIds(List<Integer> categoryIds) { this.categoryIds = categoryIds; } - @Override - public void setSearch(String search) { - this.search = search; + public void setMediaTypeIds(List<Integer> mediaTypeIds) { + this.mediaTypeIds = mediaTypeIds; } } diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/model/music/MusicListingQueryParameter.java b/src/main/java/de/bitgilde/TIMAAT/rest/model/music/MusicListingQueryParameter.java index ced6ae88..3c162703 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/model/music/MusicListingQueryParameter.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/model/music/MusicListingQueryParameter.java @@ -20,8 +20,8 @@ public class MusicListingQueryParameter extends ListingQueryParameter<MusicSorti private List<Integer> categoryIds; @QueryParam("categorySetIds") private List<Integer> categorySetIds; - @QueryParam("search") - private String search; + @QueryParam("musicTypeIds") + private List<Integer> musicTypeIds; @Override public Optional<Collection<Integer>> getCategoryIds() { @@ -35,19 +35,23 @@ public Optional<Collection<Integer>> getCategorySetIds() { @Override public Optional<String> getMusicNameSearch() { - return Optional.ofNullable(search); + return Optional.ofNullable(getSearch()); } - public void setCategorySetIds(List<Integer> categorySetIds) { - this.categorySetIds = categorySetIds; + @Override + public Optional<Collection<Integer>> getMusicTypeIds() { + return Optional.ofNullable(musicTypeIds); } - @Override - public void setSearch(String search) { - this.search = search; + public void setCategorySetIds(List<Integer> categorySetIds) { + this.categorySetIds = categorySetIds; } public void setCategoryIds(List<Integer> categoryIds) { this.categoryIds = categoryIds; } + + public void setMusicTypeIds(List<Integer> musicTypeIds) { + this.musicTypeIds = musicTypeIds; + } } diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/actor/ActorStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/actor/ActorStorage.java index c23547ed..bc8f0c15 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/actor/ActorStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/actor/ActorStorage.java @@ -16,6 +16,8 @@ import de.bitgilde.TIMAAT.model.FIPOP.Actor; import de.bitgilde.TIMAAT.model.FIPOP.ActorName_; +import de.bitgilde.TIMAAT.model.FIPOP.ActorType; +import de.bitgilde.TIMAAT.model.FIPOP.ActorType_; import de.bitgilde.TIMAAT.model.FIPOP.Actor_; import de.bitgilde.TIMAAT.model.FIPOP.Category; import de.bitgilde.TIMAAT.model.FIPOP.CategorySet; @@ -82,6 +84,11 @@ protected List<Predicate> createPredicates(ActorFilterCriteria filter, Root<Acto predicates.add(actorCategorySetJoin.get(CategorySet_.id).in(filter.getCategorySetIds().get())); } + if (filter.getActorTypeIds().isPresent() && !filter.getActorTypeIds().get().isEmpty()) { + Join<Actor, ActorType> actorTypeJoin = root.join(Actor_.actorType); + predicates.add(actorTypeJoin.get(ActorType_.id).in(filter.getActorTypeIds().get())); + } + return predicates; } @@ -98,9 +105,8 @@ public Collection<Category> updateAssignedCategoriesOfActor(int actorId, List<In Actor actor = entityManager.find(Actor.class, actorId, LockModeType.PESSIMISTIC_WRITE); List<Category> categories = categoryIds.isEmpty() ? Collections.emptyList() : entityManager.createQuery( - "select category from Actor actor join actor.categorySets categorySets join categorySets.categorySetHasCategories cshc join cshc.category category where category.id in :categoryIds", - Category.class).setParameter("categoryIds", categoryIds) - .getResultList(); + "select category from Actor actor join actor.categorySets categorySets join categorySets.categorySetHasCategories cshc join cshc.category category where category.id in :categoryIds", + Category.class).setParameter("categoryIds", categoryIds).getResultList(); actor.setCategories(categories); return categories; }); diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/actor/api/ActorFilterCriteria.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/actor/api/ActorFilterCriteria.java index 773f5a26..d0ebed19 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/actor/api/ActorFilterCriteria.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/actor/api/ActorFilterCriteria.java @@ -44,10 +44,16 @@ public interface ActorFilterCriteria { */ Optional<Integer> getExcludedAnnotationId(); + /** + * @return the ids of the {@link de.bitgilde.TIMAAT.model.FIPOP.ActorType}s the returned {@link de.bitgilde.TIMAAT.model.FIPOP.Actor}s should have + */ + Optional<Collection<Integer>> getActorTypeIds(); + class Builder { private Collection<Integer> categoryIds = null; private Collection<Integer> categorySetIds = null; + private Collection<Integer> actorTypeIds = null; private String actorNameSearch = null; private Integer excludeAnnotationId = null; @@ -71,6 +77,11 @@ public ActorFilterCriteria.Builder excludeAnnotationId(Integer excludeAnnotation return this; } + public ActorFilterCriteria.Builder actorTypeIds(Collection<Integer> actorTypeIds) { + this.actorTypeIds = actorTypeIds; + return this; + } + public ActorFilterCriteria build() { return new ActorFilterCriteria() { @Override @@ -92,6 +103,11 @@ public Optional<String> getActorNameSearch() { public Optional<Integer> getExcludedAnnotationId() { return Optional.ofNullable(excludeAnnotationId); } + + @Override + public Optional<Collection<Integer>> getActorTypeIds() { + return Optional.ofNullable(actorTypeIds); + } }; } } diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/AnnotationStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/AnnotationStorage.java index 4c1fb8c8..e1e3fdb9 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/AnnotationStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/AnnotationStorage.java @@ -28,6 +28,7 @@ import de.bitgilde.TIMAAT.storage.entity.TagStorage; import de.bitgilde.TIMAAT.storage.entity.annotation.api.AnnotationFilterCriteria; import de.bitgilde.TIMAAT.storage.entity.annotation.api.AnnotationSortingField; +import de.bitgilde.TIMAAT.storage.entity.annotation.api.AnnotationType; import jakarta.inject.Inject; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.criteria.CriteriaBuilder; @@ -321,6 +322,17 @@ protected List<Predicate> createPredicates(AnnotationFilterCriteria filter, Root predicates.add(categorySetJoin.get(CategorySet_.id).in(filter.getCategorySetIds().get())); } + if (filter.getAnnotationTypes().isPresent() && !filter.getAnnotationTypes().get().isEmpty()) { + for (AnnotationType annotationType : filter.getAnnotationTypes().get()) { + if (AnnotationType.VIDEO.equals(annotationType)) { + predicates.add(criteriaBuilder.equal(root.get(Annotation_.layerVisual), true)); + } + if (AnnotationType.AUDIO.equals(annotationType)) { + predicates.add(criteriaBuilder.equal(root.get(Annotation_.layerAudio), true)); + } + } + } + return predicates; } diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/api/AnnotationFilterCriteria.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/api/AnnotationFilterCriteria.java index a766e521..57b0c043 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/api/AnnotationFilterCriteria.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/api/AnnotationFilterCriteria.java @@ -36,6 +36,11 @@ public interface AnnotationFilterCriteria { */ Optional<Boolean> hasCategories(); + /** + * @return the {@link AnnotationType}s the returned {@link de.bitgilde.TIMAAT.model.FIPOP.Annotation}s should have + */ + Optional<Collection<AnnotationType>> getAnnotationTypes(); + class Builder { private Collection<Integer> categoryIds = null; @@ -43,6 +48,7 @@ class Builder { private String annotationNameSearch = null; private Collection<Integer> mediumAnalysisListIds = null; private Boolean hasCategories = null; + private Collection<AnnotationType> annotationTypes = null; public AnnotationFilterCriteria.Builder categoryIds(Collection<Integer> categoryIds) { this.categoryIds = categoryIds; @@ -59,16 +65,21 @@ public AnnotationFilterCriteria.Builder annotationNameSearch(String annotationNa return this; } - public AnnotationFilterCriteria.Builder mediumAnalysisListIds(Collection<Integer> mediumAnalysisListIds){ + public AnnotationFilterCriteria.Builder mediumAnalysisListIds(Collection<Integer> mediumAnalysisListIds) { this.mediumAnalysisListIds = mediumAnalysisListIds; return this; } - public AnnotationFilterCriteria.Builder hasCategories(Boolean hasCategories){ + public AnnotationFilterCriteria.Builder hasCategories(Boolean hasCategories) { this.hasCategories = hasCategories; return this; } + public AnnotationFilterCriteria.Builder annotationTypes(Collection<AnnotationType> annotationTypes) { + this.annotationTypes = annotationTypes; + return this; + } + public AnnotationFilterCriteria build() { return new AnnotationFilterCriteria() { @Override @@ -96,6 +107,11 @@ public Optional<Boolean> hasCategories() { return Optional.ofNullable(hasCategories); } + @Override + public Optional<Collection<AnnotationType>> getAnnotationTypes() { + return Optional.ofNullable(annotationTypes); + } + }; } } diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/api/AnnotationType.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/api/AnnotationType.java new file mode 100644 index 00000000..173aa190 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/api/AnnotationType.java @@ -0,0 +1,12 @@ +package de.bitgilde.TIMAAT.storage.entity.annotation.api; + +/** + * Describes the different types an {@link de.bitgilde.TIMAAT.model.FIPOP.Annotation} can be + * + * @author Nico Kotlenga + * @since 11.01.26 + */ +public enum AnnotationType { + VIDEO, + AUDIO; +} diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/MediumStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/MediumStorage.java index 9a5ab840..28d80380 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/MediumStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/MediumStorage.java @@ -4,6 +4,8 @@ import de.bitgilde.TIMAAT.model.FIPOP.CategorySet; import de.bitgilde.TIMAAT.model.FIPOP.CategorySet_; import de.bitgilde.TIMAAT.model.FIPOP.Category_; +import de.bitgilde.TIMAAT.model.FIPOP.MediaType; +import de.bitgilde.TIMAAT.model.FIPOP.MediaType_; import de.bitgilde.TIMAAT.model.FIPOP.Medium; import de.bitgilde.TIMAAT.model.FIPOP.MediumHasMusic; import de.bitgilde.TIMAAT.model.FIPOP.MediumHasMusicDetail; @@ -116,6 +118,13 @@ protected List<Predicate> createPredicates(MediumFilterCriteria filter, Root<Med predicates.add(categorySetJoin.get(CategorySet_.id).in(categorySetIds)); } + if (filter.getMediaTypeIds().isPresent() && !filter.getMediaTypeIds().get().isEmpty()) { + Collection<Integer> mediaTypeIds = filter.getMediaTypeIds().get(); + Join<Medium, MediaType> mediaTypeJoin = root.join(Medium_.mediaType); + + predicates.add(mediaTypeJoin.get(MediaType_.id).in(mediaTypeIds)); + } + return predicates; } } diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/api/MediumFilterCriteria.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/api/MediumFilterCriteria.java index 1f726c50..c657b673 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/api/MediumFilterCriteria.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/api/MediumFilterCriteria.java @@ -39,10 +39,16 @@ public interface MediumFilterCriteria { */ Optional<String> getMediumNameSearch(); + /** + * @return the ids of the {@link de.bitgilde.TIMAAT.model.FIPOP.MediaType}s the medium should belong to + */ + Optional<Collection<Integer>> getMediaTypeIds(); + class Builder { private Collection<Integer> categoryIds = null; private Collection<Integer> categorySetIds = null; + private Collection<Integer> mediaTypeIds = null; private String mediumNameSearch = null; public MediumFilterCriteria.Builder categoryIds(Collection<Integer> categoryIds) { @@ -60,6 +66,11 @@ public MediumFilterCriteria.Builder mediumNameSearch(String musicNameSearch) { return this; } + public MediumFilterCriteria.Builder mediaTypeIds(Collection<Integer> mediaTypeIds) { + this.mediaTypeIds = mediaTypeIds; + return this; + } + public MediumFilterCriteria build() { return new MediumFilterCriteria() { @Override @@ -76,6 +87,11 @@ public Optional<Collection<Integer>> getCategorySetIds() { public Optional<String> getMediumNameSearch() { return Optional.ofNullable(mediumNameSearch); } + + @Override + public Optional<Collection<Integer>> getMediaTypeIds() { + return Optional.ofNullable(mediaTypeIds); + } }; } } diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/music/MusicStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/music/MusicStorage.java index 54b31d16..72edb2a5 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/music/MusicStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/music/MusicStorage.java @@ -14,6 +14,7 @@ import de.bitgilde.TIMAAT.model.FIPOP.MusicTextSettingElementType; import de.bitgilde.TIMAAT.model.FIPOP.MusicTranslation; import de.bitgilde.TIMAAT.model.FIPOP.MusicType; +import de.bitgilde.TIMAAT.model.FIPOP.MusicType_; import de.bitgilde.TIMAAT.model.FIPOP.Music_; import de.bitgilde.TIMAAT.model.FIPOP.MusicalKey; import de.bitgilde.TIMAAT.model.FIPOP.Tag; @@ -105,6 +106,13 @@ protected List<Predicate> createPredicates(MusicFilterCriteria filter, Root<Musi predicates.add(categorySetJoin.get(CategorySet_.id).in(categorySetIds)); } + if (filter.getMusicTypeIds().isPresent() && !filter.getMusicTypeIds().get().isEmpty()) { + Collection<Integer> musicTypeIds = filter.getMusicTypeIds().get(); + Join<Music, MusicType> musicTypeJoin = root.join(Music_.musicType); + + predicates.add(musicTypeJoin.get(MusicType_.id).in(musicTypeIds)); + } + return predicates; } diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/music/api/MusicFilterCriteria.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/music/api/MusicFilterCriteria.java index a0a4825a..55dec1b3 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/music/api/MusicFilterCriteria.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/music/api/MusicFilterCriteria.java @@ -26,12 +26,18 @@ public interface MusicFilterCriteria { */ Optional<String> getMusicNameSearch(); + /** + * @return the ids of music types the returned music entries should have + */ + Optional<Collection<Integer>> getMusicTypeIds(); + class Builder { private Collection<Integer> categoryIds = null; private Collection<Integer> categorySetIds = null; private String musicNameSearch = null; + private Collection<Integer> musicTypeIds = null; public Builder categoryIds(Collection<Integer> categoryIds) { this.categoryIds = categoryIds; @@ -48,6 +54,11 @@ public Builder musicNameSearch(String musicNameSearch) { return this; } + public Builder musicTypeIds(Collection<Integer> musicTypeIds) { + this.musicTypeIds = musicTypeIds; + return this; + } + public MusicFilterCriteria build() { return new MusicFilterCriteria() { @Override @@ -64,6 +75,11 @@ public Optional<Collection<Integer>> getCategorySetIds() { public Optional<String> getMusicNameSearch() { return Optional.ofNullable(musicNameSearch); } + + @Override + public Optional<Collection<Integer>> getMusicTypeIds() { + return Optional.ofNullable(musicTypeIds); + } }; } } diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/SegmentStructureElementsStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/SegmentStructureElementsStorage.java index 7226d2a6..8d262b5e 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/SegmentStructureElementsStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/SegmentStructureElementsStorage.java @@ -4,6 +4,7 @@ import de.bitgilde.TIMAAT.model.FIPOP.AnalysisScene; import de.bitgilde.TIMAAT.model.FIPOP.AnalysisSegment; import de.bitgilde.TIMAAT.model.FIPOP.AnalysisSegmentStructureElement; +import de.bitgilde.TIMAAT.model.FIPOP.AnalysisSegmentStructureElementId_; import de.bitgilde.TIMAAT.model.FIPOP.AnalysisSegmentStructureElement_; import de.bitgilde.TIMAAT.model.FIPOP.AnalysisSequence; import de.bitgilde.TIMAAT.model.FIPOP.AnalysisTake; @@ -118,6 +119,13 @@ protected List<Predicate> createPredicates(SegmentStructureElementFilterCriteria predicates.add(categorySetJoin.get(CategorySet_.id).in(filter.getCategorySetIds().get())); } + if (filter.getSegmentStructureElementTypes().isPresent() && !filter.getSegmentStructureElementTypes().get() + .isEmpty()) { + predicates.add( + root.get(AnalysisSegmentStructureElement_.id).get(AnalysisSegmentStructureElementId_.structureElementType) + .in(filter.getSegmentStructureElementTypes().get())); + } + return predicates; } } diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/SegmentStructureElementFilterCriteria.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/SegmentStructureElementFilterCriteria.java index d85a1383..3d8c63c4 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/SegmentStructureElementFilterCriteria.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/SegmentStructureElementFilterCriteria.java @@ -39,11 +39,15 @@ public interface SegmentStructureElementFilterCriteria { */ Optional<String> getSegmentStructureElementNameSearch(); + + Optional<Collection<SegmentStructureElementType>> getSegmentStructureElementTypes(); + class Builder { private Collection<Integer> categoryIds = null; private Collection<Integer> categorySetIds = null; private String analysisSegmentNameSearch = null; + private Collection<SegmentStructureElementType> segmentStructureElementTypes = null; public SegmentStructureElementFilterCriteria.Builder categoryIds(Collection<Integer> categoryIds) { this.categoryIds = categoryIds; @@ -60,6 +64,11 @@ public SegmentStructureElementFilterCriteria.Builder analysisSegmentNameSearch(S return this; } + public SegmentStructureElementFilterCriteria.Builder segmentStructureElementTypes(Collection<SegmentStructureElementType> segmentStructureElementTypes) { + this.segmentStructureElementTypes = segmentStructureElementTypes; + return this; + } + public SegmentStructureElementFilterCriteria build() { return new SegmentStructureElementFilterCriteria() { @Override @@ -77,6 +86,10 @@ public Optional<String> getSegmentStructureElementNameSearch() { return Optional.ofNullable(analysisSegmentNameSearch); } + @Override + public Optional<Collection<SegmentStructureElementType>> getSegmentStructureElementTypes() { + return Optional.ofNullable(segmentStructureElementTypes); + } }; } } From 3303b32dd4aa3cd3db0aa0c1f5298482c5566d0c Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Sun, 11 Jan 2026 17:21:33 +0100 Subject: [PATCH 29/70] TIMAAT Weiterentwicklung #9 - Integrate usage of type query parameters * Added type query parameter usage to filter categories content table by entity type --- .../entity/annotation/AnnotationStorage.java | 7 ++- .../webapp/js/datasets/timaat.categories.js | 39 ++++++++----- src/main/webapp/js/ui/timaat.table.js | 55 +++++++++++++++---- 3 files changed, 75 insertions(+), 26 deletions(-) diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/AnnotationStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/AnnotationStorage.java index e1e3fdb9..0ac3bddd 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/AnnotationStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/AnnotationStorage.java @@ -323,14 +323,17 @@ protected List<Predicate> createPredicates(AnnotationFilterCriteria filter, Root } if (filter.getAnnotationTypes().isPresent() && !filter.getAnnotationTypes().get().isEmpty()) { + List<Predicate> typePredicates = new ArrayList<>(); for (AnnotationType annotationType : filter.getAnnotationTypes().get()) { if (AnnotationType.VIDEO.equals(annotationType)) { - predicates.add(criteriaBuilder.equal(root.get(Annotation_.layerVisual), true)); + typePredicates.add(criteriaBuilder.equal(root.get(Annotation_.layerVisual), true)); } if (AnnotationType.AUDIO.equals(annotationType)) { - predicates.add(criteriaBuilder.equal(root.get(Annotation_.layerAudio), true)); + typePredicates.add(criteriaBuilder.equal(root.get(Annotation_.layerAudio), true)); } } + + predicates.add(criteriaBuilder.or(typePredicates.toArray(new Predicate[0]))); } return predicates; diff --git a/src/main/webapp/js/datasets/timaat.categories.js b/src/main/webapp/js/datasets/timaat.categories.js index 442d1d78..fca6f96d 100644 --- a/src/main/webapp/js/datasets/timaat.categories.js +++ b/src/main/webapp/js/datasets/timaat.categories.js @@ -142,7 +142,7 @@ TIMAAT.Categories.currentItemType = itemType const $categoryNoSelectionPanelText = $('#categoriesNoSelectionPanelText') - + let clearableQueryParameterName switch (itemType) { case 'category': TIMAAT.UI.displayComponent('category', 'categoryTab', 'categoryDataTableCard'); @@ -155,6 +155,7 @@ TIMAAT.Categories.categoryDataTable.rows().deselect() TIMAAT.Categories.categoryDataTable.ajax.reload() } + clearableQueryParameterName = "categorySetIds" break case 'categorySet': TIMAAT.UI.displayComponent('category', 'categorySetTab', 'categorySetDataTableCard'); @@ -167,8 +168,15 @@ TIMAAT.Categories.categorySetDataTable.rows().deselect() TIMAAT.Categories.categorySetDataTable.ajax.reload() } + clearableQueryParameterName = "categoryIds" break } + + TIMAAT.Categories.relatedMusicTable.clearUrlSearchParam(clearableQueryParameterName) + TIMAAT.Categories.relatedMediumTable.clearUrlSearchParam(clearableQueryParameterName) + TIMAAT.Categories.relatedAnnotationTable.clearUrlSearchParam(clearableQueryParameterName) + TIMAAT.Categories.relatedActorTable.clearUrlSearchParam(clearableQueryParameterName) + TIMAAT.Categories.relatedSegmentStructureTable.clearUrlSearchParam(clearableQueryParameterName) TIMAAT.Categories.showNoSelectionPanel() }, @@ -248,7 +256,7 @@ }); new TIMAAT.Table.ColumnSelectorPopover(musicTable, "#categoriesMusicTableColumnButton") - new TIMAAT.Table.QueryParameterSelectorPopover("Type", musicTable, "typeId", musicTypesQueryParameterValues, "#categoriesMusicTableTypeButton") + new TIMAAT.Table.QueryParameterSelectorPopover("Type", musicTable, "musicTypeIds", musicTypesQueryParameterValues, "#categoriesMusicTableTypeButton") return musicTable }, @@ -272,7 +280,7 @@ }); new TIMAAT.Table.ColumnSelectorPopover(segmentStructureTable, "#categoriesSegmentStructureColumnButton") - new TIMAAT.Table.QueryParameterSelectorPopover("Type", segmentStructureTable, "type", segmentStructureTypeQueryParameterValues, "#categoriesSegmentStructureTableTypeButton") + new TIMAAT.Table.QueryParameterSelectorPopover("Type", segmentStructureTable, "segmentStructureElementTypes", segmentStructureTypeQueryParameterValues, "#categoriesSegmentStructureTableTypeButton") return segmentStructureTable }, @@ -325,7 +333,7 @@ }); new TIMAAT.Table.ColumnSelectorPopover(mediumTable, "#categoriesMediumTableColumnButton") - new TIMAAT.Table.QueryParameterSelectorPopover("Type", mediumTable, "type", mediaTypesQueryParameterValues, "#categoriesMediumTableTypeButton") + new TIMAAT.Table.QueryParameterSelectorPopover("Type", mediumTable, "mediaTypeIds", mediaTypesQueryParameterValues, "#categoriesMediumTableTypeButton") return mediumTable }, @@ -357,7 +365,7 @@ }); new TIMAAT.Table.ColumnSelectorPopover(actorTable, "#categoriesActorTableColumnButton") - new TIMAAT.Table.QueryParameterSelectorPopover("Type", actorTable, "type", actorTypesQueryParameters, "#categoriesActorTableTypeButton") + new TIMAAT.Table.QueryParameterSelectorPopover("Type", actorTable, "actorTypeIds", actorTypesQueryParameters, "#categoriesActorTableTypeButton") return actorTable }, @@ -384,7 +392,7 @@ }); new TIMAAT.Table.ColumnSelectorPopover(annotationTable, "#categoriesAnnotationTableColumnButton") - new TIMAAT.Table.QueryParameterSelectorPopover("Type", annotationTable, "type", annotationTypeQueryParameters, "#categoriesAnnotationTableTypeButton") + new TIMAAT.Table.QueryParameterSelectorPopover("Type", annotationTable, "annotationTypes", annotationTypeQueryParameters, "#categoriesAnnotationTableTypeButton") return annotationTable }, @@ -808,15 +816,17 @@ handleSelectionChanged() { let selectionCount - let urlSearchParameters = new URLSearchParams + let queryParameterName; + let queryParameterValues = [] switch (TIMAAT.Categories.currentItemType) { case "category": TIMAAT.Categories.updateCategorySelectAllCheckboxState() const selectedCategories = TIMAAT.Categories.categoryDataTable.rows({selected: true}).data().toArray() selectionCount = selectedCategories.length + queryParameterName = "categoryIds" for (let currentCategory of selectedCategories) { - urlSearchParameters.append("categoryIds", currentCategory.id) + queryParameterValues.push(currentCategory.id) } break @@ -824,9 +834,10 @@ TIMAAT.Categories.updateCategorySetSelectAllCheckboxState() const selectedCategorySets = TIMAAT.Categories.categorySetDataTable.rows({selected: true}).data().toArray() selectionCount = selectedCategorySets.length + queryParameterName = "categorySetIds" for (let currentCategorySet of selectedCategorySets) { - urlSearchParameters.append("categorySetIds", currentCategorySet.id) + queryParameterValues.push(currentCategorySet.id) } break @@ -834,11 +845,11 @@ if (selectionCount > 0) { TIMAAT.Categories.showAssignedEntitiesPanel() - TIMAAT.Categories.relatedMusicTable.urlSearchParams = urlSearchParameters - TIMAAT.Categories.relatedMediumTable.urlSearchParams = urlSearchParameters - TIMAAT.Categories.relatedAnnotationTable.urlSearchParams = urlSearchParameters - TIMAAT.Categories.relatedActorTable.urlSearchParams = urlSearchParameters - TIMAAT.Categories.relatedSegmentStructureTable.urlSearchParams = urlSearchParameters + TIMAAT.Categories.relatedMusicTable.updateUrlSearchParam(queryParameterName, queryParameterValues) + TIMAAT.Categories.relatedMediumTable.updateUrlSearchParam(queryParameterName, queryParameterValues) + TIMAAT.Categories.relatedAnnotationTable.updateUrlSearchParam(queryParameterName, queryParameterValues) + TIMAAT.Categories.relatedActorTable.updateUrlSearchParam(queryParameterName, queryParameterValues) + TIMAAT.Categories.relatedSegmentStructureTable.updateUrlSearchParam(queryParameterName, queryParameterValues) } else { TIMAAT.Categories.showNoSelectionPanel() } diff --git a/src/main/webapp/js/ui/timaat.table.js b/src/main/webapp/js/ui/timaat.table.js index f6e8ee75..7f2c5297 100644 --- a/src/main/webapp/js/ui/timaat.table.js +++ b/src/main/webapp/js/ui/timaat.table.js @@ -246,11 +246,23 @@ } } - set urlSearchParams(urlSearchParams) { - this._urlSearchParams = urlSearchParams + updateUrlSearchParam(parameterName, parameterValues) { + this._urlSearchParams.delete(parameterName) + for (let parameterValue of parameterValues) { + this._urlSearchParams.append(parameterName, parameterValue) + } + this.draw() } + clearUrlSearchParam(parameterName) { + this._urlSearchParams.delete(parameterName) + } + + getUrlSearchParamValues(parameterName) { + return this._urlSearchParams.getAll(parameterName) + } + get activeTableColumnIds() { return this._activeTableColumnIds; } @@ -289,7 +301,7 @@ $table.appendTo(this._$container) const ajaxUrl = this._dataUrl + "?" + this._urlSearchParams.toString() - console.log(ajaxUrl) + this._dataTable = $table.DataTable({ "destroy": true, "autoWidth": false, @@ -362,17 +374,29 @@ _title _queryParameterValues _$queryParameterSelectorButton + _minimumSelectedValues + _currentSelectedParameterValues - constructor(title, table, queryParameterName, queryParameterValues, queryParameterSelectorButtonSelector) { + constructor(title, table, queryParameterName, queryParameterValues, queryParameterSelectorButtonSelector, minimumSelectedValues = 1, initiallyAllSelected = true) { this._table = table; - this._queryParameterValues = queryParameterValues.sort((a,b) => a.title.localeCompare(b.title)) + this._queryParameterValues = queryParameterValues.sort((a, b) => a.title.localeCompare(b.title)) this._queryParameterName = queryParameterName this._$queryParameterSelectorButton = $(queryParameterSelectorButtonSelector) this._title = title + this._minimumSelectedValues = minimumSelectedValues + this._currentSelectedParameterValues = new Set() this._$queryParameterSelectorButton.on('click', this.openPopover); this._$queryParameterSelectorButton.prop("title", this._title) + if(initiallyAllSelected) { + for(let queryParameterValue of queryParameterValues) { + this._currentSelectedParameterValues.add(queryParameterValue.value) + } + + this._table.updateUrlSearchParam(queryParameterName, Array.from(this._currentSelectedParameterValues)) + } + this.createPopover(); } @@ -391,14 +415,25 @@ for (const currentQueryParameterValue of this._queryParameterValues) { const $currentListGroupItemCheckbox = $(`<input class="ml-2" type="checkbox">`) - // const initialSelected = currentActiveTableColumnIds.indexOf(currentTableColumnConfig.id) > -1; - //$currentListGroupItemCheckbox.prop("checked", initialSelected) + console.log(this._currentSelectedParameterValues) + const initialSelected = this._currentSelectedParameterValues.has(currentQueryParameterValue.value); + $currentListGroupItemCheckbox.prop("checked", initialSelected) const table = this._table + const queryParameterName = this._queryParameterName + const selectedParameterValues = this._currentSelectedParameterValues + const minimumSelectedValues = this._minimumSelectedValues + $currentListGroupItemCheckbox.on("change", (e) => { - console.log(currentTableColumnConfig) - //const newState = table.changeTableColumnActivState(currentTableColumnConfig.id, e.target.checked); - //$currentListGroupItemCheckbox.prop("checked", e.target.checked) + if (e.target.checked) { + selectedParameterValues.add(currentQueryParameterValue.value) + } else if (selectedParameterValues.size > minimumSelectedValues && selectedParameterValues.has(currentQueryParameterValue.value)) { + selectedParameterValues.delete(currentQueryParameterValue.value) + } else { + $currentListGroupItemCheckbox.prop("checked", true) + } + + table.updateUrlSearchParam(queryParameterName, Array.from(selectedParameterValues)) }) const $currentListGroupItem = $(`<li class="list-group-item d-flex justify-content-between align-items-center">${currentQueryParameterValue.title}</li>`) From a3888320869a27ddfb059d756adab967bce8208d Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Sun, 11 Jan 2026 18:03:20 +0100 Subject: [PATCH 30/70] TIMAAT Weiterentwicklung #9 - Added vertical scrolling for categories content tables --- src/main/webapp/css/timaat.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/webapp/css/timaat.css b/src/main/webapp/css/timaat.css index 077215fa..240dde33 100644 --- a/src/main/webapp/css/timaat.css +++ b/src/main/webapp/css/timaat.css @@ -445,4 +445,9 @@ .categoriesAccordion{ margin-bottom: 8px; +} + +#categoriesAssignedEntitiesPanel{ + max-height: calc(100vh - 180px); + overflow-y: auto; } \ No newline at end of file From 06b78a13fdc38c2dba11bd2cd3f6df4e018552fc Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Sun, 11 Jan 2026 19:08:19 +0100 Subject: [PATCH 31/70] TIMAAT Weiterentwicklung #9 - Added column groups * Table columns can now be assigned to a column group * The column selector popover is representing the columns separated by column groups --- .../webapp/js/datasets/timaat.categories.js | 2 +- src/main/webapp/js/ui/timaat.table.js | 83 ++++++++++++++----- 2 files changed, 63 insertions(+), 22 deletions(-) diff --git a/src/main/webapp/js/datasets/timaat.categories.js b/src/main/webapp/js/datasets/timaat.categories.js index fca6f96d..89aae5a1 100644 --- a/src/main/webapp/js/datasets/timaat.categories.js +++ b/src/main/webapp/js/datasets/timaat.categories.js @@ -246,7 +246,7 @@ } }).toArray() - const columns = [new TIMAAT.Table.FieldTableColumnConfig("title", "Title", "displayTitle.name"), new TIMAAT.Table.FieldTableColumnConfig("id", "ID", "id"), new TIMAAT.Table.FieldTableColumnConfig("beat", "Beat", "beat"), + const columns = [new TIMAAT.Table.FieldTableColumnConfig("title", "Title", "displayTitle.name", true), new TIMAAT.Table.FieldTableColumnConfig("id", "ID", "id", true), new TIMAAT.Table.FieldTableColumnConfig("beat", "Beat", "beat"), new TIMAAT.Table.FieldTableColumnConfig("instrumentation", "Instrumentation", "instrumentation"), new TIMAAT.Table.FieldTableColumnConfig("tempo", "Tempo", "tempo"), new TIMAAT.Table.FieldTableColumnConfig("remark", "Remark", "remark"), new TIMAAT.Table.FieldTableColumnConfig("harmony", "Harmony", "harmony"), new TIMAAT.Table.FieldTableColumnConfig("melody", "Melody", "melody"), new TIMAAT.Table.ValueMapperTableColumnConfig("musicType", "Music Type", "musicType.id", musicTypesById)] const activeColumnIds = ["id", "title", "musicType", "beat", "instrumentation", "tempo", "remark", "harmony", "melody"] diff --git a/src/main/webapp/js/ui/timaat.table.js b/src/main/webapp/js/ui/timaat.table.js index 7f2c5297..4f2b187d 100644 --- a/src/main/webapp/js/ui/timaat.table.js +++ b/src/main/webapp/js/ui/timaat.table.js @@ -27,12 +27,14 @@ _title; _data; _sortable; + _groupName; - constructor(id, title, data, sortable = true) { + constructor(id, title, data, sortable = true, groupName = null) { this._id = id; this._title = title; this._data = data; this._sortable = sortable; + this._groupName = groupName; } get title() { @@ -51,13 +53,17 @@ return this._sortable; } + get groupName() { + return this._groupName; + } + render(data, type, row) { throw new Error("This method need to get overridden") } } TIMAAT.Table.FieldTableColumnConfig = class extends TIMAAT.Table.TableColumnConfig { - constructor(id, title, data, sortable = true) { - super(id, title, data, sortable); + constructor(id, title, data, sortable = true, groupName = null) { + super(id, title, data, sortable, groupName); } render(data, type, row) { @@ -70,8 +76,8 @@ } } TIMAAT.Table.DateTableColumnConfig = class extends TIMAAT.Table.TableColumnConfig { - constructor(id, title, data, sortable = true) { - super(id, title, data, sortable); + constructor(id, title, data, sortable = true, groupName = null) { + super(id, title, data, sortable, groupName); } render(data, type, row) { @@ -87,8 +93,8 @@ } TIMAAT.Table.TimeStampTableColumnConfig = class extends TIMAAT.Table.TableColumnConfig { - constructor(id, title, data, sortable = true) { - super(id, title, data, sortable); + constructor(id, title, data, sortable = true, groupName = null) { + super(id, title, data, sortable, groupName); } render(data, type, row) { @@ -104,8 +110,8 @@ } TIMAAT.Table.BooleanTableColumnConfig = class extends TIMAAT.Table.TableColumnConfig { - constructor(id, title, data, sortable = true) { - super(id, title, data, sortable); + constructor(id, title, data, sortable = true, groupName = null) { + super(id, title, data, sortable, groupName); } render(data, type, row) { @@ -127,8 +133,8 @@ TIMAAT.Table.ValueMapperTableColumnConfig = class extends TIMAAT.Table.TableColumnConfig { _valueMap; - constructor(id, title, data, valueMap, sortable = true) { - super(id, title, data, sortable); + constructor(id, title, data, valueMap, sortable = true, groupName = null) { + super(id, title, data, sortable, groupName); this._valueMap = valueMap; this.render = this.render.bind(this); @@ -155,8 +161,8 @@ * @param title * @param imagePathGeneratorFunction : (row) => string | null , (row) => Promise<string | null> */ - constructor(id, title, imagePathGeneratorFunction) { - super(id, title, "", false); + constructor(id, title, imagePathGeneratorFunction, groupName = null) { + super(id, title, "", false, groupName); this._imagePathGeneratorFunction = imagePathGeneratorFunction; this.render = this.render.bind(this); @@ -170,8 +176,8 @@ } TIMAAT.Table.AddressTableColumnConfig = class extends TIMAAT.Table.TableColumnConfig { - constructor(id, title, data) { - super(id, title, data, false); + constructor(id, title, data, groupName = null) { + super(id, title, data, false, groupName); } render(data, type, row) { @@ -389,8 +395,8 @@ this._$queryParameterSelectorButton.on('click', this.openPopover); this._$queryParameterSelectorButton.prop("title", this._title) - if(initiallyAllSelected) { - for(let queryParameterValue of queryParameterValues) { + if (initiallyAllSelected) { + for (let queryParameterValue of queryParameterValues) { this._currentSelectedParameterValues.add(queryParameterValue.value) } @@ -464,7 +470,7 @@ } createPopover() { - const popoverMenuItems = this.createMenuItems(); + const popoverMenuItems = this.createPopoverContent(); this._$columnSelectorButton.popover({ title: "Columns", content: popoverMenuItems, @@ -473,11 +479,11 @@ }) } - createMenuItems() { - const $listGroup = $(`<ul class="list-group"></ul>`) + createListGroup(tableColumnConfigs) { const currentActiveTableColumnIds = this._table.activeTableColumnIds + const $listGroup = $(`<ul class="list-group"></ul>`) - for (const currentTableColumnConfig of this._tableColumnConfigs) { + for (const currentTableColumnConfig of tableColumnConfigs) { const $currentListGroupItemCheckbox = $(`<input class="ml-2" type="checkbox">`) const initialSelected = currentActiveTableColumnIds.indexOf(currentTableColumnConfig.id) > -1; @@ -497,6 +503,41 @@ return $listGroup } + + createPopoverContent() { + const defaultGroupColumnConfigs = [] + const columnConfigsByGroupName = new Map() + + const $popoverContent = $('<div></div>') + + for (let currentTableColumnConfig of this._tableColumnConfigs) { + const currentGroupName = currentTableColumnConfig.groupName + if (currentGroupName) { + if(!columnConfigsByGroupName.has(currentGroupName)) { + columnConfigsByGroupName.set(currentGroupName, []) + } + const groupColumnConfigs = columnConfigsByGroupName.get(currentGroupName) + groupColumnConfigs.push(currentTableColumnConfig) + } else { + defaultGroupColumnConfigs.push(currentTableColumnConfig) + } + } + + + const $defaultListGroup = this.createListGroup(defaultGroupColumnConfigs) + $popoverContent.append($defaultListGroup) + + + for (const currentGroupName of columnConfigsByGroupName.keys().toArray().sort((a, b) => a.localeCompare(b))) { + const groupColumnConfigs = columnConfigsByGroupName.get(currentGroupName) + $popoverContent.append(`<span>${currentGroupName}</span>`) + + const $currentListGroup = this.createListGroup(groupColumnConfigs) + $popoverContent.append($currentListGroup) + } + + return $popoverContent + } } TIMAAT.Table.TableConfigurationStorage = { saveActiveColumnsForTable: function (activeColumns, tableId) { From 4ceed564bc87bf2d161865580e3d5210a169b993 Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Mon, 12 Jan 2026 10:47:29 +0100 Subject: [PATCH 32/70] TIMAAT Weiterentwicklung #9 - Categories content tables - Updated column definitions * Defined column groups for specific entity types * Added missing columns --- .../bitgilde/TIMAAT/model/FIPOP/Medium.java | 8 --- src/main/webapp/css/timaat.css | 5 ++ .../webapp/js/datasets/timaat.categories.js | 61 +++++++++++++++---- src/main/webapp/js/ui/timaat.table.js | 8 +-- 4 files changed, 57 insertions(+), 25 deletions(-) diff --git a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/Medium.java b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/Medium.java index eee5fc65..4e898937 100644 --- a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/Medium.java +++ b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/Medium.java @@ -423,14 +423,6 @@ public void setRemark(String remark) { this.remark = remark; } - // public List<Annotation> getAnnotations() { - // return this.annotations; - // } - - // public void setAnnotations(List<Annotation> annotations) { - // this.annotations = annotations; - // } - public List<MediaCollectionHasMedium> getMediaCollectionHasMediums() { return this.mediaCollectionHasMediums; } diff --git a/src/main/webapp/css/timaat.css b/src/main/webapp/css/timaat.css index 240dde33..48d36178 100644 --- a/src/main/webapp/css/timaat.css +++ b/src/main/webapp/css/timaat.css @@ -450,4 +450,9 @@ #categoriesAssignedEntitiesPanel{ max-height: calc(100vh - 180px); overflow-y: auto; +} + +.ColumnSelectorPopover .popover-body{ + max-height: calc(0.25 * 100vh); + overflow-y: auto; } \ No newline at end of file diff --git a/src/main/webapp/js/datasets/timaat.categories.js b/src/main/webapp/js/datasets/timaat.categories.js index 89aae5a1..7580103c 100644 --- a/src/main/webapp/js/datasets/timaat.categories.js +++ b/src/main/webapp/js/datasets/timaat.categories.js @@ -246,10 +246,18 @@ } }).toArray() + // TODO: When adding DTO layer the client will receive for each internationalized label a map instead of a list. With this we can map directly to a target language instead of using the first result of the translation list + const musicalKeyData = (data) => { + return data.musicalKey?.musicalKeyTranslations?.[0]?.type + } + + const columns = [new TIMAAT.Table.FieldTableColumnConfig("title", "Title", "displayTitle.name", true), new TIMAAT.Table.FieldTableColumnConfig("id", "ID", "id", true), new TIMAAT.Table.FieldTableColumnConfig("beat", "Beat", "beat"), new TIMAAT.Table.FieldTableColumnConfig("instrumentation", "Instrumentation", "instrumentation"), new TIMAAT.Table.FieldTableColumnConfig("tempo", "Tempo", "tempo"), new TIMAAT.Table.FieldTableColumnConfig("remark", "Remark", "remark"), - new TIMAAT.Table.FieldTableColumnConfig("harmony", "Harmony", "harmony"), new TIMAAT.Table.FieldTableColumnConfig("melody", "Melody", "melody"), new TIMAAT.Table.ValueMapperTableColumnConfig("musicType", "Music Type", "musicType.id", musicTypesById)] - const activeColumnIds = ["id", "title", "musicType", "beat", "instrumentation", "tempo", "remark", "harmony", "melody"] + new TIMAAT.Table.FieldTableColumnConfig("harmony", "Harmony", "harmony"), new TIMAAT.Table.FieldTableColumnConfig("melody", "Melody", "melody"), new TIMAAT.Table.ValueMapperTableColumnConfig("musicType", "Music Type", "musicType.id", musicTypesById), + new TIMAAT.Table.FieldTableColumnConfig("musicalKey", "Musical Key", musicalKeyData)] + + const activeColumnIds = ["id", "title", "musicType"] const musicTable = new TIMAAT.Table.Table("categoriesMusicTable", "#categoriesMusicTableContainer", columns, activeColumnIds, "api/music/list", true, false) $('#musicTableCollapse').on('shown.bs.collapse', (event) => { musicTable.resizeToParent() @@ -273,7 +281,7 @@ const columns = [new TIMAAT.Table.FieldTableColumnConfig("id", "ID", "id"), new TIMAAT.Table.FieldTableColumnConfig("name", "Name", "name"), new TIMAAT.Table.ValueMapperTableColumnConfig("type", "Type", "segmentStructureElementType", segmentStructureTypeByEnumTypeName, true), new TIMAAT.Table.TimeStampTableColumnConfig("startTime", "Start time", "startTime"), new TIMAAT.Table.TimeStampTableColumnConfig("endTime", "End time", "endTime")] - const activeColumnIds = ["id", "name", "type", "startTime", "endTime"] + const activeColumnIds = ["id", "name", "type"] const segmentStructureTable = new TIMAAT.Table.Table("categoriesSegmentStructureTable", "#categoriesSegmentStructureTableContainer", columns, activeColumnIds, "api/segment-structure-elements/list", true, false) $('#segmentStructureTableCollapse').on('shown.bs.collapse', (event) => { segmentStructureTable.resizeToParent() @@ -321,11 +329,38 @@ return thumbnailPath } + const withData = (row) => { + if (row.mediumVideo) { + return row.mediumVideo.width + } + if (row.mediumImage) { + return row.mediumImage.width + } + return null + } + const heightData = (row) => { + if (row.mediumVideo) { + return row.mediumVideo.height + } + if (row.mediumImage) { + return row.mediumImage.height + } + return null + } + const softwareVersionData = (row) => row.mediumSoftware?.version; + const textContentData = (row) => row.mediumText?.content; + const videoFramRateData = (row) => row.mediumVideo?.frameRate; + const videoIsEpisode = (row) => row.mediumVideo?.isEpisode + const columns = [new TIMAAT.Table.FieldTableColumnConfig("id", "ID", "id"), new TIMAAT.Table.FieldTableColumnConfig("copyright", "Copyright", "copyright"), new TIMAAT.Table.FieldTableColumnConfig("fileHash", "File Hash", "fileHash"), - new TIMAAT.Table.FieldTableColumnConfig("releaseDate", "ReleaseDate", "releaseDate"), new TIMAAT.Table.DateTableColumnConfig("releaseDate", "Release Date", "releaseDate"), new TIMAAT.Table.DateTableColumnConfig("recordingStartDate", "Recording Start Date", "recordingStartDate"), + new TIMAAT.Table.DateTableColumnConfig("releaseDate", "Release Date", "releaseDate"), new TIMAAT.Table.DateTableColumnConfig("recordingStartDate", "Recording Start Date", "recordingStartDate"), new TIMAAT.Table.DateTableColumnConfig("recordingEndDate", "Recording End Date", "recordingEndDate"), new TIMAAT.Table.FieldTableColumnConfig("remark", "Remark", "remark"), new TIMAAT.Table.FieldTableColumnConfig("title", "Title", "displayTitle.name"), - new TIMAAT.Table.ValueMapperTableColumnConfig("mediaType", "Media Type", "mediaType.id", mediaTypesById), new MediumDurationColumnConfig(), new TIMAAT.Table.ImageDownloadTableColumnConfig("thumbnail", "Thumbnail", imageThumbnailGeneratorFunction)] - const activeColumnIds = ["thumbnail", "id", "title", "mediaType", "duration", "releaseDate", 'recordingStartDate', 'recordingEndDate', "fileHash", "copyright", "remark"] + new TIMAAT.Table.ValueMapperTableColumnConfig("mediaType", "Media Type", "mediaType.id", mediaTypesById), new MediumDurationColumnConfig(), new TIMAAT.Table.ImageDownloadTableColumnConfig("thumbnail", "Thumbnail", imageThumbnailGeneratorFunction), + new TIMAAT.Table.FieldTableColumnConfig("width", "Width", withData, true), new TIMAAT.Table.FieldTableColumnConfig("height", "Height", heightData, true), + new TIMAAT.Table.FieldTableColumnConfig("softwareVersion", "Software Version", softwareVersionData, true, "Software"), new TIMAAT.Table.FieldTableColumnConfig("textContent", "Text Content", textContentData, true, "Text"), + new TIMAAT.Table.FieldTableColumnConfig("videoFrameRate", "Video Frame Rate", videoFramRateData, true, "Video"), new TIMAAT.Table.BooleanTableColumnConfig("videoIsEpisode", "Video Is Episode", videoIsEpisode, "Video") + ] + const activeColumnIds = ["thumbnail", "id", "title", "mediaType"] const mediumTable = new TIMAAT.Table.Table("categoriesMediumTable", "#categoriesMediumTableContainer", columns, activeColumnIds, "api/medium/list", true, false) $('#mediumTableCollapse').on('shown.bs.collapse', (event) => { @@ -351,13 +386,13 @@ new TIMAAT.Table.FieldTableColumnConfig("name", "Name", "displayName.name"), new TIMAAT.Table.DateTableColumnConfig("nameUsedFrom", "Name used from", "displayName.usedFrom"), new TIMAAT.Table.DateTableColumnConfig("nameUsedUntil", "Name used until", "displayName.usedUntil"), new TIMAAT.Table.AddressTableColumnConfig("primaryAddress", "Primary address", "primaryAddress"), new TIMAAT.Table.FieldTableColumnConfig("primaryPhoneNumber", "Primary phone number", "primaryPhoneNumber.phoneNumber"), new TIMAAT.Table.FieldTableColumnConfig("primaryEmailAddress", "Primary email address", "primaryEmailAddress.email"), - new TIMAAT.Table.DateTableColumnConfig("disbanded", "Disbanded", "actorCollective.disbanded"), new TIMAAT.Table.DateTableColumnConfig("founded", "Founded", "actorCollective.founded"), - new TIMAAT.Table.DateTableColumnConfig("dateOfBirth", "Date of birth", "actorPerson.dateOfBirth"), new TIMAAT.Table.DateTableColumnConfig("dayOfDeath", "Day of death", "actorPerson.dayOfDeath"), - new TIMAAT.Table.FieldTableColumnConfig("title", "Title", "actorPerson.title"), new TIMAAT.Table.FieldTableColumnConfig("citizenship", "Citizenship", "actorPerson.citizenship"), - new TIMAAT.Table.FieldTableColumnConfig("placeOfBirth", "Place of birth", "actorPerson.placeOfBirth"), new TIMAAT.Table.FieldTableColumnConfig("placeOfDeath", "Place of death", "actorPerson.placeOfDeath"), - new TIMAAT.Table.ValueMapperTableColumnConfig("sex", "Sex", "actorPerson.sex.id", sexTypesById) + new TIMAAT.Table.DateTableColumnConfig("disbanded", "Disbanded", "actorCollective.disbanded", true, "Collective"), new TIMAAT.Table.DateTableColumnConfig("founded", "Founded", "actorCollective.founded", true, "Collective"), + new TIMAAT.Table.DateTableColumnConfig("dateOfBirth", "Date of birth", "actorPerson.dateOfBirth", true, "Person"), new TIMAAT.Table.DateTableColumnConfig("dayOfDeath", "Day of death", "actorPerson.dayOfDeath", true, "Person"), + new TIMAAT.Table.FieldTableColumnConfig("title", "Title", "actorPerson.title", true, "Person"), new TIMAAT.Table.FieldTableColumnConfig("citizenship", "Citizenship", "actorPerson.citizenship", true, "Person"), + new TIMAAT.Table.FieldTableColumnConfig("placeOfBirth", "Place of birth", "actorPerson.placeOfBirth", true, "Person"), new TIMAAT.Table.FieldTableColumnConfig("placeOfDeath", "Place of death", "actorPerson.placeOfDeath", true, "Person"), + new TIMAAT.Table.ValueMapperTableColumnConfig("sex", "Sex", "actorPerson.sex.id", sexTypesById, true, "Person"), new TIMAAT.Table.BooleanTableColumnConfig("isFictional", "Fictional", "isFictional") ] - const activeColumnIds = ["id", "name", "nameUsedFrom", "nameUsedUntil", "type", "primaryAddress", "primaryPhoneNumber", "primaryEmailAddress", "disbanded", "founded", "dateOfBirth", "dayOfDeath", "title", "citizenship", "placeOfBirth", "placeOfDeath", "sex"] + const activeColumnIds = ["id", "name", "type"] const actorTable = new TIMAAT.Table.Table("categoriesActorTable", "#categoriesActorTableContainer", columns, activeColumnIds, "api/actor/list", true, false) $('#actorTableCollapse').on('shown.bs.collapse', (event) => { @@ -383,7 +418,7 @@ const columns = [new TIMAAT.Table.FieldTableColumnConfig("id", "ID", "id"), new TIMAAT.Table.TimeStampTableColumnConfig("startTime", "Start time", "startTime", false), new TIMAAT.Table.TimeStampTableColumnConfig("endTime", "End time", "endTime", false), new TIMAAT.Table.BooleanTableColumnConfig("layerAudio", "Audio", "layerAudio", false), new TIMAAT.Table.BooleanTableColumnConfig("layerVisual", "Video", "layerVisual", false), new TIMAAT.Table.ImageDownloadTableColumnConfig("thumbnail", "Thumbnail", annotationThumbnailGeneratorFunction)] - const activeColumnIds = ["thumbnail", "startTime", "endTime", "layerAudio", "layerVisual", "id"] + const activeColumnIds = ["id", "thumbnail", "startTime", "endTime", "layerAudio", "layerVisual"] const annotationTable = new TIMAAT.Table.Table("categoriesAnnotationTable", "#categoriesAnnotationTableContainer", columns, activeColumnIds, "api/annotation/list", true, false) diff --git a/src/main/webapp/js/ui/timaat.table.js b/src/main/webapp/js/ui/timaat.table.js index 4f2b187d..954f299b 100644 --- a/src/main/webapp/js/ui/timaat.table.js +++ b/src/main/webapp/js/ui/timaat.table.js @@ -295,7 +295,7 @@ const columnConfigs = [] for (let activeTableColumnId of this._activeTableColumnIds) { const currentTableColumnConfig = this._tableColumnConfigsById.get(activeTableColumnId); - + console.log(currentTableColumnConfig) columnConfigs.push({ title: currentTableColumnConfig.title, data: currentTableColumnConfig.data, @@ -421,7 +421,6 @@ for (const currentQueryParameterValue of this._queryParameterValues) { const $currentListGroupItemCheckbox = $(`<input class="ml-2" type="checkbox">`) - console.log(this._currentSelectedParameterValues) const initialSelected = this._currentSelectedParameterValues.has(currentQueryParameterValue.value); $currentListGroupItemCheckbox.prop("checked", initialSelected) @@ -475,7 +474,8 @@ title: "Columns", content: popoverMenuItems, html: true, - placement: "bottom" + placement: "bottom", + customClass: "ColumnSelectorPopover" }) } @@ -530,7 +530,7 @@ for (const currentGroupName of columnConfigsByGroupName.keys().toArray().sort((a, b) => a.localeCompare(b))) { const groupColumnConfigs = columnConfigsByGroupName.get(currentGroupName) - $popoverContent.append(`<span>${currentGroupName}</span>`) + $popoverContent.append(`<span class="mt-1">${currentGroupName}</span>`) const $currentListGroup = this.createListGroup(groupColumnConfigs) $popoverContent.append($currentListGroup) From 599181cb199a631d84e5322ec9ff0c49d2cd209c Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Mon, 12 Jan 2026 18:38:28 +0100 Subject: [PATCH 33/70] TIMAAT Weiterentwicklung #9 - Categories content tables - Implemented action buttons to jump to entitys * Added actions columns containing a button to jump to the entity inside their --- .../rest/endpoint/EndpointAnnotation.java | 12 +- .../EndpointSegmentStructureElement.java | 19 ++- .../entity/annotation/AnnotationStorage.java | 8 ++ .../SegmentStructureElementsStorage.java | 8 ++ .../timaat.component.videoplayer.js | 136 +++++++++--------- .../webapp/js/datasets/timaat.categories.js | 55 +++++-- .../js/model/timaat.model.analysisaction.js | 68 ++++----- .../js/model/timaat.model.analysisscene.js | 63 ++++---- .../js/model/timaat.model.analysissegment.js | 101 ++++--------- .../js/model/timaat.model.analysissequence.js | 88 ++++-------- .../js/model/timaat.model.analysistake.js | 66 ++++----- .../js/service/timaat.service.annotation.js | 21 +++ .../timaat.service.segmentstructureelement.js | 46 ++++++ src/main/webapp/js/timaat.init.js | 2 + src/main/webapp/js/ui/timaat.table.js | 59 +++++++- 15 files changed, 416 insertions(+), 336 deletions(-) create mode 100644 src/main/webapp/js/service/timaat.service.segmentstructureelement.js diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnnotation.java b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnnotation.java index 02f44140..7a6f6f0c 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnnotation.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnnotation.java @@ -131,8 +131,7 @@ public DataTableInfo<Annotation> getAnnotationList(@BeanParam @Valid AnnotationL long totalAnnotationsCount = annotationStorage.getNumberOfTotalEntries(); long filteredAnnotationsCount = annotationStorage.getNumberOfMatchingEntries(annotationListingQueryParameter); - return new DataTableInfo<>(draw, totalAnnotationsCount, - filteredAnnotationsCount, matchingAnnotations); + return new DataTableInfo<>(draw, totalAnnotationsCount, filteredAnnotationsCount, matchingAnnotations); } @GET @@ -161,6 +160,15 @@ public Response getAnnotation(@PathParam("id") int id) { return Response.ok().entity(annotation).build(); } + @GET + @Produces(MediaType.APPLICATION_JSON) + @Path("{id}/analysis-list") + @Secured + public MediumAnalysisList getMediumAnalysisListOfAnnotation(@PathParam("id") int id) { + return annotationStorage.getMediumAnalysisListOfAnnotation(id); + } + + @POST @Produces(MediaType.APPLICATION_JSON) @Secured diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointSegmentStructureElement.java b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointSegmentStructureElement.java index 0e0dc7f1..02435eb0 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointSegmentStructureElement.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointSegmentStructureElement.java @@ -1,15 +1,18 @@ package de.bitgilde.TIMAAT.rest.endpoint; import de.bitgilde.TIMAAT.model.DataTableInfo; +import de.bitgilde.TIMAAT.model.FIPOP.MediumAnalysisList; import de.bitgilde.TIMAAT.model.FIPOP.UserAccount; import de.bitgilde.TIMAAT.rest.filter.AuthenticationFilter; import de.bitgilde.TIMAAT.rest.model.analysissegment.SegmentStructureElementListingQueryParameter; import de.bitgilde.TIMAAT.rest.model.segment.SegmentStructureElement; import de.bitgilde.TIMAAT.storage.entity.segment.SegmentStructureElementsStorage; +import de.bitgilde.TIMAAT.storage.entity.segment.api.SegmentStructureElementType; import jakarta.inject.Inject; import jakarta.ws.rs.BeanParam; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.container.ContainerRequestContext; import jakarta.ws.rs.core.Context; @@ -42,7 +45,7 @@ @Path("/segment-structure-elements") public class EndpointSegmentStructureElement { @Inject - SegmentStructureElementsStorage segmentStructureElements; + SegmentStructureElementsStorage segmentStructureElementsStorage; @Context ContainerRequestContext containerRequestContext; @@ -54,10 +57,18 @@ public DataTableInfo<SegmentStructureElement> listSegmentStructureElements(@Bean UserAccount userAccount = (UserAccount) containerRequestContext.getProperty( AuthenticationFilter.USER_ACCOUNT_PROPERTY_NAME); - List<SegmentStructureElement> matchingEntries = segmentStructureElements.getEntriesAsStream(queryParameter, + List<SegmentStructureElement> matchingEntries = segmentStructureElementsStorage.getEntriesAsStream(queryParameter, queryParameter, queryParameter, userAccount).map(SegmentStructureElement::new).collect(Collectors.toList()); - long countOfMatchingEntries = segmentStructureElements.getNumberOfMatchingEntries(queryParameter); - long totalCount = segmentStructureElements.getNumberOfTotalEntries(); + long countOfMatchingEntries = segmentStructureElementsStorage.getNumberOfMatchingEntries(queryParameter); + long totalCount = segmentStructureElementsStorage.getNumberOfTotalEntries(); return new DataTableInfo<>(draw, totalCount, countOfMatchingEntries, matchingEntries); } + + @GET + @Produces + @Path("{segmentStructureType}/{segmentStructureId}/analysis-list") + public MediumAnalysisList loadAnalysisListOfSegmentStructureElement(@PathParam("segmentStructureType") SegmentStructureElementType segmentStructureType, @PathParam("segmentStructureId") int segmentStructureId) { + return segmentStructureElementsStorage.getMediumAnalysisListOfSegmentStructureElement(segmentStructureType, + segmentStructureId); + } } diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/AnnotationStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/AnnotationStorage.java index 0ac3bddd..ba780396 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/AnnotationStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/AnnotationStorage.java @@ -37,6 +37,7 @@ import jakarta.persistence.criteria.JoinType; import jakarta.persistence.criteria.Predicate; import jakarta.persistence.criteria.Root; +import jakarta.websocket.server.PathParam; import java.sql.Timestamp; import java.time.Instant; @@ -271,6 +272,13 @@ public boolean removeMusicFromAnnotation(int annotationId, int musicId) throws D }); } + public MediumAnalysisList getMediumAnalysisListOfAnnotation(@PathParam("id") int id) { + logger.log(Level.FINE, "Loading medium analysis list from annotation {0}", new Object[]{id}); + return this.executeDbTransaction(entityManager -> entityManager.createQuery( + "select mediumAnalysisList from Annotation annotation join annotation.mediumAnalysisList mediumAnalysisList where annotation.id = :annotationId", + MediumAnalysisList.class).setParameter("annotationId", id).getSingleResult()); + } + public Annotation getAnnotationById(int annotationId) throws DbTransactionExecutionException { logger.log(Level.FINE, "Getting annotation with id {0} from DB", annotationId); return this.executeDbTransaction(entityManager -> entityManager.find(Annotation.class, annotationId)); diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/SegmentStructureElementsStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/SegmentStructureElementsStorage.java index 8d262b5e..274b4322 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/SegmentStructureElementsStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/SegmentStructureElementsStorage.java @@ -73,6 +73,14 @@ public List<Category> updateCategories(int segmentStructureId, SegmentStructureE }); } + public MediumAnalysisList getMediumAnalysisListOfSegmentStructureElement(SegmentStructureElementType segmentStructureElementType, int segmentStructureId) { + return executeDbTransaction(entityManager -> entityManager.createQuery( + "select mediumAnalysisList from AnalysisSegmentStructureElement segmentStructureElement join segmentStructureElement.mediumAnalysisList mediumAnalysisList where segmentStructureElement.id.id = :id and segmentStructureElement.id.structureElementType = :type", + MediumAnalysisList.class).setParameter("id", segmentStructureId) + .setParameter("type", segmentStructureElementType.toString()) + .getSingleResult()); + } + public List<Category> getAssignedCategories(int segmentStructureId, SegmentStructureElementType segmentStructureElementType) { return executeDbTransaction(entityManager -> { Class<? extends SegmentStructureEntity> segmentTypeEntityClass = SEGMENT_STRUCTURE_ENTITY_CLASS_BY_SEGMENT_STRUCTURE_TYPE.get( diff --git a/src/main/webapp/js/components/timaat.component.videoplayer.js b/src/main/webapp/js/components/timaat.component.videoplayer.js index 789e3448..7870a706 100644 --- a/src/main/webapp/js/components/timaat.component.videoplayer.js +++ b/src/main/webapp/js/components/timaat.component.videoplayer.js @@ -107,43 +107,7 @@ if (TIMAAT.VideoPlayer.curAnalysisList != null) { for (let marker of TIMAAT.VideoPlayer.markerList) marker._updateElementOffset(); for (let anno of TIMAAT.VideoPlayer.annotationList) for (let keyframe of anno.svg.keyframes) keyframe._updateOffsetUI(); - // console.log("TCL: $ -> TIMAAT.VideoPlayer.selectedElementType", TIMAAT.VideoPlayer.selectedElementType); - // switch (TIMAAT.VideoPlayer.selectedElementType) { - // case 'segment': - // index = TIMAAT.VideoPlayer.curAnalysisList.analysisSegmentsUI.findIndex(({model}) => model.id === TIMAAT.VideoPlayer.curSegment.model.id); - // TIMAAT.VideoPlayer.curAnalysisList.analysisSegmentsUI[index].timelineView[0].classList.replace('bg-info', 'bg-primary'); - // break; - // case 'sequence': - // index = TIMAAT.VideoPlayer.curAnalysisList.analysisSequencesUI.findIndex(({model}) => model.id === TIMAAT.VideoPlayer.curSequence.model.id); - // TIMAAT.VideoPlayer.curAnalysisList.analysisSequencesUI[index].timelineView[0].classList.replace('bg-info', 'bg-primary'); - // break; - // case 'action': - // index = TIMAAT.VideoPlayer.curAnalysisList.analysisActionsUI.findIndex(({model}) => model.id === TIMAAT.VideoPlayer.curAction.model.id); - // TIMAAT.VideoPlayer.curAnalysisList.analysisActionsUI[index].timelineView[0].classList.replace('bg-info', 'bg-primary'); - // break; - // case 'scene': - // index = TIMAAT.VideoPlayer.curAnalysisList.analysisScenesUI.findIndex(({model}) => model.id === TIMAAT.VideoPlayer.curScene.model.id); - // TIMAAT.VideoPlayer.curAnalysisList.analysisScenesUI[index].timelineView[0].classList.replace('bg-info', 'bg-primary'); - // break; - // case 'take': - // index = TIMAAT.VideoPlayer.curAnalysisList.analysisTakesUI.findIndex(({model}) => model.id === TIMAAT.VideoPlayer.curTake.model.id); - // TIMAAT.VideoPlayer.curAnalysisList.analysisTakesUI[index].timelineView[0].classList.replace('bg-info', 'bg-primary'); - // break; - // } } - // if (TIMAAT.VideoPlayer.curMusic != null) { - // switch(TIMAAT.VideoPlayer.selectedElementType) { - // // TODO check what to do instead - // // index = TIMAAT.VideoPlayer.curMusic.musicFormElementsUI.findIndex(({model}) => model.id === TIMAAT.VideoPlayer.curMusicFormElement.model.id); - // // TIMAAT.VideoPlayer.curMusic.musicFormElementsUI[index].timelineView[0].classList.replace('bg-info', 'bg-primary'); - // case 'musicFormElement': - - // break; - // case 'musicChangeInTempoElement': - - // break; - // } - // } }); this.initNotifications(); @@ -290,15 +254,6 @@ ); $('.userLogDetails').find('.userId').each(function(index,item) {TIMAAT.Util.resolveUserID(item,"me")}); }); - - // $('#videoPlayerVideoUserLog').popover({ - // container: 'body', - // html: true, - // title: '<i class="fas fa-user"></i> Maintenance log', - // content: '<div class="userLogDetails">No data logged</div>', - // placement: 'left', - // trigger: 'click', - // }); }, initMenu: function() { @@ -1371,11 +1326,42 @@ if(requiredAnnotation){ TIMAAT.VideoPlayer.selectAnnotation(requiredAnnotation) - TIMAAT.Inspector + TIMAAT.VideoPlayer.inspector.open('inspectorMetadata'); } } }, + initializeAnnotationModeWithSegmentPreselected: async function(mediumId, mediumAnalysisListId, segmentId, segmentType){ + const medium = await TIMAAT.MediumService.getMedium(mediumId) + await TIMAAT.VideoPlayer.initializeAnnotationMode(medium) + const loadedList = await TIMAAT.VideoPlayer.loadAnalysisList(mediumAnalysisListId); + + switch(segmentType){ + case "SEGMENT": + const analysisSegment = TIMAAT.VideoPlayer.curAnalysisList.analysisSegmentsUI.find(currentSegment => currentSegment.model.id === segmentId) + analysisSegment.openInInspector(true) + break + case "SEQUENCE": + const analysisSequence = TIMAAT.VideoPlayer.curAnalysisList.analysisSequencesUI.find(currentSequence => currentSequence.model.id === segmentId) + analysisSequence.openInInspector(true) + break + case "TAKE": + const analysisTake = TIMAAT.VideoPlayer.curAnalysisList.analysisTakesUI.find(currentTake => currentTake.model.id === segmentId) + analysisTake.openInInspector(true) + break + case "SCENE": + const analysisScene = TIMAAT.VideoPlayer.curAnalysisList.analysisScenesUI.find(currentScene => currentScene.model.id === segmentId) + analysisScene.openInInspector(true) + break + case "ACTION": + const analysisAction = TIMAAT.VideoPlayer.curAnalysisList.analysisActionsUI.find(currentAction => currentAction.model.id === segmentId) + analysisAction.openInInspector(true) + break + } + + //TIMAAT.VideoPlayer.inspector.setItem(take, 'take'); + }, + sort: function(elements) { if ( !elements ) return; elements.sort(function (a, b) { @@ -1884,23 +1870,28 @@ }, loadAnalysisList: async function(listId) { - // console.log("TCL: loadAnalysisList:function -> listId", listId); - $('#analysisLoader').show(); - if ( TIMAAT.VideoPlayer.model.analysisLists.length == 0 ) { // no analysis lists available - await TIMAAT.VideoPlayer.setupAnalysisList(null); - TIMAAT.VideoPlayer.initEmptyAnalysisListMenu(); - $('#analysisLoader').hide(); - } else { // load specific analysis list if possible, else load first available analysis list - let index = TIMAAT.VideoPlayer.model.analysisLists.findIndex(({id}) => id === listId); - if (index > 0) { - await TIMAAT.VideoPlayer.setupAnalysisList(TIMAAT.VideoPlayer.model.analysisLists[index]); - $('#analysisChooser').val(listId); - } else { - await TIMAAT.VideoPlayer.setupAnalysisList(TIMAAT.VideoPlayer.model.analysisLists[0]); - } - TIMAAT.VideoPlayer.initAnalysisListMenu(); - $('#analysisLoader').hide(); - } + $('#analysisLoader').show(); + + if (TIMAAT.VideoPlayer.model.analysisLists.length === 0) { + await TIMAAT.VideoPlayer.setupAnalysisList(null); + TIMAAT.VideoPlayer.initEmptyAnalysisListMenu(); + $('#analysisLoader').hide(); + return null; + } + + let index = TIMAAT.VideoPlayer.model.analysisLists.findIndex(({ id }) => id === listId); + + const list = + index >= 0 + ? TIMAAT.VideoPlayer.model.analysisLists[index] + : TIMAAT.VideoPlayer.model.analysisLists[0]; + + await TIMAAT.VideoPlayer.setupAnalysisList(list); + $('#analysisChooser').val(list?.id); + TIMAAT.VideoPlayer.initAnalysisListMenu(); + $('#analysisLoader').hide(); + + return list; }, setupAnalysisList: async function(analysisList) { @@ -1908,7 +1899,7 @@ if (analysisList) this.currentPermissionLevel = await TIMAAT.AnalysisListService.getMediumAnalysisListPermissionLevel(analysisList.id); else this.currentPermissionLevel = null; - if (analysisList == this.curAnalysisList) return; // no new analysis list loaded + if (analysisList === this.curAnalysisList) return; // no new analysis list loaded // console.log("TCL: setupAnalysisList: ", analysisList); if ( this.curAnnotation ) this.curAnnotation.setSelected(false); @@ -1935,7 +1926,13 @@ TIMAAT.VideoPlayer.annotationList.push(new TIMAAT.Annotation(annotation)); }); } - this.refreshTimelineElementsStructure(); + TIMAAT.VideoPlayer.clearTimelineElementsStructure(); + + TIMAAT.VideoPlayer.createTimelineElementsStructure(); + TIMAAT.VideoPlayer.sortTimelineElementsStructure(); + TIMAAT.VideoPlayer.showTimelineElementsStructure(); + TIMAAT.VideoPlayer.updateListUI(); + TIMAAT.VideoPlayer.sortListUI(); // this.selectAnnotation(null); this.inspector.setItem(this.curAnalysisList, 'analysisList'); @@ -2727,7 +2724,7 @@ refreshTimelineElementsStructure: async function() { // console.log("TCL: refreshTimelineElementsStructure:function()"); - await TIMAAT.VideoPlayer.clearTimelineElementsStructure(); + TIMAAT.VideoPlayer.clearTimelineElementsStructure(); // Refresh current list data (required mainly for delete operations) if (TIMAAT.VideoPlayer.curAnalysisList) { TIMAAT.VideoPlayer.curAnalysisList = await TIMAAT.AnalysisListService.getAnalysisList(TIMAAT.VideoPlayer.curAnalysisList.id); @@ -2735,11 +2732,12 @@ if (TIMAAT.VideoPlayer.curMusic) { TIMAAT.VideoPlayer.curMusic = await TIMAAT.MusicService.getMusic(TIMAAT.VideoPlayer.curMusic.id); } - await TIMAAT.VideoPlayer.createTimelineElementsStructure(); - await TIMAAT.VideoPlayer.sortTimelineElementsStructure(); - await TIMAAT.VideoPlayer.showTimelineElementsStructure(); + TIMAAT.VideoPlayer.createTimelineElementsStructure(); + TIMAAT.VideoPlayer.sortTimelineElementsStructure(); + TIMAAT.VideoPlayer.showTimelineElementsStructure(); TIMAAT.VideoPlayer.updateListUI(); TIMAAT.VideoPlayer.sortListUI(); + console.log("refreshed ") }, clearTimelineElementsStructure: function() { diff --git a/src/main/webapp/js/datasets/timaat.categories.js b/src/main/webapp/js/datasets/timaat.categories.js index 7580103c..9d872053 100644 --- a/src/main/webapp/js/datasets/timaat.categories.js +++ b/src/main/webapp/js/datasets/timaat.categories.js @@ -251,13 +251,18 @@ return data.musicalKey?.musicalKeyTranslations?.[0]?.type } + const navigateToMusicEntry = (music) => { + window.navigation.navigate(`/TIMAAT/#music/${music.id}`); + } + const actionTableColumnButtons = [new TIMAAT.Table.ActionsTableColumnButton("Jump to entity", navigateToMusicEntry, "fa-arrow-right")] + const columns = [new TIMAAT.Table.FieldTableColumnConfig("title", "Title", "displayTitle.name", true), new TIMAAT.Table.FieldTableColumnConfig("id", "ID", "id", true), new TIMAAT.Table.FieldTableColumnConfig("beat", "Beat", "beat"), new TIMAAT.Table.FieldTableColumnConfig("instrumentation", "Instrumentation", "instrumentation"), new TIMAAT.Table.FieldTableColumnConfig("tempo", "Tempo", "tempo"), new TIMAAT.Table.FieldTableColumnConfig("remark", "Remark", "remark"), new TIMAAT.Table.FieldTableColumnConfig("harmony", "Harmony", "harmony"), new TIMAAT.Table.FieldTableColumnConfig("melody", "Melody", "melody"), new TIMAAT.Table.ValueMapperTableColumnConfig("musicType", "Music Type", "musicType.id", musicTypesById), - new TIMAAT.Table.FieldTableColumnConfig("musicalKey", "Musical Key", musicalKeyData)] + new TIMAAT.Table.FieldTableColumnConfig("musicalKey", "Musical Key", musicalKeyData), new TIMAAT.Table.ActionsTableColumnConfig("actions", actionTableColumnButtons)] - const activeColumnIds = ["id", "title", "musicType"] + const activeColumnIds = ["id", "title", "musicType", "actions"] const musicTable = new TIMAAT.Table.Table("categoriesMusicTable", "#categoriesMusicTableContainer", columns, activeColumnIds, "api/music/list", true, false) $('#musicTableCollapse').on('shown.bs.collapse', (event) => { musicTable.resizeToParent() @@ -278,10 +283,20 @@ }).toArray() + const navigateToSegmentStructureEntry = (segmentStructure) => { + TIMAAT.SegmentStructureElementService.getMediumAnalysisList(segmentStructure.segmentStructureElementType, segmentStructure.id).then(analysisList => { + TIMAAT.VideoPlayer.initializeAnnotationModeWithSegmentPreselected(analysisList.mediumID, analysisList.id, segmentStructure.id, segmentStructure.segmentStructureElementType) + }) + } + const actionTableColumnButtons = [new TIMAAT.Table.ActionsTableColumnButton("Jump to entity", navigateToSegmentStructureEntry, "fa-arrow-right")] + + const columns = [new TIMAAT.Table.FieldTableColumnConfig("id", "ID", "id"), new TIMAAT.Table.FieldTableColumnConfig("name", "Name", "name"), new TIMAAT.Table.ValueMapperTableColumnConfig("type", "Type", "segmentStructureElementType", segmentStructureTypeByEnumTypeName, true), - new TIMAAT.Table.TimeStampTableColumnConfig("startTime", "Start time", "startTime"), new TIMAAT.Table.TimeStampTableColumnConfig("endTime", "End time", "endTime")] - const activeColumnIds = ["id", "name", "type"] + new TIMAAT.Table.TimeStampTableColumnConfig("startTime", "Start time", "startTime"), new TIMAAT.Table.TimeStampTableColumnConfig("endTime", "End time", "endTime"), + new TIMAAT.Table.ActionsTableColumnConfig("actions", actionTableColumnButtons)] + + const activeColumnIds = ["id", "name", "type", "actions"] const segmentStructureTable = new TIMAAT.Table.Table("categoriesSegmentStructureTable", "#categoriesSegmentStructureTableContainer", columns, activeColumnIds, "api/segment-structure-elements/list", true, false) $('#segmentStructureTableCollapse').on('shown.bs.collapse', (event) => { segmentStructureTable.resizeToParent() @@ -352,15 +367,21 @@ const videoFramRateData = (row) => row.mediumVideo?.frameRate; const videoIsEpisode = (row) => row.mediumVideo?.isEpisode + const navigateToMediumEntry = (medium) => { + window.navigation.navigate(`/TIMAAT/#medium/${medium.id}`); + } + const actionTableColumnButtons = [new TIMAAT.Table.ActionsTableColumnButton("Jump to entity", navigateToMediumEntry, "fa-arrow-right")] + const columns = [new TIMAAT.Table.FieldTableColumnConfig("id", "ID", "id"), new TIMAAT.Table.FieldTableColumnConfig("copyright", "Copyright", "copyright"), new TIMAAT.Table.FieldTableColumnConfig("fileHash", "File Hash", "fileHash"), new TIMAAT.Table.DateTableColumnConfig("releaseDate", "Release Date", "releaseDate"), new TIMAAT.Table.DateTableColumnConfig("recordingStartDate", "Recording Start Date", "recordingStartDate"), new TIMAAT.Table.DateTableColumnConfig("recordingEndDate", "Recording End Date", "recordingEndDate"), new TIMAAT.Table.FieldTableColumnConfig("remark", "Remark", "remark"), new TIMAAT.Table.FieldTableColumnConfig("title", "Title", "displayTitle.name"), new TIMAAT.Table.ValueMapperTableColumnConfig("mediaType", "Media Type", "mediaType.id", mediaTypesById), new MediumDurationColumnConfig(), new TIMAAT.Table.ImageDownloadTableColumnConfig("thumbnail", "Thumbnail", imageThumbnailGeneratorFunction), new TIMAAT.Table.FieldTableColumnConfig("width", "Width", withData, true), new TIMAAT.Table.FieldTableColumnConfig("height", "Height", heightData, true), new TIMAAT.Table.FieldTableColumnConfig("softwareVersion", "Software Version", softwareVersionData, true, "Software"), new TIMAAT.Table.FieldTableColumnConfig("textContent", "Text Content", textContentData, true, "Text"), - new TIMAAT.Table.FieldTableColumnConfig("videoFrameRate", "Video Frame Rate", videoFramRateData, true, "Video"), new TIMAAT.Table.BooleanTableColumnConfig("videoIsEpisode", "Video Is Episode", videoIsEpisode, "Video") + new TIMAAT.Table.FieldTableColumnConfig("videoFrameRate", "Video Frame Rate", videoFramRateData, true, "Video"), new TIMAAT.Table.BooleanTableColumnConfig("videoIsEpisode", "Video Is Episode", videoIsEpisode, "Video"), + new TIMAAT.Table.ActionsTableColumnConfig("actions", actionTableColumnButtons) ] - const activeColumnIds = ["thumbnail", "id", "title", "mediaType"] + const activeColumnIds = ["thumbnail", "id", "title", "mediaType", "actions"] const mediumTable = new TIMAAT.Table.Table("categoriesMediumTable", "#categoriesMediumTableContainer", columns, activeColumnIds, "api/medium/list", true, false) $('#mediumTableCollapse').on('shown.bs.collapse', (event) => { @@ -382,6 +403,11 @@ }).toArray() const sexTypesById = new Map([[1, "Female"], [2, "Male"], [3, "Other"], [4, "Unknown"]]) + const navigateToActorEntry = (actor) => { + window.navigation.navigate(`/TIMAAT/#actor/${actor.id}`); + } + const actionTableColumnButtons = [new TIMAAT.Table.ActionsTableColumnButton("Jump to entity", navigateToActorEntry, "fa-arrow-right")] + const columns = [new TIMAAT.Table.FieldTableColumnConfig("id", "ID", "id"), new TIMAAT.Table.ValueMapperTableColumnConfig("type", "Type", "actorType.id", actorTypesById), new TIMAAT.Table.FieldTableColumnConfig("name", "Name", "displayName.name"), new TIMAAT.Table.DateTableColumnConfig("nameUsedFrom", "Name used from", "displayName.usedFrom"), new TIMAAT.Table.DateTableColumnConfig("nameUsedUntil", "Name used until", "displayName.usedUntil"), new TIMAAT.Table.AddressTableColumnConfig("primaryAddress", "Primary address", "primaryAddress"), @@ -390,9 +416,10 @@ new TIMAAT.Table.DateTableColumnConfig("dateOfBirth", "Date of birth", "actorPerson.dateOfBirth", true, "Person"), new TIMAAT.Table.DateTableColumnConfig("dayOfDeath", "Day of death", "actorPerson.dayOfDeath", true, "Person"), new TIMAAT.Table.FieldTableColumnConfig("title", "Title", "actorPerson.title", true, "Person"), new TIMAAT.Table.FieldTableColumnConfig("citizenship", "Citizenship", "actorPerson.citizenship", true, "Person"), new TIMAAT.Table.FieldTableColumnConfig("placeOfBirth", "Place of birth", "actorPerson.placeOfBirth", true, "Person"), new TIMAAT.Table.FieldTableColumnConfig("placeOfDeath", "Place of death", "actorPerson.placeOfDeath", true, "Person"), - new TIMAAT.Table.ValueMapperTableColumnConfig("sex", "Sex", "actorPerson.sex.id", sexTypesById, true, "Person"), new TIMAAT.Table.BooleanTableColumnConfig("isFictional", "Fictional", "isFictional") + new TIMAAT.Table.ValueMapperTableColumnConfig("sex", "Sex", "actorPerson.sex.id", sexTypesById, true, "Person"), new TIMAAT.Table.BooleanTableColumnConfig("isFictional", "Fictional", "isFictional"), + new TIMAAT.Table.ActionsTableColumnConfig("actions", actionTableColumnButtons) ] - const activeColumnIds = ["id", "name", "type"] + const activeColumnIds = ["id", "name", "type", "actions"] const actorTable = new TIMAAT.Table.Table("categoriesActorTable", "#categoriesActorTableContainer", columns, activeColumnIds, "api/actor/list", true, false) $('#actorTableCollapse').on('shown.bs.collapse', (event) => { @@ -415,10 +442,18 @@ } const annotationTypeQueryParameters = [{title: "Video", value: "VIDEO"}, {title: "Audio", value: "AUDIO"}] + const navigateToAnnotationEntry = (annotation) => { + TIMAAT.AnnotationService.getMediumAnalysisList(annotation.id).then(analysisList => { + TIMAAT.VideoPlayer.initializeAnnotationModeWithAnnotationByIds(analysisList.mediumID, annotation.id) + }) + } + const actionTableColumnButtons = [new TIMAAT.Table.ActionsTableColumnButton("Jump to entity", navigateToAnnotationEntry, "fa-arrow-right")] + + const columns = [new TIMAAT.Table.FieldTableColumnConfig("id", "ID", "id"), new TIMAAT.Table.TimeStampTableColumnConfig("startTime", "Start time", "startTime", false), new TIMAAT.Table.TimeStampTableColumnConfig("endTime", "End time", "endTime", false), new TIMAAT.Table.BooleanTableColumnConfig("layerAudio", "Audio", "layerAudio", false), - new TIMAAT.Table.BooleanTableColumnConfig("layerVisual", "Video", "layerVisual", false), new TIMAAT.Table.ImageDownloadTableColumnConfig("thumbnail", "Thumbnail", annotationThumbnailGeneratorFunction)] - const activeColumnIds = ["id", "thumbnail", "startTime", "endTime", "layerAudio", "layerVisual"] + new TIMAAT.Table.BooleanTableColumnConfig("layerVisual", "Video", "layerVisual", false), new TIMAAT.Table.ActionsTableColumnConfig("actions", actionTableColumnButtons)] + const activeColumnIds = ["id", "startTime", "endTime", "layerAudio", "layerVisual", "actions"] const annotationTable = new TIMAAT.Table.Table("categoriesAnnotationTable", "#categoriesAnnotationTableContainer", columns, activeColumnIds, "api/annotation/list", true, false) diff --git a/src/main/webapp/js/model/timaat.model.analysisaction.js b/src/main/webapp/js/model/timaat.model.analysisaction.js index a1c5db27..5ef40e3d 100644 --- a/src/main/webapp/js/model/timaat.model.analysisaction.js +++ b/src/main/webapp/js/model/timaat.model.analysisaction.js @@ -61,8 +61,7 @@ </div>` ); - var action = this; // save annotation for events - + this.openInInspector = this.openInInspector.bind(this); } updateUI() { @@ -87,6 +86,31 @@ } + openInInspector(collapseInspector){ + let index = TIMAAT.VideoPlayer.curAnalysisList.analysisScenesUI.findIndex(({model}) => model.id === this.model.sceneId); + TIMAAT.VideoPlayer.curScene = TIMAAT.VideoPlayer.curAnalysisList.analysisScenesUI[index]; + index = TIMAAT.VideoPlayer.curAnalysisList.analysisSegmentsUI.findIndex(({model}) => model.id === TIMAAT.VideoPlayer.curScene.model.segmentId); + TIMAAT.VideoPlayer.curSegment = TIMAAT.VideoPlayer.curAnalysisList.analysisSegmentsUI[index]; + TIMAAT.VideoPlayer.curAction = this; + + this.timelineView.removeClass('bg-info') + this.timelineView.addClass('bg-primary'); + + TIMAAT.VideoPlayer.selectedElementType = 'action'; + TIMAAT.VideoPlayer.jumpVisible(this.model.startTime, this.model.endTime); + TIMAAT.VideoPlayer.pause(); + // TIMAAT.VideoPlayer.selectAnnotation(null); + if (TIMAAT.VideoPlayer.curAnnotation) { + TIMAAT.VideoPlayer.curAnnotation.setSelected(false); + } + $('#timelineKeyframePane').hide(); + TIMAAT.VideoPlayer.inspector.setItem(this, 'action'); + + if(collapseInspector){ + TIMAAT.VideoPlayer.inspector.open('inspectorMetadata'); + } + } + addUI() { // console.log("TCL: AnalysisAction -> addUI -> addUI()"); $('#timelinePaneAction').append(this.timelineView); @@ -94,46 +118,10 @@ var action = this; // save annotation for events // attach event handlers this.timelineView.on('click', this, function(ev) { - var index = TIMAAT.VideoPlayer.curAnalysisList.analysisScenesUI.findIndex(({model}) => model.id === action.model.sceneId); - TIMAAT.VideoPlayer.curScene = TIMAAT.VideoPlayer.curAnalysisList.analysisScenesUI[index]; - index = TIMAAT.VideoPlayer.curAnalysisList.analysisSegmentsUI.findIndex(({model}) => model.id === TIMAAT.VideoPlayer.curScene.model.segmentId); - TIMAAT.VideoPlayer.curSegment = TIMAAT.VideoPlayer.curAnalysisList.analysisSegmentsUI[index]; - TIMAAT.VideoPlayer.curAction = action; - this.classList.replace('bg-info', 'bg-primary'); - this.classList.add('bg-primary'); - TIMAAT.VideoPlayer.selectedElementType = 'action'; - TIMAAT.VideoPlayer.jumpVisible(action.model.startTime, action.model.endTime); - TIMAAT.VideoPlayer.pause(); - // TIMAAT.VideoPlayer.selectAnnotation(null); - if (TIMAAT.VideoPlayer.curAnnotation) { - TIMAAT.VideoPlayer.curAnnotation.setSelected(false); - } - $('#timelineKeyframePane').hide(); - TIMAAT.VideoPlayer.inspector.setItem(action, 'action'); - // TODO - // TIMAAT.URLHistory.setURL(null, 'Action · '+action.model.analysisActionTranslations[0].name, '#analysis/'+TIMAAT.VideoPlayer.curAnalysisList.id+'/action/'+action.model.id); + action.openInInspector(false) }); this.timelineView.on('dblclick', this, function(ev) { - var index = TIMAAT.VideoPlayer.curAnalysisList.analysisScenesUI.findIndex(({model}) => model.id === action.model.sceneId); - TIMAAT.VideoPlayer.curScene = TIMAAT.VideoPlayer.curAnalysisList.analysisScenesUI[index]; - index = TIMAAT.VideoPlayer.curAnalysisList.analysisSegmentsUI.findIndex(({model}) => model.id === TIMAAT.VideoPlayer.curScene.model.segmentId); - TIMAAT.VideoPlayer.curSegment = TIMAAT.VideoPlayer.curAnalysisList.analysisSegmentsUI[index]; - TIMAAT.VideoPlayer.curAction = action; - this.classList.replace('bg-info', 'bg-primary'); - this.classList.add('bg-primary'); - TIMAAT.VideoPlayer.selectedElementType = 'action'; - TIMAAT.VideoPlayer.jumpTo(action.model.startTime); - // TIMAAT.VideoPlayer.jumpVisible(action.model.startTime, action.model.endTime); - TIMAAT.VideoPlayer.pause(); - // TIMAAT.VideoPlayer.selectAnnotation(null); - if (TIMAAT.VideoPlayer.curAnnotation) { - TIMAAT.VideoPlayer.curAnnotation.setSelected(false); - } - $('#timelineKeyframePane').hide(); - TIMAAT.VideoPlayer.inspector.setItem(action, 'action'); - TIMAAT.VideoPlayer.inspector.open('inspectorMetadata'); - // TODO - // TIMAAT.URLHistory.setURL(null, 'Action · '+action.model.analysisActionTranslations[0].name, '#analysis/'+TIMAAT.VideoPlayer.curAnalysisList.id+'/action/'+action.model.id); + action.openInInspector(true) }); // console.log("TCL: AnalysisAction -> addUI -> this.updateUI()"); this.updateUI(); diff --git a/src/main/webapp/js/model/timaat.model.analysisscene.js b/src/main/webapp/js/model/timaat.model.analysisscene.js index 11d8b99a..55c3162d 100644 --- a/src/main/webapp/js/model/timaat.model.analysisscene.js +++ b/src/main/webapp/js/model/timaat.model.analysisscene.js @@ -61,10 +61,31 @@ </div>` ); - var scene = this; // save annotation for events - + this.openInInspector = this.openInInspector.bind(this); } + openInInspector(collapseInspector) { + let index = TIMAAT.VideoPlayer.curAnalysisList.analysisSegmentsUI.findIndex(({model}) => model.id === this.model.segmentId); + TIMAAT.VideoPlayer.curSegment = TIMAAT.VideoPlayer.curAnalysisList.analysisSegmentsUI[index]; + TIMAAT.VideoPlayer.curScene = this; + this.timelineView.removeClass('bg-info'); + this.timelineView.addClass('bg-primary'); + TIMAAT.VideoPlayer.selectedElementType = 'scene'; + TIMAAT.VideoPlayer.curAction = null; + TIMAAT.VideoPlayer.jumpVisible(this.model.startTime, this.model.endTime); + TIMAAT.VideoPlayer.pause(); + // TIMAAT.VideoPlayer.selectAnnotation(null); + if (TIMAAT.VideoPlayer.curAnnotation) { + TIMAAT.VideoPlayer.curAnnotation.setSelected(false); + } + $('#timelineKeyframePane').hide(); + TIMAAT.VideoPlayer.inspector.setItem(this, 'scene'); + + if(collapseInspector){ + TIMAAT.VideoPlayer.inspector.open('inspectorMetadata'); + } + } + updateUI() { // console.log("TCL: AnalysisScene -> updateUI -> updateUI()"); this.listView.attr('data-start-time', this.model.startTime); @@ -96,44 +117,10 @@ var scene = this; // save annotation for events // attach event handlers this.timelineView.on('click', this, function(ev) { - var index = TIMAAT.VideoPlayer.curAnalysisList.analysisSegmentsUI.findIndex(({model}) => model.id === scene.model.segmentId); - TIMAAT.VideoPlayer.curSegment = TIMAAT.VideoPlayer.curAnalysisList.analysisSegmentsUI[index]; - TIMAAT.VideoPlayer.curScene = scene; - this.classList.replace('bg-info', 'bg-primary'); - this.classList.add('bg-primary'); - TIMAAT.VideoPlayer.selectedElementType = 'scene'; - TIMAAT.VideoPlayer.curAction = null; - TIMAAT.VideoPlayer.jumpVisible(scene.model.startTime, scene.model.endTime); - TIMAAT.VideoPlayer.pause(); - // TIMAAT.VideoPlayer.selectAnnotation(null); - if (TIMAAT.VideoPlayer.curAnnotation) { - TIMAAT.VideoPlayer.curAnnotation.setSelected(false); - } - $('#timelineKeyframePane').hide(); - TIMAAT.VideoPlayer.inspector.setItem(scene, 'scene'); - // TODO - // TIMAAT.URLHistory.setURL(null, 'Scene · '+scene.model.analysisSceneTranslations[0].name, '#analysis/'+TIMAAT.VideoPlayer.curAnalysisList.id+'/scene/'+scene.model.id); + scene.openInInspector(false) }); this.timelineView.on('dblclick', this, function(ev) { - var index = TIMAAT.VideoPlayer.curAnalysisList.analysisSegmentsUI.findIndex(({model}) => model.id === scene.model.segmentId); - TIMAAT.VideoPlayer.curSegment = TIMAAT.VideoPlayer.curAnalysisList.analysisSegmentsUI[index]; - TIMAAT.VideoPlayer.curScene = scene; - this.classList.replace('bg-info', 'bg-primary'); - this.classList.add('bg-primary'); - TIMAAT.VideoPlayer.selectedElementType = 'scene'; - TIMAAT.VideoPlayer.curAction = null; - TIMAAT.VideoPlayer.jumpTo(scene.model.startTime); - // TIMAAT.VideoPlayer.jumpVisible(scene.model.startTime, scene.model.endTime); - TIMAAT.VideoPlayer.pause(); - // TIMAAT.VideoPlayer.selectAnnotation(null); - if (TIMAAT.VideoPlayer.curAnnotation) { - TIMAAT.VideoPlayer.curAnnotation.setSelected(false); - } - $('#timelineKeyframePane').hide(); - TIMAAT.VideoPlayer.inspector.setItem(scene, 'scene'); - TIMAAT.VideoPlayer.inspector.open('inspectorMetadata'); - // TODO - // TIMAAT.URLHistory.setURL(null, 'Scene · '+scene.model.analysisSceneTranslations[0].name, '#analysis/'+TIMAAT.VideoPlayer.curAnalysisList.id+'/scene/'+scene.model.id); + scene.openInInspector(true) }); // console.log("TCL: AnalysisScene -> addUI -> this.updateUI()"); this.updateUI(); diff --git a/src/main/webapp/js/model/timaat.model.analysissegment.js b/src/main/webapp/js/model/timaat.model.analysissegment.js index 8c6d7087..231a6250 100644 --- a/src/main/webapp/js/model/timaat.model.analysissegment.js +++ b/src/main/webapp/js/model/timaat.model.analysissegment.js @@ -63,10 +63,30 @@ this.timelineView.attr('data-start', this.model.startTime); this.timelineView.attr('data-end', this.model.endTime); - var segment = this; // save annotation for events - + this.openInInspector = this.openInInspector.bind(this); } + openInInspector(collapseInspector) { + TIMAAT.VideoPlayer.curSegment = this; + this.timelineView.removeClass('bg-info'); + this.timelineView.addClass('bg-primary'); + TIMAAT.VideoPlayer.selectedElementType = 'segment'; + TIMAAT.VideoPlayer.curSequence = null; + TIMAAT.VideoPlayer.curTake = null; + TIMAAT.VideoPlayer.jumpVisible(this.model.startTime, this.model.endTime); + TIMAAT.VideoPlayer.pause(); + // TIMAAT.VideoPlayer.selectAnnotation(null); + if (TIMAAT.VideoPlayer.curAnnotation) { + TIMAAT.VideoPlayer.curAnnotation.setSelected(false); + } + $('#timelineKeyframePane').hide(); + TIMAAT.VideoPlayer.inspector.setItem(this, 'segment'); + + if(collapseInspector){ + TIMAAT.VideoPlayer.inspector.open('inspectorMetadata'); + } + } + updateUI() { // console.log("TCL: AnalysisSegment -> updateUI -> updateUI()"); this.listView.attr('data-start-time', this.model.startTime); @@ -97,92 +117,25 @@ } addUI() { - // console.log("TCL: AnalysisSegment -> addUI -> addUI()"); $('#analysisList').append(this.listView); $('#timelinePaneSegment').append(this.timelineView); - // console.log("TCL: AnalysisSegment -> addUI -> this.timelineView", this.timelineView); var segment = this; // save annotation for events - // console.log("TCL: AnalysisSegment -> addUI -> segment", segment); // attach event handlers this.listView.on('click', this, function(ev) { - TIMAAT.VideoPlayer.curSegment = segment; - TIMAAT.VideoPlayer.curSegment.timelineView[0].classList.replace('bg-info', 'bg-primary'); - TIMAAT.VideoPlayer.curSegment.timelineView[0].classList.add('bg-primary'); - TIMAAT.VideoPlayer.selectedElementType = 'segment'; - TIMAAT.VideoPlayer.curSequence = null; - TIMAAT.VideoPlayer.curTake = null; - TIMAAT.VideoPlayer.jumpVisible(segment.model.startTime, segment.model.endTime); - TIMAAT.VideoPlayer.pause(); - // TIMAAT.VideoPlayer.selectAnnotation(null); - if (TIMAAT.VideoPlayer.curAnnotation) { - TIMAAT.VideoPlayer.curAnnotation.setSelected(false); - } - $('#timelineKeyframePane').hide(); - TIMAAT.VideoPlayer.inspector.setItem(segment, 'segment'); - // TODO - // TIMAAT.URLHistory.setURL(null, 'Segment · '+segment.model.analysisSegmentTranslations[0].name, '#analysis/'+TIMAAT.VideoPlayer.curAnalysisList.id+'/segment/'+segment.model.id); + segment.openInInspector(false) }); this.timelineView.on('click', this, function(ev) { - TIMAAT.VideoPlayer.curSegment = segment; - this.classList.replace('bg-info', 'bg-primary'); - this.classList.add('bg-primary'); - TIMAAT.VideoPlayer.selectedElementType = 'segment'; - TIMAAT.VideoPlayer.curSequence = null; - TIMAAT.VideoPlayer.curTake = null; - TIMAAT.VideoPlayer.jumpVisible(segment.model.startTime, segment.model.endTime); - TIMAAT.VideoPlayer.pause(); - // TIMAAT.VideoPlayer.selectAnnotation(null); - if (TIMAAT.VideoPlayer.curAnnotation) { - TIMAAT.VideoPlayer.curAnnotation.setSelected(false); - } - $('#timelineKeyframePane').hide(); - TIMAAT.VideoPlayer.inspector.setItem(segment, 'segment'); - // TODO - // TIMAAT.URLHistory.setURL(null, 'Segment · '+segment.model.analysisSegmentTranslations[0].name, '#analysis/'+TIMAAT.VideoPlayer.curAnalysisList.id+'/segment/'+segment.model.id); + segment.openInInspector(false) }); this.listView.on('dblclick', this, function(ev) { - TIMAAT.VideoPlayer.curSegment = segment; - TIMAAT.VideoPlayer.curSegment.timelineView[0].classList.replace('bg-info', 'bg-primary'); - TIMAAT.VideoPlayer.curSegment.timelineView[0].classList.add('bg-primary'); - TIMAAT.VideoPlayer.selectedElementType = 'segment'; - TIMAAT.VideoPlayer.curSequence = null; - TIMAAT.VideoPlayer.curTake = null; - TIMAAT.VideoPlayer.jumpTo(segment.model.startTime); - // TIMAAT.VideoPlayer.jumpVisible(segment.model.startTime, segment.model.endTime); - TIMAAT.VideoPlayer.pause(); - // TIMAAT.VideoPlayer.selectAnnotation(null); - if (TIMAAT.VideoPlayer.curAnnotation) { - TIMAAT.VideoPlayer.curAnnotation.setSelected(false); - } - $('#timelineKeyframePane').hide(); - TIMAAT.VideoPlayer.inspector.setItem(segment, 'segment'); - TIMAAT.VideoPlayer.inspector.open('inspectorMetadata'); - // TODO - // TIMAAT.URLHistory.setURL(null, 'Segment · '+segment.model.analysisSegmentTranslations[0].name, '#analysis/'+TIMAAT.VideoPlayer.curAnalysisList.id+'/segment/'+segment.model.id); + segment.openInInspector(true) }); this.timelineView.on('dblclick', this, function(ev) { - TIMAAT.VideoPlayer.curSegment = segment; - this.classList.replace('bg-info', 'bg-primary'); - this.classList.add('bg-primary'); - TIMAAT.VideoPlayer.selectedElementType = 'segment'; - TIMAAT.VideoPlayer.curSequence = null; - TIMAAT.VideoPlayer.curTake = null; - TIMAAT.VideoPlayer.jumpTo(segment.model.startTime); - // TIMAAT.VideoPlayer.jumpVisible(segment.model.startTime, segment.model.endTime); - TIMAAT.VideoPlayer.pause(); - // TIMAAT.VideoPlayer.selectAnnotation(null); - if (TIMAAT.VideoPlayer.curAnnotation) { - TIMAAT.VideoPlayer.curAnnotation.setSelected(false); - } - $('#timelineKeyframePane').hide(); - TIMAAT.VideoPlayer.inspector.setItem(segment, 'segment'); - TIMAAT.VideoPlayer.inspector.open('inspectorMetadata'); - // TODO - // TIMAAT.URLHistory.setURL(null, 'Segment · '+segment.model.analysisSegmentTranslations[0].name, '#analysis/'+TIMAAT.VideoPlayer.curAnalysisList.id+'/segment/'+segment.model.id); + segment.openInInspector(true) }); - // console.log("TCL: AnalysisSegment -> addUI -> this.updateUI()"); + this.updateUI(); } diff --git a/src/main/webapp/js/model/timaat.model.analysissequence.js b/src/main/webapp/js/model/timaat.model.analysissequence.js index d942cf1e..a2fcc4c9 100644 --- a/src/main/webapp/js/model/timaat.model.analysissequence.js +++ b/src/main/webapp/js/model/timaat.model.analysissequence.js @@ -60,9 +60,32 @@ <div class="timeline__sequence-name text-white font-weight-bold"></div> </div>` ); - var sequence = this; // save annotation for events + + this.openInInspector = this.openInInspector.bind(this); } + openInInspector(collapseInspector) { + let index = TIMAAT.VideoPlayer.curAnalysisList.analysisSegmentsUI.findIndex(({model}) => model.id === this.model.segmentId); + TIMAAT.VideoPlayer.curSegment = TIMAAT.VideoPlayer.curAnalysisList.analysisSegmentsUI[index]; + TIMAAT.VideoPlayer.curSequence = this; + this.timelineView.removeClass('bg-info'); + this.timelineView.addClass('bg-primary'); + TIMAAT.VideoPlayer.selectedElementType = 'sequence'; + TIMAAT.VideoPlayer.curTake = null; + TIMAAT.VideoPlayer.jumpVisible(this.model.startTime, this.model.endTime); + TIMAAT.VideoPlayer.pause(); + + if (TIMAAT.VideoPlayer.curAnnotation) { + TIMAAT.VideoPlayer.curAnnotation.setSelected(false); + } + $('#timelineKeyframePane').hide(); + TIMAAT.VideoPlayer.inspector.setItem(this, 'sequence'); + + if(collapseInspector){ + TIMAAT.VideoPlayer.inspector.open('inspectorMetadata'); + } + } + updateUI() { // console.log("TCL: AnalysisSequence -> updateUI -> updateUI()"); this.listView.attr('data-start-time', this.model.startTime); @@ -92,69 +115,18 @@ } addUI() { - // console.log("TCL: AnalysisSequence -> addUI -> addUI()"); - // $('#analysisList').append(this.listView); $('#timelinePaneSequence').append(this.timelineView); - var sequence = this; // save annotation for events - // console.log("TCL: AnalysisSequence -> addUI -> sequence", sequence); - // attach event handlers - // this.listView.on('click', this, function(ev) { - // TIMAAT.VideoPlayer.curSequence = sequence; - // TIMAAT.VideoPlayer.jumpVisible(sequence.model.startTime, sequence.model.endTime); - // TIMAAT.VideoPlayer.pause(); - // TIMAAT.VideoPlayer.selectAnnotation(null); - // TIMAAT.VideoPlayer.inspector.setItem(sequence, 'sequence'); - // }); + let sequence = this; // save annotation for events + this.timelineView.on('click', this, function(ev) { - var index = TIMAAT.VideoPlayer.curAnalysisList.analysisSegmentsUI.findIndex(({model}) => model.id === sequence.model.segmentId); - TIMAAT.VideoPlayer.curSegment = TIMAAT.VideoPlayer.curAnalysisList.analysisSegmentsUI[index]; - TIMAAT.VideoPlayer.curSequence = sequence; - this.classList.replace('bg-info', 'bg-primary'); - this.classList.add('bg-primary'); - TIMAAT.VideoPlayer.selectedElementType = 'sequence'; - TIMAAT.VideoPlayer.curTake = null; - TIMAAT.VideoPlayer.jumpVisible(sequence.model.startTime, sequence.model.endTime); - TIMAAT.VideoPlayer.pause(); - // TIMAAT.VideoPlayer.selectAnnotation(null); - if (TIMAAT.VideoPlayer.curAnnotation) { - TIMAAT.VideoPlayer.curAnnotation.setSelected(false); - } - $('#timelineKeyframePane').hide(); - TIMAAT.VideoPlayer.inspector.setItem(sequence, 'sequence'); - //TODO - // TIMAAT.URLHistory.setURL(null, 'Sequence · '+sequence.model.analysisSequenceTranslations[0].name, '#analysis/'+TIMAAT.VideoPlayer.curAnalysisList.id+'/sequence/'+sequence.model.id); + sequence.openInInspector(false) }); - // this.listView.on('dblclick', this, function(ev) { - // TIMAAT.VideoPlayer.curSequence = sequence; - // TIMAAT.VideoPlayer.jumpVisible(sequence.model.startTime, sequence.model.endTime); - // TIMAAT.VideoPlayer.pause(); - // TIMAAT.VideoPlayer.selectAnnotation(null); - // TIMAAT.VideoPlayer.inspector.setItem(sequence, 'sequence'); - // TIMAAT.VideoPlayer.inspector.open('inspectorMetadata'); - // }); + this.timelineView.on('dblclick', this, function(ev) { - var index = TIMAAT.VideoPlayer.curAnalysisList.analysisSegmentsUI.findIndex(({model}) => model.id === sequence.model.segmentId); - TIMAAT.VideoPlayer.curSegment = TIMAAT.VideoPlayer.curAnalysisList.analysisSegmentsUI[index]; - TIMAAT.VideoPlayer.curSequence = sequence; - this.classList.replace('bg-info', 'bg-primary'); - this.classList.add('bg-primary'); - TIMAAT.VideoPlayer.selectedElementType = 'sequence'; - TIMAAT.VideoPlayer.curTake = null; - TIMAAT.VideoPlayer.jumpTo(sequence.model.startTime); - // TIMAAT.VideoPlayer.jumpVisible(sequence.model.startTime, sequence.model.endTime); - TIMAAT.VideoPlayer.pause(); - // TIMAAT.VideoPlayer.selectAnnotation(null); - if (TIMAAT.VideoPlayer.curAnnotation) { - TIMAAT.VideoPlayer.curAnnotation.setSelected(false); - } - $('#timelineKeyframePane').hide(); - TIMAAT.VideoPlayer.inspector.setItem(sequence, 'sequence'); - TIMAAT.VideoPlayer.inspector.open('inspectorMetadata'); - // TODO - // TIMAAT.URLHistory.setURL(null, 'Sequence · '+sequence.model.analysisSequenceTranslations[0].name, '#analysis/'+TIMAAT.VideoPlayer.curAnalysisList.id+'/sequence/'+sequence.model.id); + sequence.openInInspector(true) }); - // console.log("TCL: AnalysisSequence -> addUI -> this.updateUI()"); + this.updateUI(); } diff --git a/src/main/webapp/js/model/timaat.model.analysistake.js b/src/main/webapp/js/model/timaat.model.analysistake.js index 45aa9cc8..d272d852 100644 --- a/src/main/webapp/js/model/timaat.model.analysistake.js +++ b/src/main/webapp/js/model/timaat.model.analysistake.js @@ -63,6 +63,30 @@ var take = this; // save annotation for events } + openInInspector(collapseInspector) { + let index = TIMAAT.VideoPlayer.curAnalysisList.analysisSequencesUI.findIndex(({model}) => model.id === this.model.sequenceId); + TIMAAT.VideoPlayer.curSequence = TIMAAT.VideoPlayer.curAnalysisList.analysisSequencesUI[index]; + index = TIMAAT.VideoPlayer.curAnalysisList.analysisSegmentsUI.findIndex(({model}) => model.id === TIMAAT.VideoPlayer.curSequence.model.segmentId); + TIMAAT.VideoPlayer.curSegment = TIMAAT.VideoPlayer.curAnalysisList.analysisSegmentsUI[index]; + TIMAAT.VideoPlayer.curTake = this; + this.timelineView.removeClass('bg-info'); + this.timelineView.addClass('bg-primary'); + + TIMAAT.VideoPlayer.selectedElementType = 'take'; + TIMAAT.VideoPlayer.jumpVisible(this.model.startTime, this.model.endTime); + TIMAAT.VideoPlayer.pause(); + // TIMAAT.VideoPlayer.selectAnnotation(null); + if (TIMAAT.VideoPlayer.curAnnotation) { + TIMAAT.VideoPlayer.curAnnotation.setSelected(false); + } + $('#timelineKeyframePane').hide(); + TIMAAT.VideoPlayer.inspector.setItem(this, 'take'); + + if(collapseInspector){ + TIMAAT.VideoPlayer.inspector.open('inspectorMetadata'); + } + } + updateUI() { // console.log("TCL: AnalysisTake -> updateUI -> updateUI()"); this.listView.attr('data-start-time', this.model.startTime); @@ -91,49 +115,13 @@ // $('#analysisList').append(this.listView); $('#timelinePaneTake').append(this.timelineView); - var take = this; // save annotation for events + const take = this; // save annotation for events // attach event handlers this.timelineView.on('click', this, function(ev) { - var index = TIMAAT.VideoPlayer.curAnalysisList.analysisSequencesUI.findIndex(({model}) => model.id === take.model.sequenceId); - TIMAAT.VideoPlayer.curSequence = TIMAAT.VideoPlayer.curAnalysisList.analysisSequencesUI[index]; - index = TIMAAT.VideoPlayer.curAnalysisList.analysisSegmentsUI.findIndex(({model}) => model.id === TIMAAT.VideoPlayer.curSequence.model.segmentId); - TIMAAT.VideoPlayer.curSegment = TIMAAT.VideoPlayer.curAnalysisList.analysisSegmentsUI[index]; - TIMAAT.VideoPlayer.curTake = take; - this.classList.replace('bg-info', 'bg-primary'); - this.classList.add('bg-primary'); - TIMAAT.VideoPlayer.selectedElementType = 'take'; - TIMAAT.VideoPlayer.jumpVisible(take.model.startTime, take.model.endTime); - TIMAAT.VideoPlayer.pause(); - // TIMAAT.VideoPlayer.selectAnnotation(null); - if (TIMAAT.VideoPlayer.curAnnotation) { - TIMAAT.VideoPlayer.curAnnotation.setSelected(false); - } - $('#timelineKeyframePane').hide(); - TIMAAT.VideoPlayer.inspector.setItem(take, 'take'); - // TODO - // TIMAAT.URLHistory.setURL(null, 'Take · '+take.model.analysisTakeTranslations[0].name, '#analysis/'+TIMAAT.VideoPlayer.curAnalysisList.id+'/take/'+take.model.id); + take.openInInspector(false) }); this.timelineView.on('dblclick', this, function(ev) { - var index = TIMAAT.VideoPlayer.curAnalysisList.analysisSequencesUI.findIndex(({model}) => model.id === take.model.sequenceId); - TIMAAT.VideoPlayer.curSequence = TIMAAT.VideoPlayer.curAnalysisList.analysisSequencesUI[index]; - index = TIMAAT.VideoPlayer.curAnalysisList.analysisSegmentsUI.findIndex(({model}) => model.id === TIMAAT.VideoPlayer.curSequence.model.segmentId); - TIMAAT.VideoPlayer.curSegment = TIMAAT.VideoPlayer.curAnalysisList.analysisSegmentsUI[index]; - TIMAAT.VideoPlayer.curTake = take; - this.classList.replace('bg-info', 'bg-primary'); - this.classList.add('bg-primary'); - TIMAAT.VideoPlayer.selectedElementType = 'take'; - TIMAAT.VideoPlayer.jumpTo(take.model.startTime); - // TIMAAT.VideoPlayer.jumpVisible(take.model.startTime, take.model.endTime); - TIMAAT.VideoPlayer.pause(); - // TIMAAT.VideoPlayer.selectAnnotation(null); - if (TIMAAT.VideoPlayer.curAnnotation) { - TIMAAT.VideoPlayer.curAnnotation.setSelected(false); - } - $('#timelineKeyframePane').hide(); - TIMAAT.VideoPlayer.inspector.setItem(take, 'take'); - TIMAAT.VideoPlayer.inspector.open('inspectorMetadata'); - // TODO - // TIMAAT.URLHistory.setURL(null, 'Take · '+take.model.analysisTakeTranslations[0].name, '#analysis/'+TIMAAT.VideoPlayer.curAnalysisList.id+'/take/'+take.model.id); + take.openInInspector(true) }); // console.log("TCL: AnalysisTake -> addUI -> this.updateUI()"); this.updateUI(); diff --git a/src/main/webapp/js/service/timaat.service.annotation.js b/src/main/webapp/js/service/timaat.service.annotation.js index 984771fc..7351a9b9 100644 --- a/src/main/webapp/js/service/timaat.service.annotation.js +++ b/src/main/webapp/js/service/timaat.service.annotation.js @@ -98,6 +98,27 @@ console.error("ERROR: ", error); }); }, + async getMediumAnalysisList(annotationId) { + return new Promise(resolve => { + $.ajax({ + url: window.location.protocol + '//' + window.location.host + "/TIMAAT/api/annotation/" + annotationId + "/analysis-list", + type: "GET", + contentType: "application/json; charset=utf-8", + dataType: "json", + beforeSend: function (xhr) { + xhr.setRequestHeader('Authorization', 'Bearer ' + TIMAAT.Service.token); + }, + }).done(function (data) { + resolve(data); + }) + .fail(function (error) { + console.error("ERROR responseText: ", error.responseText); + console.error("ERROR: ", error); + }); + }).catch((error) => { + console.error("ERROR: ", error); + }); + }, async updateAnnotationThumbnail(annotationId, thumbnailPositionMs){ const payload = { thumbnailPositionMs diff --git a/src/main/webapp/js/service/timaat.service.segmentstructureelement.js b/src/main/webapp/js/service/timaat.service.segmentstructureelement.js new file mode 100644 index 00000000..1588ccb2 --- /dev/null +++ b/src/main/webapp/js/service/timaat.service.segmentstructureelement.js @@ -0,0 +1,46 @@ +'use strict'; +(function (factory, window) { + /*globals define, module, require*/ + + // define an AMD module that relies on 'TIMAAT' + if (typeof define === 'function' && define.amd) { + define(['TIMAAT'], factory); + + + // define a Common JS module that relies on 'TIMAAT' + } else if (typeof exports === 'object') { + module.exports = factory(require('TIMAAT')); + } + + // attach your plugin to the global 'TIMAAT' variable + if (typeof window !== 'undefined' && window.TIMAAT) { + factory(window.TIMAAT); + } + +}(function (TIMAAT) { + + TIMAAT.SegmentStructureElementService = { + async getMediumAnalysisList(segmentStructureType, segmentStructureId) { + return new Promise(resolve => { + $.ajax({ + url: window.location.protocol + '//' + window.location.host + "/TIMAAT/api/segment-structure-elements/" + segmentStructureType + "/" + segmentStructureId + + "/analysis-list", + type: "GET", + contentType: "application/json; charset=utf-8", + dataType: "json", + beforeSend: function (xhr) { + xhr.setRequestHeader('Authorization', 'Bearer ' + TIMAAT.Service.token); + }, + }).done(function (data) { + resolve(data); + }) + .fail(function (error) { + console.error("ERROR responseText: ", error.responseText); + console.error("ERROR: ", error); + }); + }).catch((error) => { + console.error("ERROR: ", error); + }); + } + } +})) \ No newline at end of file diff --git a/src/main/webapp/js/timaat.init.js b/src/main/webapp/js/timaat.init.js index 32cc6d6c..062b817f 100644 --- a/src/main/webapp/js/timaat.init.js +++ b/src/main/webapp/js/timaat.init.js @@ -65,6 +65,7 @@ requirejs.config({ "TIMAAT-analysisListService" : 'service/timaat.service.analysislist', "TIMAAT-annotationService" : 'service/timaat.service.annotation', "TIMAAT-roleService" : 'service/timaat.service.role', + "TIMAAT-segmentStructureElementService" : 'service/timaat.service.segmentstructureelement', "TIMAAT-languageService" : 'service/timaat.service.language', "TIMAAT-locationService" : 'service/timaat.service.location', "TIMAAT-mediumService" : 'service/timaat.service.medium', @@ -173,6 +174,7 @@ require(['domReady', 'TIMAAT-datasets', 'TIMAAT-lists', 'TIMAAT-service', + 'TIMAAT-segmentStructureElementService', 'TIMAAT-userService', 'TIMAAT-publicationService', 'TIMAAT-marker', diff --git a/src/main/webapp/js/ui/timaat.table.js b/src/main/webapp/js/ui/timaat.table.js index 954f299b..00fbca28 100644 --- a/src/main/webapp/js/ui/timaat.table.js +++ b/src/main/webapp/js/ui/timaat.table.js @@ -60,6 +60,9 @@ render(data, type, row) { throw new Error("This method need to get overridden") } + + createdCell(td, cellData, rowData, row, col) { + } } TIMAAT.Table.FieldTableColumnConfig = class extends TIMAAT.Table.TableColumnConfig { constructor(id, title, data, sortable = true, groupName = null) { @@ -130,6 +133,58 @@ } } + TIMAAT.Table.ActionsTableColumnButton = class { + _onClick + _faIconClass + _title + + /** + * @param title used as tooltip + * @param onClick (row) => void + * @param faIconClass the name of the fontawesome icon class + */ + constructor(title, onClick, faIconClass) { + this._onClick = onClick + this._faIconClass = faIconClass + this._title = title + } + + createButton(){ + return $(`<button title="${this._title}" class="btn btn-sm btn-outline btn-secondary fas ${this._faIconClass}"></button>`) + } + + get onClick(){ + return this._onClick; + } + } + + TIMAAT.Table.ActionsTableColumnConfig = class extends TIMAAT.Table.TableColumnConfig { + _actionTableColumnButtons + + constructor(id, actionTableColumnButtons){ + super(id, "Actions", null , false); + this._actionTableColumnButtons = actionTableColumnButtons; + + this.render = this.render.bind(this); + this.createdCell = this.createdCell.bind(this); + } + + render(data, type, row) { + const $actionsTableCell = $("<div class='d-flex justify-content-between actionsTableCell'></div>") + + return $actionsTableCell.prop('outerHTML') + } + + createdCell(td, cellData, rowData, row, col) { + const $actionsTableCell = $(td).find(".actionsTableCell") + for(let actionTableColumnButton of this._actionTableColumnButtons){ + const $button = actionTableColumnButton.createButton() + $button.on("click", () => actionTableColumnButton.onClick(rowData)) + $actionsTableCell.append($button) + } + } + } + TIMAAT.Table.ValueMapperTableColumnConfig = class extends TIMAAT.Table.TableColumnConfig { _valueMap; @@ -162,7 +217,7 @@ * @param imagePathGeneratorFunction : (row) => string | null , (row) => Promise<string | null> */ constructor(id, title, imagePathGeneratorFunction, groupName = null) { - super(id, title, "", false, groupName); + super(id, title, null, false, groupName); this._imagePathGeneratorFunction = imagePathGeneratorFunction; this.render = this.render.bind(this); @@ -295,12 +350,12 @@ const columnConfigs = [] for (let activeTableColumnId of this._activeTableColumnIds) { const currentTableColumnConfig = this._tableColumnConfigsById.get(activeTableColumnId); - console.log(currentTableColumnConfig) columnConfigs.push({ title: currentTableColumnConfig.title, data: currentTableColumnConfig.data, render: currentTableColumnConfig.render, orderable: currentTableColumnConfig.sortable, + fnCreatedCell: currentTableColumnConfig.createdCell }); $('<th>').text(currentTableColumnConfig.title).appendTo($headerRow); } From ad5a401ef447cb7a7685ef0619fb2a8070126fbd Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Mon, 12 Jan 2026 22:38:28 +0100 Subject: [PATCH 34/70] TIMAAT Weiterentwicklung #9 - Categories content table - Ordering * Added order parameter to column definition * Defined order parameter for listing endpoints * Defined order parameter for orderable columns --- .../storage/db/SortingFieldPathProducer.java | 15 ++++ .../entity/actor/api/ActorSortingField.java | 23 ++++-- .../api/AnnotationSortingField.java | 18 +++-- .../entity/medium/api/MediumSortingField.java | 32 +++++--- .../entity/music/api/MusicSortingField.java | 21 ++--- .../api/SegmentStructureSortingField.java | 22 ++++-- .../webapp/js/datasets/timaat.categories.js | 76 +++++++++++-------- src/main/webapp/js/ui/timaat.table.js | 42 +++++----- 8 files changed, 156 insertions(+), 93 deletions(-) create mode 100644 src/main/java/de/bitgilde/TIMAAT/storage/db/SortingFieldPathProducer.java diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/db/SortingFieldPathProducer.java b/src/main/java/de/bitgilde/TIMAAT/storage/db/SortingFieldPathProducer.java new file mode 100644 index 00000000..700cab2e --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/storage/db/SortingFieldPathProducer.java @@ -0,0 +1,15 @@ +package de.bitgilde.TIMAAT.storage.db; + +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Root; + +/** + * Mapps a {@link de.bitgilde.TIMAAT.storage.api.SortingField} to a {@link jakarta.persistence.criteria.Path} + * + * @author Nico Kotlenga + * @since 12.01.26 + */ +@FunctionalInterface +public interface SortingFieldPathProducer<ENTITY_TYPE> { + Path<?> getPathFromRoot(Root<ENTITY_TYPE> root); +} diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/actor/api/ActorSortingField.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/actor/api/ActorSortingField.java index 855202a1..0cc64280 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/actor/api/ActorSortingField.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/actor/api/ActorSortingField.java @@ -1,8 +1,12 @@ package de.bitgilde.TIMAAT.storage.entity.actor.api; import de.bitgilde.TIMAAT.model.FIPOP.Actor; +import de.bitgilde.TIMAAT.model.FIPOP.ActorName_; import de.bitgilde.TIMAAT.model.FIPOP.Actor_; +import de.bitgilde.TIMAAT.model.FIPOP.EmailAddress_; +import de.bitgilde.TIMAAT.model.FIPOP.PhoneNumber_; import de.bitgilde.TIMAAT.storage.db.DbSortingField; +import de.bitgilde.TIMAAT.storage.db.SortingFieldPathProducer; import jakarta.persistence.criteria.Path; import jakarta.persistence.criteria.Root; @@ -27,15 +31,20 @@ * @since 13.12.25 */ public enum ActorSortingField implements DbSortingField<Actor> { - ID; + ID(root -> root.get(Actor_.id)), NAME(root -> root.get(Actor_.displayName).get(ActorName_.name)), NAME_USED_FROM( + root -> root.get(Actor_.displayName).get(ActorName_.usedFrom)), NAME_USED_UNTIL( + root -> root.get(Actor_.displayName).get(ActorName_.usedUntil)), PRIMARY_PHONE_NUMBER( + root -> root.get(Actor_.primaryPhoneNumber).get(PhoneNumber_.phoneNumber)), PRIMARY_EMAIL_ADDRESS( + root -> root.get(Actor_.actorHasEmailAddress).get(EmailAddress_.email)), FICTIONAL(root -> root.get(Actor_.isFictional)); + + private final SortingFieldPathProducer<Actor> pathProducer; + + ActorSortingField(SortingFieldPathProducer<Actor> pathProducer) { + this.pathProducer = pathProducer; + } @Override public Path<?> getPathFromRootEntity(Root<Actor> root) { - switch (this) { - case ID: - return root.get(Actor_.id); - default: - throw new IllegalArgumentException("Unexpected enum value"); - } + return pathProducer.getPathFromRoot(root); } } diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/api/AnnotationSortingField.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/api/AnnotationSortingField.java index c3bf3706..5b796707 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/api/AnnotationSortingField.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/api/AnnotationSortingField.java @@ -3,6 +3,7 @@ import de.bitgilde.TIMAAT.model.FIPOP.Annotation; import de.bitgilde.TIMAAT.model.FIPOP.Annotation_; import de.bitgilde.TIMAAT.storage.db.DbSortingField; +import de.bitgilde.TIMAAT.storage.db.SortingFieldPathProducer; import jakarta.persistence.criteria.Path; import jakarta.persistence.criteria.Root; @@ -13,15 +14,18 @@ * @since 12.12.25 */ public enum AnnotationSortingField implements DbSortingField<Annotation> { - ID; + ID(root -> root.get(Annotation_.id)), START_TIME(root -> root.get(Annotation_.startTime)), END_TIME( + root -> root.get(Annotation_.endTime)), LAYER_AUDIO(root -> root.get(Annotation_.layerAudio)), LAYER_VISUAL( + root -> root.get(Annotation_.layerVisual)); + + private final SortingFieldPathProducer<Annotation> pathProducer; + + AnnotationSortingField(SortingFieldPathProducer<Annotation> pathProducer) { + this.pathProducer = pathProducer; + } @Override public Path<?> getPathFromRootEntity(Root<Annotation> root) { - switch (this) { - case ID: - return root.get(Annotation_.id); - default: - throw new IllegalArgumentException("Unexpected sorting field"); - } + return pathProducer.getPathFromRoot(root); } } diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/api/MediumSortingField.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/api/MediumSortingField.java index cba150f1..ed85d05f 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/api/MediumSortingField.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/api/MediumSortingField.java @@ -1,8 +1,13 @@ package de.bitgilde.TIMAAT.storage.entity.medium.api; import de.bitgilde.TIMAAT.model.FIPOP.Medium; +import de.bitgilde.TIMAAT.model.FIPOP.MediumSoftware_; +import de.bitgilde.TIMAAT.model.FIPOP.MediumText_; +import de.bitgilde.TIMAAT.model.FIPOP.MediumVideo_; import de.bitgilde.TIMAAT.model.FIPOP.Medium_; +import de.bitgilde.TIMAAT.model.FIPOP.Title_; import de.bitgilde.TIMAAT.storage.db.DbSortingField; +import de.bitgilde.TIMAAT.storage.db.SortingFieldPathProducer; import jakarta.persistence.criteria.Path; import jakarta.persistence.criteria.Root; @@ -27,18 +32,25 @@ * @since 13.12.25 */ public enum MediumSortingField implements DbSortingField<Medium> { - ID, - RELEASEDATE; + ID(root -> root.get(Medium_.id)), COPYRIGHT(root -> root.get(Medium_.copyright)), FILE_HASH( + root -> root.get(Medium_.fileHash)), RELEASE_DATE( + root -> root.get(Medium_.releaseDate)), RECORDING_START_DATE( + root -> root.get(Medium_.recordingStartDate)), RECORDING_END_DATE( + root -> root.get(Medium_.recordingEndDate)), REMARK(root -> root.get(Medium_.remark)), TITLE( + root -> root.get(Medium_.displayTitle).get(Title_.name)), SOFTWARE_VERSION( + root -> root.get(Medium_.mediumSoftware).get(MediumSoftware_.version)), TEXT_CONTENT( + root -> root.get(Medium_.mediumText).get(MediumText_.content)), VIDEO_FRAME_RATE( + root -> root.get(Medium_.mediumVideo).get(MediumVideo_.frameRate)), VIDEO_IS_EPISODE( + root -> root.get(Medium_.mediumVideo).get(MediumVideo_.isEpisode)); + + private final SortingFieldPathProducer<Medium> pathProducer; + + MediumSortingField(SortingFieldPathProducer<Medium> pathProducer) { + this.pathProducer = pathProducer; + } @Override public Path<?> getPathFromRootEntity(Root<Medium> root) { - switch (this) { - case ID: - return root.get(Medium_.id); - case RELEASEDATE: - return root.get(Medium_.releaseDate); - default: - throw new IllegalArgumentException("Unexpected enum value"); - } + return pathProducer.getPathFromRoot(root); } } diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/music/api/MusicSortingField.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/music/api/MusicSortingField.java index 46d00874..c99e3161 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/music/api/MusicSortingField.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/music/api/MusicSortingField.java @@ -4,6 +4,7 @@ import de.bitgilde.TIMAAT.model.FIPOP.Music_; import de.bitgilde.TIMAAT.model.FIPOP.Title_; import de.bitgilde.TIMAAT.storage.db.DbSortingField; +import de.bitgilde.TIMAAT.storage.db.SortingFieldPathProducer; import de.bitgilde.TIMAAT.storage.entity.music.MusicStorage; import jakarta.persistence.criteria.Path; import jakarta.persistence.criteria.Root; @@ -15,18 +16,20 @@ * @since 12.12.25 */ public enum MusicSortingField implements DbSortingField<Music> { - ID, TITLE; + ID(root -> root.get(Music_.id)), TITLE(root -> root.get(Music_.displayTitle).get(Title_.name)), BEAT( + root -> root.get(Music_.beat)), INSTRUMENTATION(root -> root.get(Music_.instrumentation)), TEMPO( + root -> root.get(Music_.tempo)), REMARK(root -> root.get(Music_.remark)), HARMONY( + root -> root.get(Music_.harmony)), MELODY(root -> root.get(Music_.melody)); + + private final SortingFieldPathProducer<Music> pathProducer; + + MusicSortingField(SortingFieldPathProducer<Music> pathProducer) { + this.pathProducer = pathProducer; + } @Override public Path<?> getPathFromRootEntity(Root<Music> root) { - switch (this) { - case ID: - return root.get(Music_.id); - case TITLE: - return root.get(Music_.displayTitle).get(Title_.name); - default: - throw new IllegalStateException("Unexpected value: " + this); - } + return pathProducer.getPathFromRoot(root); } } diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/SegmentStructureSortingField.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/SegmentStructureSortingField.java index d0a77863..2bc8447a 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/SegmentStructureSortingField.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/api/SegmentStructureSortingField.java @@ -2,8 +2,10 @@ import de.bitgilde.TIMAAT.model.FIPOP.AnalysisSegment; import de.bitgilde.TIMAAT.model.FIPOP.AnalysisSegmentStructureElement; +import de.bitgilde.TIMAAT.model.FIPOP.AnalysisSegmentStructureElementId_; import de.bitgilde.TIMAAT.model.FIPOP.AnalysisSegmentStructureElement_; import de.bitgilde.TIMAAT.storage.db.DbSortingField; +import de.bitgilde.TIMAAT.storage.db.SortingFieldPathProducer; import jakarta.persistence.criteria.Path; import jakarta.persistence.criteria.Root; @@ -28,15 +30,21 @@ * @since 31.12.25 */ public enum SegmentStructureSortingField implements DbSortingField<AnalysisSegmentStructureElement> { - ID; + ID(root -> root.get(AnalysisSegmentStructureElement_.id)), NAME( + root -> root.get(AnalysisSegmentStructureElement_.name)), TYPE( + root -> root.get(AnalysisSegmentStructureElement_.id) + .get(AnalysisSegmentStructureElementId_.structureElementType)), START_TIME( + root -> root.get(AnalysisSegmentStructureElement_.startTime)), END_TIME( + root -> root.get(AnalysisSegmentStructureElement_.endTime)); + + private final SortingFieldPathProducer<AnalysisSegmentStructureElement> pathProducer; + + SegmentStructureSortingField(SortingFieldPathProducer<AnalysisSegmentStructureElement> pathProducer) { + this.pathProducer = pathProducer; + } @Override public Path<?> getPathFromRootEntity(Root<AnalysisSegmentStructureElement> root) { - switch (this) { - case ID: - return root.get(AnalysisSegmentStructureElement_.id); - default: - throw new IllegalArgumentException("Unexpected sorting field"); - } + return pathProducer.getPathFromRoot(root); } } diff --git a/src/main/webapp/js/datasets/timaat.categories.js b/src/main/webapp/js/datasets/timaat.categories.js index 9d872053..7c71176f 100644 --- a/src/main/webapp/js/datasets/timaat.categories.js +++ b/src/main/webapp/js/datasets/timaat.categories.js @@ -248,7 +248,7 @@ // TODO: When adding DTO layer the client will receive for each internationalized label a map instead of a list. With this we can map directly to a target language instead of using the first result of the translation list const musicalKeyData = (data) => { - return data.musicalKey?.musicalKeyTranslations?.[0]?.type + return data.musicalKey?.musicalKeyTranslations?.[0]?.type ?? "-" } const navigateToMusicEntry = (music) => { @@ -257,9 +257,9 @@ const actionTableColumnButtons = [new TIMAAT.Table.ActionsTableColumnButton("Jump to entity", navigateToMusicEntry, "fa-arrow-right")] - const columns = [new TIMAAT.Table.FieldTableColumnConfig("title", "Title", "displayTitle.name", true), new TIMAAT.Table.FieldTableColumnConfig("id", "ID", "id", true), new TIMAAT.Table.FieldTableColumnConfig("beat", "Beat", "beat"), - new TIMAAT.Table.FieldTableColumnConfig("instrumentation", "Instrumentation", "instrumentation"), new TIMAAT.Table.FieldTableColumnConfig("tempo", "Tempo", "tempo"), new TIMAAT.Table.FieldTableColumnConfig("remark", "Remark", "remark"), - new TIMAAT.Table.FieldTableColumnConfig("harmony", "Harmony", "harmony"), new TIMAAT.Table.FieldTableColumnConfig("melody", "Melody", "melody"), new TIMAAT.Table.ValueMapperTableColumnConfig("musicType", "Music Type", "musicType.id", musicTypesById), + const columns = [new TIMAAT.Table.FieldTableColumnConfig("title", "Title", "displayTitle.name", "TITLE"), new TIMAAT.Table.FieldTableColumnConfig("id", "ID", "id", "ID"), new TIMAAT.Table.FieldTableColumnConfig("beat", "Beat", "beat", "BEAT"), + new TIMAAT.Table.FieldTableColumnConfig("instrumentation", "Instrumentation", "instrumentation", "INSTRUMENTATION"), new TIMAAT.Table.FieldTableColumnConfig("tempo", "Tempo", "tempo", "TEMPO"), new TIMAAT.Table.FieldTableColumnConfig("remark", "Remark", "remark", "REMARK"), + new TIMAAT.Table.FieldTableColumnConfig("harmony", "Harmony", "harmony", "HARMONY"), new TIMAAT.Table.FieldTableColumnConfig("melody", "Melody", "melody", "MELODY"), new TIMAAT.Table.ValueMapperTableColumnConfig("musicType", "Music Type", "musicType.id", musicTypesById), new TIMAAT.Table.FieldTableColumnConfig("musicalKey", "Musical Key", musicalKeyData), new TIMAAT.Table.ActionsTableColumnConfig("actions", actionTableColumnButtons)] const activeColumnIds = ["id", "title", "musicType", "actions"] @@ -291,9 +291,9 @@ const actionTableColumnButtons = [new TIMAAT.Table.ActionsTableColumnButton("Jump to entity", navigateToSegmentStructureEntry, "fa-arrow-right")] - const columns = [new TIMAAT.Table.FieldTableColumnConfig("id", "ID", "id"), new TIMAAT.Table.FieldTableColumnConfig("name", "Name", "name"), - new TIMAAT.Table.ValueMapperTableColumnConfig("type", "Type", "segmentStructureElementType", segmentStructureTypeByEnumTypeName, true), - new TIMAAT.Table.TimeStampTableColumnConfig("startTime", "Start time", "startTime"), new TIMAAT.Table.TimeStampTableColumnConfig("endTime", "End time", "endTime"), + const columns = [new TIMAAT.Table.FieldTableColumnConfig("id", "ID", "id", "ID"), new TIMAAT.Table.FieldTableColumnConfig("name", "Name", "name", "NAME"), + new TIMAAT.Table.ValueMapperTableColumnConfig("type", "Type", "segmentStructureElementType", segmentStructureTypeByEnumTypeName, "TYPE"), + new TIMAAT.Table.TimeStampTableColumnConfig("startTime", "Start time", "startTime", "START_TIME"), new TIMAAT.Table.TimeStampTableColumnConfig("endTime", "End time", "endTime", "END_TIME"), new TIMAAT.Table.ActionsTableColumnConfig("actions", actionTableColumnButtons)] const activeColumnIds = ["id", "name", "type", "actions"] @@ -318,7 +318,7 @@ const MediumDurationColumnConfig = class MediumDurationColumnConfig extends TIMAAT.Table.TableColumnConfig { constructor() { - super("duration", "Duration", ""); + super("duration", "Duration", null); } render(data, type, row) { @@ -351,7 +351,7 @@ if (row.mediumImage) { return row.mediumImage.width } - return null + return "-" } const heightData = (row) => { if (row.mediumVideo) { @@ -360,25 +360,25 @@ if (row.mediumImage) { return row.mediumImage.height } - return null + return "-" } - const softwareVersionData = (row) => row.mediumSoftware?.version; - const textContentData = (row) => row.mediumText?.content; - const videoFramRateData = (row) => row.mediumVideo?.frameRate; - const videoIsEpisode = (row) => row.mediumVideo?.isEpisode + const softwareVersionData = (row) => row.mediumSoftware?.version ?? "-"; + const textContentData = (row) => row.mediumText?.content ?? "-"; + const videoFramRateData = (row) => row.mediumVideo?.frameRate ?? "-"; + const videoIsEpisode = (row) => row.mediumVideo?.isEpisode ?? "-" const navigateToMediumEntry = (medium) => { window.navigation.navigate(`/TIMAAT/#medium/${medium.id}`); } const actionTableColumnButtons = [new TIMAAT.Table.ActionsTableColumnButton("Jump to entity", navigateToMediumEntry, "fa-arrow-right")] - const columns = [new TIMAAT.Table.FieldTableColumnConfig("id", "ID", "id"), new TIMAAT.Table.FieldTableColumnConfig("copyright", "Copyright", "copyright"), new TIMAAT.Table.FieldTableColumnConfig("fileHash", "File Hash", "fileHash"), - new TIMAAT.Table.DateTableColumnConfig("releaseDate", "Release Date", "releaseDate"), new TIMAAT.Table.DateTableColumnConfig("recordingStartDate", "Recording Start Date", "recordingStartDate"), - new TIMAAT.Table.DateTableColumnConfig("recordingEndDate", "Recording End Date", "recordingEndDate"), new TIMAAT.Table.FieldTableColumnConfig("remark", "Remark", "remark"), new TIMAAT.Table.FieldTableColumnConfig("title", "Title", "displayTitle.name"), + const columns = [new TIMAAT.Table.FieldTableColumnConfig("id", "ID", "id", "ID"), new TIMAAT.Table.FieldTableColumnConfig("copyright", "Copyright", "copyright", "COPYRIGHT"), new TIMAAT.Table.FieldTableColumnConfig("fileHash", "File Hash", "fileHash", "FILE_HASH"), + new TIMAAT.Table.DateTableColumnConfig("releaseDate", "Release Date", "releaseDate", "RELEASE_DATE"), new TIMAAT.Table.DateTableColumnConfig("recordingStartDate", "Recording Start Date", "recordingStartDate", "RECORDING_START_DATE"), + new TIMAAT.Table.DateTableColumnConfig("recordingEndDate", "Recording End Date", "recordingEndDate", "RECORDING_END_DATE"), new TIMAAT.Table.FieldTableColumnConfig("remark", "Remark", "remark", "REMARK"), new TIMAAT.Table.FieldTableColumnConfig("title", "Title", "displayTitle.name", "TITLE"), new TIMAAT.Table.ValueMapperTableColumnConfig("mediaType", "Media Type", "mediaType.id", mediaTypesById), new MediumDurationColumnConfig(), new TIMAAT.Table.ImageDownloadTableColumnConfig("thumbnail", "Thumbnail", imageThumbnailGeneratorFunction), - new TIMAAT.Table.FieldTableColumnConfig("width", "Width", withData, true), new TIMAAT.Table.FieldTableColumnConfig("height", "Height", heightData, true), - new TIMAAT.Table.FieldTableColumnConfig("softwareVersion", "Software Version", softwareVersionData, true, "Software"), new TIMAAT.Table.FieldTableColumnConfig("textContent", "Text Content", textContentData, true, "Text"), - new TIMAAT.Table.FieldTableColumnConfig("videoFrameRate", "Video Frame Rate", videoFramRateData, true, "Video"), new TIMAAT.Table.BooleanTableColumnConfig("videoIsEpisode", "Video Is Episode", videoIsEpisode, "Video"), + new TIMAAT.Table.FieldTableColumnConfig("width", "Width", withData), new TIMAAT.Table.FieldTableColumnConfig("height", "Height", heightData), + new TIMAAT.Table.FieldTableColumnConfig("softwareVersion", "Software Version", softwareVersionData, null, "Software"), new TIMAAT.Table.FieldTableColumnConfig("textContent", "Text Content", textContentData, null, "Text"), + new TIMAAT.Table.FieldTableColumnConfig("videoFrameRate", "Video Frame Rate", videoFramRateData, null, "Video"), new TIMAAT.Table.BooleanTableColumnConfig("videoIsEpisode", "Video Is Episode", videoIsEpisode, null, "Video"), new TIMAAT.Table.ActionsTableColumnConfig("actions", actionTableColumnButtons) ] const activeColumnIds = ["thumbnail", "id", "title", "mediaType", "actions"] @@ -408,15 +408,27 @@ } const actionTableColumnButtons = [new TIMAAT.Table.ActionsTableColumnButton("Jump to entity", navigateToActorEntry, "fa-arrow-right")] - const columns = [new TIMAAT.Table.FieldTableColumnConfig("id", "ID", "id"), new TIMAAT.Table.ValueMapperTableColumnConfig("type", "Type", "actorType.id", actorTypesById), - new TIMAAT.Table.FieldTableColumnConfig("name", "Name", "displayName.name"), new TIMAAT.Table.DateTableColumnConfig("nameUsedFrom", "Name used from", "displayName.usedFrom"), - new TIMAAT.Table.DateTableColumnConfig("nameUsedUntil", "Name used until", "displayName.usedUntil"), new TIMAAT.Table.AddressTableColumnConfig("primaryAddress", "Primary address", "primaryAddress"), - new TIMAAT.Table.FieldTableColumnConfig("primaryPhoneNumber", "Primary phone number", "primaryPhoneNumber.phoneNumber"), new TIMAAT.Table.FieldTableColumnConfig("primaryEmailAddress", "Primary email address", "primaryEmailAddress.email"), - new TIMAAT.Table.DateTableColumnConfig("disbanded", "Disbanded", "actorCollective.disbanded", true, "Collective"), new TIMAAT.Table.DateTableColumnConfig("founded", "Founded", "actorCollective.founded", true, "Collective"), - new TIMAAT.Table.DateTableColumnConfig("dateOfBirth", "Date of birth", "actorPerson.dateOfBirth", true, "Person"), new TIMAAT.Table.DateTableColumnConfig("dayOfDeath", "Day of death", "actorPerson.dayOfDeath", true, "Person"), - new TIMAAT.Table.FieldTableColumnConfig("title", "Title", "actorPerson.title", true, "Person"), new TIMAAT.Table.FieldTableColumnConfig("citizenship", "Citizenship", "actorPerson.citizenship", true, "Person"), - new TIMAAT.Table.FieldTableColumnConfig("placeOfBirth", "Place of birth", "actorPerson.placeOfBirth", true, "Person"), new TIMAAT.Table.FieldTableColumnConfig("placeOfDeath", "Place of death", "actorPerson.placeOfDeath", true, "Person"), - new TIMAAT.Table.ValueMapperTableColumnConfig("sex", "Sex", "actorPerson.sex.id", sexTypesById, true, "Person"), new TIMAAT.Table.BooleanTableColumnConfig("isFictional", "Fictional", "isFictional"), + const collectiveDisbandedData = (row) => row.actorCollective?.disbanded ?? "-" + const collectiveFoundedData = (row) => row.actorCollective?.founded ?? "-" + const personDataOfBirthData = (row) => row.actorPerson?.dateOfBirth ?? "-" + const personDayOfDeathData = (row) => row.actorPerson?.dayOfDeath ?? "-" + const personTitleData = (row) => row.actorPerson?.title ?? "-" + const personCitizenshipData = (row) => row.actorPerson?.citizenship ?? "-" + const personPlaceOfBirthData = (row) => row.actorPerson?.placeOfBirth ?? "-" + const personPlaceOfDeathData = (row) => row.actorPerson?.placeOfDeath ?? "-" + const personSexData = (row) => row.actorPerson?.sex?.id + const primaryEmailAddressData = (row) => row.primaryEmailAddress?.email ?? "-" + const primaryPhoneNumberData = (row) => row.primaryPhoneNumber?.phoneNumber ?? "-" + + const columns = [new TIMAAT.Table.FieldTableColumnConfig("id", "ID", "id", "ID"), new TIMAAT.Table.ValueMapperTableColumnConfig("type", "Type", "actorType.id", actorTypesById), + new TIMAAT.Table.FieldTableColumnConfig("name", "Name", "displayName.name", "NAME"), new TIMAAT.Table.DateTableColumnConfig("nameUsedFrom", "Name used from", "displayName.usedFrom", "NAME_USED_FROM"), + new TIMAAT.Table.DateTableColumnConfig("nameUsedUntil", "Name used until", "displayName.usedUntil", "NAME_USED_UNTIL"), new TIMAAT.Table.AddressTableColumnConfig("primaryAddress", "Primary address", "primaryAddress"), + new TIMAAT.Table.FieldTableColumnConfig("primaryPhoneNumber", "Primary phone number", primaryPhoneNumberData, "PRIMARY_PHONE_NUMBER"), new TIMAAT.Table.FieldTableColumnConfig("primaryEmailAddress", "Primary email address", primaryEmailAddressData, "PRIMARY_EMAIL_ADDRESS"), + new TIMAAT.Table.DateTableColumnConfig("disbanded", "Disbanded", collectiveDisbandedData, null, "Collective"), new TIMAAT.Table.DateTableColumnConfig("founded", "Founded", collectiveFoundedData, null, "Collective"), + new TIMAAT.Table.DateTableColumnConfig("dateOfBirth", "Date of birth", personDataOfBirthData, null, "Person"), new TIMAAT.Table.DateTableColumnConfig("dayOfDeath", "Day of death", personDayOfDeathData, null, "Person"), + new TIMAAT.Table.FieldTableColumnConfig("title", "Title", personTitleData, null, "Person"), new TIMAAT.Table.FieldTableColumnConfig("citizenship", "Citizenship", personCitizenshipData, null, "Person"), + new TIMAAT.Table.FieldTableColumnConfig("placeOfBirth", "Place of birth", personPlaceOfBirthData, null, "Person"), new TIMAAT.Table.FieldTableColumnConfig("placeOfDeath", "Place of death", personPlaceOfDeathData, null, "Person"), + new TIMAAT.Table.ValueMapperTableColumnConfig("sex", "Sex", personSexData, sexTypesById, null, "Person"), new TIMAAT.Table.BooleanTableColumnConfig("isFictional", "Fictional", "isFictional", "FICTIONAL"), new TIMAAT.Table.ActionsTableColumnConfig("actions", actionTableColumnButtons) ] const activeColumnIds = ["id", "name", "type", "actions"] @@ -450,9 +462,9 @@ const actionTableColumnButtons = [new TIMAAT.Table.ActionsTableColumnButton("Jump to entity", navigateToAnnotationEntry, "fa-arrow-right")] - const columns = [new TIMAAT.Table.FieldTableColumnConfig("id", "ID", "id"), new TIMAAT.Table.TimeStampTableColumnConfig("startTime", "Start time", "startTime", false), - new TIMAAT.Table.TimeStampTableColumnConfig("endTime", "End time", "endTime", false), new TIMAAT.Table.BooleanTableColumnConfig("layerAudio", "Audio", "layerAudio", false), - new TIMAAT.Table.BooleanTableColumnConfig("layerVisual", "Video", "layerVisual", false), new TIMAAT.Table.ActionsTableColumnConfig("actions", actionTableColumnButtons)] + const columns = [new TIMAAT.Table.FieldTableColumnConfig("id", "ID", "id", "ID"), new TIMAAT.Table.TimeStampTableColumnConfig("startTime", "Start time", "startTime", "START_TIME"), + new TIMAAT.Table.TimeStampTableColumnConfig("endTime", "End time", "endTime", "END_TIME"), new TIMAAT.Table.BooleanTableColumnConfig("layerAudio", "Audio", "layerAudio", "LAYER_AUDIO"), + new TIMAAT.Table.BooleanTableColumnConfig("layerVisual", "Video", "layerVisual", "LAYER_VISUAL"), new TIMAAT.Table.ActionsTableColumnConfig("actions", actionTableColumnButtons)] const activeColumnIds = ["id", "startTime", "endTime", "layerAudio", "layerVisual", "actions"] const annotationTable = new TIMAAT.Table.Table("categoriesAnnotationTable", "#categoriesAnnotationTableContainer", columns, activeColumnIds, "api/annotation/list", true, false) diff --git a/src/main/webapp/js/ui/timaat.table.js b/src/main/webapp/js/ui/timaat.table.js index 00fbca28..0f1c303e 100644 --- a/src/main/webapp/js/ui/timaat.table.js +++ b/src/main/webapp/js/ui/timaat.table.js @@ -26,14 +26,14 @@ _id; _title; _data; - _sortable; + _sortingParameterName; _groupName; - constructor(id, title, data, sortable = true, groupName = null) { + constructor(id, title, data, sortingParameterName=null, groupName = null) { this._id = id; this._title = title; this._data = data; - this._sortable = sortable; + this._sortingParameterName = sortingParameterName; this._groupName = groupName; } @@ -49,8 +49,8 @@ return this._id; } - get sortable() { - return this._sortable; + get sortingParameterName() { + return this._sortingParameterName; } get groupName() { @@ -65,8 +65,8 @@ } } TIMAAT.Table.FieldTableColumnConfig = class extends TIMAAT.Table.TableColumnConfig { - constructor(id, title, data, sortable = true, groupName = null) { - super(id, title, data, sortable, groupName); + constructor(id, title, data, sortingParameterName = null, groupName = null) { + super(id, title, data, sortingParameterName, groupName); } render(data, type, row) { @@ -79,8 +79,8 @@ } } TIMAAT.Table.DateTableColumnConfig = class extends TIMAAT.Table.TableColumnConfig { - constructor(id, title, data, sortable = true, groupName = null) { - super(id, title, data, sortable, groupName); + constructor(id, title, data, sortingParameterName = null, groupName = null) { + super(id, title, data, sortingParameterName, groupName); } render(data, type, row) { @@ -96,8 +96,8 @@ } TIMAAT.Table.TimeStampTableColumnConfig = class extends TIMAAT.Table.TableColumnConfig { - constructor(id, title, data, sortable = true, groupName = null) { - super(id, title, data, sortable, groupName); + constructor(id, title, data, sortingParameterName = null, groupName = null) { + super(id, title, data, sortingParameterName, groupName); } render(data, type, row) { @@ -113,8 +113,8 @@ } TIMAAT.Table.BooleanTableColumnConfig = class extends TIMAAT.Table.TableColumnConfig { - constructor(id, title, data, sortable = true, groupName = null) { - super(id, title, data, sortable, groupName); + constructor(id, title, data, sortingParameterName = null, groupName = null) { + super(id, title, data, sortingParameterName, groupName); } render(data, type, row) { @@ -162,7 +162,7 @@ _actionTableColumnButtons constructor(id, actionTableColumnButtons){ - super(id, "Actions", null , false); + super(id, "Actions", null , null); this._actionTableColumnButtons = actionTableColumnButtons; this.render = this.render.bind(this); @@ -188,8 +188,8 @@ TIMAAT.Table.ValueMapperTableColumnConfig = class extends TIMAAT.Table.TableColumnConfig { _valueMap; - constructor(id, title, data, valueMap, sortable = true, groupName = null) { - super(id, title, data, sortable, groupName); + constructor(id, title, data, valueMap, sortingParameterName=null, groupName = null) { + super(id, title, data, sortingParameterName, groupName); this._valueMap = valueMap; this.render = this.render.bind(this); @@ -217,7 +217,7 @@ * @param imagePathGeneratorFunction : (row) => string | null , (row) => Promise<string | null> */ constructor(id, title, imagePathGeneratorFunction, groupName = null) { - super(id, title, null, false, groupName); + super(id, title, null, null, groupName); this._imagePathGeneratorFunction = imagePathGeneratorFunction; this.render = this.render.bind(this); @@ -232,7 +232,7 @@ TIMAAT.Table.AddressTableColumnConfig = class extends TIMAAT.Table.TableColumnConfig { constructor(id, title, data, groupName = null) { - super(id, title, data, false, groupName); + super(id, title, data, null, groupName); } render(data, type, row) { @@ -354,8 +354,9 @@ title: currentTableColumnConfig.title, data: currentTableColumnConfig.data, render: currentTableColumnConfig.render, - orderable: currentTableColumnConfig.sortable, - fnCreatedCell: currentTableColumnConfig.createdCell + orderable: currentTableColumnConfig.sortingParameterName !== null, + fnCreatedCell: currentTableColumnConfig.createdCell, + name: currentTableColumnConfig.sortingParameterName, }); $('<th>').text(currentTableColumnConfig.title).appendTo($headerRow); } @@ -376,7 +377,6 @@ "processing": true, "stateSave": true, "scrollX": true, - "rowId": 'id', "serverSide": true, "ajax": { "url": ajaxUrl, From eb25e32015b0dd2b9d9cf1790449bf94d59d9922 Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Tue, 13 Jan 2026 08:39:05 +0100 Subject: [PATCH 35/70] TIMAAT Weiterentwicklung #9 - Implemented thumbnail column for annotations --- .../webapp/js/datasets/timaat.categories.js | 11 ++++- src/main/webapp/js/ui/timaat.table.js | 40 +++++++++++++------ 2 files changed, 37 insertions(+), 14 deletions(-) diff --git a/src/main/webapp/js/datasets/timaat.categories.js b/src/main/webapp/js/datasets/timaat.categories.js index 7c71176f..18c64456 100644 --- a/src/main/webapp/js/datasets/timaat.categories.js +++ b/src/main/webapp/js/datasets/timaat.categories.js @@ -459,13 +459,20 @@ TIMAAT.VideoPlayer.initializeAnnotationModeWithAnnotationByIds(analysisList.mediumID, annotation.id) }) } + + const imageThumbnailGeneratorFunction = async (row) => { + const annotationThumbnailBlob = await TIMAAT.AnnotationService.getAnnotationThumbnailBlob(row.id) + return URL.createObjectURL(annotationThumbnailBlob) + } + const actionTableColumnButtons = [new TIMAAT.Table.ActionsTableColumnButton("Jump to entity", navigateToAnnotationEntry, "fa-arrow-right")] const columns = [new TIMAAT.Table.FieldTableColumnConfig("id", "ID", "id", "ID"), new TIMAAT.Table.TimeStampTableColumnConfig("startTime", "Start time", "startTime", "START_TIME"), new TIMAAT.Table.TimeStampTableColumnConfig("endTime", "End time", "endTime", "END_TIME"), new TIMAAT.Table.BooleanTableColumnConfig("layerAudio", "Audio", "layerAudio", "LAYER_AUDIO"), - new TIMAAT.Table.BooleanTableColumnConfig("layerVisual", "Video", "layerVisual", "LAYER_VISUAL"), new TIMAAT.Table.ActionsTableColumnConfig("actions", actionTableColumnButtons)] - const activeColumnIds = ["id", "startTime", "endTime", "layerAudio", "layerVisual", "actions"] + new TIMAAT.Table.BooleanTableColumnConfig("layerVisual", "Video", "layerVisual", "LAYER_VISUAL"), new TIMAAT.Table.ActionsTableColumnConfig("actions", actionTableColumnButtons), + new TIMAAT.Table.ImageDownloadTableColumnConfig("thumbnail", "Thumbnail", imageThumbnailGeneratorFunction)] + const activeColumnIds = ["thumbnail", "id", "startTime", "endTime", "layerAudio", "layerVisual", "actions"] const annotationTable = new TIMAAT.Table.Table("categoriesAnnotationTable", "#categoriesAnnotationTableContainer", columns, activeColumnIds, "api/annotation/list", true, false) diff --git a/src/main/webapp/js/ui/timaat.table.js b/src/main/webapp/js/ui/timaat.table.js index 0f1c303e..056ded7a 100644 --- a/src/main/webapp/js/ui/timaat.table.js +++ b/src/main/webapp/js/ui/timaat.table.js @@ -29,7 +29,7 @@ _sortingParameterName; _groupName; - constructor(id, title, data, sortingParameterName=null, groupName = null) { + constructor(id, title, data, sortingParameterName = null, groupName = null) { this._id = id; this._title = title; this._data = data; @@ -149,11 +149,11 @@ this._title = title } - createButton(){ - return $(`<button title="${this._title}" class="btn btn-sm btn-outline btn-secondary fas ${this._faIconClass}"></button>`) + createButton() { + return $(`<button title="${this._title}" class="btn btn-sm btn-outline btn-secondary fas ${this._faIconClass}"></button>`) } - get onClick(){ + get onClick() { return this._onClick; } } @@ -161,8 +161,8 @@ TIMAAT.Table.ActionsTableColumnConfig = class extends TIMAAT.Table.TableColumnConfig { _actionTableColumnButtons - constructor(id, actionTableColumnButtons){ - super(id, "Actions", null , null); + constructor(id, actionTableColumnButtons) { + super(id, "Actions", null, null); this._actionTableColumnButtons = actionTableColumnButtons; this.render = this.render.bind(this); @@ -177,7 +177,7 @@ createdCell(td, cellData, rowData, row, col) { const $actionsTableCell = $(td).find(".actionsTableCell") - for(let actionTableColumnButton of this._actionTableColumnButtons){ + for (let actionTableColumnButton of this._actionTableColumnButtons) { const $button = actionTableColumnButton.createButton() $button.on("click", () => actionTableColumnButton.onClick(rowData)) $actionsTableCell.append($button) @@ -188,7 +188,7 @@ TIMAAT.Table.ValueMapperTableColumnConfig = class extends TIMAAT.Table.TableColumnConfig { _valueMap; - constructor(id, title, data, valueMap, sortingParameterName=null, groupName = null) { + constructor(id, title, data, valueMap, sortingParameterName = null, groupName = null) { super(id, title, data, sortingParameterName, groupName); this._valueMap = valueMap; @@ -221,12 +221,28 @@ this._imagePathGeneratorFunction = imagePathGeneratorFunction; this.render = this.render.bind(this); + this.createdCell = this.createdCell.bind(this); } render(data, type, row) { - const imagePath = this._imagePathGeneratorFunction(row); - let imageSrc = imagePath ?? "img/preview-placeholder.png" - return `<img src="${imageSrc}" width="150" height="auto" alt="Image cell"/>` + return `<img src="img/preview-placeholder.png" width="150" height="auto" alt="Image cell"/>` + } + + createdCell(td, cellData, rowData, row, col) { + const $img = $(td).find("img"); + + if (this._imagePathGeneratorFunction.constructor.name === 'AsyncFunction') { + this._imagePathGeneratorFunction(rowData).then(imgSrc => { + if (imgSrc) { + $img.prop("src", imgSrc); + } + }) + } else { + const imgSrc = this._imagePathGeneratorFunction(rowData) + if (imgSrc) { + $img.prop("src", imgSrc); + } + } } } @@ -568,7 +584,7 @@ for (let currentTableColumnConfig of this._tableColumnConfigs) { const currentGroupName = currentTableColumnConfig.groupName if (currentGroupName) { - if(!columnConfigsByGroupName.has(currentGroupName)) { + if (!columnConfigsByGroupName.has(currentGroupName)) { columnConfigsByGroupName.set(currentGroupName, []) } const groupColumnConfigs = columnConfigsByGroupName.get(currentGroupName) From bd8aad10ccb709c1d2c12ba19cab439dd506851b Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Tue, 13 Jan 2026 10:30:06 +0100 Subject: [PATCH 36/70] TIMAAT Weiterentwicklung #9 - Implemented authorization verification * Added authorization verification when loading annotation and segment structure elements --- .../TIMAAT/rest/endpoint/EndpointActor.java | 8 +- .../rest/endpoint/EndpointAnnotation.java | 10 +- .../TIMAAT/rest/endpoint/EndpointMedium.java | 8 +- .../TIMAAT/rest/endpoint/EndpointMusic.java | 8 +- .../EndpointSegmentStructureElement.java | 8 +- .../TIMAAT/storage/api/EntityStorage.java | 12 +- .../bitgilde/TIMAAT/storage/db/DbStorage.java | 44 ++++++-- .../storage/entity/actor/ActorStorage.java | 50 +++++---- .../entity/annotation/AnnotationStorage.java | 106 +++++++++++------- .../storage/entity/medium/MediumStorage.java | 41 +++---- .../storage/entity/music/MusicStorage.java | 45 ++++---- .../SegmentStructureElementsStorage.java | 74 +++++++----- 12 files changed, 248 insertions(+), 166 deletions(-) diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointActor.java b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointActor.java index 4ae1499b..ddbe75d5 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointActor.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointActor.java @@ -113,10 +113,10 @@ public DataTableInfo<Actor> getActorList(@BeanParam ActorListingQueryParameter q AuthenticationFilter.USER_ACCOUNT_PROPERTY_NAME); int draw = queryParameter.getDraw().isPresent() ? queryParameter.getDraw().get() : 0; - List<Actor> actors = actorStorage.getEntriesAsStream(queryParameter, queryParameter, queryParameter, userAccount).collect( + List<Actor> actors = actorStorage.getEntriesAsStreamRespectingAuthorization(queryParameter, queryParameter, queryParameter, userAccount).collect( Collectors.toList()); - Long actorsCount = actorStorage.getNumberOfTotalEntries(); - Long matchingActorsCount = actorStorage.getNumberOfMatchingEntries(queryParameter); + Long actorsCount = actorStorage.getNumberOfTotalEntriesRespectingAuthorization(userAccount); + Long matchingActorsCount = actorStorage.getNumberOfMatchingEntriesRespectingAuthorization(queryParameter, userAccount); return new DataTableInfo<>(draw, actorsCount, matchingActorsCount, actors); @@ -130,7 +130,7 @@ public List<SelectElement<Integer>> getActorSelectList(@BeanParam ActorListingQu { UserAccount userAccount = (UserAccount) containerRequestContext.getProperty( AuthenticationFilter.USER_ACCOUNT_PROPERTY_NAME); - return actorStorage.getEntriesAsStream(queryParameter, queryParameter, queryParameter, userAccount) + return actorStorage.getEntriesAsStreamRespectingAuthorization(queryParameter, queryParameter, queryParameter, userAccount) .map(currentActor -> new SelectElement<>(currentActor.getId(), currentActor.getDisplayName().getName())) .collect(Collectors.toList()); } diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnnotation.java b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnnotation.java index 7a6f6f0c..71b41560 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnnotation.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnnotation.java @@ -117,19 +117,19 @@ public class EndpointAnnotation { @Inject TemporaryFileStorage temporaryFileStorage; - //TODO: Filter by permission (currently no permissions are respected) @GET @Produces @Path("list") + @Secured public DataTableInfo<Annotation> getAnnotationList(@BeanParam @Valid AnnotationListingQueryParameter annotationListingQueryParameter) { UserAccount userAccount = (UserAccount) containerRequestContext.getProperty( AuthenticationFilter.USER_ACCOUNT_PROPERTY_NAME); int draw = annotationListingQueryParameter.getDraw().orElse(0); - List<Annotation> matchingAnnotations = annotationStorage.getEntriesAsStream(annotationListingQueryParameter, + List<Annotation> matchingAnnotations = annotationStorage.getEntriesAsStreamRespectingAuthorization(annotationListingQueryParameter, annotationListingQueryParameter, annotationListingQueryParameter, userAccount).collect(Collectors.toList()); - long totalAnnotationsCount = annotationStorage.getNumberOfTotalEntries(); - long filteredAnnotationsCount = annotationStorage.getNumberOfMatchingEntries(annotationListingQueryParameter); + long totalAnnotationsCount = annotationStorage.getNumberOfTotalEntriesRespectingAuthorization(userAccount); + long filteredAnnotationsCount = annotationStorage.getNumberOfMatchingEntriesRespectingAuthorization(annotationListingQueryParameter, userAccount); return new DataTableInfo<>(draw, totalAnnotationsCount, filteredAnnotationsCount, matchingAnnotations); } @@ -140,7 +140,7 @@ public DataTableInfo<Annotation> getAnnotationList(@BeanParam @Valid AnnotationL public CountResult getCountOfAnnotations(@BeanParam @Valid AnnotationListingQueryParameter annotationListingQueryParameter) { UserAccount userAccount = (UserAccount) containerRequestContext.getProperty( AuthenticationFilter.USER_ACCOUNT_PROPERTY_NAME); - long filteredAnnotationsCount = annotationStorage.getNumberOfMatchingEntries(annotationListingQueryParameter); + long filteredAnnotationsCount = annotationStorage.getNumberOfMatchingEntriesRespectingAuthorization(annotationListingQueryParameter, userAccount); return new CountResult(filteredAnnotationsCount); } diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java index 7df6a485..d8f682bf 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java @@ -181,10 +181,10 @@ public DataTableInfo<Medium> getMediaList(@BeanParam MediumListingQueryParameter AuthenticationFilter.USER_ACCOUNT_PROPERTY_NAME); int draw = queryParameter.getDraw().orElse(0); - List<Medium> matchingMediums = mediumStorage.getEntriesAsStream(queryParameter, queryParameter, queryParameter, + List<Medium> matchingMediums = mediumStorage.getEntriesAsStreamRespectingAuthorization(queryParameter, queryParameter, queryParameter, userAccount).collect(Collectors.toList()); - long totalMediumEntries = mediumStorage.getNumberOfTotalEntries(); - long filteredMediumEntries = mediumStorage.getNumberOfMatchingEntries(queryParameter); + long totalMediumEntries = mediumStorage.getNumberOfTotalEntriesRespectingAuthorization(userAccount); + long filteredMediumEntries = mediumStorage.getNumberOfMatchingEntriesRespectingAuthorization(queryParameter, userAccount); return new DataTableInfo<>(draw, totalMediumEntries, filteredMediumEntries, matchingMediums); @@ -200,7 +200,7 @@ public List<SelectElement<Integer>> getMediumSelectList(@QueryParam("search") St AuthenticationFilter.USER_ACCOUNT_PROPERTY_NAME); MediumFilterCriteria filterCriteria = new MediumFilterCriteria.Builder().mediumNameSearch(search).build(); - return mediumStorage.getEntriesAsStream(filterCriteria, PagingParameter.NO_PAGING, + return mediumStorage.getEntriesAsStreamRespectingAuthorization(filterCriteria, PagingParameter.NO_PAGING, SortingParameter.defaultSortOrder(), userAccount) .map(currentMedium -> new SelectElement<Integer>(currentMedium.getId(), currentMedium.getDisplayTitle().getName())).collect(Collectors.toList()); diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMusic.java b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMusic.java index f54e6a7e..0d592d74 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMusic.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMusic.java @@ -203,10 +203,10 @@ public DataTableInfo<Music> getMusicList(@BeanParam MusicListingQueryParameter q AuthenticationFilter.USER_ACCOUNT_PROPERTY_NAME); int draw = queryParameter.getDraw().orElse(0); - List<Music> matchingMusic = musicStorage.getEntriesAsStream(queryParameter, queryParameter, queryParameter, + List<Music> matchingMusic = musicStorage.getEntriesAsStreamRespectingAuthorization(queryParameter, queryParameter, queryParameter, userAccount).collect(Collectors.toList()); - long totalMusicEntries = musicStorage.getNumberOfTotalEntries(); - long filteredMusicEntries = musicStorage.getNumberOfMatchingEntries(queryParameter); + long totalMusicEntries = musicStorage.getNumberOfTotalEntriesRespectingAuthorization(userAccount); + long filteredMusicEntries = musicStorage.getNumberOfMatchingEntriesRespectingAuthorization(queryParameter, userAccount); /** * TODO: This one can be removed when directly filter on storage layer @@ -223,7 +223,7 @@ public List<SelectElement<Integer>> getMusicSelectList(@QueryParam("search") Str UserAccount userAccount = (UserAccount) containerRequestContext.getProperty( AuthenticationFilter.USER_ACCOUNT_PROPERTY_NAME); MusicFilterCriteria filterCriteria = new MusicFilterCriteria.Builder().musicNameSearch(searchText).build(); - return musicStorage.getEntriesAsStream(filterCriteria, PagingParameter.NO_PAGING, + return musicStorage.getEntriesAsStreamRespectingAuthorization(filterCriteria, PagingParameter.NO_PAGING, SortingParameter.defaultSortOrder(), userAccount) .map(currentMusic -> new SelectElement<>(currentMusic.getId(), currentMusic.getDisplayTitle().getName())).collect(Collectors.toList()); diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointSegmentStructureElement.java b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointSegmentStructureElement.java index 02435eb0..72762afb 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointSegmentStructureElement.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointSegmentStructureElement.java @@ -3,6 +3,7 @@ import de.bitgilde.TIMAAT.model.DataTableInfo; import de.bitgilde.TIMAAT.model.FIPOP.MediumAnalysisList; import de.bitgilde.TIMAAT.model.FIPOP.UserAccount; +import de.bitgilde.TIMAAT.rest.Secured; import de.bitgilde.TIMAAT.rest.filter.AuthenticationFilter; import de.bitgilde.TIMAAT.rest.model.analysissegment.SegmentStructureElementListingQueryParameter; import de.bitgilde.TIMAAT.rest.model.segment.SegmentStructureElement; @@ -52,15 +53,16 @@ public class EndpointSegmentStructureElement { @GET @Produces @Path("list") + @Secured public DataTableInfo<SegmentStructureElement> listSegmentStructureElements(@BeanParam SegmentStructureElementListingQueryParameter queryParameter) { int draw = queryParameter.getDraw().orElse(0); UserAccount userAccount = (UserAccount) containerRequestContext.getProperty( AuthenticationFilter.USER_ACCOUNT_PROPERTY_NAME); - List<SegmentStructureElement> matchingEntries = segmentStructureElementsStorage.getEntriesAsStream(queryParameter, + List<SegmentStructureElement> matchingEntries = segmentStructureElementsStorage.getEntriesAsStreamRespectingAuthorization(queryParameter, queryParameter, queryParameter, userAccount).map(SegmentStructureElement::new).collect(Collectors.toList()); - long countOfMatchingEntries = segmentStructureElementsStorage.getNumberOfMatchingEntries(queryParameter); - long totalCount = segmentStructureElementsStorage.getNumberOfTotalEntries(); + long countOfMatchingEntries = segmentStructureElementsStorage.getNumberOfMatchingEntriesRespectingAuthorization(queryParameter, userAccount); + long totalCount = segmentStructureElementsStorage.getNumberOfTotalEntriesRespectingAuthorization(userAccount); return new DataTableInfo<>(draw, totalCount, countOfMatchingEntries, matchingEntries); } diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/api/EntityStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/api/EntityStorage.java index fe42a3d3..245f0051 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/api/EntityStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/api/EntityStorage.java @@ -20,17 +20,23 @@ public interface EntityStorage<ENTITY_TYPE, FILTER_TYPE, SORTING_FIELD_TYPE exte * @param userAccount used to filter entries by authorization * @return the resulting {@link Stream} */ - Stream<ENTITY_TYPE> getEntriesAsStream(FILTER_TYPE filter, PagingParameter pagingParameter, SortingParameter<SORTING_FIELD_TYPE> sortingParameter, UserAccount userAccount); + Stream<ENTITY_TYPE> getEntriesAsStreamRespectingAuthorization(FILTER_TYPE filter, PagingParameter pagingParameter, SortingParameter<SORTING_FIELD_TYPE> sortingParameter, UserAccount userAccount); /** - * Loads the count of entities matching the specified filters + * Loads the count of entities matching the specified filters which are accessible for the specified * @param filter which the items will match * @return the number of matching entries */ - Long getNumberOfMatchingEntries(FILTER_TYPE filter); + Long getNumberOfMatchingEntriesRespectingAuthorization(FILTER_TYPE filter, UserAccount userAccount); /** * @return the number of total entries inside the storage */ Long getNumberOfTotalEntries(); + + /** + * @param userAccount which will be respected by the query + * @return the number of entries to which the passed user has access to + */ + Long getNumberOfTotalEntriesRespectingAuthorization(UserAccount userAccount); } diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/db/DbStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/db/DbStorage.java index 92671a71..5e204f8e 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/db/DbStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/db/DbStorage.java @@ -1,12 +1,12 @@ package de.bitgilde.TIMAAT.storage.db; import de.bitgilde.TIMAAT.db.DbAccessComponent; -import de.bitgilde.TIMAAT.model.FIPOP.Music; import de.bitgilde.TIMAAT.model.FIPOP.UserAccount; import de.bitgilde.TIMAAT.storage.api.EntityStorage; import de.bitgilde.TIMAAT.storage.api.PagingParameter; import de.bitgilde.TIMAAT.storage.api.SortOrder; import de.bitgilde.TIMAAT.storage.api.SortingParameter; +import jakarta.annotation.Nullable; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaQuery; @@ -63,14 +63,19 @@ public DbStorage(Class<ENTITY_TYPE> entityTypeClass, SORTING_FIELD_TYPE defaultS * @param userAccount used to filter entries by authorization * @return the resulting {@link Stream} */ - public Stream<ENTITY_TYPE> getEntriesAsStream(FILTER_TYPE filter, PagingParameter pagingParameter, SortingParameter<SORTING_FIELD_TYPE> sortingParameter, UserAccount userAccount) { - logger.log(Level.FINER, "Loading music entries matching the specified filter criteria"); + public Stream<ENTITY_TYPE> getEntriesAsStreamRespectingAuthorization(FILTER_TYPE filter, PagingParameter pagingParameter, SortingParameter<SORTING_FIELD_TYPE> sortingParameter, UserAccount userAccount) { + logger.log(Level.FINER, "Loading entries matching the specified filter criteria"); + + if(userAccount == null) { + throw new IllegalArgumentException("user account has to be set for an authorization respecting loading of entities"); + } + return executeStreamDbTransaction(entityManager -> { CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder(); CriteriaQuery<ENTITY_TYPE> criteriaQuery = criteriaBuilder.createQuery(entityTypeClass); Root<ENTITY_TYPE> root = criteriaQuery.from(entityTypeClass); - List<Predicate> predicates = createPredicates(filter, root, criteriaBuilder, criteriaQuery); + List<Predicate> predicates = createPredicates(filter, root, criteriaBuilder, criteriaQuery, userAccount); Order sortOrder = createSortOrder(sortingParameter, root, criteriaBuilder); criteriaQuery.distinct(true); @@ -88,7 +93,8 @@ public Stream<ENTITY_TYPE> getEntriesAsStream(FILTER_TYPE filter, PagingParamete * @param filter which the items will match * @return the number of matching entries */ - public Long getNumberOfMatchingEntries(FILTER_TYPE filter) { + @Override + public Long getNumberOfMatchingEntriesRespectingAuthorization(FILTER_TYPE filter, UserAccount userAccount) { logger.log(Level.FINE, "Loading number of matching music entries"); return executeDbTransaction(entityManager -> { CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder(); @@ -96,7 +102,7 @@ public Long getNumberOfMatchingEntries(FILTER_TYPE filter) { Root<ENTITY_TYPE> root = criteriaQuery.from(entityTypeClass); criteriaQuery.select(criteriaBuilder.countDistinct(root)); - List<Predicate> predicates = createPredicates(filter, root, criteriaBuilder, criteriaQuery); + List<Predicate> predicates = createPredicates(filter, root, criteriaBuilder, criteriaQuery, userAccount); criteriaQuery.where(predicates.toArray(new Predicate[0])); return entityManager.createQuery(criteriaQuery).getSingleResult(); @@ -107,26 +113,44 @@ public Long getNumberOfMatchingEntries(FILTER_TYPE filter) { * @return the number of total entries inside the storage */ public Long getNumberOfTotalEntries() { - logger.log(Level.FINE, "Loading number of total music entries"); + logger.log(Level.FINE, "Loading number of total entries"); + return executeDbTransaction(entityManager -> { + CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder(); + CriteriaQuery<Long> criteriaQuery = criteriaBuilder.createQuery(Long.class); + + Root<?> root = criteriaQuery.from(entityTypeClass); + criteriaQuery.select(criteriaBuilder.countDistinct(root)); + + return entityManager.createQuery(criteriaQuery).getSingleResult(); + }); + } + + public Long getNumberOfTotalEntriesRespectingAuthorization(UserAccount userAccount) { + logger.log(Level.FINE, "Loading number of total entries accessible for user account"); return executeDbTransaction(entityManager -> { CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder(); CriteriaQuery<Long> criteriaQuery = criteriaBuilder.createQuery(Long.class); - Root<?> root = criteriaQuery.from(Music.class); - criteriaQuery.select(criteriaBuilder.count(root)); + Root<ENTITY_TYPE> root = criteriaQuery.from(entityTypeClass); + List<Predicate> predicates = createPredicates(null, root, criteriaBuilder, criteriaQuery, userAccount); + + criteriaQuery.select(criteriaBuilder.countDistinct(root)); + criteriaQuery.where(predicates.toArray(new Predicate[0])); return entityManager.createQuery(criteriaQuery).getSingleResult(); }); } + /** * Creates the {@link Predicate}s to filter entities by the specified filter criteria * @param filter which need to get fulfilled * @param root of the current query * @param criteriaBuilder which can be used the create the {@link Predicate}s + * @param userAccount which can be provided to create filters respecting the authorization * @return a {@link List} of {@link Predicate}s */ - protected abstract List<Predicate> createPredicates(FILTER_TYPE filter, Root<ENTITY_TYPE> root, CriteriaBuilder criteriaBuilder, CriteriaQuery<?> criteriaQuery); + protected abstract List<Predicate> createPredicates(@Nullable FILTER_TYPE filter, Root<ENTITY_TYPE> root, CriteriaBuilder criteriaBuilder, CriteriaQuery<?> criteriaQuery, @Nullable UserAccount userAccount); /** * Creates the {@link Order} to match current defined {@link SortingParameter} diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/actor/ActorStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/actor/ActorStorage.java index bc8f0c15..8e68ddf2 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/actor/ActorStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/actor/ActorStorage.java @@ -23,6 +23,7 @@ import de.bitgilde.TIMAAT.model.FIPOP.CategorySet; import de.bitgilde.TIMAAT.model.FIPOP.CategorySet_; import de.bitgilde.TIMAAT.model.FIPOP.Category_; +import de.bitgilde.TIMAAT.model.FIPOP.UserAccount; import de.bitgilde.TIMAAT.storage.db.DbStorage; import de.bitgilde.TIMAAT.storage.entity.actor.api.ActorFilterCriteria; import de.bitgilde.TIMAAT.storage.entity.actor.api.ActorSortingField; @@ -57,36 +58,39 @@ public ActorStorage(EntityManagerFactory emf) { } @Override - protected List<Predicate> createPredicates(ActorFilterCriteria filter, Root<Actor> root, CriteriaBuilder criteriaBuilder, CriteriaQuery<?> criteriaQuery) { + protected List<Predicate> createPredicates(ActorFilterCriteria filter, Root<Actor> root, CriteriaBuilder criteriaBuilder, CriteriaQuery<?> criteriaQuery, UserAccount userAccount) { List<Predicate> predicates = new ArrayList<>(); - if (filter.getActorNameSearch().isPresent()) { - String searchText = filter.getActorNameSearch().get(); - predicates.add(criteriaBuilder.like(root.get(Actor_.displayName).get(ActorName_.name), "%" + searchText + "%")); - } + if(filter != null){ + if (filter.getActorNameSearch().isPresent()) { + String searchText = filter.getActorNameSearch().get(); + predicates.add(criteriaBuilder.like(root.get(Actor_.displayName).get(ActorName_.name), "%" + searchText + "%")); + } - if (filter.getExcludedAnnotationId().isPresent()) { - Integer excludedAnnotationId = filter.getExcludedAnnotationId().get(); - predicates.add(criteriaBuilder.notEqual(root.get(Actor_.id), excludedAnnotationId)); - } + if (filter.getExcludedAnnotationId().isPresent()) { + Integer excludedAnnotationId = filter.getExcludedAnnotationId().get(); + predicates.add(criteriaBuilder.notEqual(root.get(Actor_.id), excludedAnnotationId)); + } - boolean categoryFilterActive = filter.getCategoryIds().isPresent() && !filter.getCategoryIds().get().isEmpty(); - boolean categorySetFilterActive = filter.getCategorySetIds().isPresent() && !filter.getCategorySetIds().get() - .isEmpty(); + boolean categoryFilterActive = filter.getCategoryIds().isPresent() && !filter.getCategoryIds().get().isEmpty(); + boolean categorySetFilterActive = filter.getCategorySetIds().isPresent() && !filter.getCategorySetIds().get() + .isEmpty(); - if (categoryFilterActive) { - Join<Actor, Category> actorCategoryJoin = root.join(Actor_.categories); - predicates.add(actorCategoryJoin.get(Category_.id).in(filter.getCategoryIds().get())); - } + if (categoryFilterActive) { + Join<Actor, Category> actorCategoryJoin = root.join(Actor_.categories); + predicates.add(actorCategoryJoin.get(Category_.id).in(filter.getCategoryIds().get())); + } - if (categorySetFilterActive) { - Join<Actor, CategorySet> actorCategorySetJoin = root.join(Actor_.categorySets); - predicates.add(actorCategorySetJoin.get(CategorySet_.id).in(filter.getCategorySetIds().get())); - } + if (categorySetFilterActive) { + Join<Actor, CategorySet> actorCategorySetJoin = root.join(Actor_.categorySets); + predicates.add(actorCategorySetJoin.get(CategorySet_.id).in(filter.getCategorySetIds().get())); + } + + if (filter.getActorTypeIds().isPresent() && !filter.getActorTypeIds().get().isEmpty()) { + Join<Actor, ActorType> actorTypeJoin = root.join(Actor_.actorType); + predicates.add(actorTypeJoin.get(ActorType_.id).in(filter.getActorTypeIds().get())); + } - if (filter.getActorTypeIds().isPresent() && !filter.getActorTypeIds().get().isEmpty()) { - Join<Actor, ActorType> actorTypeJoin = root.join(Actor_.actorType); - predicates.add(actorTypeJoin.get(ActorType_.id).in(filter.getActorTypeIds().get())); } return predicates; diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/AnnotationStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/AnnotationStorage.java index ba780396..bf3f63fd 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/AnnotationStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/annotation/AnnotationStorage.java @@ -23,6 +23,9 @@ import de.bitgilde.TIMAAT.model.FIPOP.SvgShapeType; import de.bitgilde.TIMAAT.model.FIPOP.Tag; import de.bitgilde.TIMAAT.model.FIPOP.UserAccount; +import de.bitgilde.TIMAAT.model.FIPOP.UserAccountHasMediumAnalysisList; +import de.bitgilde.TIMAAT.model.FIPOP.UserAccountHasMediumAnalysisList_; +import de.bitgilde.TIMAAT.model.FIPOP.UserAccount_; import de.bitgilde.TIMAAT.model.IndexBasedRange; import de.bitgilde.TIMAAT.storage.db.DbStorage; import de.bitgilde.TIMAAT.storage.entity.TagStorage; @@ -285,65 +288,82 @@ public Annotation getAnnotationById(int annotationId) throws DbTransactionExecut } @Override - protected List<Predicate> createPredicates(AnnotationFilterCriteria filter, Root<Annotation> root, CriteriaBuilder criteriaBuilder, CriteriaQuery<?> criteriaQuery) { + protected List<Predicate> createPredicates(AnnotationFilterCriteria filter, Root<Annotation> root, CriteriaBuilder criteriaBuilder, CriteriaQuery<?> criteriaQuery, UserAccount userAccount) { List<Predicate> predicates = new ArrayList<>(); - if (filter.getAnnotationNameSearch().isPresent() && !filter.getAnnotationNameSearch().get().isBlank()) { - String annotationNameSearch = filter.getAnnotationNameSearch().get(); - Join<Annotation, AnnotationTranslation> annotationTranslationJoin = root.join(Annotation_.annotationTranslations); + if (filter != null) { + if (filter.getAnnotationNameSearch().isPresent() && !filter.getAnnotationNameSearch().get().isBlank()) { + String annotationNameSearch = filter.getAnnotationNameSearch().get(); + Join<Annotation, AnnotationTranslation> annotationTranslationJoin = root.join( + Annotation_.annotationTranslations); - predicates.add(criteriaBuilder.like(annotationTranslationJoin.get(AnnotationTranslation_.title), - "%" + annotationNameSearch + "%")); - } - - if (filter.getMediumAnalysisListIds().isPresent() && !filter.getMediumAnalysisListIds().get().isEmpty()) { - predicates.add(root.get(Annotation_.mediumAnalysisList).get(MediumAnalysisList_.id) - .in(filter.getMediumAnalysisListIds().get())); - } - - boolean categoryFilterActive = filter.getCategoryIds().isPresent() && !filter.getCategoryIds().get().isEmpty(); - boolean categorySetFilterActive = filter.getCategorySetIds().isPresent() && !filter.getCategorySetIds().get() - .isEmpty(); - boolean hasCategoryFilterActive = filter.hasCategories().isPresent(); + predicates.add(criteriaBuilder.like(annotationTranslationJoin.get(AnnotationTranslation_.title), + "%" + annotationNameSearch + "%")); + } - if (categoryFilterActive || hasCategoryFilterActive) { - Join<Annotation, Category> categoryJoin = root.join(Annotation_.categories, JoinType.LEFT); + if (filter.getMediumAnalysisListIds().isPresent() && !filter.getMediumAnalysisListIds().get().isEmpty()) { + predicates.add(root.get(Annotation_.mediumAnalysisList).get(MediumAnalysisList_.id) + .in(filter.getMediumAnalysisListIds().get())); + } - if (hasCategoryFilterActive) { - if (filter.hasCategories().get()) { - predicates.add(categoryJoin.get(Category_.id).isNotNull()); + boolean categoryFilterActive = filter.getCategoryIds().isPresent() && !filter.getCategoryIds().get().isEmpty(); + boolean categorySetFilterActive = filter.getCategorySetIds().isPresent() && !filter.getCategorySetIds().get() + .isEmpty(); + boolean hasCategoryFilterActive = filter.hasCategories().isPresent(); + + if (categoryFilterActive || hasCategoryFilterActive) { + Join<Annotation, Category> categoryJoin = root.join(Annotation_.categories, JoinType.LEFT); + + if (hasCategoryFilterActive) { + if (filter.hasCategories().get()) { + predicates.add(categoryJoin.get(Category_.id).isNotNull()); + } + else { + predicates.add(categoryJoin.get(Category_.id).isNull()); + } } - else { - predicates.add(categoryJoin.get(Category_.id).isNull()); + + if (categoryFilterActive) { + predicates.add(categoryJoin.get(Category_.id).in(filter.getCategoryIds().get())); } } - if (categoryFilterActive) { - predicates.add(categoryJoin.get(Category_.id).in(filter.getCategoryIds().get())); + + if (categorySetFilterActive) { + Join<MediumAnalysisList, CategorySet> categorySetJoin = root.join(Annotation_.mediumAnalysisList) + .join(MediumAnalysisList_.categorySets); + predicates.add(categorySetJoin.get(CategorySet_.id).in(filter.getCategorySetIds().get())); } - } + if (filter.getAnnotationTypes().isPresent() && !filter.getAnnotationTypes().get().isEmpty()) { + List<Predicate> typePredicates = new ArrayList<>(); + for (AnnotationType annotationType : filter.getAnnotationTypes().get()) { + if (AnnotationType.VIDEO.equals(annotationType)) { + typePredicates.add(criteriaBuilder.equal(root.get(Annotation_.layerVisual), true)); + } + if (AnnotationType.AUDIO.equals(annotationType)) { + typePredicates.add(criteriaBuilder.equal(root.get(Annotation_.layerAudio), true)); + } + } - if (categorySetFilterActive) { - Join<MediumAnalysisList, CategorySet> categorySetJoin = root.join(Annotation_.mediumAnalysisList) - .join(MediumAnalysisList_.categorySets); - predicates.add(categorySetJoin.get(CategorySet_.id).in(filter.getCategorySetIds().get())); + predicates.add(criteriaBuilder.or(typePredicates.toArray(new Predicate[0]))); + } } - if (filter.getAnnotationTypes().isPresent() && !filter.getAnnotationTypes().get().isEmpty()) { - List<Predicate> typePredicates = new ArrayList<>(); - for (AnnotationType annotationType : filter.getAnnotationTypes().get()) { - if (AnnotationType.VIDEO.equals(annotationType)) { - typePredicates.add(criteriaBuilder.equal(root.get(Annotation_.layerVisual), true)); - } - if (AnnotationType.AUDIO.equals(annotationType)) { - typePredicates.add(criteriaBuilder.equal(root.get(Annotation_.layerAudio), true)); - } - } + if (userAccount != null) { + Join<Annotation, MediumAnalysisList> mediumAnalysisListJoin = root.join(Annotation_.mediumAnalysisList); + Join<MediumAnalysisList, UserAccountHasMediumAnalysisList> userAccountHasMediumAnalysisList = mediumAnalysisListJoin.join( + MediumAnalysisList_.userAccountHasMediumAnalysisLists); + Join<UserAccountHasMediumAnalysisList, UserAccount> userAccountJoin = userAccountHasMediumAnalysisList.join( + UserAccountHasMediumAnalysisList_.userAccount); - predicates.add(criteriaBuilder.or(typePredicates.toArray(new Predicate[0]))); - } + Predicate mediumAnalysisListHasGlobalAccess = criteriaBuilder.greaterThanOrEqualTo( + mediumAnalysisListJoin.get(MediumAnalysisList_.globalPermission), (byte) 1); + Predicate userHasAccess = criteriaBuilder.equal(userAccountJoin.get(UserAccount_.id), userAccount.getId()); + + predicates.add(criteriaBuilder.or(mediumAnalysisListHasGlobalAccess, userHasAccess)); + } return predicates; } diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/MediumStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/MediumStorage.java index 28d80380..dfd20304 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/MediumStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/MediumStorage.java @@ -12,6 +12,7 @@ import de.bitgilde.TIMAAT.model.FIPOP.Medium_; import de.bitgilde.TIMAAT.model.FIPOP.Music; import de.bitgilde.TIMAAT.model.FIPOP.Title_; +import de.bitgilde.TIMAAT.model.FIPOP.UserAccount; import de.bitgilde.TIMAAT.model.TimeRange; import de.bitgilde.TIMAAT.storage.db.DbStorage; import de.bitgilde.TIMAAT.storage.entity.medium.api.MediumFilterCriteria; @@ -96,33 +97,35 @@ public List<MediumHasMusic> updateMediumHasMusicList(int mediumId, Map<Integer, } @Override - protected List<Predicate> createPredicates(MediumFilterCriteria filter, Root<Medium> root, CriteriaBuilder criteriaBuilder, CriteriaQuery<?> criteriaQuery) { + protected List<Predicate> createPredicates(MediumFilterCriteria filter, Root<Medium> root, CriteriaBuilder criteriaBuilder, CriteriaQuery<?> criteriaQuery, UserAccount userAccount) { List<Predicate> predicates = new ArrayList<>(); - if (filter.getMediumNameSearch().isPresent()) { - String searchText = filter.getMediumNameSearch().get(); - predicates.add(criteriaBuilder.like(root.get(Medium_.displayTitle).get(Title_.name), "%" + searchText + "%")); - } + if(filter != null) { + if (filter.getMediumNameSearch().isPresent()) { + String searchText = filter.getMediumNameSearch().get(); + predicates.add(criteriaBuilder.like(root.get(Medium_.displayTitle).get(Title_.name), "%" + searchText + "%")); + } - if (filter.getCategoryIds().isPresent() && !filter.getCategoryIds().get().isEmpty()) { - Collection<Integer> categoryIds = filter.getCategoryIds().get(); - Join<Medium, Category> categoryJoin = root.join(Medium_.categories); + if (filter.getCategoryIds().isPresent() && !filter.getCategoryIds().get().isEmpty()) { + Collection<Integer> categoryIds = filter.getCategoryIds().get(); + Join<Medium, Category> categoryJoin = root.join(Medium_.categories); - predicates.add(categoryJoin.get(Category_.id).in(categoryIds)); - } + predicates.add(categoryJoin.get(Category_.id).in(categoryIds)); + } - if (filter.getCategorySetIds().isPresent() && !filter.getCategorySetIds().get().isEmpty()) { - Collection<Integer> categorySetIds = filter.getCategorySetIds().get(); - Join<Medium, CategorySet> categorySetJoin = root.join(Medium_.categorySets); + if (filter.getCategorySetIds().isPresent() && !filter.getCategorySetIds().get().isEmpty()) { + Collection<Integer> categorySetIds = filter.getCategorySetIds().get(); + Join<Medium, CategorySet> categorySetJoin = root.join(Medium_.categorySets); - predicates.add(categorySetJoin.get(CategorySet_.id).in(categorySetIds)); - } + predicates.add(categorySetJoin.get(CategorySet_.id).in(categorySetIds)); + } - if (filter.getMediaTypeIds().isPresent() && !filter.getMediaTypeIds().get().isEmpty()) { - Collection<Integer> mediaTypeIds = filter.getMediaTypeIds().get(); - Join<Medium, MediaType> mediaTypeJoin = root.join(Medium_.mediaType); + if (filter.getMediaTypeIds().isPresent() && !filter.getMediaTypeIds().get().isEmpty()) { + Collection<Integer> mediaTypeIds = filter.getMediaTypeIds().get(); + Join<Medium, MediaType> mediaTypeJoin = root.join(Medium_.mediaType); - predicates.add(mediaTypeJoin.get(MediaType_.id).in(mediaTypeIds)); + predicates.add(mediaTypeJoin.get(MediaType_.id).in(mediaTypeIds)); + } } return predicates; diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/music/MusicStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/music/MusicStorage.java index 72edb2a5..8117ca23 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/music/MusicStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/music/MusicStorage.java @@ -82,37 +82,40 @@ public MusicStorage(EntityManagerFactory emf, TagStorage tagStorage) { this.tagStorage = tagStorage; } - - protected List<Predicate> createPredicates(MusicFilterCriteria filter, Root<Music> root, CriteriaBuilder criteriaBuilder, CriteriaQuery<?> criteriaQuery) { + @Override + protected List<Predicate> createPredicates(MusicFilterCriteria filter, Root<Music> root, CriteriaBuilder criteriaBuilder, CriteriaQuery<?> criteriaQuery, UserAccount userAccount) { List<Predicate> predicates = new ArrayList<>(); - if (filter.getMusicNameSearch().isPresent()) { - String musicNameSearchText = filter.getMusicNameSearch().get(); - predicates.add( - criteriaBuilder.like(root.get(Music_.displayTitle).get(Title_.name), "%" + musicNameSearchText + "%")); - } + if(filter != null) { + if (filter.getMusicNameSearch().isPresent()) { + String musicNameSearchText = filter.getMusicNameSearch().get(); + predicates.add( + criteriaBuilder.like(root.get(Music_.displayTitle).get(Title_.name), "%" + musicNameSearchText + "%")); + } - if (filter.getCategoryIds().isPresent() && !filter.getCategoryIds().get().isEmpty()) { - Collection<Integer> categoryIds = filter.getCategoryIds().get(); - Join<Music, Category> categoryJoin = root.join(Music_.categories); + if (filter.getCategoryIds().isPresent() && !filter.getCategoryIds().get().isEmpty()) { + Collection<Integer> categoryIds = filter.getCategoryIds().get(); + Join<Music, Category> categoryJoin = root.join(Music_.categories); - predicates.add(categoryJoin.get(Category_.id).in(categoryIds)); - } + predicates.add(categoryJoin.get(Category_.id).in(categoryIds)); + } - if (filter.getCategorySetIds().isPresent() && !filter.getCategorySetIds().get().isEmpty()) { - Collection<Integer> categorySetIds = filter.getCategorySetIds().get(); - Join<Music, CategorySet> categorySetJoin = root.join(Music_.categorySets); + if (filter.getCategorySetIds().isPresent() && !filter.getCategorySetIds().get().isEmpty()) { + Collection<Integer> categorySetIds = filter.getCategorySetIds().get(); + Join<Music, CategorySet> categorySetJoin = root.join(Music_.categorySets); - predicates.add(categorySetJoin.get(CategorySet_.id).in(categorySetIds)); - } + predicates.add(categorySetJoin.get(CategorySet_.id).in(categorySetIds)); + } - if (filter.getMusicTypeIds().isPresent() && !filter.getMusicTypeIds().get().isEmpty()) { - Collection<Integer> musicTypeIds = filter.getMusicTypeIds().get(); - Join<Music, MusicType> musicTypeJoin = root.join(Music_.musicType); + if (filter.getMusicTypeIds().isPresent() && !filter.getMusicTypeIds().get().isEmpty()) { + Collection<Integer> musicTypeIds = filter.getMusicTypeIds().get(); + Join<Music, MusicType> musicTypeJoin = root.join(Music_.musicType); - predicates.add(musicTypeJoin.get(MusicType_.id).in(musicTypeIds)); + predicates.add(musicTypeJoin.get(MusicType_.id).in(musicTypeIds)); + } } + return predicates; } diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/SegmentStructureElementsStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/SegmentStructureElementsStorage.java index 274b4322..c3cf51c4 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/SegmentStructureElementsStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/segment/SegmentStructureElementsStorage.java @@ -16,6 +16,10 @@ import de.bitgilde.TIMAAT.model.FIPOP.MediumAnalysisList; import de.bitgilde.TIMAAT.model.FIPOP.MediumAnalysisList_; import de.bitgilde.TIMAAT.model.FIPOP.SegmentStructureEntity; +import de.bitgilde.TIMAAT.model.FIPOP.UserAccount; +import de.bitgilde.TIMAAT.model.FIPOP.UserAccountHasMediumAnalysisList; +import de.bitgilde.TIMAAT.model.FIPOP.UserAccountHasMediumAnalysisList_; +import de.bitgilde.TIMAAT.model.FIPOP.UserAccount_; import de.bitgilde.TIMAAT.storage.db.DbStorage; import de.bitgilde.TIMAAT.storage.entity.segment.api.SegmentStructureElementFilterCriteria; import de.bitgilde.TIMAAT.storage.entity.segment.api.SegmentStructureElementType; @@ -75,10 +79,9 @@ public List<Category> updateCategories(int segmentStructureId, SegmentStructureE public MediumAnalysisList getMediumAnalysisListOfSegmentStructureElement(SegmentStructureElementType segmentStructureElementType, int segmentStructureId) { return executeDbTransaction(entityManager -> entityManager.createQuery( - "select mediumAnalysisList from AnalysisSegmentStructureElement segmentStructureElement join segmentStructureElement.mediumAnalysisList mediumAnalysisList where segmentStructureElement.id.id = :id and segmentStructureElement.id.structureElementType = :type", - MediumAnalysisList.class).setParameter("id", segmentStructureId) - .setParameter("type", segmentStructureElementType.toString()) - .getSingleResult()); + "select mediumAnalysisList from AnalysisSegmentStructureElement segmentStructureElement join segmentStructureElement.mediumAnalysisList mediumAnalysisList where segmentStructureElement.id.id = :id and segmentStructureElement.id.structureElementType = :type", + MediumAnalysisList.class).setParameter("id", segmentStructureId).setParameter("type", + segmentStructureElementType.toString()).getSingleResult()); } public List<Category> getAssignedCategories(int segmentStructureId, SegmentStructureElementType segmentStructureElementType) { @@ -102,36 +105,53 @@ public List<Category> getAssignableCategories(int segmentStructureId, SegmentStr } @Override - protected List<Predicate> createPredicates(SegmentStructureElementFilterCriteria filter, Root<AnalysisSegmentStructureElement> root, CriteriaBuilder criteriaBuilder, CriteriaQuery<?> criteriaQuery) { + protected List<Predicate> createPredicates(SegmentStructureElementFilterCriteria filter, Root<AnalysisSegmentStructureElement> root, CriteriaBuilder criteriaBuilder, CriteriaQuery<?> criteriaQuery, UserAccount userAccount) { List<Predicate> predicates = new ArrayList<>(); - if (filter.getSegmentStructureElementNameSearch().isPresent()) { - String searchText = filter.getSegmentStructureElementNameSearch().get(); - predicates.add(criteriaBuilder.like(root.get(AnalysisSegmentStructureElement_.name), "%" + searchText + "%")); + if (filter != null) { + if (filter.getSegmentStructureElementNameSearch().isPresent()) { + String searchText = filter.getSegmentStructureElementNameSearch().get(); + predicates.add(criteriaBuilder.like(root.get(AnalysisSegmentStructureElement_.name), "%" + searchText + "%")); + } + + boolean categoryFilterActive = filter.getCategoryIds().isPresent() && !filter.getCategoryIds().get().isEmpty(); + if (categoryFilterActive) { + Join<AnalysisSegmentStructureElement, Category> categoryJoin = root.join( + AnalysisSegmentStructureElement_.categories); + predicates.add(categoryJoin.get(Category_.id).in(filter.getCategoryIds().get())); + } + + boolean categorySetFilterActive = filter.getCategorySetIds().isPresent() && !filter.getCategorySetIds().get() + .isEmpty(); + if (categorySetFilterActive) { + Join<AnalysisSegmentStructureElement, MediumAnalysisList> mediumAnalysisListJoin = root.join( + AnalysisSegmentStructureElement_.mediumAnalysisList); + Join<MediumAnalysisList, CategorySet> categorySetJoin = mediumAnalysisListJoin.join( + MediumAnalysisList_.categorySets); + predicates.add(categorySetJoin.get(CategorySet_.id).in(filter.getCategorySetIds().get())); + } + + if (filter.getSegmentStructureElementTypes().isPresent() && !filter.getSegmentStructureElementTypes().get() + .isEmpty()) { + predicates.add(root.get(AnalysisSegmentStructureElement_.id) + .get(AnalysisSegmentStructureElementId_.structureElementType) + .in(filter.getSegmentStructureElementTypes().get())); + } } - boolean categoryFilterActive = filter.getCategoryIds().isPresent() && !filter.getCategoryIds().get().isEmpty(); - if (categoryFilterActive) { - Join<AnalysisSegmentStructureElement, Category> categoryJoin = root.join( - AnalysisSegmentStructureElement_.categories); - predicates.add(categoryJoin.get(Category_.id).in(filter.getCategoryIds().get())); - } - - boolean categorySetFilterActive = filter.getCategorySetIds().isPresent() && !filter.getCategorySetIds().get() - .isEmpty(); - if (categorySetFilterActive) { + if (userAccount != null) { Join<AnalysisSegmentStructureElement, MediumAnalysisList> mediumAnalysisListJoin = root.join( AnalysisSegmentStructureElement_.mediumAnalysisList); - Join<MediumAnalysisList, CategorySet> categorySetJoin = mediumAnalysisListJoin.join( - MediumAnalysisList_.categorySets); - predicates.add(categorySetJoin.get(CategorySet_.id).in(filter.getCategorySetIds().get())); - } + Join<MediumAnalysisList, UserAccountHasMediumAnalysisList> userAccountHasMediumAnalysisList = mediumAnalysisListJoin.join( + MediumAnalysisList_.userAccountHasMediumAnalysisLists); + Join<UserAccountHasMediumAnalysisList, UserAccount> userAccountJoin = userAccountHasMediumAnalysisList.join( + UserAccountHasMediumAnalysisList_.userAccount); + + Predicate mediumAnalysisListHasGlobalAccess = criteriaBuilder.greaterThanOrEqualTo( + mediumAnalysisListJoin.get(MediumAnalysisList_.globalPermission), (byte) 1); + Predicate userHasAccess = criteriaBuilder.equal(userAccountJoin.get(UserAccount_.id), userAccount.getId()); - if (filter.getSegmentStructureElementTypes().isPresent() && !filter.getSegmentStructureElementTypes().get() - .isEmpty()) { - predicates.add( - root.get(AnalysisSegmentStructureElement_.id).get(AnalysisSegmentStructureElementId_.structureElementType) - .in(filter.getSegmentStructureElementTypes().get())); + predicates.add(criteriaBuilder.or(mediumAnalysisListHasGlobalAccess, userHasAccess)); } return predicates; From 403a3258b0b7a7f3de4ecc415eea05108e0ba536 Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Tue, 13 Jan 2026 10:39:54 +0100 Subject: [PATCH 37/70] TIMAAT Weiterentwicklung #9 - Configurable search field for generic tables * Added parameter describing if a search field should be shown for a table --- src/main/webapp/js/datasets/timaat.categories.js | 4 ++-- src/main/webapp/js/ui/timaat.table.js | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/js/datasets/timaat.categories.js b/src/main/webapp/js/datasets/timaat.categories.js index 18c64456..4289b833 100644 --- a/src/main/webapp/js/datasets/timaat.categories.js +++ b/src/main/webapp/js/datasets/timaat.categories.js @@ -461,7 +461,7 @@ } const imageThumbnailGeneratorFunction = async (row) => { - const annotationThumbnailBlob = await TIMAAT.AnnotationService.getAnnotationThumbnailBlob(row.id) + const annotationThumbnailBlob = await TIMAAT.AnnotationService.getAnnotationThumbnailBlob(row.id) return URL.createObjectURL(annotationThumbnailBlob) } @@ -474,7 +474,7 @@ new TIMAAT.Table.ImageDownloadTableColumnConfig("thumbnail", "Thumbnail", imageThumbnailGeneratorFunction)] const activeColumnIds = ["thumbnail", "id", "startTime", "endTime", "layerAudio", "layerVisual", "actions"] - const annotationTable = new TIMAAT.Table.Table("categoriesAnnotationTable", "#categoriesAnnotationTableContainer", columns, activeColumnIds, "api/annotation/list", true, false) + const annotationTable = new TIMAAT.Table.Table("categoriesAnnotationTable", "#categoriesAnnotationTableContainer", columns, activeColumnIds, "api/annotation/list", true, false, new URLSearchParams(), false) $('#annotationTableCollapse').on('shown.bs.collapse', (event) => { annotationTable.resizeToParent() diff --git a/src/main/webapp/js/ui/timaat.table.js b/src/main/webapp/js/ui/timaat.table.js index 056ded7a..c68f4962 100644 --- a/src/main/webapp/js/ui/timaat.table.js +++ b/src/main/webapp/js/ui/timaat.table.js @@ -269,8 +269,9 @@ _reorderableColumns _urlSearchParams _dataTable = null; + _searchable; - constructor(tableId, containerSelector, tableColumnConfigs, defaultActiveTableColumnConfigs, dataUrl, reorderableColumns = true, active = true, urlSearchParams = new URLSearchParams()) { + constructor(tableId, containerSelector, tableColumnConfigs, defaultActiveTableColumnConfigs, dataUrl, reorderableColumns = true, active = true, urlSearchParams = new URLSearchParams(), searchable = true) { this._tableColumnConfigsById = new Map() for (let tableColumnConfig of tableColumnConfigs) { this._tableColumnConfigsById.set(tableColumnConfig.id, tableColumnConfig); @@ -282,6 +283,7 @@ this._reorderableColumns = reorderableColumns; this._active = active this._urlSearchParams = urlSearchParams + this._searchable = searchable this.draw() } @@ -391,6 +393,7 @@ "pagingType": "full", "dom": '<lf<t>ip>', "processing": true, + "searching": this._searchable, "stateSave": true, "scrollX": true, "serverSide": true, From 88c9f047d182cc44655c2b2edc4fdf85588cb521 Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Tue, 13 Jan 2026 10:52:41 +0100 Subject: [PATCH 38/70] TIMAAT Weiterentwicklung #9 - Updated generic table representation to match application style * Updated paging button representation * Updated info text --- src/main/webapp/js/ui/timaat.table.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/webapp/js/ui/timaat.table.js b/src/main/webapp/js/ui/timaat.table.js index c68f4962..c2d705d2 100644 --- a/src/main/webapp/js/ui/timaat.table.js +++ b/src/main/webapp/js/ui/timaat.table.js @@ -421,6 +421,16 @@ self._dataTable?.colReorder.reset() } }, + "language": { + info: "Page _PAGE_ of _PAGES_ ( _TOTAL_ total entries)", + infoFiltered: "", + paginate : { + "first" : "<<", + "previous": "<", + "next" : ">", + "last" : ">>" + } + }, "columns": columnConfigs }) From 25afede24e0244bbd2fab8e46e83c04b2dfd3569 Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Tue, 13 Jan 2026 11:00:12 +0100 Subject: [PATCH 39/70] TIMAAT Weiterentwicklung #9 - Fixed bug leading to a hiding of save and cancel button on forms for editing and adding categories/category sets --- src/main/webapp/js/datasets/timaat.categories.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/webapp/js/datasets/timaat.categories.js b/src/main/webapp/js/datasets/timaat.categories.js index 4289b833..c6fddc82 100644 --- a/src/main/webapp/js/datasets/timaat.categories.js +++ b/src/main/webapp/js/datasets/timaat.categories.js @@ -527,6 +527,8 @@ showAddCategoryPanel() { $('.categoriesRightPanelContent').hide() + $('.formSubmitButton').show() + $('.formDismissButton').show() const $categoryCreateChangeForm = $('#categoryCreateChangeForm') TIMAAT.Categories.resetCategoryCreateChangeFormState($categoryCreateChangeForm) @@ -609,6 +611,8 @@ showAddCategorySetPanel() { $('.categoriesRightPanelContent').hide() + $('.formSubmitButton').show() + $('.formDismissButton').show() const $categorySetCreateChangeForm = $('#categorySetCreateChangeForm') TIMAAT.Categories.resetCategorySetCreateChangeFormState($categorySetCreateChangeForm) @@ -638,6 +642,8 @@ showEditCategorySetPanel(categorySet) { $('.categoriesRightPanelContent').hide() + $('.formSubmitButton').show() + $('.formDismissButton').show() const $categorySetCreateChangeForm = $('#categorySetCreateChangeForm') TIMAAT.Categories.resetCategorySetCreateChangeFormState($categorySetCreateChangeForm) @@ -681,6 +687,8 @@ }, showEditCategoryPanel(category) { $('.categoriesRightPanelContent').hide() + $('.formSubmitButton').show() + $('.formDismissButton').show() const $categoryCreateChangeForm = $('#categoryCreateChangeForm') TIMAAT.Categories.resetCategoryCreateChangeFormState($categoryCreateChangeForm) From a690885225d1d32a51f7e598e76f243ca01686a0 Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Tue, 13 Jan 2026 11:14:04 +0100 Subject: [PATCH 40/70] TIMAAT Weiterentwicklung #9 - Fixed bug leading to not selectable audio annotations * Increased z-index of audio annotations * Increased z-index of timeline marker --- src/main/webapp/css/timaat.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/css/timaat.css b/src/main/webapp/css/timaat.css index 48d36178..ca641ddf 100644 --- a/src/main/webapp/css/timaat.css +++ b/src/main/webapp/css/timaat.css @@ -184,7 +184,7 @@ .timeline__position-indicator { position: absolute; - z-index: 100; + z-index: 2500; margin-left: 0; height: 100%; width: 1px; @@ -355,7 +355,7 @@ } .timeline__marker { - z-index: 500; + z-index: 2000; } .inspectorMusicPaneLinkedMusicPane { From fd6868b38a5602aff5294cba40ac6ef8600c98de Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Tue, 13 Jan 2026 11:41:40 +0100 Subject: [PATCH 41/70] TIMAAT Weiterentwicklung #9 - Fixed titles in form --- src/main/webapp/js/datasets/timaat.datasets.music.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/js/datasets/timaat.datasets.music.js b/src/main/webapp/js/datasets/timaat.datasets.music.js index b345730a..ba9dd716 100644 --- a/src/main/webapp/js/datasets/timaat.datasets.music.js +++ b/src/main/webapp/js/datasets/timaat.datasets.music.js @@ -687,9 +687,9 @@ return false; if (title != '' && languageId != null) { var titlesInForm = $('#musicFormTitles').serializeArray(); - // console.log("TCL: titlesInForm", titlesInForm); + var numberOfTitleElements = 2; - var indexName = titlesInForm[titlesInForm.length-numberOfTitleElements-1].name; // find last used indexed name + var indexName = titlesInForm[titlesInForm.length-numberOfTitleElements].name; // find last used indexed name var indexString = indexName.substring(indexName.lastIndexOf("[") + 1, indexName.lastIndexOf("]")); var i = Number(indexString)+1; // console.log("i", i); From 2cf9347ee5f671c4a8bf08c12ee55fd1832caca7 Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Tue, 13 Jan 2026 11:45:25 +0100 Subject: [PATCH 42/70] TIMAAT Weiterentwicklung #9 - Fixed used query parameter to filter by type in datatables representing music of a specific type --- src/main/webapp/js/datasets/timaat.datasets.music.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/js/datasets/timaat.datasets.music.js b/src/main/webapp/js/datasets/timaat.datasets.music.js index ba9dd716..9fac7898 100644 --- a/src/main/webapp/js/datasets/timaat.datasets.music.js +++ b/src/main/webapp/js/datasets/timaat.datasets.music.js @@ -3923,7 +3923,7 @@ length : data.length, orderby: data.columns[data.order[0].column].name, dir : data.order[0].dir, - musicTypeId : 1 + musicTypeIds : 1 } if ( data.search && data.search.value && data.search.value.length > 0 ) serverData.search = data.search.value; @@ -4060,7 +4060,7 @@ length : data.length, orderby: data.columns[data.order[0].column].name, dir : data.order[0].dir, - musicTypeId: 2 + musicTypeIds: 2 } if ( data.search && data.search.value && data.search.value.length > 0 ) serverData.search = data.search.value; From 1092dcab8b576d163b536bdbf437c45b47060c0c Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Tue, 13 Jan 2026 12:03:47 +0100 Subject: [PATCH 43/70] TIMAAT Weiterentwicklung #9 - Fixed dependency bug --- src/main/webapp/js/timaat.init.js | 461 +++++++++++++++--------------- 1 file changed, 234 insertions(+), 227 deletions(-) diff --git a/src/main/webapp/js/timaat.init.js b/src/main/webapp/js/timaat.init.js index 062b817f..91c15f6d 100644 --- a/src/main/webapp/js/timaat.init.js +++ b/src/main/webapp/js/timaat.init.js @@ -1,244 +1,251 @@ requirejs.config({ - baseUrl: 'js', - paths: { - "argon2" : '../third-party/argon2/argon2-asm.min', - "jquery" : '../third-party/jquery/jquery.min', - "jquery-ui" : '../third-party/jquery/plugins/jquery-ui/jquery-ui.min', - "jquery-validate" : '../third-party/jquery/plugins/jquery.validate', - "jquery-datetime" : '../third-party/jquery/plugins/jquery-datetimepicker/jquery.datetimepicker.full', - "jquery-mousewheel" : '../third-party/jquery/plugins/jquery-mousewheel', - "jquery-tinycolorpicker" : '../third-party/tinycolorpicker/jquery.tinycolorpicker', - "jquery-dropzone" : '../third-party/dropzone/dropzone', - "bootstrap" : '../third-party/bootstrap/js/bootstrap.bundle.min', - "datatables" : '../third-party/datatables/datatables.min', - "datatables.net" : '../third-party/datatables/DataTables-1.11.5/js/jquery.dataTables', - "datatables.net-bs" : '../third-party/datatables/DataTables-1.11.5/js/dataTables.bootstrap', + baseUrl: 'js', + paths: { + "argon2" : '../third-party/argon2/argon2-asm.min', + "jquery" : '../third-party/jquery/jquery.min', + "jquery-ui" : '../third-party/jquery/plugins/jquery-ui/jquery-ui.min', + "jquery-validate" : '../third-party/jquery/plugins/jquery.validate', + "jquery-datetime" : '../third-party/jquery/plugins/jquery-datetimepicker/jquery.datetimepicker.full', + "jquery-mousewheel" : '../third-party/jquery/plugins/jquery-mousewheel', + "jquery-tinycolorpicker" : '../third-party/tinycolorpicker/jquery.tinycolorpicker', + "jquery-dropzone" : '../third-party/dropzone/dropzone', + "bootstrap" : '../third-party/bootstrap/js/bootstrap.bundle.min', + "datatables" : '../third-party/datatables/datatables.min', + "datatables.net" : '../third-party/datatables/DataTables-1.11.5/js/jquery.dataTables', + "datatables.net-bs" : '../third-party/datatables/DataTables-1.11.5/js/dataTables.bootstrap', "datatables.net-bs4" : '../third-party/datatables/DataTables-1.11.5/js/dataTables.bootstrap4', "datatables.net-responsive" : '../third-party/datatables/Responsive-2.2.9/js/dataTables.responsive', "datatables.select" : '../third-party/datatables/Select-1.3.4/js/dataTables.select', "datatables.col-reorder" : '../third-party/datatables/ColReorder-1.5.2/js/colReorder.dataTables', - "domReady" : '../third-party/requirejs/domReady', - "moment" : '../third-party/moment/moment-with-locales', - "leaflet" : '../third-party/leaflet/leaflet', - "leaflet-editable" : '../third-party/leaflet/plugins/Leaflet.Editable/src/Leaflet.Editable', - "leaflet-pathdrag" : '../third-party/leaflet/plugins/Path.Drag.js/src/Path.Drag', - "leaflet-pathtransform" : '../third-party/leaflet/plugins/Path.Transform.js/L.Path.Transform', - "leaflet-customcontrol" : '../third-party/leaflet/plugins/Leaflet.Control.Custom/Leaflet.Control.Custom', - "leaflet-sidebar" : '../third-party/leaflet/plugins/leaflet-sidebar-v2/js/leaflet-sidebar.min', - "popper" : '../third-party/popper/popper.min', - "select2" : '../third-party/select2/js/select2.min', - "summernote" : '../third-party/summernote/summernote.min', - "wavesurfer" : '../third-party/wavesurferjs/wavesurfer.min', + "domReady" : '../third-party/requirejs/domReady', + "moment" : '../third-party/moment/moment-with-locales', + "leaflet" : '../third-party/leaflet/leaflet', + "leaflet-editable" : '../third-party/leaflet/plugins/Leaflet.Editable/src/Leaflet.Editable', + "leaflet-pathdrag" : '../third-party/leaflet/plugins/Path.Drag.js/src/Path.Drag', + "leaflet-pathtransform" : '../third-party/leaflet/plugins/Path.Transform.js/L.Path.Transform', + "leaflet-customcontrol" : '../third-party/leaflet/plugins/Leaflet.Control.Custom/Leaflet.Control.Custom', + "leaflet-sidebar" : '../third-party/leaflet/plugins/leaflet-sidebar-v2/js/leaflet-sidebar.min', + "popper" : '../third-party/popper/popper.min', + "select2" : '../third-party/select2/js/select2.min', + "summernote" : '../third-party/summernote/summernote.min', + "wavesurfer" : '../third-party/wavesurferjs/wavesurfer.min', "eventsource" : '../third-party/eventsource/eventsource.min', - "TIMAAT" : 'timaat.main', - "TIMAAT-entityupdate" : 'timaat.entityupdate', - "TIMAAT-html" : 'timaat.html', - "TIMAAT-URLHistory" : 'timaat.url', - "TIMAAT-ui" : 'ui/timaat.ui', - "TIMAAT-ui-inspector" : 'ui/timaat.inspector', - "TIMAAT-ui-timeline" : 'ui/timaat.timeline', + "TIMAAT" : 'timaat.main', + "TIMAAT-entityupdate" : 'timaat.entityupdate', + "TIMAAT-html" : 'timaat.html', + "TIMAAT-URLHistory" : 'timaat.url', + "TIMAAT-ui" : 'ui/timaat.ui', + "TIMAAT-ui-inspector" : 'ui/timaat.inspector', + "TIMAAT-ui-timeline" : 'ui/timaat.timeline', "TIMAAT-ui-table" : 'ui/timaat.table', - "TIMAAT-uploadManager" : 'components/timaat.uploadmanager', - "TIMAAT-videoPlayer" : 'components/timaat.component.videoplayer', - "TIMAAT-settings" : 'components/timaat.component.settings', - "TIMAAT-userSettings" : 'components/timaat.component.usersettings', - "TIMAAT-datasets" : 'datasets/timaat.datasets', - "TIMAAT-actorDatasets" : 'datasets/timaat.datasets.actor', - "TIMAAT-analysisDatasets" : 'datasets/timaat.datasets.analysis', - "TIMAAT-eventDatasets" : 'datasets/timaat.datasets.event', - "TIMAAT-locationDatasets" : 'datasets/timaat.datasets.location', - "TIMAAT-mediumDatasets" : 'datasets/timaat.datasets.medium', - "TIMAAT-mediumCollectionDatasets" : 'datasets/timaat.datasets.mediumcollection', - "TIMAAT-musicDatasets" : 'datasets/timaat.datasets.music', - "TIMAAT-lists" : 'datasets/timaat.lists', - "TIMAAT-roleLists" : 'datasets/timaat.lists.role', - "TIMAAT-languageLists" : 'datasets/timaat.lists.language', - "TIMAAT-tagLists" : 'datasets/timaat.lists.tag', + "TIMAAT-uploadManager" : 'components/timaat.uploadmanager', + "TIMAAT-videoPlayer" : 'components/timaat.component.videoplayer', + "TIMAAT-settings" : 'components/timaat.component.settings', + "TIMAAT-userSettings" : 'components/timaat.component.usersettings', + "TIMAAT-datasets" : 'datasets/timaat.datasets', + "TIMAAT-actorDatasets" : 'datasets/timaat.datasets.actor', + "TIMAAT-analysisDatasets" : 'datasets/timaat.datasets.analysis', + "TIMAAT-eventDatasets" : 'datasets/timaat.datasets.event', + "TIMAAT-locationDatasets" : 'datasets/timaat.datasets.location', + "TIMAAT-mediumDatasets" : 'datasets/timaat.datasets.medium', + "TIMAAT-mediumCollectionDatasets" : 'datasets/timaat.datasets.mediumcollection', + "TIMAAT-musicDatasets" : 'datasets/timaat.datasets.music', + "TIMAAT-lists" : 'datasets/timaat.lists', + "TIMAAT-roleLists" : 'datasets/timaat.lists.role', + "TIMAAT-languageLists" : 'datasets/timaat.lists.language', + "TIMAAT-tagLists" : 'datasets/timaat.lists.tag', "TIMAAT-categories" : 'datasets/timaat.categories', - "TIMAAT-service" : 'service/timaat.service', - "TIMAAT-userService" : 'service/timaat.service.usersettings', - "TIMAAT-publicationService" : 'service/timaat.service.publication', - "TIMAAT-categoryService" : 'service/timaat.service.category', - "TIMAAT-categorySetService" : 'service/timaat.service.categoryset', - "TIMAAT-actorService" : 'service/timaat.service.actor', - "TIMAAT-analysisService" : 'service/timaat.service.analysis', - "TIMAAT-analysisListService" : 'service/timaat.service.analysislist', - "TIMAAT-annotationService" : 'service/timaat.service.annotation', - "TIMAAT-roleService" : 'service/timaat.service.role', + "TIMAAT-service" : 'service/timaat.service', + "TIMAAT-userService" : 'service/timaat.service.usersettings', + "TIMAAT-publicationService" : 'service/timaat.service.publication', + "TIMAAT-categoryService" : 'service/timaat.service.category', + "TIMAAT-categorySetService" : 'service/timaat.service.categoryset', + "TIMAAT-actorService" : 'service/timaat.service.actor', + "TIMAAT-analysisService" : 'service/timaat.service.analysis', + "TIMAAT-analysisListService" : 'service/timaat.service.analysislist', + "TIMAAT-annotationService" : 'service/timaat.service.annotation', + "TIMAAT-roleService" : 'service/timaat.service.role', "TIMAAT-segmentStructureElementService" : 'service/timaat.service.segmentstructureelement', - "TIMAAT-languageService" : 'service/timaat.service.language', - "TIMAAT-locationService" : 'service/timaat.service.location', - "TIMAAT-mediumService" : 'service/timaat.service.medium', - "TIMAAT-mediumCollectionService" : 'service/timaat.service.mediumcollection', - "TIMAAT-eventService" : 'service/timaat.service.event', - "TIMAAT-musicService" : 'service/timaat.service.music', - "TIMAAT-util" : 'timaat.util', - "TIMAAT-marker" : 'model/timaat.marker', - "TIMAAT-keyframe" : 'model/timaat.keyframe', - "TIMAAT-annotation" : 'model/timaat.annotation', - "TIMAAT-analysisSegment" : 'model/timaat.model.analysissegment', - "TIMAAT-analysisSequence" : 'model/timaat.model.analysissequence', - "TIMAAT-analysisTake" : 'model/timaat.model.analysistake', - "TIMAAT-analysisScene" : 'model/timaat.model.analysisscene', - "TIMAAT-analysisAction" : 'model/timaat.model.analysisaction', - "TIMAAT-actor" : 'model/timaat.model.actor', - "TIMAAT-actorType" : 'model/timaat.model.actortype', - "TIMAAT-role" : 'model/timaat.model.role', - "TIMAAT-roleGroup" : 'model/timaat.model.rolegroup', - "TIMAAT-language" : 'model/timaat.model.language', - "TIMAAT-addressType" : 'model/timaat.model.addresstype', - "TIMAAT-emailAddressType" : 'model/timaat.model.emailaddresstype', - "TIMAAT-event" : 'model/timaat.model.event', - "TIMAAT-medium" : 'model/timaat.model.medium', - "TIMAAT-mediumCollection" : 'model/timaat.model.mediumcollection', - "TIMAAT-music" : 'model/timaat.model.music', - "TIMAAT-musicArticulationElement" : 'model/timaat.model.musicArticulationElement', - "TIMAAT-musicChangeInTempoElement": 'model/timaat.model.musicChangeInTempoElement', - "TIMAAT-musicDynamicsElement" : 'model/timaat.model.musicDynamicsElement', - "TIMAAT-musicTextSettingElement" : 'model/timaat.model.musicTextSettingElement', - "TIMAAT-musicFormElement" : 'model/timaat.model.musicFormElement', - "TIMAAT-mediumType" : 'model/timaat.model.mediumtype', - "TIMAAT-location" : 'model/timaat.model.location', - "TIMAAT-locationType" : 'model/timaat.model.locationtype', - "TIMAAT-country" : 'model/timaat.model.location.country', - "TIMAAT-province" : 'model/timaat.model.location.province', - "TIMAAT-county" : 'model/timaat.model.location.county', - "TIMAAT-city" : 'model/timaat.model.location.city', - "TIMAAT-street" : 'model/timaat.model.location.street', - }, - shim: { - 'jquery' : { exports: 'jquery' }, - 'jquery-ui' : { deps: [ 'jquery' ], exports: 'jQuery.ui' }, - 'jquery-validate' : { deps: [ 'jquery' ], exports: 'jQuery.validate' }, - 'jquery-datetime' : { deps: [ 'jquery' ], exports: 'jQuery.datetimepicker' }, - 'jquery-tinycolorpicker': { deps: [ 'jquery' ], exports: 'jQuery.tinycolorpicker' }, - 'jquery-dropzone' : { deps: [ 'jquery' ], exports: 'jQuery.dropzone' }, - 'bootstrap' : { deps: [ 'jquery', 'jquery-ui' ], }, - 'moment' : { deps: [ 'jquery' ], exports: 'moment' }, - 'datatables' : { deps: [ 'bootstrap', 'jquery' ], exports: 'datatables' }, - 'summernote' : { deps: [ 'bootstrap', 'jquery', 'jquery-ui' ], exports: 'summernote' }, - 'leaflet-editable' : { deps: [ 'leaflet' ], }, - 'leaflet-pathdrag' : { deps: [ 'leaflet' ], exports: 'L.PathDraggable' }, - 'leaflet-pathtransform' : { deps: [ 'leaflet', 'leaflet-pathdrag' ], }, - 'leaflet-customcontrol' : { deps: [ 'leaflet' ], }, - 'leaflet-sidebar' : { deps: [ 'leaflet' ], }, + "TIMAAT-languageService" : 'service/timaat.service.language', + "TIMAAT-locationService" : 'service/timaat.service.location', + "TIMAAT-mediumService" : 'service/timaat.service.medium', + "TIMAAT-mediumCollectionService" : 'service/timaat.service.mediumcollection', + "TIMAAT-eventService" : 'service/timaat.service.event', + "TIMAAT-musicService" : 'service/timaat.service.music', + "TIMAAT-util" : 'timaat.util', + "TIMAAT-marker" : 'model/timaat.marker', + "TIMAAT-keyframe" : 'model/timaat.keyframe', + "TIMAAT-annotation" : 'model/timaat.annotation', + "TIMAAT-analysisSegment" : 'model/timaat.model.analysissegment', + "TIMAAT-analysisSequence" : 'model/timaat.model.analysissequence', + "TIMAAT-analysisTake" : 'model/timaat.model.analysistake', + "TIMAAT-analysisScene" : 'model/timaat.model.analysisscene', + "TIMAAT-analysisAction" : 'model/timaat.model.analysisaction', + "TIMAAT-actor" : 'model/timaat.model.actor', + "TIMAAT-actorType" : 'model/timaat.model.actortype', + "TIMAAT-role" : 'model/timaat.model.role', + "TIMAAT-roleGroup" : 'model/timaat.model.rolegroup', + "TIMAAT-language" : 'model/timaat.model.language', + "TIMAAT-addressType" : 'model/timaat.model.addresstype', + "TIMAAT-emailAddressType" : 'model/timaat.model.emailaddresstype', + "TIMAAT-event" : 'model/timaat.model.event', + "TIMAAT-medium" : 'model/timaat.model.medium', + "TIMAAT-mediumCollection" : 'model/timaat.model.mediumcollection', + "TIMAAT-music" : 'model/timaat.model.music', + "TIMAAT-musicArticulationElement" : 'model/timaat.model.musicArticulationElement', + "TIMAAT-musicChangeInTempoElement": 'model/timaat.model.musicChangeInTempoElement', + "TIMAAT-musicDynamicsElement" : 'model/timaat.model.musicDynamicsElement', + "TIMAAT-musicTextSettingElement" : 'model/timaat.model.musicTextSettingElement', + "TIMAAT-musicFormElement" : 'model/timaat.model.musicFormElement', + "TIMAAT-mediumType" : 'model/timaat.model.mediumtype', + "TIMAAT-location" : 'model/timaat.model.location', + "TIMAAT-locationType" : 'model/timaat.model.locationtype', + "TIMAAT-country" : 'model/timaat.model.location.country', + "TIMAAT-province" : 'model/timaat.model.location.province', + "TIMAAT-county" : 'model/timaat.model.location.county', + "TIMAAT-city" : 'model/timaat.model.location.city', + "TIMAAT-street" : 'model/timaat.model.location.street', + }, + shim: { + 'jquery' : { exports: 'jquery' }, + 'jquery-ui' : { deps: [ 'jquery' ], exports: 'jQuery.ui' }, + 'jquery-validate' : { deps: [ 'jquery' ], exports: 'jQuery.validate' }, + 'jquery-datetime' : { deps: [ 'jquery' ], exports: 'jQuery.datetimepicker' }, + 'jquery-tinycolorpicker': { deps: [ 'jquery' ], exports: 'jQuery.tinycolorpicker' }, + 'jquery-dropzone' : { deps: [ 'jquery' ], exports: 'jQuery.dropzone' }, + 'bootstrap' : { deps: [ 'jquery', 'jquery-ui' ], }, + 'moment' : { deps: [ 'jquery' ], exports: 'moment' }, + 'datatables' : { deps: [ 'bootstrap', 'jquery' ], exports: 'datatables' }, + 'datatables.net' : { deps: [ 'jquery' ], exports: '$.fn.dataTable' }, + 'datatables.net-bs' : { deps: [ 'datatables.net' ] }, + 'datatables.net-bs4' : { deps: [ 'datatables.net' ] }, + 'datatables.net-responsive': { deps: [ 'datatables.net' ] }, + 'datatables.select' : { deps: [ 'datatables.net' ], init: function() { return $.fn.dataTable; } }, + 'datatables.col-reorder': { deps: [ 'datatables.net' ], init: function() { return $.fn.dataTable; } }, + 'summernote' : { deps: [ 'bootstrap', 'jquery', 'jquery-ui' ], exports: 'summernote' }, + 'leaflet-editable' : { deps: [ 'leaflet' ], }, + 'leaflet-pathdrag' : { deps: [ 'leaflet' ], exports: 'L.PathDraggable' }, + 'leaflet-pathtransform' : { deps: [ 'leaflet', 'leaflet-pathdrag' ], }, + 'leaflet-customcontrol' : { deps: [ 'leaflet' ], }, + 'leaflet-sidebar' : { deps: [ 'leaflet' ], }, 'eventsource' : { exports: 'EventSourcePolyfill' } - }, - packages: [{ - name : 'moment', - location: '../third-party/moment', - main : 'moment' - }], + }, + packages: [{ + name : 'moment', + location: '../third-party/moment', + main : 'moment' + }], + waitSeconds: 30 }); require(['domReady', 'eventsource', - 'jquery', - 'jquery-ui', - 'jquery-validate', - 'jquery-datetime', - 'jquery-tinycolorpicker', - 'jquery-dropzone', - 'popper', + 'jquery', + 'jquery-ui', + 'jquery-validate', + 'jquery-datetime', + 'jquery-tinycolorpicker', + 'jquery-dropzone', + 'popper', 'wavesurfer', - 'bootstrap', - 'select2', - 'summernote', - 'argon2', - 'leaflet', - 'leaflet-editable', - 'leaflet-pathdrag', + 'bootstrap', + 'select2', + 'summernote', + 'argon2', + 'leaflet', + 'leaflet-editable', + 'leaflet-pathdrag', // 'leaflet-pathtransform', - 'leaflet-customcontrol', - 'leaflet-sidebar', - ], function (domReady) { domReady(function () { - console.info("TIMAAT::Init"); - requirejs([ - 'moment', - 'datatables', - 'datatables.col-reorder', - 'datatables.select', - 'TIMAAT', - 'TIMAAT-entityupdate', - 'TIMAAT-html', - 'TIMAAT-URLHistory', - 'TIMAAT-ui', - 'TIMAAT-ui-inspector', - 'TIMAAT-ui-table', - 'TIMAAT-ui-timeline', - 'TIMAAT-uploadManager', - 'TIMAAT-videoPlayer', - 'TIMAAT-settings', - 'TIMAAT-userSettings', - 'TIMAAT-util', - 'TIMAAT-datasets', - 'TIMAAT-lists', - 'TIMAAT-service', - 'TIMAAT-segmentStructureElementService', - 'TIMAAT-userService', - 'TIMAAT-publicationService', - 'TIMAAT-marker', - 'TIMAAT-keyframe', - 'TIMAAT-annotation', - 'TIMAAT-annotationService', - 'TIMAAT-analysisSegment', - 'TIMAAT-analysisSequence', - 'TIMAAT-analysisTake', - 'TIMAAT-analysisScene', - 'TIMAAT-analysisAction', - 'TIMAAT-actor', - 'TIMAAT-actorDatasets', - 'TIMAAT-actorService', - 'TIMAAT-actorType', - 'TIMAAT-addressType', - 'TIMAAT-emailAddressType', - 'TIMAAT-analysisDatasets', - 'TIMAAT-analysisListService', - 'TIMAAT-analysisService', - 'TIMAAT-categoryService', - 'TIMAAT-categorySetService', - 'TIMAAT-categories', - 'TIMAAT-event', - 'TIMAAT-eventDatasets', - 'TIMAAT-eventService', - 'TIMAAT-language', - 'TIMAAT-languageLists', - 'TIMAAT-languageService', - 'TIMAAT-location', - 'TIMAAT-locationDatasets', - 'TIMAAT-locationService', - 'TIMAAT-locationType', - 'TIMAAT-country', - 'TIMAAT-province', - 'TIMAAT-county', - 'TIMAAT-city', - 'TIMAAT-street', - 'TIMAAT-medium', - 'TIMAAT-mediumDatasets', - 'TIMAAT-mediumService', - 'TIMAAT-mediumType', - 'TIMAAT-mediumCollection', - 'TIMAAT-mediumCollectionDatasets', - 'TIMAAT-mediumCollectionService', - 'TIMAAT-music', - 'TIMAAT-musicArticulationElement', - 'TIMAAT-musicChangeInTempoElement', - 'TIMAAT-musicDynamicsElement', - 'TIMAAT-musicTextSettingElement', - 'TIMAAT-musicFormElement', - 'TIMAAT-musicDatasets', - 'TIMAAT-musicService', - 'TIMAAT-role', - 'TIMAAT-roleGroup', - 'TIMAAT-roleLists', - 'TIMAAT-roleService', - 'TIMAAT-tagLists', - ], function (moment) { - console.info("TIMAAT::Setup"); - window.moment = moment; - // init UI - TIMAAT.UI.init(); - console.info("TIMAAT::Ready"); - }); - }); + 'leaflet-customcontrol', + 'leaflet-sidebar', +], function (domReady) { domReady(function () { + console.info("TIMAAT::Init"); + requirejs([ + 'moment', + 'datatables.net', + 'datatables.col-reorder', + 'datatables.select', + 'TIMAAT', + 'TIMAAT-entityupdate', + 'TIMAAT-html', + 'TIMAAT-URLHistory', + 'TIMAAT-ui', + 'TIMAAT-ui-inspector', + 'TIMAAT-ui-table', + 'TIMAAT-ui-timeline', + 'TIMAAT-uploadManager', + 'TIMAAT-videoPlayer', + 'TIMAAT-settings', + 'TIMAAT-userSettings', + 'TIMAAT-util', + 'TIMAAT-datasets', + 'TIMAAT-lists', + 'TIMAAT-service', + 'TIMAAT-segmentStructureElementService', + 'TIMAAT-userService', + 'TIMAAT-publicationService', + 'TIMAAT-marker', + 'TIMAAT-keyframe', + 'TIMAAT-annotation', + 'TIMAAT-annotationService', + 'TIMAAT-analysisSegment', + 'TIMAAT-analysisSequence', + 'TIMAAT-analysisTake', + 'TIMAAT-analysisScene', + 'TIMAAT-analysisAction', + 'TIMAAT-actor', + 'TIMAAT-actorDatasets', + 'TIMAAT-actorService', + 'TIMAAT-actorType', + 'TIMAAT-addressType', + 'TIMAAT-emailAddressType', + 'TIMAAT-analysisDatasets', + 'TIMAAT-analysisListService', + 'TIMAAT-analysisService', + 'TIMAAT-categoryService', + 'TIMAAT-categorySetService', + 'TIMAAT-categories', + 'TIMAAT-event', + 'TIMAAT-eventDatasets', + 'TIMAAT-eventService', + 'TIMAAT-language', + 'TIMAAT-languageLists', + 'TIMAAT-languageService', + 'TIMAAT-location', + 'TIMAAT-locationDatasets', + 'TIMAAT-locationService', + 'TIMAAT-locationType', + 'TIMAAT-country', + 'TIMAAT-province', + 'TIMAAT-county', + 'TIMAAT-city', + 'TIMAAT-street', + 'TIMAAT-medium', + 'TIMAAT-mediumDatasets', + 'TIMAAT-mediumService', + 'TIMAAT-mediumType', + 'TIMAAT-mediumCollection', + 'TIMAAT-mediumCollectionDatasets', + 'TIMAAT-mediumCollectionService', + 'TIMAAT-music', + 'TIMAAT-musicArticulationElement', + 'TIMAAT-musicChangeInTempoElement', + 'TIMAAT-musicDynamicsElement', + 'TIMAAT-musicTextSettingElement', + 'TIMAAT-musicFormElement', + 'TIMAAT-musicDatasets', + 'TIMAAT-musicService', + 'TIMAAT-role', + 'TIMAAT-roleGroup', + 'TIMAAT-roleLists', + 'TIMAAT-roleService', + 'TIMAAT-tagLists', + ], function (moment) { + console.info("TIMAAT::Setup"); + window.moment = moment; + // init UI + TIMAAT.UI.init(); + console.info("TIMAAT::Ready"); + }); +}); }); From fc534c042cf412bbc505e859b9deb7c24af567d8 Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Tue, 13 Jan 2026 12:49:44 +0100 Subject: [PATCH 44/70] TIMAAT Weiterentwicklung #9 - Fixed entrypoint script --- docker/timaat-entrypoint.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docker/timaat-entrypoint.sh b/docker/timaat-entrypoint.sh index 1f6b16b6..18d5a1e0 100755 --- a/docker/timaat-entrypoint.sh +++ b/docker/timaat-entrypoint.sh @@ -18,9 +18,7 @@ for var in "${required_vars[@]}"; do fi done echo "Verify database and create or upgrade schema (if necessary)" -if [ "$(mysql -u"${DATABASE_USER}" -p"${DATABASE_PASSWORD}" -h"${DATABASE_HOST}" -P"${DATABASE_PORT}" -N -s -e \ - "SELECT COUNT(*) FROM information_schema.tables WHERE \ - table_schema='${DATABASE_SCHEMA_NAME}' AND table_name='db_version';")" -eq 1 ]; then +if [ "$(mysql -u"${DATABASE_USER}" -p"${DATABASE_PASSWORD}" -h"${DATABASE_HOST}" -P"${DATABASE_PORT}" -N -s -e "SELECT COUNT(*) FROM information_schema.tables WHERE table_schema='${DATABASE_SCHEMA_NAME}' AND table_name='db_version';")" -eq 1 ]; then echo "Database schema already exists. Executing schema update when necessary." mysql -u"${DATABASE_USER}" -p"${DATABASE_PASSWORD}" -h"${DATABASE_HOST}" -P"${DATABASE_PORT}" ${DATABASE_SCHEMA_NAME} < /var/lib/timmat/sql/db_update.sql else From d084ca22a4a944eb2beb4c05468998f02d0ce01c Mon Sep 17 00:00:00 2001 From: Nico Kotlenga <NicoKotlenga@live.de> Date: Thu, 26 Feb 2026 08:31:46 +0100 Subject: [PATCH 45/70] Update docker-image-build.yml --- .github/workflows/docker-image-build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-image-build.yml b/.github/workflows/docker-image-build.yml index 39a55868..7b7e0063 100644 --- a/.github/workflows/docker-image-build.yml +++ b/.github/workflows/docker-image-build.yml @@ -1,6 +1,7 @@ name: Build & Push Multi-Arch Docker Image on: + workflow_dispatch: push: branches: - master @@ -62,4 +63,4 @@ jobs: platforms: linux/amd64,linux/arm64 push: true tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} \ No newline at end of file + labels: ${{ steps.meta.outputs.labels }} From e7af3e1aa176e0cdeded6ed131470ae520419bcf Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Mon, 20 Apr 2026 14:49:31 +0200 Subject: [PATCH 46/70] master: Increased version to 1.0.0-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 45b7d458..93d78858 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>TIMAATTest</groupId> <artifactId>TIMAATTest</artifactId> - <version>0.15.0-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>war</packaging> <properties> <!-- <buildDirectory>c:\xampp\tomcat-1\webapps</buildDirectory> --> From 36497aed4c0a4e3899ee98fa600b4e10e201fdd2 Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Tue, 12 May 2026 09:25:11 +0200 Subject: [PATCH 47/70] TIMAAT #57 - Updated database schema Implemented database schema version 1.0.0 with following changes: * Added table `transcription` which is holding information about the available transcriptions * Each transcription is related to one medium * Added column `default_transcription_id` to table `medium` defining the transcription which is currently the default transcription of that medium * Added tables `transcription_engine` and `transcription_model` giving information about all engines which are currently or previously usable with the connected speech-to-text infrastructure * Added table `transcription_state` holding the difference states a transcription can have. The table `transcription_state_translation` contains the translation strings of the states * Added table `system_settings` containing the runtime changeable configuration parameters related to the whole TIMAAT system. --- docs/database.md | 11 +- docs/img/db_update_1_0_0_transcriptions.png | Bin 0 -> 124529 bytes pom.xml | 2 - src/main/resources/database/db_update.sql | 167 +++++++++++++++++++- src/main/resources/database/fipop.sql | 159 ++++++++++++++++++- 5 files changed, 332 insertions(+), 7 deletions(-) create mode 100644 docs/img/db_update_1_0_0_transcriptions.png diff --git a/docs/database.md b/docs/database.md index 806b4fa0..f68f3a6f 100644 --- a/docs/database.md +++ b/docs/database.md @@ -49,4 +49,13 @@ The versioning of the database schema follows the following pattern: * Removed unused column `category_set_id` from table `annotation_has_category` * Added tables `actor_has_category_set` and `actor_has_category` to link actors with categories -* Added view `analysis_segment_structure_element` which combines information of all segment structure type tables \ No newline at end of file +* Added view `analysis_segment_structure_element` which combines information of all segment structure type tables + +### 1.0.0 +* Added table `transcription` which is holding information about the available transcriptions + * Each transcription is related to one medium +* Added column `default_transcription_id` to table `medium` defining the transcription which is currently the default transcription of that medium +* Added tables `transcription_engine` and `transcription_model` giving information about all engines which are currently or previously usable with the connected speech-to-text infrastructure +* Added table `transcription_state` holding the difference states a transcription can have. The table `transcription_state_translation` contains the translation strings of the states +* Added table `system_settings` containing the runtime changeable configuration parameters related to the whole TIMAAT system. + ![db_update_1_0_0_transcriptions.png](img/db_update_1_0_0_transcriptions.png) \ No newline at end of file diff --git a/docs/img/db_update_1_0_0_transcriptions.png b/docs/img/db_update_1_0_0_transcriptions.png new file mode 100644 index 0000000000000000000000000000000000000000..6636e21acd254686d240b9729d09dd954d2d9b70 GIT binary patch literal 124529 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 Y?;h<=dAxjn6YzKW!qq<ujjrAMA3AHrwEzGB literal 0 HcmV?d00001 diff --git a/pom.xml b/pom.xml index 93d78858..e48c5814 100644 --- a/pom.xml +++ b/pom.xml @@ -5,9 +5,7 @@ <version>1.0.0-SNAPSHOT</version> <packaging>war</packaging> <properties> - <!-- <buildDirectory>c:\xampp\tomcat-1\webapps</buildDirectory> --> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <!-- <maven.compiler.release>17</maven.compiler.release> --> <maven.compiler.release>11</maven.compiler.release> <jersey.version>3.1.10</jersey.version> </properties> diff --git a/src/main/resources/database/db_update.sql b/src/main/resources/database/db_update.sql index b3885c8f..0d6ffc65 100644 --- a/src/main/resources/database/db_update.sql +++ b/src/main/resources/database/db_update.sql @@ -412,14 +412,16 @@ BEGIN structureElement.structure_element_type as structure_element_type, hasCategory.category_id as category_id from analysis_segment_structure_element structureElement - join analysis_segment_has_category hasCategory on structureElement.id = hasCategory.analysis_segment_id + join analysis_segment_has_category hasCategory + on structureElement.id = hasCategory.analysis_segment_id where structure_element_type = 'SEGMENT') UNION (select structureElement.id as id, structureElement.structure_element_type as structure_element_type, hasCategory.category_id as category_id from analysis_segment_structure_element structureElement - join analysis_sequence_has_category hasCategory on structureElement.id = hasCategory.analysis_sequence_id + join analysis_sequence_has_category hasCategory + on structureElement.id = hasCategory.analysis_sequence_id where structure_element_type = 'SEQUENCE') UNION (select structureElement.id as id, @@ -447,6 +449,163 @@ END $$ DELIMITER ; +DELIMITER $$ +CREATE PROCEDURE update_to_1_0_0() +BEGIN + DECLARE db_major_version int; + DECLARE db_minor_version int; + DECLARE db_patch_version int; + + SELECT major_version, minor_version, patch_version + INTO db_major_version, db_minor_version, db_patch_version + FROM db_version + LIMIT 1; + + IF db_major_version = 0 AND db_minor_version = 15 AND db_patch_version = 1 THEN + SELECT 'execute update to 1.0.0' AS log_message; + DELETE FROM db_version; + INSERT INTO db_version (major_version, minor_version, patch_version) VALUES (1, 0, 0); + + CREATE TABLE `fipop`.`transcription_engine` + ( + `engine_identifier` VARCHAR(45) primary key, + `engine_name` VARCHAR(45) not null, + `active` BOOL not null default true + ) + ENGINE = InnoDB; + + CREATE TABLE `fipop`.`transcription_model` + ( + `model_identifier` VARCHAR(45) primary key, + `engine_identifier` VARCHAR(45) not null, + `default` bool not null default false, + `active` bool not null default true, + CONSTRAINT `fk_transcription_model_transcription_engine` + FOREIGN KEY (`engine_identifier`) + REFERENCES `fipop`.`transcription_engine` (`engine_identifier`) + ON DELETE CASCADE + ON UPDATE NO ACTION + ) + ENGINE = InnoDB; + CREATE INDEX fk_transcription_model_engine_identifier_idx ON `fipop`.`transcription_model` (engine_identifier ASC); + + CREATE TABLE `fipop`.`transcription_state` + ( + `id` int primary key + ) + ENGINE = InnoDB; + + CREATE TABLE `fipop`.`transcription_state_translation` + ( + `id` int primary key, + `transcription_state_id` int not null, + `language_id` int not null, + `state_name` varchar(20), + CONSTRAINT `fk_transcription_state_translation_transcription_state` + FOREIGN KEY (`transcription_state_id`) + REFERENCES `fipop`.`transcription_state` (`id`) + ON DELETE CASCADE + ON UPDATE NO ACTION, + CONSTRAINT `fk_transcription_state_translation_language` + FOREIGN KEY (`language_id`) + REFERENCES `fipop`.`language` (`id`) + ON DELETE CASCADE + ON UPDATE NO ACTION + ) + ENGINE = InnoDB; + CREATE INDEX fk_transcription_state_translation_transcription_state_idx on `fipop`.`transcription_state_translation` (`transcription_state_id` ASC); + CREATE INDEX fk_transcription_state_translation_language_idx on `fipop`.`transcription_state_translation` (`language_id` ASC); + + CREATE TABLE `fipop`.`transcription` + ( + `id` int primary key, + `name` varchar(150) not null, + `model_identifier` varchar(45), + `engine_identifier` varchar(45), + `medium_id` int not null, + `transcription_state_id` int not null, + `transcription_task_id` bigint, + `created_at` timestamp not null default CURRENT_TIMESTAMP, + `last_edited_at` timestamp, + `created_by_user_account_id` int, + `last_edited_by_user_account_id` int, + CONSTRAINT `fk_transcription_transcription_model` + FOREIGN KEY (`model_identifier`) + REFERENCES `fipop`.`transcription_model` (`model_identifier`) + ON DELETE SET NULL + ON UPDATE NO ACTION, + CONSTRAINT `fk_transcription_transcription_engine` + FOREIGN KEY (`engine_identifier`) + REFERENCES `fipop`.`transcription_engine` (`engine_identifier`) + ON DELETE SET NULL + ON UPDATE NO ACTION, + CONSTRAINT `fk_transcription_medium` + FOREIGN KEY (`medium_id`) + REFERENCES `fipop`.`medium` (`id`) + ON DELETE CASCADE + ON UPDATE NO ACTION, + CONSTRAINT `fk_transcription_transcription_state` + FOREIGN KEY (`transcription_state_id`) + REFERENCES `fipop`.`transcription_state` (`id`), + CONSTRAINT `fk_transcription_creation_user` + FOREIGN KEY (`created_by_user_account_id`) + REFERENCES `fipop`.`user_account` (`id`) + ON DELETE SET NULL + ON UPDATE NO ACTION, + CONSTRAINT `fk_transcription_edit_user` + FOREIGN KEY (`last_edited_by_user_account_id`) + REFERENCES `fipop`.`user_account` (`id`) + ON DELETE SET NULL + ON UPDATE NO ACTION + ) + ENGINE = InnoDB; + CREATE INDEX `fk_transcription_transcription_model_idx` on `fipop`.`transcription` (`model_identifier` ASC); + CREATE INDEX `fk_transcription_transcription_engine_idx` on `fipop`.`transcription` (`engine_identifier` ASC); + CREATE INDEX `fk_transcription_transcription_medium_idx` on `fipop`.`transcription` (`medium_id` ASC); + CREATE INDEX `fk_transcription_transcription_transcription_state_idx` on `fipop`.`transcription` (`transcription_state_id` ASC); + CREATE INDEX `fk_transcription_creation_user_idx` on `fipop`.`transcription` (`created_by_user_account_id` ASC); + CREATE INDEX `fk_transcription_edit_user_idx` on `fipop`.`transcription` (`last_edited_by_user_account_id` ASC); + + CREATE TABLE `fipop`.`system_settings` + ( + `id` smallint primary key default 1, + `auto_transcribe_uploads` bool not null default false, + `created_at` timestamp not null default CURRENT_TIMESTAMP, + `last_edited_at` timestamp, + `last_edited_by_user_account_id` int, + CONSTRAINT `fk_system_settings_user` + FOREIGN KEY (`last_edited_by_user_account_id`) + REFERENCES `fipop`.`user_account` (`id`) + ON DELETE SET NULL + ON UPDATE NO ACTION, + CONSTRAINT system_settings_singleton CHECK (id = 1) + ) + ENGINE = InnoDB; + CREATE INDEX `fk_system_settings_user_idx` on `fipop`.`system_settings` (`last_edited_by_user_account_id` ASC); + + ALTER TABLE `fipop`.`medium` + ADD COLUMN `default_transcription_id` int; + ALTER TABLE `fipop`.`medium` + ADD CONSTRAINT `fk_medium_transcription` FOREIGN KEY (`default_transcription_id`) + REFERENCES `fipop`.`transcription` (`id`) + ON DELETE SET NULL + ON UPDATE NO ACTION; + CREATE INDEX `fk_medium_transcription_idx` on `fipop`.`medium` (`default_transcription_id` ASC); + + INSERT INTO transcription_state VALUES (1), (2), (3), (4), (5); + INSERT INTO transcription_state_translation (id, transcription_state_id, language_id, state_name) + VALUES (1, 1, 1, 'pending'), + (2, 2, 1, 'running'), + (3, 3, 1, 'completed'), + (4, 4, 1, 'failed'), + (5, 5, 1, 'imported'); + + INSERT INTO system_settings(id, auto_transcribe_uploads) VALUES (1, TRUE); + + END IF; +END $$ +DELIMITER ; + /** * Call update functions */ @@ -455,6 +614,7 @@ CALL update_to_0_14_1(); CALL update_to_0_14_2(); CALL update_to_0_15_0(); CALL update_to_0_15_1(); +CALL update_to_1_0_0(); /* * Delete update functions after finishing update script @@ -463,4 +623,5 @@ DROP PROCEDURE update_to_0_14_0; DROP PROCEDURE update_to_0_14_1; DROP PROCEDURE update_to_0_14_2; DROP PROCEDURE update_to_0_15_0; -DROP PROCEDURE update_to_0_15_1; \ No newline at end of file +DROP PROCEDURE update_to_0_15_1; +DROP PROCEDURE update_to_1_0_0; \ No newline at end of file diff --git a/src/main/resources/database/fipop.sql b/src/main/resources/database/fipop.sql index 720ef561..ce1ae8c8 100644 --- a/src/main/resources/database/fipop.sql +++ b/src/main/resources/database/fipop.sql @@ -8777,6 +8777,163 @@ CREATE TABLE `FIPOP`.`annotation_has_music_translation_area` ) ENGINE = InnoDB; +-- ----------------------------------------------------- +-- Table `FIPOP`.`transcription_engine` +-- ----------------------------------------------------- +CREATE TABLE `fipop`.`transcription_engine` +( + `engine_identifier` VARCHAR(45) primary key, + `engine_name` VARCHAR(45) not null, + `active` BOOL not null default true +) + ENGINE = InnoDB; + +-- ----------------------------------------------------- +-- Table `FIPOP`.`transcription_model` +-- ----------------------------------------------------- +CREATE TABLE `fipop`.`transcription_model` +( + `model_identifier` VARCHAR(45) primary key, + `engine_identifier` VARCHAR(45) not null, + `default` bool not null default false, + `active` bool not null default true, + CONSTRAINT `fk_transcription_model_transcription_engine` + FOREIGN KEY (`engine_identifier`) + REFERENCES `fipop`.`transcription_engine` (`engine_identifier`) + ON DELETE CASCADE + ON UPDATE NO ACTION +) + ENGINE = InnoDB; + +-- ----------------------------------------------------- +-- Table `FIPOP`.`transcription_state` +-- ----------------------------------------------------- +CREATE TABLE `fipop`.`transcription_state` +( + `id` int primary key +) + ENGINE = InnoDB; + +-- ----------------------------------------------------- +-- Table `FIPOP`.`transcription_state_translation` +-- ----------------------------------------------------- +CREATE TABLE `fipop`.`transcription_state_translation` +( + `id` int primary key, + `transcription_state_id` int not null, + `language_id` int not null, + `state_name` varchar(20), + CONSTRAINT `fk_transcription_state_translation_transcription_state` + FOREIGN KEY (`transcription_state_id`) + REFERENCES `fipop`.`transcription_state` (`id`) + ON DELETE CASCADE + ON UPDATE NO ACTION, + CONSTRAINT `fk_transcription_state_translation_language` + FOREIGN KEY (`language_id`) + REFERENCES `fipop`.`language` (`id`) + ON DELETE CASCADE + ON UPDATE NO ACTION +) + ENGINE = InnoDB; + +-- ----------------------------------------------------- +-- Table `FIPOP`.`transcription` +-- ----------------------------------------------------- +CREATE TABLE `fipop`.`transcription` +( + `id` int primary key, + `name` varchar(150) not null, + `model_identifier` varchar(45), + `engine_identifier` varchar(45), + `medium_id` int not null, + `transcription_state_id` int not null, + `transcription_task_id` bigint, + `created_at` timestamp not null default CURRENT_TIMESTAMP, + `last_edited_at` timestamp, + `created_by_user_account_id` int, + `last_edited_by_user_account_id` int, + CONSTRAINT `fk_transcription_transcription_model` + FOREIGN KEY (`model_identifier`) + REFERENCES `fipop`.`transcription_model` (`model_identifier`) + ON DELETE SET NULL + ON UPDATE NO ACTION, + CONSTRAINT `fk_transcription_transcription_engine` + FOREIGN KEY (`engine_identifier`) + REFERENCES `fipop`.`transcription_engine` (`engine_identifier`) + ON DELETE SET NULL + ON UPDATE NO ACTION, + CONSTRAINT `fk_transcription_medium` + FOREIGN KEY (`medium_id`) + REFERENCES `fipop`.`medium` (`id`) + ON DELETE CASCADE + ON UPDATE NO ACTION, + CONSTRAINT `fk_transcription_transcription_state` + FOREIGN KEY (`transcription_state_id`) + REFERENCES `fipop`.`transcription_state` (`id`), + CONSTRAINT `fk_transcription_creation_user` + FOREIGN KEY (`created_by_user_account_id`) + REFERENCES `fipop`.`user_account` (`id`) + ON DELETE SET NULL + ON UPDATE NO ACTION, + CONSTRAINT `fk_transcription_edit_user` + FOREIGN KEY (`last_edited_by_user_account_id`) + REFERENCES `fipop`.`user_account` (`id`) + ON DELETE SET NULL + ON UPDATE NO ACTION +) + ENGINE = InnoDB; + +-- ----------------------------------------------------- +-- Table `FIPOP`.`system_settings` +-- ----------------------------------------------------- +CREATE TABLE `fipop`.`system_settings` +( + `id` smallint primary key default 1, + `auto_transcribe_uploads` bool not null default false, + `created_at` timestamp not null default CURRENT_TIMESTAMP, + `last_edited_at` timestamp, + `last_edited_by_user_account_id` int, + CONSTRAINT `fk_system_settings_user` + FOREIGN KEY (`last_edited_by_user_account_id`) + REFERENCES `fipop`.`user_account` (`id`) + ON DELETE SET NULL + ON UPDATE NO ACTION, + CONSTRAINT system_settings_singleton CHECK (id = 1) +) + ENGINE = InnoDB; + +-- ----------------------------------------------------- +-- Add foreign key to `FIPOP`.`medium` +-- ----------------------------------------------------- +ALTER TABLE `fipop`.`medium` + ADD COLUMN `default_transcription_id` int; +ALTER TABLE `fipop`.`medium` + ADD CONSTRAINT `fk_medium_transcription` FOREIGN KEY (`default_transcription_id`) + REFERENCES `fipop`.`transcription` (`id`) + ON DELETE SET NULL + ON UPDATE NO ACTION; +CREATE INDEX `fk_medium_transcription_idx` on `fipop`.`medium` (`default_transcription_id` ASC); + + +-- ----------------------------------------------------- +-- Data for table `FIPOP`.`transcription_state` +-- ----------------------------------------------------- +INSERT INTO transcription_state VALUES (1), (2), (3), (4), (5); + +-- ----------------------------------------------------- +-- Data for table `FIPOP`.`transcription_state_translation` +-- ----------------------------------------------------- +INSERT INTO transcription_state_translation (id, transcription_state_id, language_id, state_name) +VALUES (1, 1, 1, 'pending'), + (2, 2, 1, 'running'), + (3, 3, 1, 'completed'), + (4, 4, 1, 'failed'), + (5, 5, 1, 'imported'); + +-- ----------------------------------------------------- +-- Data for table `FIPOP`.`system_settings` +-- ----------------------------------------------------- +INSERT INTO system_settings(id, auto_transcribe_uploads) VALUES (1, TRUE); -- ----------------------------------------------------- -- Data for table `FIPOP`.`db_version` @@ -8784,7 +8941,7 @@ CREATE TABLE `FIPOP`.`annotation_has_music_translation_area` START TRANSACTION; USE `FIPOP`; INSERT INTO `FIPOP`.`db_version` (major_version, minor_version, patch_version) -VALUES (0, 14, 2); +VALUES (1, 0, 0); COMMIT; From 7654e16edc923a4c2fcf133e4bee5e0ae8788afd Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Tue, 12 May 2026 12:39:56 +0200 Subject: [PATCH 48/70] TIMAAT #57 - Implemented ORM * Added entity definitions for new database schema * Fixed database create script --- .../bitgilde/TIMAAT/model/FIPOP/Medium.java | 30 +++- .../TIMAAT/model/FIPOP/SystemSetting.java | 75 +++++++++ .../TIMAAT/model/FIPOP/Transcription.java | 143 ++++++++++++++++++ .../model/FIPOP/TranscriptionEngine.java | 45 ++++++ .../model/FIPOP/TranscriptionModel.java | 44 ++++++ .../model/FIPOP/TranscriptionModelId.java | 50 ++++++ .../model/FIPOP/TranscriptionState.java | 36 +++++ .../FIPOP/TranscriptionStateTranslation.java | 61 ++++++++ src/main/resources/META-INF/persistence.xml | 6 + src/main/resources/database/fipop.sql | 19 +-- 10 files changed, 498 insertions(+), 11 deletions(-) create mode 100644 src/main/java/de/bitgilde/TIMAAT/model/FIPOP/SystemSetting.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/model/FIPOP/Transcription.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionEngine.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionModel.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionModelId.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionState.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionStateTranslation.java diff --git a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/Medium.java b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/Medium.java index 4e898937..459d4e64 100644 --- a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/Medium.java +++ b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/Medium.java @@ -25,8 +25,10 @@ import java.io.Serializable; import java.sql.Timestamp; import java.util.Date; +import java.util.LinkedHashSet; import java.util.List; import java.util.Objects; +import java.util.Set; /* Licensed under the Apache License, Version 2.0 (the "License"); @@ -314,8 +316,16 @@ public class Medium implements Serializable { @Transient private String viewToken; + @ManyToOne + @JoinColumn(name = "default_transcription_id") + private Transcription defaultTranscription; - public Medium() { + @OneToMany(mappedBy = "medium") + @JsonIgnore + private Set<Transcription> transcriptions = new LinkedHashSet<>(); + + + public Medium() { } public int getId() { @@ -843,7 +853,23 @@ public void setViewToken(String viewToken) { this.viewToken = viewToken; } - public MediumAudioAnalysis getMediumAudioAnalysis() { + public Transcription getDefaultTranscription() { + return defaultTranscription; + } + + public void setDefaultTranscription(Transcription defaultTranscription) { + this.defaultTranscription = defaultTranscription; + } + + public Set<Transcription> getTranscriptions() { + return transcriptions; + } + + public void setTranscriptions(Set<Transcription> transcriptions) { + this.transcriptions = transcriptions; + } + + public MediumAudioAnalysis getMediumAudioAnalysis() { return mediumAudioAnalysis; } diff --git a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/SystemSetting.java b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/SystemSetting.java new file mode 100644 index 00000000..04d90b8d --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/SystemSetting.java @@ -0,0 +1,75 @@ +package de.bitgilde.TIMAAT.model.FIPOP; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; + +import java.time.Instant; + +@Entity +@Table(name = "system_settings") +public class SystemSetting { + @Id + @Column(name = "id", nullable = false) + private Short id; + + @NotNull + @Column(name = "auto_transcribe_uploads", nullable = false) + private Boolean autoTranscribeUploads; + + @NotNull + @Column(name = "created_at", nullable = false) + private Instant createdAt; + + @Column(name = "last_edited_at") + private Instant lastEditedAt; + + @ManyToOne + @JoinColumn(name = "last_edited_by_user_account_id") + private UserAccount lastEditedByUserAccount; + + public Short getId() { + return id; + } + + public void setId(Short id) { + this.id = id; + } + + public Boolean getAutoTranscribeUploads() { + return autoTranscribeUploads; + } + + public void setAutoTranscribeUploads(Boolean autoTranscribeUploads) { + this.autoTranscribeUploads = autoTranscribeUploads; + } + + public Instant getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Instant createdAt) { + this.createdAt = createdAt; + } + + public Instant getLastEditedAt() { + return lastEditedAt; + } + + public void setLastEditedAt(Instant lastEditedAt) { + this.lastEditedAt = lastEditedAt; + } + + public UserAccount getLastEditedByUserAccount() { + return lastEditedByUserAccount; + } + + public void setLastEditedByUserAccount(UserAccount lastEditedByUserAccount) { + this.lastEditedByUserAccount = lastEditedByUserAccount; + } + +} \ No newline at end of file diff --git a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/Transcription.java b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/Transcription.java new file mode 100644 index 00000000..7b0f9ca5 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/Transcription.java @@ -0,0 +1,143 @@ +package de.bitgilde.TIMAAT.model.FIPOP; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; + +import java.time.Instant; + +@Entity +@Table(name = "transcription") +public class Transcription { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id", nullable = false) + private Integer id; + + @Size(max = 150) + @NotNull + @Column(name = "name", nullable = false, length = 150) + private String name; + + @ManyToOne + @JoinColumn(name = "model_identifier", referencedColumnName = "model_identifier") + @JoinColumn(name = "engine_identifier", referencedColumnName = "engine_identifier") + private TranscriptionModel transcriptionModel; + + @NotNull + @ManyToOne(optional = false) + @JoinColumn(name = "medium_id", nullable = false) + private Medium medium; + + @NotNull + @ManyToOne(optional = false) + @JoinColumn(name = "transcription_state_id", nullable = false) + private TranscriptionState transcriptionState; + + @Column(name = "transcription_task_id") + private Long transcriptionTaskId; + + @NotNull + @Column(name = "created_at", nullable = false) + private Instant createdAt; + + @Column(name = "last_edited_at") + private Instant lastEditedAt; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "created_by_user_account_id") + private UserAccount createdByUserAccount; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "last_edited_by_user_account_id") + private UserAccount lastEditedByUserAccount; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public TranscriptionModel getTranscriptionModel() { + return transcriptionModel; + } + + public void setTranscriptionModel(TranscriptionModel modelIdentifier) { + this.transcriptionModel = modelIdentifier; + } + + public Medium getMedium() { + return medium; + } + + public void setMedium(Medium medium) { + this.medium = medium; + } + + public TranscriptionState getTranscriptionState() { + return transcriptionState; + } + + public void setTranscriptionState(TranscriptionState transcriptionState) { + this.transcriptionState = transcriptionState; + } + + public Long getTranscriptionTaskId() { + return transcriptionTaskId; + } + + public void setTranscriptionTaskId(Long transcriptionTaskId) { + this.transcriptionTaskId = transcriptionTaskId; + } + + public Instant getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Instant createdAt) { + this.createdAt = createdAt; + } + + public Instant getLastEditedAt() { + return lastEditedAt; + } + + public void setLastEditedAt(Instant lastEditedAt) { + this.lastEditedAt = lastEditedAt; + } + + public UserAccount getCreatedByUserAccount() { + return createdByUserAccount; + } + + public void setCreatedByUserAccount(UserAccount createdByUserAccount) { + this.createdByUserAccount = createdByUserAccount; + } + + public UserAccount getLastEditedByUserAccount() { + return lastEditedByUserAccount; + } + + public void setLastEditedByUserAccount(UserAccount lastEditedByUserAccount) { + this.lastEditedByUserAccount = lastEditedByUserAccount; + } + +} \ No newline at end of file diff --git a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionEngine.java b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionEngine.java new file mode 100644 index 00000000..b1308188 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionEngine.java @@ -0,0 +1,45 @@ +package de.bitgilde.TIMAAT.model.FIPOP; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; + +@Entity +@Table(name = "transcription_engine") +public class TranscriptionEngine { + @Id + @Column(name = "engine_identifier") + private String engineIdentifier; + + @Column(name = "engine_name") + private String engineName; + + @Column(name = "active") + private Boolean active; + + public String getEngineIdentifier() { + return engineIdentifier; + } + + public void setEngineIdentifier(String engineIdentifier) { + this.engineIdentifier = engineIdentifier; + } + + public String getEngineName() { + return engineName; + } + + public void setEngineName(String engineName) { + this.engineName = engineName; + } + + public Boolean getActive() { + return active; + } + + public void setActive(Boolean active) { + this.active = active; + } + +} \ No newline at end of file diff --git a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionModel.java b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionModel.java new file mode 100644 index 00000000..51536b49 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionModel.java @@ -0,0 +1,44 @@ +package de.bitgilde.TIMAAT.model.FIPOP; + +import jakarta.persistence.Column; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; + +@Entity +@Table(name = "transcription_model") +public class TranscriptionModel { + @EmbeddedId + private TranscriptionModelId id; + + @Column(name = "`default`") + private Boolean defaultTranscriptionModel; + + @Column(name = "active") + private Boolean active; + + public TranscriptionModelId getId() { + return id; + } + + public void setId(TranscriptionModelId id) { + this.id = id; + } + + public Boolean getDefaultTranscriptionModel() { + return defaultTranscriptionModel; + } + + public void setDefaultField(Boolean defaultTranscriptionModel) { + this.defaultTranscriptionModel = defaultTranscriptionModel; + } + + public Boolean getActive() { + return active; + } + + public void setActive(Boolean active) { + this.active = active; + } + +} \ No newline at end of file diff --git a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionModelId.java b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionModelId.java new file mode 100644 index 00000000..90765c1c --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionModelId.java @@ -0,0 +1,50 @@ +package de.bitgilde.TIMAAT.model.FIPOP; + +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; + +import java.io.Serializable; +import java.util.Objects; + +@Embeddable +public class TranscriptionModelId implements Serializable { + private static final long serialVersionUID = -2982668900563654074L; + @Column(name = "model_identifier") + private String modelIdentifier; + + @Column(name = "engine_identifier") + private String engineIdentifier; + + public String getModelIdentifier() { + return modelIdentifier; + } + + public void setModelIdentifier(String modelIdentifier) { + this.modelIdentifier = modelIdentifier; + } + + public String getEngineIdentifier() { + return engineIdentifier; + } + + public void setEngineIdentifier(String engineIdentifier) { + this.engineIdentifier = engineIdentifier; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + TranscriptionModelId entity = (TranscriptionModelId) o; + return Objects.equals(this.modelIdentifier, entity.modelIdentifier) && Objects.equals(this.engineIdentifier, entity.engineIdentifier); + } + + @Override + public int hashCode() { + return Objects.hash(modelIdentifier, engineIdentifier); + } +} \ No newline at end of file diff --git a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionState.java b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionState.java new file mode 100644 index 00000000..2bc51abc --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionState.java @@ -0,0 +1,36 @@ +package de.bitgilde.TIMAAT.model.FIPOP; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; + +import java.util.Set; + +@Entity +@Table(name = "transcription_state") +public class TranscriptionState { + @Id + @Column(name = "id", nullable = false) + private Integer id; + + @OneToMany(mappedBy = "transcriptionState") + private Set<TranscriptionStateTranslation> transcriptionStateTranslations; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Set<TranscriptionStateTranslation> getTranscriptionStateTranslations() { + return transcriptionStateTranslations; + } + + public void setTranscriptionStateTranslations(Set<TranscriptionStateTranslation> transcriptionStateTranslations) { + this.transcriptionStateTranslations = transcriptionStateTranslations; + } +} \ No newline at end of file diff --git a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionStateTranslation.java b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionStateTranslation.java new file mode 100644 index 00000000..0b6fbe12 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionStateTranslation.java @@ -0,0 +1,61 @@ +package de.bitgilde.TIMAAT.model.FIPOP; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; + +@Entity +@Table(name = "transcription_state_translation", schema = "fipop") +public class TranscriptionStateTranslation { + @Id + @Column(name = "id") + private Integer id; + + @ManyToOne + @JoinColumn(name="transcription_state_id") + @JsonIgnore + private TranscriptionState transcriptionState; + + @Column(name = "language_id") + private Integer languageId; + + @Column(name = "state_name") + private String stateName; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public TranscriptionState getTranscriptionState() { + return transcriptionState; + } + + public void setTranscriptionState(TranscriptionState transcriptionState) { + this.transcriptionState = transcriptionState; + } + + public Integer getLanguageId() { + return languageId; + } + + public void setLanguageId(Integer languageId) { + this.languageId = languageId; + } + + public String getStateName() { + return stateName; + } + + public void setStateName(String stateName) { + this.stateName = stateName; + } + +} \ No newline at end of file diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index 57437c1c..f1af06f8 100644 --- a/src/main/resources/META-INF/persistence.xml +++ b/src/main/resources/META-INF/persistence.xml @@ -269,6 +269,7 @@ <class>de.bitgilde.TIMAAT.model.FIPOP.Street</class> <class>de.bitgilde.TIMAAT.model.FIPOP.SvgShapeType</class> <class>de.bitgilde.TIMAAT.model.FIPOP.SvgShapeTypeTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.SystemSetting</class> <class>de.bitgilde.TIMAAT.model.FIPOP.Tag</class> <class>de.bitgilde.TIMAAT.model.FIPOP.TakeJunction</class> <class>de.bitgilde.TIMAAT.model.FIPOP.TakeJunctionTranslation</class> @@ -281,6 +282,11 @@ <class>de.bitgilde.TIMAAT.model.FIPOP.TerritoryTranslation</class> <class>de.bitgilde.TIMAAT.model.FIPOP.Timbre</class> <class>de.bitgilde.TIMAAT.model.FIPOP.Title</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.Transcription</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.TranscriptionEngine</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.TranscriptionModel</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.TranscriptionState</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.TranscriptionStateTranslation</class> <class>de.bitgilde.TIMAAT.model.FIPOP.UserAccount</class> <class>de.bitgilde.TIMAAT.model.FIPOP.UserAccountHasCategorySet</class> <class>de.bitgilde.TIMAAT.model.FIPOP.UserAccountHasCategorySetPK</class> diff --git a/src/main/resources/database/fipop.sql b/src/main/resources/database/fipop.sql index ce1ae8c8..c49f4d77 100644 --- a/src/main/resources/database/fipop.sql +++ b/src/main/resources/database/fipop.sql @@ -8920,15 +8920,6 @@ CREATE INDEX `fk_medium_transcription_idx` on `fipop`.`medium` (`default_transcr -- ----------------------------------------------------- INSERT INTO transcription_state VALUES (1), (2), (3), (4), (5); --- ----------------------------------------------------- --- Data for table `FIPOP`.`transcription_state_translation` --- ----------------------------------------------------- -INSERT INTO transcription_state_translation (id, transcription_state_id, language_id, state_name) -VALUES (1, 1, 1, 'pending'), - (2, 2, 1, 'running'), - (3, 3, 1, 'completed'), - (4, 4, 1, 'failed'), - (5, 5, 1, 'imported'); -- ----------------------------------------------------- -- Data for table `FIPOP`.`system_settings` @@ -17167,6 +17158,16 @@ VALUES (42, 9, 42); COMMIT; +-- ----------------------------------------------------- +-- Data for table `FIPOP`.`transcription_state_translation` +-- ----------------------------------------------------- +INSERT INTO transcription_state_translation (id, transcription_state_id, language_id, state_name) +VALUES (1, 1, 1, 'pending'), + (2, 2, 1, 'running'), + (3, 3, 1, 'completed'), + (4, 4, 1, 'failed'), + (5, 5, 1, 'imported'); + -- ----------------------------------------------------- -- Data for table `FIPOP`.`maqam_subtype_translation` -- ----------------------------------------------------- From 48278e9cbc9c3eada20f7b5536dc9696d773b278 Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Tue, 12 May 2026 16:13:16 +0200 Subject: [PATCH 49/70] TIMAAT #57 - Updated database model * Changed states which a transcription can enter * Define new TranscriptionType representing whether a transcription is imported or generated * Created db storage for transcriptions --- docs/img/db_update_1_0_0_transcriptions.png | Bin 124529 -> 152264 bytes pom.xml | 55 +- .../TIMAAT/di/binder/TIMAATBinder.java | 12 +- .../TIMAAT/model/FIPOP/Transcription.java | 12 + .../FIPOP/TranscriptionStateTranslation.java | 2 +- .../TIMAAT/model/FIPOP/TranscriptionType.java | 36 + .../FIPOP/TranscriptionTypeTranslation.java | 61 ++ .../TIMAAT/rest/endpoint/EndpointActor.java | 4 +- .../rest/endpoint/EndpointAnnotation.java | 2 +- .../TIMAAT/rest/endpoint/EndpointMedium.java | 12 +- .../TIMAAT/rest/endpoint/EndpointMusic.java | 4 +- .../EndpointSegmentStructureElement.java | 2 +- .../rest/feature/EagerInitializerFeature.java | 2 +- .../{ => service}/task/TaskService.java | 16 +- .../task/api/MediumAudioAnalysisTask.java | 2 +- .../TIMAAT/{ => service}/task/api/Task.java | 2 +- .../{ => service}/task/api/TaskState.java | 2 +- .../{ => service}/task/api/TaskType.java | 4 +- .../exception/TaskExecutionException.java | 6 +- .../task/exception/TaskServiceException.java | 6 +- .../task/exception/TaskStorageException.java | 6 +- .../MediumAudioAnalysisTaskExecutor.java | 8 +- .../task/execution/TaskExecutor.java | 6 +- .../task/execution/TaskExecutorFactory.java | 12 +- .../task/execution/TaskExecutorService.java | 8 +- .../task/storage/DbTaskStorage.java | 14 +- .../task/storage/TaskStateUpdater.java | 6 +- .../task/storage/TaskStorage.java | 6 +- .../transcription/TranscriptionService.java | 48 ++ .../stt/SpeechToTextService.java | 28 + .../stt/SpeechToTextServiceUniErfurt.java | 10 + .../TIMAAT/storage/api/EntityStorage.java | 2 +- .../bitgilde/TIMAAT/storage/db/DbStorage.java | 6 +- .../entity/actor/api/ActorSortingField.java | 3 +- .../transcription/TranscriptionStorage.java | 56 ++ .../api/TranscriptionFilterCriteria.java | 50 ++ .../api/TranscriptionSortingField.java | 42 ++ .../transcription/api/TranscriptionState.java | 21 + .../transcription/api/TranscriptionType.java | 23 + src/main/resources/META-INF/persistence.xml | 637 +++++++++--------- src/main/resources/database/db_update.sql | 48 +- src/main/resources/database/fipop.sql | 57 +- 42 files changed, 923 insertions(+), 416 deletions(-) create mode 100644 src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionType.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionTypeTranslation.java rename src/main/java/de/bitgilde/TIMAAT/{ => service}/task/TaskService.java (85%) rename src/main/java/de/bitgilde/TIMAAT/{ => service}/task/api/MediumAudioAnalysisTask.java (96%) rename src/main/java/de/bitgilde/TIMAAT/{ => service}/task/api/Task.java (95%) rename src/main/java/de/bitgilde/TIMAAT/{ => service}/task/api/TaskState.java (95%) rename src/main/java/de/bitgilde/TIMAAT/{ => service}/task/api/TaskType.java (87%) rename src/main/java/de/bitgilde/TIMAAT/{ => service}/task/exception/TaskExecutionException.java (91%) rename src/main/java/de/bitgilde/TIMAAT/{ => service}/task/exception/TaskServiceException.java (87%) rename src/main/java/de/bitgilde/TIMAAT/{ => service}/task/exception/TaskStorageException.java (84%) rename src/main/java/de/bitgilde/TIMAAT/{ => service}/task/execution/MediumAudioAnalysisTaskExecutor.java (95%) rename src/main/java/de/bitgilde/TIMAAT/{ => service}/task/execution/TaskExecutor.java (83%) rename src/main/java/de/bitgilde/TIMAAT/{ => service}/task/execution/TaskExecutorFactory.java (88%) rename src/main/java/de/bitgilde/TIMAAT/{ => service}/task/execution/TaskExecutorService.java (96%) rename src/main/java/de/bitgilde/TIMAAT/{ => service}/task/storage/DbTaskStorage.java (93%) rename src/main/java/de/bitgilde/TIMAAT/{ => service}/task/storage/TaskStateUpdater.java (86%) rename src/main/java/de/bitgilde/TIMAAT/{ => service}/task/storage/TaskStorage.java (87%) create mode 100644 src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/service/transcription/stt/SpeechToTextService.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/service/transcription/stt/SpeechToTextServiceUniErfurt.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/TranscriptionStorage.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/api/TranscriptionFilterCriteria.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/api/TranscriptionSortingField.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/api/TranscriptionState.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/api/TranscriptionType.java diff --git a/docs/img/db_update_1_0_0_transcriptions.png b/docs/img/db_update_1_0_0_transcriptions.png index 6636e21acd254686d240b9729d09dd954d2d9b70..05b89f616713db358bc2d6e146a6114dd3f39746 100644 GIT binary patch literal 152264 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®=I&F07B6ltdc1|_4;^AVAJ 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%0A#ZO+rt|-2=+q#h@GaV<Jfb05%f@GXuy8ADAwe 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 literal 124529 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 Y?;h<=dAxjn6YzKW!qq<ujjrAMA3AHrwEzGB diff --git a/pom.xml b/pom.xml index e48c5814..0af03123 100644 --- a/pom.xml +++ b/pom.xml @@ -6,8 +6,11 @@ <packaging>war</packaging> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <maven.compiler.release>11</maven.compiler.release> + <maven.compiler.release>25</maven.compiler.release> + <eclipselink.version>3.0.2</eclipselink.version> <jersey.version>3.1.10</jersey.version> + <bytebuddy.version>1.17.5</bytebuddy.version> + <mockito.version>5.18.0</mockito.version> </properties> <build> <sourceDirectory>src/main/java</sourceDirectory> @@ -21,10 +24,18 @@ <artifactId>maven-compiler-plugin</artifactId> <version>3.11.0</version> <configuration> - <release>11</release> - <generatedSourcesDirectory> - ${project.build.directory}/generated-sources/annotations - </generatedSourcesDirectory> + <release>${maven.compiler.release}</release> + <generatedSourcesDirectory>${project.build.directory}/generated-sources/annotations</generatedSourcesDirectory> + <annotationProcessors> + <annotationProcessor>org.eclipse.persistence.internal.jpa.modelgen.CanonicalModelProcessor</annotationProcessor> + </annotationProcessors> + <annotationProcessorPaths> + <path> + <groupId>org.eclipse.persistence</groupId> + <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId> + <version>${eclipselink.version}</version> + </path> + </annotationProcessorPaths> </configuration> </plugin> @@ -53,6 +64,9 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <version>3.1.2</version> + <configuration> + <argLine>-javaagent:${settings.localRepository}/org/mockito/mockito-core/${mockito.version}/mockito-core-${mockito.version}.jar</argLine> + </configuration> </plugin> </plugins> </build> @@ -96,7 +110,7 @@ <dependency> <groupId>org.glassfish.jersey.media</groupId> <artifactId>jersey-media-sse</artifactId> - <version>${jersey.version}</version> <!-- oder eine andere Jersey-Version, passend zu deinem Projekt --> + <version>${jersey.version}</version> </dependency> <!-- https://mvnrepository.com/artifact/org.glassfish.jaxb/jaxb-runtime --> <dependency> @@ -170,12 +184,7 @@ <dependency> <groupId>org.eclipse.persistence</groupId> <artifactId>eclipselink</artifactId> - <version>3.0.2</version> - </dependency> - <dependency> - <groupId>org.eclipse.persistence</groupId> - <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId> - <version>3.0.2</version> + <version>${eclipselink.version}</version> </dependency> <!-- https://mvnrepository.com/artifact/jakarta.xml.bind/jakarta.xml.bind-api --> <dependency> @@ -221,6 +230,12 @@ <artifactId>im4java</artifactId> <version>1.4.0</version> </dependency> + <!-- NKO Dev Studio Dependencies --> + <dependency> + <groupId>studio.nko-dev</groupId> + <artifactId>speech-to-text-service-client-uni-erfurt</artifactId> + <version>1.0.1</version> + </dependency> <!-- Test dependencies --> <dependency> <groupId>org.junit.jupiter</groupId> @@ -237,8 +252,20 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>5.18.0</version> + <version>${mockito.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>net.bytebuddy</groupId> + <artifactId>byte-buddy</artifactId> + <version>${bytebuddy.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>net.bytebuddy</groupId> + <artifactId>byte-buddy-agent</artifactId> + <version>${bytebuddy.version}</version> <scope>test</scope> </dependency> </dependencies> -</project> \ No newline at end of file +</project> diff --git a/src/main/java/de/bitgilde/TIMAAT/di/binder/TIMAATBinder.java b/src/main/java/de/bitgilde/TIMAAT/di/binder/TIMAATBinder.java index d9ffc896..7b50c679 100644 --- a/src/main/java/de/bitgilde/TIMAAT/di/binder/TIMAATBinder.java +++ b/src/main/java/de/bitgilde/TIMAAT/di/binder/TIMAATBinder.java @@ -25,12 +25,12 @@ import de.bitgilde.TIMAAT.storage.file.ImageFileStorage; import de.bitgilde.TIMAAT.storage.file.TemporaryFileStorage; import de.bitgilde.TIMAAT.storage.file.VideoFileStorage; -import de.bitgilde.TIMAAT.task.TaskService; -import de.bitgilde.TIMAAT.task.execution.TaskExecutorFactory; -import de.bitgilde.TIMAAT.task.execution.TaskExecutorService; -import de.bitgilde.TIMAAT.task.storage.DbTaskStorage; -import de.bitgilde.TIMAAT.task.storage.TaskStateUpdater; -import de.bitgilde.TIMAAT.task.storage.TaskStorage; +import de.bitgilde.TIMAAT.service.task.TaskService; +import de.bitgilde.TIMAAT.service.task.execution.TaskExecutorFactory; +import de.bitgilde.TIMAAT.service.task.execution.TaskExecutorService; +import de.bitgilde.TIMAAT.service.task.storage.DbTaskStorage; +import de.bitgilde.TIMAAT.service.task.storage.TaskStateUpdater; +import de.bitgilde.TIMAAT.service.task.storage.TaskStorage; import jakarta.inject.Singleton; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.Persistence; diff --git a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/Transcription.java b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/Transcription.java index 7b0f9ca5..851bd922 100644 --- a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/Transcription.java +++ b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/Transcription.java @@ -42,6 +42,11 @@ public class Transcription { @JoinColumn(name = "transcription_state_id", nullable = false) private TranscriptionState transcriptionState; + @NotNull + @ManyToOne(optional = false) + @JoinColumn(name = "transcription_type_id", nullable = false) + private TranscriptionType transcriptionType; + @Column(name = "transcription_task_id") private Long transcriptionTaskId; @@ -140,4 +145,11 @@ public void setLastEditedByUserAccount(UserAccount lastEditedByUserAccount) { this.lastEditedByUserAccount = lastEditedByUserAccount; } + public TranscriptionType getTranscriptionType() { + return transcriptionType; + } + + public void setTranscriptionType(TranscriptionType transcriptionType) { + this.transcriptionType = transcriptionType; + } } \ No newline at end of file diff --git a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionStateTranslation.java b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionStateTranslation.java index 0b6fbe12..5e8fb250 100644 --- a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionStateTranslation.java +++ b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionStateTranslation.java @@ -9,7 +9,7 @@ import jakarta.persistence.Table; @Entity -@Table(name = "transcription_state_translation", schema = "fipop") +@Table(name = "transcription_state_translation") public class TranscriptionStateTranslation { @Id @Column(name = "id") diff --git a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionType.java b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionType.java new file mode 100644 index 00000000..d292fbc7 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionType.java @@ -0,0 +1,36 @@ +package de.bitgilde.TIMAAT.model.FIPOP; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; + +import java.util.Set; + +@Entity +@Table(name = "transcription_type") +public class TranscriptionType { + @Id + @Column(name = "id", nullable = false) + private Integer id; + + @OneToMany(mappedBy = "transcriptionType") + private Set<TranscriptionStateTranslation> transcriptionTypeTranslations; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Set<TranscriptionStateTranslation> getTranscriptionTypeTranslations() { + return transcriptionTypeTranslations; + } + + public void setTranscriptionTypeTranslations(Set<TranscriptionStateTranslation> transcriptionTypeTranslations) { + this.transcriptionTypeTranslations = transcriptionTypeTranslations; + } +} \ No newline at end of file diff --git a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionTypeTranslation.java b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionTypeTranslation.java new file mode 100644 index 00000000..797640ca --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionTypeTranslation.java @@ -0,0 +1,61 @@ +package de.bitgilde.TIMAAT.model.FIPOP; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; + +@Entity +@Table(name = "transcription_type_translation") +public class TranscriptionTypeTranslation { + @Id + @Column(name = "id") + private Integer id; + + @ManyToOne + @JoinColumn(name="transcription_type_id") + @JsonIgnore + private TranscriptionType transcriptionType; + + @Column(name = "language_id") + private Integer languageId; + + @Column(name = "state_name") + private String stateName; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public TranscriptionType getTranscriptionType() { + return transcriptionType; + } + + public void setTranscriptionType(TranscriptionType transcriptionType) { + this.transcriptionType = transcriptionType; + } + + public Integer getLanguageId() { + return languageId; + } + + public void setLanguageId(Integer languageId) { + this.languageId = languageId; + } + + public String getStateName() { + return stateName; + } + + public void setStateName(String stateName) { + this.stateName = stateName; + } + +} \ No newline at end of file diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointActor.java b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointActor.java index ddbe75d5..e5e19744 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointActor.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointActor.java @@ -113,7 +113,7 @@ public DataTableInfo<Actor> getActorList(@BeanParam ActorListingQueryParameter q AuthenticationFilter.USER_ACCOUNT_PROPERTY_NAME); int draw = queryParameter.getDraw().isPresent() ? queryParameter.getDraw().get() : 0; - List<Actor> actors = actorStorage.getEntriesAsStreamRespectingAuthorization(queryParameter, queryParameter, queryParameter, userAccount).collect( + List<Actor> actors = actorStorage.getEntriesAsStream(queryParameter, queryParameter, queryParameter, userAccount).collect( Collectors.toList()); Long actorsCount = actorStorage.getNumberOfTotalEntriesRespectingAuthorization(userAccount); Long matchingActorsCount = actorStorage.getNumberOfMatchingEntriesRespectingAuthorization(queryParameter, userAccount); @@ -130,7 +130,7 @@ public List<SelectElement<Integer>> getActorSelectList(@BeanParam ActorListingQu { UserAccount userAccount = (UserAccount) containerRequestContext.getProperty( AuthenticationFilter.USER_ACCOUNT_PROPERTY_NAME); - return actorStorage.getEntriesAsStreamRespectingAuthorization(queryParameter, queryParameter, queryParameter, userAccount) + return actorStorage.getEntriesAsStream(queryParameter, queryParameter, queryParameter, userAccount) .map(currentActor -> new SelectElement<>(currentActor.getId(), currentActor.getDisplayName().getName())) .collect(Collectors.toList()); } diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnnotation.java b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnnotation.java index 71b41560..4c319075 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnnotation.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointAnnotation.java @@ -126,7 +126,7 @@ public DataTableInfo<Annotation> getAnnotationList(@BeanParam @Valid AnnotationL AuthenticationFilter.USER_ACCOUNT_PROPERTY_NAME); int draw = annotationListingQueryParameter.getDraw().orElse(0); - List<Annotation> matchingAnnotations = annotationStorage.getEntriesAsStreamRespectingAuthorization(annotationListingQueryParameter, + List<Annotation> matchingAnnotations = annotationStorage.getEntriesAsStream(annotationListingQueryParameter, annotationListingQueryParameter, annotationListingQueryParameter, userAccount).collect(Collectors.toList()); long totalAnnotationsCount = annotationStorage.getNumberOfTotalEntriesRespectingAuthorization(userAccount); long filteredAnnotationsCount = annotationStorage.getNumberOfMatchingEntriesRespectingAuthorization(annotationListingQueryParameter, userAccount); diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java index d8f682bf..c369d546 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java @@ -63,10 +63,10 @@ import de.bitgilde.TIMAAT.storage.file.TemporaryFileStorage; import de.bitgilde.TIMAAT.storage.file.TemporaryFileStorage.TemporaryFile; import de.bitgilde.TIMAAT.storage.file.VideoFileStorage; -import de.bitgilde.TIMAAT.task.TaskService; -import de.bitgilde.TIMAAT.task.api.MediumAudioAnalysisTask.SupportedMediumType; -import de.bitgilde.TIMAAT.task.api.TaskState; -import de.bitgilde.TIMAAT.task.exception.TaskServiceException; +import de.bitgilde.TIMAAT.service.task.TaskService; +import de.bitgilde.TIMAAT.service.task.api.MediumAudioAnalysisTask.SupportedMediumType; +import de.bitgilde.TIMAAT.service.task.api.TaskState; +import de.bitgilde.TIMAAT.service.task.exception.TaskServiceException; import io.jsonwebtoken.JwtBuilder; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; @@ -181,7 +181,7 @@ public DataTableInfo<Medium> getMediaList(@BeanParam MediumListingQueryParameter AuthenticationFilter.USER_ACCOUNT_PROPERTY_NAME); int draw = queryParameter.getDraw().orElse(0); - List<Medium> matchingMediums = mediumStorage.getEntriesAsStreamRespectingAuthorization(queryParameter, queryParameter, queryParameter, + List<Medium> matchingMediums = mediumStorage.getEntriesAsStream(queryParameter, queryParameter, queryParameter, userAccount).collect(Collectors.toList()); long totalMediumEntries = mediumStorage.getNumberOfTotalEntriesRespectingAuthorization(userAccount); long filteredMediumEntries = mediumStorage.getNumberOfMatchingEntriesRespectingAuthorization(queryParameter, userAccount); @@ -200,7 +200,7 @@ public List<SelectElement<Integer>> getMediumSelectList(@QueryParam("search") St AuthenticationFilter.USER_ACCOUNT_PROPERTY_NAME); MediumFilterCriteria filterCriteria = new MediumFilterCriteria.Builder().mediumNameSearch(search).build(); - return mediumStorage.getEntriesAsStreamRespectingAuthorization(filterCriteria, PagingParameter.NO_PAGING, + return mediumStorage.getEntriesAsStream(filterCriteria, PagingParameter.NO_PAGING, SortingParameter.defaultSortOrder(), userAccount) .map(currentMedium -> new SelectElement<Integer>(currentMedium.getId(), currentMedium.getDisplayTitle().getName())).collect(Collectors.toList()); diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMusic.java b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMusic.java index 0d592d74..47d6371d 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMusic.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMusic.java @@ -203,7 +203,7 @@ public DataTableInfo<Music> getMusicList(@BeanParam MusicListingQueryParameter q AuthenticationFilter.USER_ACCOUNT_PROPERTY_NAME); int draw = queryParameter.getDraw().orElse(0); - List<Music> matchingMusic = musicStorage.getEntriesAsStreamRespectingAuthorization(queryParameter, queryParameter, queryParameter, + List<Music> matchingMusic = musicStorage.getEntriesAsStream(queryParameter, queryParameter, queryParameter, userAccount).collect(Collectors.toList()); long totalMusicEntries = musicStorage.getNumberOfTotalEntriesRespectingAuthorization(userAccount); long filteredMusicEntries = musicStorage.getNumberOfMatchingEntriesRespectingAuthorization(queryParameter, userAccount); @@ -223,7 +223,7 @@ public List<SelectElement<Integer>> getMusicSelectList(@QueryParam("search") Str UserAccount userAccount = (UserAccount) containerRequestContext.getProperty( AuthenticationFilter.USER_ACCOUNT_PROPERTY_NAME); MusicFilterCriteria filterCriteria = new MusicFilterCriteria.Builder().musicNameSearch(searchText).build(); - return musicStorage.getEntriesAsStreamRespectingAuthorization(filterCriteria, PagingParameter.NO_PAGING, + return musicStorage.getEntriesAsStream(filterCriteria, PagingParameter.NO_PAGING, SortingParameter.defaultSortOrder(), userAccount) .map(currentMusic -> new SelectElement<>(currentMusic.getId(), currentMusic.getDisplayTitle().getName())).collect(Collectors.toList()); diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointSegmentStructureElement.java b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointSegmentStructureElement.java index 72762afb..43f2aae8 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointSegmentStructureElement.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointSegmentStructureElement.java @@ -59,7 +59,7 @@ public DataTableInfo<SegmentStructureElement> listSegmentStructureElements(@Bean UserAccount userAccount = (UserAccount) containerRequestContext.getProperty( AuthenticationFilter.USER_ACCOUNT_PROPERTY_NAME); - List<SegmentStructureElement> matchingEntries = segmentStructureElementsStorage.getEntriesAsStreamRespectingAuthorization(queryParameter, + List<SegmentStructureElement> matchingEntries = segmentStructureElementsStorage.getEntriesAsStream(queryParameter, queryParameter, queryParameter, userAccount).map(SegmentStructureElement::new).collect(Collectors.toList()); long countOfMatchingEntries = segmentStructureElementsStorage.getNumberOfMatchingEntriesRespectingAuthorization(queryParameter, userAccount); long totalCount = segmentStructureElementsStorage.getNumberOfTotalEntriesRespectingAuthorization(userAccount); diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/feature/EagerInitializerFeature.java b/src/main/java/de/bitgilde/TIMAAT/rest/feature/EagerInitializerFeature.java index 5d420bfb..ce33f1fe 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/feature/EagerInitializerFeature.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/feature/EagerInitializerFeature.java @@ -1,6 +1,6 @@ package de.bitgilde.TIMAAT.rest.feature; -import de.bitgilde.TIMAAT.task.TaskService; +import de.bitgilde.TIMAAT.service.task.TaskService; import jakarta.inject.Inject; import jakarta.ws.rs.core.Feature; import jakarta.ws.rs.core.FeatureContext; diff --git a/src/main/java/de/bitgilde/TIMAAT/task/TaskService.java b/src/main/java/de/bitgilde/TIMAAT/service/task/TaskService.java similarity index 85% rename from src/main/java/de/bitgilde/TIMAAT/task/TaskService.java rename to src/main/java/de/bitgilde/TIMAAT/service/task/TaskService.java index 1a7ae02e..be8961ae 100644 --- a/src/main/java/de/bitgilde/TIMAAT/task/TaskService.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/task/TaskService.java @@ -1,12 +1,12 @@ -package de.bitgilde.TIMAAT.task; +package de.bitgilde.TIMAAT.service.task; -import de.bitgilde.TIMAAT.task.api.MediumAudioAnalysisTask; -import de.bitgilde.TIMAAT.task.api.MediumAudioAnalysisTask.SupportedMediumType; -import de.bitgilde.TIMAAT.task.api.Task; -import de.bitgilde.TIMAAT.task.exception.TaskServiceException; -import de.bitgilde.TIMAAT.task.exception.TaskStorageException; -import de.bitgilde.TIMAAT.task.execution.TaskExecutorService; -import de.bitgilde.TIMAAT.task.storage.TaskStorage; +import de.bitgilde.TIMAAT.service.task.api.MediumAudioAnalysisTask; +import de.bitgilde.TIMAAT.service.task.api.MediumAudioAnalysisTask.SupportedMediumType; +import de.bitgilde.TIMAAT.service.task.api.Task; +import de.bitgilde.TIMAAT.service.task.exception.TaskServiceException; +import de.bitgilde.TIMAAT.service.task.exception.TaskStorageException; +import de.bitgilde.TIMAAT.service.task.execution.TaskExecutorService; +import de.bitgilde.TIMAAT.service.task.storage.TaskStorage; import jakarta.annotation.PreDestroy; import jakarta.inject.Inject; diff --git a/src/main/java/de/bitgilde/TIMAAT/task/api/MediumAudioAnalysisTask.java b/src/main/java/de/bitgilde/TIMAAT/service/task/api/MediumAudioAnalysisTask.java similarity index 96% rename from src/main/java/de/bitgilde/TIMAAT/task/api/MediumAudioAnalysisTask.java rename to src/main/java/de/bitgilde/TIMAAT/service/task/api/MediumAudioAnalysisTask.java index f5438dba..adacf5f6 100644 --- a/src/main/java/de/bitgilde/TIMAAT/task/api/MediumAudioAnalysisTask.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/task/api/MediumAudioAnalysisTask.java @@ -1,4 +1,4 @@ -package de.bitgilde.TIMAAT.task.api; +package de.bitgilde.TIMAAT.service.task.api; /* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/de/bitgilde/TIMAAT/task/api/Task.java b/src/main/java/de/bitgilde/TIMAAT/service/task/api/Task.java similarity index 95% rename from src/main/java/de/bitgilde/TIMAAT/task/api/Task.java rename to src/main/java/de/bitgilde/TIMAAT/service/task/api/Task.java index b5e2eb25..441ea1a2 100644 --- a/src/main/java/de/bitgilde/TIMAAT/task/api/Task.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/task/api/Task.java @@ -1,4 +1,4 @@ -package de.bitgilde.TIMAAT.task.api; +package de.bitgilde.TIMAAT.service.task.api; /* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/de/bitgilde/TIMAAT/task/api/TaskState.java b/src/main/java/de/bitgilde/TIMAAT/service/task/api/TaskState.java similarity index 95% rename from src/main/java/de/bitgilde/TIMAAT/task/api/TaskState.java rename to src/main/java/de/bitgilde/TIMAAT/service/task/api/TaskState.java index 5a859139..5bb0265b 100644 --- a/src/main/java/de/bitgilde/TIMAAT/task/api/TaskState.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/task/api/TaskState.java @@ -1,4 +1,4 @@ -package de.bitgilde.TIMAAT.task.api; +package de.bitgilde.TIMAAT.service.task.api; /* diff --git a/src/main/java/de/bitgilde/TIMAAT/task/api/TaskType.java b/src/main/java/de/bitgilde/TIMAAT/service/task/api/TaskType.java similarity index 87% rename from src/main/java/de/bitgilde/TIMAAT/task/api/TaskType.java rename to src/main/java/de/bitgilde/TIMAAT/service/task/api/TaskType.java index fd6dcd13..b568ae12 100644 --- a/src/main/java/de/bitgilde/TIMAAT/task/api/TaskType.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/task/api/TaskType.java @@ -1,4 +1,4 @@ -package de.bitgilde.TIMAAT.task.api; +package de.bitgilde.TIMAAT.service.task.api; /* Licensed under the Apache License, Version 2.0 (the "License"); @@ -14,7 +14,7 @@ limitations under the License. */ -import de.bitgilde.TIMAAT.task.execution.TaskExecutorService; +import de.bitgilde.TIMAAT.service.task.execution.TaskExecutorService; /** * This enum describes the different {@link TaskType}s which can be executed by the {@link TaskExecutorService} diff --git a/src/main/java/de/bitgilde/TIMAAT/task/exception/TaskExecutionException.java b/src/main/java/de/bitgilde/TIMAAT/service/task/exception/TaskExecutionException.java similarity index 91% rename from src/main/java/de/bitgilde/TIMAAT/task/exception/TaskExecutionException.java rename to src/main/java/de/bitgilde/TIMAAT/service/task/exception/TaskExecutionException.java index 4dceabe0..5ee925ca 100644 --- a/src/main/java/de/bitgilde/TIMAAT/task/exception/TaskExecutionException.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/task/exception/TaskExecutionException.java @@ -1,4 +1,4 @@ -package de.bitgilde.TIMAAT.task.exception; +package de.bitgilde.TIMAAT.service.task.exception; /* @@ -15,8 +15,10 @@ limitations under the License. */ +import de.bitgilde.TIMAAT.service.task.api.Task; + /** - * This exception will be thrown when an error occurred during {@link de.bitgilde.TIMAAT.task.api.Task} + * This exception will be thrown when an error occurred during {@link Task} * execution. * * @author Nico Kotlenga diff --git a/src/main/java/de/bitgilde/TIMAAT/task/exception/TaskServiceException.java b/src/main/java/de/bitgilde/TIMAAT/service/task/exception/TaskServiceException.java similarity index 87% rename from src/main/java/de/bitgilde/TIMAAT/task/exception/TaskServiceException.java rename to src/main/java/de/bitgilde/TIMAAT/service/task/exception/TaskServiceException.java index 2f90476e..53ace4e1 100644 --- a/src/main/java/de/bitgilde/TIMAAT/task/exception/TaskServiceException.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/task/exception/TaskServiceException.java @@ -1,4 +1,4 @@ -package de.bitgilde.TIMAAT.task.exception; +package de.bitgilde.TIMAAT.service.task.exception; /* Licensed under the Apache License, Version 2.0 (the "License"); @@ -14,8 +14,10 @@ limitations under the License. */ +import de.bitgilde.TIMAAT.service.task.TaskService; + /** - * This exception will be thrown when an error occurred during using the {@link de.bitgilde.TIMAAT.task.TaskService} + * This exception will be thrown when an error occurred during using the {@link TaskService} * * @author Nico Kotlenga * @since 22.07.25 diff --git a/src/main/java/de/bitgilde/TIMAAT/task/exception/TaskStorageException.java b/src/main/java/de/bitgilde/TIMAAT/service/task/exception/TaskStorageException.java similarity index 84% rename from src/main/java/de/bitgilde/TIMAAT/task/exception/TaskStorageException.java rename to src/main/java/de/bitgilde/TIMAAT/service/task/exception/TaskStorageException.java index 33bcb609..3a52fb71 100644 --- a/src/main/java/de/bitgilde/TIMAAT/task/exception/TaskStorageException.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/task/exception/TaskStorageException.java @@ -1,4 +1,4 @@ -package de.bitgilde.TIMAAT.task.exception; +package de.bitgilde.TIMAAT.service.task.exception; /* Licensed under the Apache License, Version 2.0 (the "License"); @@ -14,8 +14,10 @@ limitations under the License. */ +import de.bitgilde.TIMAAT.service.task.storage.TaskStorage; + /** - * This type of exception will be thrown when an error occurred during using the {@link de.bitgilde.TIMAAT.task.storage.TaskStorage} + * This type of exception will be thrown when an error occurred during using the {@link TaskStorage} * * @author Nico Kotlenga * @since 20.07.25 diff --git a/src/main/java/de/bitgilde/TIMAAT/task/execution/MediumAudioAnalysisTaskExecutor.java b/src/main/java/de/bitgilde/TIMAAT/service/task/execution/MediumAudioAnalysisTaskExecutor.java similarity index 95% rename from src/main/java/de/bitgilde/TIMAAT/task/execution/MediumAudioAnalysisTaskExecutor.java rename to src/main/java/de/bitgilde/TIMAAT/service/task/execution/MediumAudioAnalysisTaskExecutor.java index 284c1d92..1da24c63 100644 --- a/src/main/java/de/bitgilde/TIMAAT/task/execution/MediumAudioAnalysisTaskExecutor.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/task/execution/MediumAudioAnalysisTaskExecutor.java @@ -1,4 +1,4 @@ -package de.bitgilde.TIMAAT.task.execution; +package de.bitgilde.TIMAAT.service.task.execution; import de.bitgilde.TIMAAT.processing.audio.FfmpegAudioEngine; import de.bitgilde.TIMAAT.processing.audio.api.AudioMetaInformation; @@ -8,9 +8,9 @@ import de.bitgilde.TIMAAT.storage.file.AudioContainingMediumFileStorage; import de.bitgilde.TIMAAT.storage.file.TemporaryFileStorage; import de.bitgilde.TIMAAT.storage.file.TemporaryFileStorage.TemporaryFile; -import de.bitgilde.TIMAAT.task.api.MediumAudioAnalysisTask; -import de.bitgilde.TIMAAT.task.api.MediumAudioAnalysisTask.SupportedMediumType; -import de.bitgilde.TIMAAT.task.exception.TaskExecutionException; +import de.bitgilde.TIMAAT.service.task.api.MediumAudioAnalysisTask; +import de.bitgilde.TIMAAT.service.task.api.MediumAudioAnalysisTask.SupportedMediumType; +import de.bitgilde.TIMAAT.service.task.exception.TaskExecutionException; import java.io.IOException; import java.nio.file.Path; diff --git a/src/main/java/de/bitgilde/TIMAAT/task/execution/TaskExecutor.java b/src/main/java/de/bitgilde/TIMAAT/service/task/execution/TaskExecutor.java similarity index 83% rename from src/main/java/de/bitgilde/TIMAAT/task/execution/TaskExecutor.java rename to src/main/java/de/bitgilde/TIMAAT/service/task/execution/TaskExecutor.java index ae319eb3..73a0f720 100644 --- a/src/main/java/de/bitgilde/TIMAAT/task/execution/TaskExecutor.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/task/execution/TaskExecutor.java @@ -1,7 +1,7 @@ -package de.bitgilde.TIMAAT.task.execution; +package de.bitgilde.TIMAAT.service.task.execution; -import de.bitgilde.TIMAAT.task.api.Task; -import de.bitgilde.TIMAAT.task.exception.TaskExecutionException; +import de.bitgilde.TIMAAT.service.task.api.Task; +import de.bitgilde.TIMAAT.service.task.exception.TaskExecutionException; /* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/de/bitgilde/TIMAAT/task/execution/TaskExecutorFactory.java b/src/main/java/de/bitgilde/TIMAAT/service/task/execution/TaskExecutorFactory.java similarity index 88% rename from src/main/java/de/bitgilde/TIMAAT/task/execution/TaskExecutorFactory.java rename to src/main/java/de/bitgilde/TIMAAT/service/task/execution/TaskExecutorFactory.java index d5e1185f..79f0cb5a 100644 --- a/src/main/java/de/bitgilde/TIMAAT/task/execution/TaskExecutorFactory.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/task/execution/TaskExecutorFactory.java @@ -1,4 +1,4 @@ -package de.bitgilde.TIMAAT.task.execution; +package de.bitgilde.TIMAAT.service.task.execution; import de.bitgilde.TIMAAT.processing.audio.FfmpegAudioEngine; import de.bitgilde.TIMAAT.storage.entity.AudioAnalysisResultStorage; @@ -6,10 +6,10 @@ import de.bitgilde.TIMAAT.storage.file.AudioFileStorage; import de.bitgilde.TIMAAT.storage.file.TemporaryFileStorage; import de.bitgilde.TIMAAT.storage.file.VideoFileStorage; -import de.bitgilde.TIMAAT.task.api.MediumAudioAnalysisTask; -import de.bitgilde.TIMAAT.task.api.MediumAudioAnalysisTask.SupportedMediumType; -import de.bitgilde.TIMAAT.task.api.Task; -import de.bitgilde.TIMAAT.task.api.TaskType; +import de.bitgilde.TIMAAT.service.task.api.MediumAudioAnalysisTask; +import de.bitgilde.TIMAAT.service.task.api.MediumAudioAnalysisTask.SupportedMediumType; +import de.bitgilde.TIMAAT.service.task.api.Task; +import de.bitgilde.TIMAAT.service.task.api.TaskType; import jakarta.inject.Inject; import java.util.Map; @@ -29,7 +29,7 @@ */ /** - * This factory is responsible to create {@link TaskExecutor} for the passed {@link de.bitgilde.TIMAAT.task.api.Task} + * This factory is responsible to create {@link TaskExecutor} for the passed {@link Task} * * @author Nico Kotlenga * @since 20.07.25 diff --git a/src/main/java/de/bitgilde/TIMAAT/task/execution/TaskExecutorService.java b/src/main/java/de/bitgilde/TIMAAT/service/task/execution/TaskExecutorService.java similarity index 96% rename from src/main/java/de/bitgilde/TIMAAT/task/execution/TaskExecutorService.java rename to src/main/java/de/bitgilde/TIMAAT/service/task/execution/TaskExecutorService.java index 09132f38..6a854f09 100644 --- a/src/main/java/de/bitgilde/TIMAAT/task/execution/TaskExecutorService.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/task/execution/TaskExecutorService.java @@ -1,10 +1,10 @@ -package de.bitgilde.TIMAAT.task.execution; +package de.bitgilde.TIMAAT.service.task.execution; import de.bitgilde.TIMAAT.PropertyConstants; import de.bitgilde.TIMAAT.PropertyManagement; -import de.bitgilde.TIMAAT.task.api.Task; -import de.bitgilde.TIMAAT.task.api.TaskState; -import de.bitgilde.TIMAAT.task.storage.TaskStateUpdater; +import de.bitgilde.TIMAAT.service.task.api.Task; +import de.bitgilde.TIMAAT.service.task.api.TaskState; +import de.bitgilde.TIMAAT.service.task.storage.TaskStateUpdater; import jakarta.annotation.PreDestroy; import jakarta.inject.Inject; diff --git a/src/main/java/de/bitgilde/TIMAAT/task/storage/DbTaskStorage.java b/src/main/java/de/bitgilde/TIMAAT/service/task/storage/DbTaskStorage.java similarity index 93% rename from src/main/java/de/bitgilde/TIMAAT/task/storage/DbTaskStorage.java rename to src/main/java/de/bitgilde/TIMAAT/service/task/storage/DbTaskStorage.java index 365e0e57..02bdf7e0 100644 --- a/src/main/java/de/bitgilde/TIMAAT/task/storage/DbTaskStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/task/storage/DbTaskStorage.java @@ -1,4 +1,4 @@ -package de.bitgilde.TIMAAT.task.storage; +package de.bitgilde.TIMAAT.service.task.storage; import de.bitgilde.TIMAAT.db.DbAccessComponent; import de.bitgilde.TIMAAT.db.exception.DbTransactionExecutionException; @@ -6,11 +6,11 @@ import de.bitgilde.TIMAAT.model.FIPOP.Medium; import de.bitgilde.TIMAAT.model.FIPOP.MediumAudioAnalysis; import de.bitgilde.TIMAAT.sse.EntityUpdateEventService; -import de.bitgilde.TIMAAT.task.api.MediumAudioAnalysisTask; -import de.bitgilde.TIMAAT.task.api.MediumAudioAnalysisTask.SupportedMediumType; -import de.bitgilde.TIMAAT.task.api.Task; -import de.bitgilde.TIMAAT.task.api.TaskState; -import de.bitgilde.TIMAAT.task.exception.TaskStorageException; +import de.bitgilde.TIMAAT.service.task.api.MediumAudioAnalysisTask; +import de.bitgilde.TIMAAT.service.task.api.MediumAudioAnalysisTask.SupportedMediumType; +import de.bitgilde.TIMAAT.service.task.api.Task; +import de.bitgilde.TIMAAT.service.task.api.TaskState; +import de.bitgilde.TIMAAT.service.task.exception.TaskStorageException; import jakarta.inject.Inject; import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManagerFactory; @@ -35,7 +35,7 @@ */ /** - * {@link TaskStorage} using the db to persist {@link de.bitgilde.TIMAAT.task.api.Task} + * {@link TaskStorage} using the db to persist {@link Task} * information * * @author Nico Kotlenga diff --git a/src/main/java/de/bitgilde/TIMAAT/task/storage/TaskStateUpdater.java b/src/main/java/de/bitgilde/TIMAAT/service/task/storage/TaskStateUpdater.java similarity index 86% rename from src/main/java/de/bitgilde/TIMAAT/task/storage/TaskStateUpdater.java rename to src/main/java/de/bitgilde/TIMAAT/service/task/storage/TaskStateUpdater.java index 3b4a46a9..425232b3 100644 --- a/src/main/java/de/bitgilde/TIMAAT/task/storage/TaskStateUpdater.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/task/storage/TaskStateUpdater.java @@ -1,7 +1,7 @@ -package de.bitgilde.TIMAAT.task.storage; +package de.bitgilde.TIMAAT.service.task.storage; -import de.bitgilde.TIMAAT.task.api.Task; -import de.bitgilde.TIMAAT.task.api.TaskState; +import de.bitgilde.TIMAAT.service.task.api.Task; +import de.bitgilde.TIMAAT.service.task.api.TaskState; /* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/de/bitgilde/TIMAAT/task/storage/TaskStorage.java b/src/main/java/de/bitgilde/TIMAAT/service/task/storage/TaskStorage.java similarity index 87% rename from src/main/java/de/bitgilde/TIMAAT/task/storage/TaskStorage.java rename to src/main/java/de/bitgilde/TIMAAT/service/task/storage/TaskStorage.java index cd127181..0978cbc5 100644 --- a/src/main/java/de/bitgilde/TIMAAT/task/storage/TaskStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/task/storage/TaskStorage.java @@ -1,7 +1,7 @@ -package de.bitgilde.TIMAAT.task.storage; +package de.bitgilde.TIMAAT.service.task.storage; -import de.bitgilde.TIMAAT.task.api.Task; -import de.bitgilde.TIMAAT.task.exception.TaskStorageException; +import de.bitgilde.TIMAAT.service.task.api.Task; +import de.bitgilde.TIMAAT.service.task.exception.TaskStorageException; import java.util.stream.Stream; diff --git a/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java b/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java new file mode 100644 index 00000000..56b839cb --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java @@ -0,0 +1,48 @@ +package de.bitgilde.TIMAAT.service.transcription; + +import de.bitgilde.TIMAAT.service.transcription.stt.SpeechToTextService; +import de.bitgilde.TIMAAT.storage.api.PagingParameter; +import de.bitgilde.TIMAAT.storage.api.SortingParameter; +import de.bitgilde.TIMAAT.storage.entity.transcription.TranscriptionStorage; +import de.bitgilde.TIMAAT.storage.entity.transcription.api.TranscriptionFilterCriteria; +import de.bitgilde.TIMAAT.storage.entity.transcription.api.TranscriptionState; +import jakarta.inject.Inject; + +import java.util.Set; +import java.util.logging.Logger; + +/** + * Service responsible to coordinate the execution of speech-to-text processes + * + * @author Nico Kotlenga (nico@nko-dev.studio) + * @since 12.05.26 + */ +public abstract class TranscriptionService { + + private static final Logger logger = Logger.getLogger(TranscriptionService.class.getName()); + + private final TranscriptionStorage transcriptionStorage; + private final SpeechToTextService speechToTextService; + + @Inject + public TranscriptionService(TranscriptionStorage transcriptionStorage, SpeechToTextService speechToTextService) { + this.transcriptionStorage = transcriptionStorage; + this.speechToTextService = speechToTextService; + + resumeMonitoringOfUncompletedSpeechToTextTasks(); + } + + private void resumeMonitoringOfUncompletedSpeechToTextTasks() { + logger.info("Resuming monitoring of uncompleted speech-to-text tasks"); + TranscriptionFilterCriteria transcriptionFilterCriteria = new TranscriptionFilterCriteria.Builder().transcriptionStates( + Set.of(TranscriptionState.PENDING, TranscriptionState.COMPLETED)).build(); + transcriptionStorage.getEntriesAsStream(transcriptionFilterCriteria, PagingParameter.NO_PAGING, + SortingParameter.defaultSortOrder(), null).forEach(transcription -> { + if(transcription.getTranscriptionTaskId() != null){ + + }else { + + } + }); + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/service/transcription/stt/SpeechToTextService.java b/src/main/java/de/bitgilde/TIMAAT/service/transcription/stt/SpeechToTextService.java new file mode 100644 index 00000000..ab10145b --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/service/transcription/stt/SpeechToTextService.java @@ -0,0 +1,28 @@ +package de.bitgilde.TIMAAT.service.transcription.stt; + +import de.bitgilde.TIMAAT.model.FIPOP.Transcription; +import studio.nkodev.stt.client.SpeechToTextServiceClient; + +/** + * This service is using the {@link studio.nkodev.stt.client.SpeechToTextServiceClient} to trigger and monitor + * speech to text tasks + * + * @author Nico Kotlenga (nico@nko-dev.studio) + * @since 12.05.26 + */ +public class SpeechToTextService { + + private final SpeechToTextServiceClient speechToTextServiceClient; + + public SpeechToTextService(SpeechToTextServiceClient speechToTextServiceClient) { + this.speechToTextServiceClient = speechToTextServiceClient; + } + + public void startSpeechToTextTaskForTranscription(Transcription transcription){ + + } + + public void monitorSpeechToTextTask(long speechToTextTaskId){ + + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/service/transcription/stt/SpeechToTextServiceUniErfurt.java b/src/main/java/de/bitgilde/TIMAAT/service/transcription/stt/SpeechToTextServiceUniErfurt.java new file mode 100644 index 00000000..6b0bc38c --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/service/transcription/stt/SpeechToTextServiceUniErfurt.java @@ -0,0 +1,10 @@ +package de.bitgilde.TIMAAT.service.transcription.stt; + +/** + * TODO: Add javadoc + * + * @author Nico Kotlenga (nico@nko-dev.studio) + * @since 12.05.26 + */ +public class SpeechToTextServiceUniErfurt { +} diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/api/EntityStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/api/EntityStorage.java index 245f0051..7928e388 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/api/EntityStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/api/EntityStorage.java @@ -20,7 +20,7 @@ public interface EntityStorage<ENTITY_TYPE, FILTER_TYPE, SORTING_FIELD_TYPE exte * @param userAccount used to filter entries by authorization * @return the resulting {@link Stream} */ - Stream<ENTITY_TYPE> getEntriesAsStreamRespectingAuthorization(FILTER_TYPE filter, PagingParameter pagingParameter, SortingParameter<SORTING_FIELD_TYPE> sortingParameter, UserAccount userAccount); + Stream<ENTITY_TYPE> getEntriesAsStream(FILTER_TYPE filter, PagingParameter pagingParameter, SortingParameter<SORTING_FIELD_TYPE> sortingParameter, UserAccount userAccount); /** * Loads the count of entities matching the specified filters which are accessible for the specified diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/db/DbStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/db/DbStorage.java index 5e204f8e..b6df01b6 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/db/DbStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/db/DbStorage.java @@ -63,13 +63,9 @@ public DbStorage(Class<ENTITY_TYPE> entityTypeClass, SORTING_FIELD_TYPE defaultS * @param userAccount used to filter entries by authorization * @return the resulting {@link Stream} */ - public Stream<ENTITY_TYPE> getEntriesAsStreamRespectingAuthorization(FILTER_TYPE filter, PagingParameter pagingParameter, SortingParameter<SORTING_FIELD_TYPE> sortingParameter, UserAccount userAccount) { + public Stream<ENTITY_TYPE> getEntriesAsStream(FILTER_TYPE filter, PagingParameter pagingParameter, SortingParameter<SORTING_FIELD_TYPE> sortingParameter, @Nullable UserAccount userAccount) { logger.log(Level.FINER, "Loading entries matching the specified filter criteria"); - if(userAccount == null) { - throw new IllegalArgumentException("user account has to be set for an authorization respecting loading of entities"); - } - return executeStreamDbTransaction(entityManager -> { CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder(); CriteriaQuery<ENTITY_TYPE> criteriaQuery = criteriaBuilder.createQuery(entityTypeClass); diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/actor/api/ActorSortingField.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/actor/api/ActorSortingField.java index 0cc64280..7b4e4303 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/actor/api/ActorSortingField.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/actor/api/ActorSortingField.java @@ -35,7 +35,8 @@ public enum ActorSortingField implements DbSortingField<Actor> { root -> root.get(Actor_.displayName).get(ActorName_.usedFrom)), NAME_USED_UNTIL( root -> root.get(Actor_.displayName).get(ActorName_.usedUntil)), PRIMARY_PHONE_NUMBER( root -> root.get(Actor_.primaryPhoneNumber).get(PhoneNumber_.phoneNumber)), PRIMARY_EMAIL_ADDRESS( - root -> root.get(Actor_.actorHasEmailAddress).get(EmailAddress_.email)), FICTIONAL(root -> root.get(Actor_.isFictional)); + root -> root.get(Actor_.actorHasEmailAddress).get(EmailAddress_.email)), FICTIONAL( + root -> root.get(Actor_.isFictional)); private final SortingFieldPathProducer<Actor> pathProducer; diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/TranscriptionStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/TranscriptionStorage.java new file mode 100644 index 00000000..0b5ab658 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/TranscriptionStorage.java @@ -0,0 +1,56 @@ +package de.bitgilde.TIMAAT.storage.entity.transcription; + +import de.bitgilde.TIMAAT.model.FIPOP.Transcription; +import de.bitgilde.TIMAAT.model.FIPOP.TranscriptionState_; +import de.bitgilde.TIMAAT.model.FIPOP.Transcription_; +import de.bitgilde.TIMAAT.model.FIPOP.UserAccount; +import de.bitgilde.TIMAAT.storage.db.DbStorage; +import de.bitgilde.TIMAAT.storage.entity.transcription.api.TranscriptionFilterCriteria; +import de.bitgilde.TIMAAT.storage.entity.transcription.api.TranscriptionSortingField; +import de.bitgilde.TIMAAT.storage.entity.transcription.api.TranscriptionState; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; +import org.jspecify.annotations.Nullable; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + +/** + * Storage responsible to provide access to {@link de.bitgilde.TIMAAT.model.FIPOP.Transcription} entities + * + * @author Nico Kotlenga (nico@nko-dev.studio) + * @since 12.05.26 + */ +public class TranscriptionStorage extends DbStorage<Transcription, TranscriptionFilterCriteria, TranscriptionSortingField> { + + @Inject + public TranscriptionStorage(EntityManagerFactory emf) { + super(Transcription.class, TranscriptionSortingField.ID, emf); + } + + @Override + protected List<Predicate> createPredicates(@Nullable TranscriptionFilterCriteria filter, Root<Transcription> root, CriteriaBuilder criteriaBuilder, CriteriaQuery<?> criteriaQuery, @Nullable UserAccount userAccount) { + if (filter != null) { + List<Predicate> predicates = new ArrayList<>(1); + + if (filter.getTranscriptionStates().isPresent()) { + Collection<Integer> transcriptionStateIds = filter.getTranscriptionStates().get().stream() + .map(TranscriptionState::getDatabaseId) + .collect(Collectors.toSet()); + predicates.add( + root.get(Transcription_.transcriptionState).get(TranscriptionState_.id).in(transcriptionStateIds)); + } + + return predicates; + } + + return Collections.emptyList(); + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/api/TranscriptionFilterCriteria.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/api/TranscriptionFilterCriteria.java new file mode 100644 index 00000000..38c47bd9 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/api/TranscriptionFilterCriteria.java @@ -0,0 +1,50 @@ +package de.bitgilde.TIMAAT.storage.entity.transcription.api; + +import java.util.Collection; +import java.util.Optional; + +/* + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + +/** + * Filters which can be passed when listing items of {@link de.bitgilde.TIMAAT.storage.entity.transcription.TranscriptionStorage} + * + * @author Nico Kotlenga + * @since 27.12.25 + */ +public interface TranscriptionFilterCriteria { + /** + * @return the category ids the returning actor should belong to + */ + Optional<Collection<TranscriptionState>> getTranscriptionStates(); + + class Builder { + + private Collection<TranscriptionState> transcriptionStates = null; + + public TranscriptionFilterCriteria.Builder transcriptionStates(Collection<TranscriptionState> transcriptionStates) { + this.transcriptionStates = transcriptionStates; + return this; + } + + public TranscriptionFilterCriteria build() { + return new TranscriptionFilterCriteria() { + @Override + public Optional<Collection<TranscriptionState>> getTranscriptionStates() { + return Optional.ofNullable(transcriptionStates); + } + }; + } + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/api/TranscriptionSortingField.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/api/TranscriptionSortingField.java new file mode 100644 index 00000000..ee36a25a --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/api/TranscriptionSortingField.java @@ -0,0 +1,42 @@ +package de.bitgilde.TIMAAT.storage.entity.transcription.api; + +/* + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + +import de.bitgilde.TIMAAT.model.FIPOP.Transcription; +import de.bitgilde.TIMAAT.model.FIPOP.Transcription_; +import de.bitgilde.TIMAAT.storage.db.DbSortingField; +import de.bitgilde.TIMAAT.storage.db.SortingFieldPathProducer; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Root; + +/** + * Fields which can be used to sort transcriptions + * + * @author Nico Kotlenga (nico@nko-dev.studio) + * @since 12.05.26 + */ +public enum TranscriptionSortingField implements DbSortingField<Transcription> { + ID(root -> root.get(Transcription_.id)); + private final SortingFieldPathProducer<Transcription> pathProducer; + + TranscriptionSortingField(SortingFieldPathProducer<Transcription> pathProducer) { + this.pathProducer = pathProducer; + } + + @Override + public Path<?> getPathFromRootEntity(Root<Transcription> root) { + return pathProducer.getPathFromRoot(root); + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/api/TranscriptionState.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/api/TranscriptionState.java new file mode 100644 index 00000000..78b6045c --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/api/TranscriptionState.java @@ -0,0 +1,21 @@ +package de.bitgilde.TIMAAT.storage.entity.transcription.api; + +/** + * Different states a {@link de.bitgilde.TIMAAT.model.FIPOP.Transcription} can be in + * + * @author Nico Kotlenga (nico@nko-dev.studio) + * @since 12.05.26 + */ +public enum TranscriptionState { + PREPARING(1), PENDING(2), RUNNING(3), COMPLETED(4), FAILED(5); + + private final int databaseId; + + TranscriptionState(int databaseId) { + this.databaseId = databaseId; + } + + public int getDatabaseId() { + return databaseId; + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/api/TranscriptionType.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/api/TranscriptionType.java new file mode 100644 index 00000000..0141f0fb --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/api/TranscriptionType.java @@ -0,0 +1,23 @@ +package de.bitgilde.TIMAAT.storage.entity.transcription.api; + +/** + * Type of the {@link de.bitgilde.TIMAAT.model.FIPOP.Transcription}. + * Transcriptions can be generated by using the speech-to-text-service or imported from a file + * + * @author Nico Kotlenga (nico@nko-dev.studio) + * @since 12.05.26 + */ +public enum TranscriptionType { + GENERATED(1), + IMPORTED(2); + + private final int databaseId; + + TranscriptionType(int databaseId) { + this.databaseId = databaseId; + } + + public int getDatabaseId() { + return databaseId; + } +} diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index f1af06f8..d6d7b635 100644 --- a/src/main/resources/META-INF/persistence.xml +++ b/src/main/resources/META-INF/persistence.xml @@ -1,319 +1,324 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE xml> -<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.0" xsi:schemalocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd"> - <persistence-unit name="FIPOP-JPA" transaction-type="RESOURCE_LOCAL"> - <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider> - <jta-data-source>java:/FIPOP</jta-data-source> - <class>de.bitgilde.TIMAAT.model.FIPOP.ActingTechnique</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.ActingTechniqueTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.Actor</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.ActorActorRelationshipType</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.ActorActorRelationshipTypeTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.ActorCollective</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.ActorHasAddress</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.ActorHasAddressPK</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.ActorHasEmailAddress</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.ActorHasEmailAddressPK</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.ActorHasPhoneNumber</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.ActorHasPhoneNumberPK</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.ActorHasRole</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.ActorHasRolePK</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.ActorIsLocatedInCountry</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.ActorIsLocatedInCountryPK</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.ActorName</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.ActorPerson</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.ActorPersonIsMemberOfActorCollective</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.ActorPersonIsMemberOfActorCollectivePK</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.ActorPersonTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.ActorRelatesToActor</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.ActorRelatesToActorPK</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.ActorType</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.ActorTypeTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.Address</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.AddressType</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.AddressTypeTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.Analysis</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisAction</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisActionTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisActor</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisMethod</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisMethodType</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisMethodTypeTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisMusic</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisScene</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisSceneTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisSegment</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisSegmentStructureElement</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisSegmentTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisSequence</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisSequenceTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisSpeech</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisTake</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisTakeTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisVoice</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.Annotation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.AnnotationHasMusic</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.AnnotationHasMusicTranslationArea</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.AnnotationTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.Articulation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.ArticulationTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.AudioAnalysis</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.AudioAnalysisState</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.AudioAnalysisStateTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.AudioPostProduction</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.AudioPostProductionTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.Bibliography</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.CameraAxisOfAction</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.CameraAxisOfActionTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.CameraDepthOfFocus</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.CameraDepthOfFocusTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.CameraDistance</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.CameraDistanceTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.CameraElevation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.CameraElevationTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.CameraHandling</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.CameraHandlingTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.CameraHorizontalAngle</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.CameraHorizontalAngleTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.CameraMovement</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.CameraMovementCharacteristic</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.CameraMovementCharacteristicTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.CameraMovementType</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.CameraMovementTypeTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.CameraShotType</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.CameraShotTypeTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.CameraVerticalAngle</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.CameraVerticalAngleTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.Category</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.CategorySet</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.CategorySetHasCategory</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.CategorySetHasCategoryPK</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.ChangeInDynamics</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.ChangeInDynamicsTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.ChangeInTempo</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.ChangeInTempoTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.ChurchMusicalKey</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.ChurchMusicalKeyTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.Citizenship</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.CitizenshipTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.City</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.ColorTemperature</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.ColorTemperatureTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.ConceptCameraPositionAndPerspective</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.ConceptDirection</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.ConceptDirectionTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.Country</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.County</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.DynamicMarking</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.DynamicMarkingTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.EditingMontage</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.EditingRhythm</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.EditingRhythmTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.EmailAddress</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.EmailAddressType</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.EmailAddressTypeTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.EpisodeInformation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.Event</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.EventDomain</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.EventDomainTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.EventEventRelationshipType</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.EventEventRelationshipTypeTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.EventRelatesToEvent</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.EventRelatesToEventPK</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.EventTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.EventType</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.EventTypeTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.FacialExpression</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.FacialExpressionIntensity</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.FacialExpressionIntensityTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.FacialExpressionTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.GesturalEmotion</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.GesturalEmotionIntensity</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.GesturalEmotionIntensityTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.GesturalEmotionTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.ImageCadreEditing</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.ImageCadreEditingTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.Instrument</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.InstrumentSubtype</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.InstrumentSubtypeTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.InstrumentType</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.InstrumentTypeTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.Jins</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.JinsTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.Language</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.Lighting</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.LightingDuration</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.LightingDurationTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.LightingType</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.LightingTypeTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.LightModifier</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.LightModifierTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.LightPosition</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.LightPositionAngleHorizontal</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.LightPositionAngleHorizontalTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.LightPositionAngleVertical</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.LightPositionAngleVerticalTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.LightPositionTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.LineupMember</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.Location</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.LocationTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.LocationType</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.LocationTypeTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.Maqam</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MaqamType</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MaqamTypeTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MaqamSubtype</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MaqamSubtypeTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MartinezScheffelUnreliableNarration</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MartinezScheffelUnreliableNarrationTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MediaCollection</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MediaCollectionAlbum</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MediaCollectionAnalysisList</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MediaCollectionAnalysisListHasTag</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MediaCollectionAnalysisListHasTagPK</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MediaCollectionAnalysisListTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MediaCollectionHasMedium</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MediaCollectionHasMediumPK</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MediaCollectionSeries</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MediaCollectionType</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MediaCollectionTypeTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MediaType</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MediaTypeTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.Medium</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MediumAnalysisList</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MediumAnalysisListTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MediumAudio</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MediumAudioAnalysis</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MediumDocument</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MediumEventRelationshipType</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MediumEventRelationshipTypeTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MediumHasActorWithRole</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MediumHasActorWithRolePK</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MediumHasLanguage</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MediumHasLanguagePK</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MediumHasMusic</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MediumHasMusicDetail</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MediumHasMusicPK</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MediumImage</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MediumLanguageType</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MediumLanguageTypeTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MediumRelatesToEvent</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MediumRelatesToEventPK</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MediumSoftware</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MediumText</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MediumVideo</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MediumVideogame</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MediumVideoHasMediumImage</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MediumVideoHasMediumImagePK</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MembershipDetail</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MontageFigureMacro</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MontageFigureMacroTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MontageFigureMicro</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MontageFigureMicroTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.Music</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MusicalKey</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MusicalKeyTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MusicalNotation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MusicArticulationElement</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MusicHasActorWithRole</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MusicHasActorWithRolePK</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MusicChangeInTempoElement</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MusicChurchMusic</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MusicDynamicsElement</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MusicDynamicsElementType</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MusicDynamicsElementTypeTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MusicFormElement</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MusicFormElementTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MusicFormElementType</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MusicFormElementTypeTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MusicTextSettingElement</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MusicTextSettingElementType</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MusicTextSettingElementTypeTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MusicNashid</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MusicType</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MusicTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.MusicTypeTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.PermissionType</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.PhoneNumber</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.PhoneNumberType</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.PhoneNumberTypeTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.PhysicalExpression</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.PhysicalExpressionIntensity</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.PhysicalExpressionIntensityTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.PhysicalExpressionTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.Platform</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.PlaybackSpeed</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.PlaybackSpeedTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.PropagandaType</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.Province</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.Publication</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.Reference</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.ReferenceDataFieldRequirement</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.ReferenceDataFieldRequirementPK</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.ReferenceEntryType</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.Rhythm</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.Role</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.RoleGroup</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.RoleGroupTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.RoleTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.SegmentSelectorType</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.SegmentSelectorTypeTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.SelectorSvg</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.Sex</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.SexTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.SongStructure</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.SongStructureElement</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.SongStructureElementTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.SoundEffectDescriptive</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.Source</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.Street</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.SvgShapeType</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.SvgShapeTypeTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.SystemSetting</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.Tag</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.TakeJunction</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.TakeJunctionTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.TakeLength</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.TakeTypeProgression</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.TakeTypeProgressionTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.TempoMarking</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.TempoMarkingTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.Territory</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.TerritoryTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.Timbre</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.Title</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.Transcription</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.TranscriptionEngine</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.TranscriptionModel</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.TranscriptionState</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.TranscriptionStateTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.UserAccount</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.UserAccountHasCategorySet</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.UserAccountHasCategorySetPK</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.UserAccountHasMediaCollection</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.UserAccountHasMediaCollectionAnalysisList</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.UserAccountHasMediaCollectionAnalysisListPK</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.UserAccountHasMediaCollectionPK</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.UserAccountHasMediumAnalysisList</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.UserAccountHasMediumAnalysisListPK</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.UserLog</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.UserLogEventType</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.UserPassword</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.UserPasswordHashType</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.UserPasswordOldHash</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.Voice</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.VoiceLeadingPattern</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.VoiceLeadingPatternTranslation</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.VoiceType</class> - <class>de.bitgilde.TIMAAT.model.FIPOP.VoiceTypeTranslation</class> - <properties> - <property name="eclipselink.ddl-generation.output-mode" value="database"/> - <property name="autoReconnect" value="true"/> - <property name="jakarta.persistence.jdbc.driver" value="com.mysql.cj.jdbc.Driver"/> - <property name="jakarta.persistence.jdbc.url" value="jdbc:mysql://localhost:3306/FIPOP?useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTCs"/> - <property name="jakarta.persistence.jdbc.user" value="root"/> - <property name="jakarta.persistence.jdbc.password" value="geheim123"/> - <property name="eclipselink.cache.shared.default" value="false"/> - </properties> - </persistence-unit> +<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="3.0" + xsi:schemalocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd"> + <persistence-unit name="FIPOP-JPA" transaction-type="RESOURCE_LOCAL"> + <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider> + <jta-data-source>java:/FIPOP</jta-data-source> + <class>de.bitgilde.TIMAAT.model.FIPOP.ActingTechnique</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.ActingTechniqueTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.Actor</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.ActorActorRelationshipType</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.ActorActorRelationshipTypeTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.ActorCollective</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.ActorHasAddress</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.ActorHasAddressPK</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.ActorHasEmailAddress</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.ActorHasEmailAddressPK</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.ActorHasPhoneNumber</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.ActorHasPhoneNumberPK</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.ActorHasRole</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.ActorHasRolePK</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.ActorIsLocatedInCountry</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.ActorIsLocatedInCountryPK</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.ActorName</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.ActorPerson</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.ActorPersonIsMemberOfActorCollective</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.ActorPersonIsMemberOfActorCollectivePK</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.ActorPersonTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.ActorRelatesToActor</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.ActorRelatesToActorPK</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.ActorType</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.ActorTypeTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.Address</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.AddressType</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.AddressTypeTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.Analysis</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisAction</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisActionTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisActor</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisMethod</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisMethodType</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisMethodTypeTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisMusic</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisScene</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisSceneTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisSegment</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisSegmentStructureElement</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisSegmentTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisSequence</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisSequenceTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisSpeech</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisTake</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisTakeTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.AnalysisVoice</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.Annotation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.AnnotationHasMusic</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.AnnotationHasMusicTranslationArea</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.AnnotationTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.Articulation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.ArticulationTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.AudioAnalysis</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.AudioAnalysisState</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.AudioAnalysisStateTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.AudioPostProduction</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.AudioPostProductionTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.Bibliography</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.CameraAxisOfAction</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.CameraAxisOfActionTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.CameraDepthOfFocus</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.CameraDepthOfFocusTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.CameraDistance</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.CameraDistanceTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.CameraElevation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.CameraElevationTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.CameraHandling</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.CameraHandlingTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.CameraHorizontalAngle</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.CameraHorizontalAngleTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.CameraMovement</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.CameraMovementCharacteristic</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.CameraMovementCharacteristicTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.CameraMovementType</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.CameraMovementTypeTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.CameraShotType</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.CameraShotTypeTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.CameraVerticalAngle</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.CameraVerticalAngleTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.Category</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.CategorySet</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.CategorySetHasCategory</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.CategorySetHasCategoryPK</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.ChangeInDynamics</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.ChangeInDynamicsTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.ChangeInTempo</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.ChangeInTempoTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.ChurchMusicalKey</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.ChurchMusicalKeyTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.Citizenship</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.CitizenshipTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.City</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.ColorTemperature</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.ColorTemperatureTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.ConceptCameraPositionAndPerspective</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.ConceptDirection</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.ConceptDirectionTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.Country</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.County</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.DynamicMarking</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.DynamicMarkingTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.EditingMontage</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.EditingRhythm</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.EditingRhythmTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.EmailAddress</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.EmailAddressType</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.EmailAddressTypeTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.EpisodeInformation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.Event</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.EventDomain</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.EventDomainTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.EventEventRelationshipType</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.EventEventRelationshipTypeTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.EventRelatesToEvent</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.EventRelatesToEventPK</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.EventTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.EventType</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.EventTypeTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.FacialExpression</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.FacialExpressionIntensity</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.FacialExpressionIntensityTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.FacialExpressionTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.GesturalEmotion</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.GesturalEmotionIntensity</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.GesturalEmotionIntensityTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.GesturalEmotionTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.ImageCadreEditing</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.ImageCadreEditingTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.Instrument</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.InstrumentSubtype</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.InstrumentSubtypeTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.InstrumentType</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.InstrumentTypeTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.Jins</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.JinsTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.Language</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.Lighting</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.LightingDuration</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.LightingDurationTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.LightingType</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.LightingTypeTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.LightModifier</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.LightModifierTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.LightPosition</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.LightPositionAngleHorizontal</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.LightPositionAngleHorizontalTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.LightPositionAngleVertical</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.LightPositionAngleVerticalTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.LightPositionTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.LineupMember</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.Location</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.LocationTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.LocationType</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.LocationTypeTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.Maqam</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MaqamType</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MaqamTypeTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MaqamSubtype</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MaqamSubtypeTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MartinezScheffelUnreliableNarration</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MartinezScheffelUnreliableNarrationTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MediaCollection</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MediaCollectionAlbum</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MediaCollectionAnalysisList</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MediaCollectionAnalysisListHasTag</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MediaCollectionAnalysisListHasTagPK</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MediaCollectionAnalysisListTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MediaCollectionHasMedium</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MediaCollectionHasMediumPK</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MediaCollectionSeries</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MediaCollectionType</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MediaCollectionTypeTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MediaType</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MediaTypeTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.Medium</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MediumAnalysisList</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MediumAnalysisListTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MediumAudio</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MediumAudioAnalysis</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MediumDocument</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MediumEventRelationshipType</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MediumEventRelationshipTypeTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MediumHasActorWithRole</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MediumHasActorWithRolePK</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MediumHasLanguage</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MediumHasLanguagePK</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MediumHasMusic</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MediumHasMusicDetail</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MediumHasMusicPK</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MediumImage</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MediumLanguageType</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MediumLanguageTypeTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MediumRelatesToEvent</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MediumRelatesToEventPK</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MediumSoftware</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MediumText</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MediumVideo</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MediumVideogame</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MediumVideoHasMediumImage</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MediumVideoHasMediumImagePK</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MembershipDetail</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MontageFigureMacro</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MontageFigureMacroTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MontageFigureMicro</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MontageFigureMicroTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.Music</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MusicalKey</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MusicalKeyTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MusicalNotation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MusicArticulationElement</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MusicHasActorWithRole</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MusicHasActorWithRolePK</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MusicChangeInTempoElement</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MusicChurchMusic</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MusicDynamicsElement</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MusicDynamicsElementType</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MusicDynamicsElementTypeTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MusicFormElement</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MusicFormElementTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MusicFormElementType</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MusicFormElementTypeTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MusicTextSettingElement</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MusicTextSettingElementType</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MusicTextSettingElementTypeTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MusicNashid</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MusicType</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MusicTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.MusicTypeTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.PermissionType</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.PhoneNumber</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.PhoneNumberType</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.PhoneNumberTypeTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.PhysicalExpression</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.PhysicalExpressionIntensity</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.PhysicalExpressionIntensityTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.PhysicalExpressionTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.Platform</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.PlaybackSpeed</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.PlaybackSpeedTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.PropagandaType</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.Province</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.Publication</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.Reference</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.ReferenceDataFieldRequirement</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.ReferenceDataFieldRequirementPK</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.ReferenceEntryType</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.Rhythm</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.Role</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.RoleGroup</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.RoleGroupTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.RoleTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.SegmentSelectorType</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.SegmentSelectorTypeTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.SelectorSvg</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.Sex</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.SexTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.SongStructure</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.SongStructureElement</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.SongStructureElementTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.SoundEffectDescriptive</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.Source</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.Street</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.SvgShapeType</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.SvgShapeTypeTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.SystemSetting</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.Tag</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.TakeJunction</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.TakeJunctionTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.TakeLength</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.TakeTypeProgression</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.TakeTypeProgressionTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.TempoMarking</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.TempoMarkingTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.Territory</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.TerritoryTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.Timbre</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.Title</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.Transcription</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.TranscriptionEngine</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.TranscriptionModel</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.TranscriptionState</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.TranscriptionStateTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.TranscriptionType</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.TranscriptionTypeTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.UserAccount</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.UserAccountHasCategorySet</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.UserAccountHasCategorySetPK</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.UserAccountHasMediaCollection</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.UserAccountHasMediaCollectionAnalysisList</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.UserAccountHasMediaCollectionAnalysisListPK</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.UserAccountHasMediaCollectionPK</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.UserAccountHasMediumAnalysisList</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.UserAccountHasMediumAnalysisListPK</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.UserLog</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.UserLogEventType</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.UserPassword</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.UserPasswordHashType</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.UserPasswordOldHash</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.Voice</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.VoiceLeadingPattern</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.VoiceLeadingPatternTranslation</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.VoiceType</class> + <class>de.bitgilde.TIMAAT.model.FIPOP.VoiceTypeTranslation</class> + <properties> + <property name="eclipselink.ddl-generation.output-mode" value="database"/> + <property name="autoReconnect" value="true"/> + <property name="jakarta.persistence.jdbc.driver" value="com.mysql.cj.jdbc.Driver"/> + <property name="jakarta.persistence.jdbc.url" + value="jdbc:mysql://localhost:3306/FIPOP?useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTCs"/> + <property name="jakarta.persistence.jdbc.user" value="root"/> + <property name="jakarta.persistence.jdbc.password" value="geheim123"/> + <property name="eclipselink.cache.shared.default" value="false"/> + </properties> + </persistence-unit> </persistence> diff --git a/src/main/resources/database/db_update.sql b/src/main/resources/database/db_update.sql index 0d6ffc65..903157b5 100644 --- a/src/main/resources/database/db_update.sql +++ b/src/main/resources/database/db_update.sql @@ -516,6 +516,33 @@ BEGIN CREATE INDEX fk_transcription_state_translation_transcription_state_idx on `fipop`.`transcription_state_translation` (`transcription_state_id` ASC); CREATE INDEX fk_transcription_state_translation_language_idx on `fipop`.`transcription_state_translation` (`language_id` ASC); + CREATE TABLE `fipop`.`transcription_type` + ( + `id` int primary key + ) + ENGINE = InnoDB; + + CREATE TABLE `fipop`.`transcription_type_translation` + ( + `id` int primary key, + `transcription_type_id` int not null, + `language_id` int not null, + `state_name` varchar(20), + CONSTRAINT `fk_transcription_type_translation_transcription_state` + FOREIGN KEY (`transcription_type_id`) + REFERENCES `fipop`.`transcription_type` (`id`) + ON DELETE CASCADE + ON UPDATE NO ACTION, + CONSTRAINT `fk_transcription_type_translation_language` + FOREIGN KEY (`language_id`) + REFERENCES `fipop`.`language` (`id`) + ON DELETE CASCADE + ON UPDATE NO ACTION + ) + ENGINE = InnoDB; + CREATE INDEX fk_transcription_type_translation_transcription_type_idx on `fipop`.`transcription_type_translation` (`transcription_type_id` ASC); + CREATE INDEX fk_transcription_type_translation_language_idx on `fipop`.`transcription_type_translation` (`language_id` ASC); + CREATE TABLE `fipop`.`transcription` ( `id` int primary key, @@ -524,6 +551,7 @@ BEGIN `engine_identifier` varchar(45), `medium_id` int not null, `transcription_state_id` int not null, + `transcription_type_id` int not null , `transcription_task_id` bigint, `created_at` timestamp not null default CURRENT_TIMESTAMP, `last_edited_at` timestamp, @@ -547,6 +575,9 @@ BEGIN CONSTRAINT `fk_transcription_transcription_state` FOREIGN KEY (`transcription_state_id`) REFERENCES `fipop`.`transcription_state` (`id`), + CONSTRAINT `fk_transcription_transcription_type` + FOREIGN KEY (`transcription_type_id`) + REFERENCES `fipop`.`transcription_type` (`id`), CONSTRAINT `fk_transcription_creation_user` FOREIGN KEY (`created_by_user_account_id`) REFERENCES `fipop`.`user_account` (`id`) @@ -563,6 +594,7 @@ BEGIN CREATE INDEX `fk_transcription_transcription_engine_idx` on `fipop`.`transcription` (`engine_identifier` ASC); CREATE INDEX `fk_transcription_transcription_medium_idx` on `fipop`.`transcription` (`medium_id` ASC); CREATE INDEX `fk_transcription_transcription_transcription_state_idx` on `fipop`.`transcription` (`transcription_state_id` ASC); + CREATE INDEX `fk_transcription_transcription_transcription_type_idx` on `fipop`.`transcription` (`transcription_type_id` ASC); CREATE INDEX `fk_transcription_creation_user_idx` on `fipop`.`transcription` (`created_by_user_account_id` ASC); CREATE INDEX `fk_transcription_edit_user_idx` on `fipop`.`transcription` (`last_edited_by_user_account_id` ASC); @@ -594,11 +626,17 @@ BEGIN INSERT INTO transcription_state VALUES (1), (2), (3), (4), (5); INSERT INTO transcription_state_translation (id, transcription_state_id, language_id, state_name) - VALUES (1, 1, 1, 'pending'), - (2, 2, 1, 'running'), - (3, 3, 1, 'completed'), - (4, 4, 1, 'failed'), - (5, 5, 1, 'imported'); + VALUES (1, 1, 1, 'prepare'), + (2, 1, 1, 'pending'), + (3, 2, 1, 'running'), + (4, 3, 1, 'completed'), + (5, 4, 1, 'failed'); + + INSERT INTO transcription_type VALUES (1), (2); + INSERT INTO transcription_type_translation (id, transcription_type_translation.transcription_type_id, language_id, state_name) + VALUES (1, 1, 1, 'generated'), + (2, 1, 1, 'imported'); + INSERT INTO system_settings(id, auto_transcribe_uploads) VALUES (1, TRUE); diff --git a/src/main/resources/database/fipop.sql b/src/main/resources/database/fipop.sql index c49f4d77..bf50f532 100644 --- a/src/main/resources/database/fipop.sql +++ b/src/main/resources/database/fipop.sql @@ -8836,6 +8836,37 @@ CREATE TABLE `fipop`.`transcription_state_translation` ) ENGINE = InnoDB; +-- ----------------------------------------------------- +-- Table `FIPOP`.`transcription_type` +-- ----------------------------------------------------- +CREATE TABLE `fipop`.`transcription_type` +( + `id` int primary key +) + ENGINE = InnoDB; + +-- ----------------------------------------------------- +-- Table `FIPOP`.`transcription_type_translation` +-- ----------------------------------------------------- +CREATE TABLE `fipop`.`transcription_type_translation` +( + `id` int primary key, + `transcription_type_id` int not null, + `language_id` int not null, + `state_name` varchar(20), + CONSTRAINT `fk_transcription_type_translation_transcription_state` + FOREIGN KEY (`transcription_type_id`) + REFERENCES `fipop`.`transcription_type` (`id`) + ON DELETE CASCADE + ON UPDATE NO ACTION, + CONSTRAINT `fk_transcription_type_translation_language` + FOREIGN KEY (`language_id`) + REFERENCES `fipop`.`language` (`id`) + ON DELETE CASCADE + ON UPDATE NO ACTION +) + ENGINE = InnoDB; + -- ----------------------------------------------------- -- Table `FIPOP`.`transcription` -- ----------------------------------------------------- @@ -8846,6 +8877,7 @@ CREATE TABLE `fipop`.`transcription` `model_identifier` varchar(45), `engine_identifier` varchar(45), `medium_id` int not null, + `transcription_type_id` int not null , `transcription_state_id` int not null, `transcription_task_id` bigint, `created_at` timestamp not null default CURRENT_TIMESTAMP, @@ -8870,6 +8902,9 @@ CREATE TABLE `fipop`.`transcription` CONSTRAINT `fk_transcription_transcription_state` FOREIGN KEY (`transcription_state_id`) REFERENCES `fipop`.`transcription_state` (`id`), + CONSTRAINT `fk_transcription_transcription_type` + FOREIGN KEY (`transcription_type_id`) + REFERENCES `fipop`.`transcription_type` (`id`), CONSTRAINT `fk_transcription_creation_user` FOREIGN KEY (`created_by_user_account_id`) REFERENCES `fipop`.`user_account` (`id`) @@ -8920,6 +8955,11 @@ CREATE INDEX `fk_medium_transcription_idx` on `fipop`.`medium` (`default_transcr -- ----------------------------------------------------- INSERT INTO transcription_state VALUES (1), (2), (3), (4), (5); +-- ----------------------------------------------------- +-- Data for table `FIPOP`.`transcription_type` +-- ----------------------------------------------------- +INSERT INTO transcription_state VALUES (1), (2); + -- ----------------------------------------------------- -- Data for table `FIPOP`.`system_settings` @@ -17162,11 +17202,18 @@ COMMIT; -- Data for table `FIPOP`.`transcription_state_translation` -- ----------------------------------------------------- INSERT INTO transcription_state_translation (id, transcription_state_id, language_id, state_name) -VALUES (1, 1, 1, 'pending'), - (2, 2, 1, 'running'), - (3, 3, 1, 'completed'), - (4, 4, 1, 'failed'), - (5, 5, 1, 'imported'); +VALUES (1, 1, 1, 'prepare'), + (2, 1, 1, 'pending'), + (3, 2, 1, 'running'), + (4, 3, 1, 'completed'), + (5, 4, 1, 'failed'); + +-- ----------------------------------------------------- +-- Data for table `FIPOP`.`transcription_type_translation` +-- ----------------------------------------------------- +INSERT INTO transcription_type_translation (id, transcription_type_translation.transcription_type_id, language_id, state_name) +VALUES (1, 1, 1, 'generated'), + (2, 1, 1, 'imported'); -- ----------------------------------------------------- -- Data for table `FIPOP`.`maqam_subtype_translation` From 3cd70ae8e784ae9079b957ccee5e75457f2a1f70 Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Tue, 12 May 2026 17:01:39 +0200 Subject: [PATCH 50/70] TIMAAT #57 - Defined new task type handling the preparation of a medium to be used for transcriptions --- pom.xml | 2 +- .../TranscriptionMediumPreparationTask.java | 12 ++++++++++ .../TranscriptionMediumPreparationTask.java | 10 +++++++++ .../transcription/TranscriptionService.java | 22 ++++++++++++++----- .../GenerateTranscriptionConfiguration.java | 11 ++++++++++ .../stt/SpeechToTextService.java | 6 +++-- .../transcription/TranscriptionStorage.java | 13 ++++++++++- .../api/TranscriptionFilterCriteria.java | 17 +++++++++++--- .../transcription/api/TranscriptionState.java | 2 +- .../TIMAAT/storage/file/VideoFileStorage.java | 4 ++++ 10 files changed, 85 insertions(+), 14 deletions(-) create mode 100644 src/main/java/de/bitgilde/TIMAAT/service/task/api/TranscriptionMediumPreparationTask.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/service/task/execution/TranscriptionMediumPreparationTask.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/service/transcription/api/GenerateTranscriptionConfiguration.java diff --git a/pom.xml b/pom.xml index 0af03123..3b70cc80 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <maven.compiler.release>25</maven.compiler.release> - <eclipselink.version>3.0.2</eclipselink.version> + <eclipselink.version>5.0.0</eclipselink.version> <jersey.version>3.1.10</jersey.version> <bytebuddy.version>1.17.5</bytebuddy.version> <mockito.version>5.18.0</mockito.version> diff --git a/src/main/java/de/bitgilde/TIMAAT/service/task/api/TranscriptionMediumPreparationTask.java b/src/main/java/de/bitgilde/TIMAAT/service/task/api/TranscriptionMediumPreparationTask.java new file mode 100644 index 00000000..8e9fabf3 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/service/task/api/TranscriptionMediumPreparationTask.java @@ -0,0 +1,12 @@ +package de.bitgilde.TIMAAT.service.task.api; + +/** + * This task will be executed before creating the actual transcription. + * It prepares a medium file by extracting the audio layer and convert it to mono, + * reducing the size of information which needed to get transferred to the speech-to-text-service + * + * @author Nico Kotlenga (nico@nko-dev.studio) + * @since 12.05.26 + */ +public record TranscriptionMediumPreparationTask(long mediumId) { +} diff --git a/src/main/java/de/bitgilde/TIMAAT/service/task/execution/TranscriptionMediumPreparationTask.java b/src/main/java/de/bitgilde/TIMAAT/service/task/execution/TranscriptionMediumPreparationTask.java new file mode 100644 index 00000000..0eac148a --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/service/task/execution/TranscriptionMediumPreparationTask.java @@ -0,0 +1,10 @@ +package de.bitgilde.TIMAAT.service.task.execution; + +/** + * TODO: Add javadoc + * + * @author Nico Kotlenga (nico@nko-dev.studio) + * @since 12.05.26 + */ +public class TranscriptionMediumPreparationTask { +} diff --git a/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java b/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java index 56b839cb..30dc7a32 100644 --- a/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java @@ -1,18 +1,20 @@ package de.bitgilde.TIMAAT.service.transcription; +import de.bitgilde.TIMAAT.service.transcription.api.GenerateTranscriptionConfiguration; import de.bitgilde.TIMAAT.service.transcription.stt.SpeechToTextService; import de.bitgilde.TIMAAT.storage.api.PagingParameter; import de.bitgilde.TIMAAT.storage.api.SortingParameter; import de.bitgilde.TIMAAT.storage.entity.transcription.TranscriptionStorage; import de.bitgilde.TIMAAT.storage.entity.transcription.api.TranscriptionFilterCriteria; import de.bitgilde.TIMAAT.storage.entity.transcription.api.TranscriptionState; +import de.bitgilde.TIMAAT.storage.entity.transcription.api.TranscriptionType; import jakarta.inject.Inject; import java.util.Set; import java.util.logging.Logger; /** - * Service responsible to coordinate the execution of speech-to-text processes + * Service responsible to manage Transcriptions. This includes the generation, modifying, and deletion. * * @author Nico Kotlenga (nico@nko-dev.studio) * @since 12.05.26 @@ -29,18 +31,26 @@ public TranscriptionService(TranscriptionStorage transcriptionStorage, SpeechToT this.transcriptionStorage = transcriptionStorage; this.speechToTextService = speechToTextService; - resumeMonitoringOfUncompletedSpeechToTextTasks(); + resumeMonitoringOfActiveTranscriptions(); } - private void resumeMonitoringOfUncompletedSpeechToTextTasks() { + public void generateTranscription(GenerateTranscriptionConfiguration generateTranscriptionConfiguration) { + + } + + + + private void resumeMonitoringOfActiveTranscriptions() { logger.info("Resuming monitoring of uncompleted speech-to-text tasks"); TranscriptionFilterCriteria transcriptionFilterCriteria = new TranscriptionFilterCriteria.Builder().transcriptionStates( - Set.of(TranscriptionState.PENDING, TranscriptionState.COMPLETED)).build(); + Set.of(TranscriptionState.PENDING, TranscriptionState.COMPLETED)).transcriptionTypes( + Set.of(TranscriptionType.GENERATED)).build(); transcriptionStorage.getEntriesAsStream(transcriptionFilterCriteria, PagingParameter.NO_PAGING, SortingParameter.defaultSortOrder(), null).forEach(transcription -> { - if(transcription.getTranscriptionTaskId() != null){ + if (transcription.getTranscriptionTaskId() != null) { - }else { + } + else { } }); diff --git a/src/main/java/de/bitgilde/TIMAAT/service/transcription/api/GenerateTranscriptionConfiguration.java b/src/main/java/de/bitgilde/TIMAAT/service/transcription/api/GenerateTranscriptionConfiguration.java new file mode 100644 index 00000000..f173e1c7 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/service/transcription/api/GenerateTranscriptionConfiguration.java @@ -0,0 +1,11 @@ +package de.bitgilde.TIMAAT.service.transcription.api; + +/** + * Configuration required to create a new Transcription + * + * @author Nico Kotlenga (nico@nko-dev.studio) + * @since 12.05.26 + */ +public record GenerateTranscriptionConfiguration(int mediumId, String engineIdentifier, String modelIdentifier) { + +} diff --git a/src/main/java/de/bitgilde/TIMAAT/service/transcription/stt/SpeechToTextService.java b/src/main/java/de/bitgilde/TIMAAT/service/transcription/stt/SpeechToTextService.java index ab10145b..f944290c 100644 --- a/src/main/java/de/bitgilde/TIMAAT/service/transcription/stt/SpeechToTextService.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/transcription/stt/SpeechToTextService.java @@ -18,11 +18,13 @@ public SpeechToTextService(SpeechToTextServiceClient speechToTextServiceClient) this.speechToTextServiceClient = speechToTextServiceClient; } - public void startSpeechToTextTaskForTranscription(Transcription transcription){ + public void startSpeechToTextTask(Transcription transcription){ } - public void monitorSpeechToTextTask(long speechToTextTaskId){ + public void resumeSpeechToTextTask(Transcription transcription){ } + + } diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/TranscriptionStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/TranscriptionStorage.java index 0b5ab658..316ed104 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/TranscriptionStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/TranscriptionStorage.java @@ -2,12 +2,14 @@ import de.bitgilde.TIMAAT.model.FIPOP.Transcription; import de.bitgilde.TIMAAT.model.FIPOP.TranscriptionState_; +import de.bitgilde.TIMAAT.model.FIPOP.TranscriptionType_; import de.bitgilde.TIMAAT.model.FIPOP.Transcription_; import de.bitgilde.TIMAAT.model.FIPOP.UserAccount; import de.bitgilde.TIMAAT.storage.db.DbStorage; import de.bitgilde.TIMAAT.storage.entity.transcription.api.TranscriptionFilterCriteria; import de.bitgilde.TIMAAT.storage.entity.transcription.api.TranscriptionSortingField; import de.bitgilde.TIMAAT.storage.entity.transcription.api.TranscriptionState; +import de.bitgilde.TIMAAT.storage.entity.transcription.api.TranscriptionType; import jakarta.inject.Inject; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.criteria.CriteriaBuilder; @@ -38,7 +40,7 @@ public TranscriptionStorage(EntityManagerFactory emf) { @Override protected List<Predicate> createPredicates(@Nullable TranscriptionFilterCriteria filter, Root<Transcription> root, CriteriaBuilder criteriaBuilder, CriteriaQuery<?> criteriaQuery, @Nullable UserAccount userAccount) { if (filter != null) { - List<Predicate> predicates = new ArrayList<>(1); + List<Predicate> predicates = new ArrayList<>(2); if (filter.getTranscriptionStates().isPresent()) { Collection<Integer> transcriptionStateIds = filter.getTranscriptionStates().get().stream() @@ -48,6 +50,15 @@ protected List<Predicate> createPredicates(@Nullable TranscriptionFilterCriteria root.get(Transcription_.transcriptionState).get(TranscriptionState_.id).in(transcriptionStateIds)); } + + if (filter.getTranscriptionTypes().isPresent()) { + Collection<Integer> transcriptionTypeIds = filter.getTranscriptionTypes().get().stream() + .map(TranscriptionType::getDatabaseId) + .collect(Collectors.toSet()); + predicates.add( + root.get(Transcription_.transcriptionType).get(TranscriptionType_.id).in(transcriptionTypeIds)); + } + return predicates; } diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/api/TranscriptionFilterCriteria.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/api/TranscriptionFilterCriteria.java index 38c47bd9..5e9bb0a8 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/api/TranscriptionFilterCriteria.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/api/TranscriptionFilterCriteria.java @@ -24,26 +24,37 @@ * @since 27.12.25 */ public interface TranscriptionFilterCriteria { - /** - * @return the category ids the returning actor should belong to - */ + Optional<Collection<TranscriptionState>> getTranscriptionStates(); + Optional<Collection<TranscriptionType>> getTranscriptionTypes(); + class Builder { private Collection<TranscriptionState> transcriptionStates = null; + private Collection<TranscriptionType> transcriptionTypes = null; public TranscriptionFilterCriteria.Builder transcriptionStates(Collection<TranscriptionState> transcriptionStates) { this.transcriptionStates = transcriptionStates; return this; } + public TranscriptionFilterCriteria.Builder transcriptionTypes(Collection<TranscriptionType> transcriptionTypes) { + this.transcriptionTypes = transcriptionTypes; + return this; + } + public TranscriptionFilterCriteria build() { return new TranscriptionFilterCriteria() { @Override public Optional<Collection<TranscriptionState>> getTranscriptionStates() { return Optional.ofNullable(transcriptionStates); } + + @Override + public Optional<Collection<TranscriptionType>> getTranscriptionTypes() { + return Optional.ofNullable(transcriptionTypes); + } }; } } diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/api/TranscriptionState.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/api/TranscriptionState.java index 78b6045c..cb512118 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/api/TranscriptionState.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/api/TranscriptionState.java @@ -7,7 +7,7 @@ * @since 12.05.26 */ public enum TranscriptionState { - PREPARING(1), PENDING(2), RUNNING(3), COMPLETED(4), FAILED(5); + WAITING_FOR_PREPARATION(1), PREPARING(2), PENDING(3), RUNNING(4), COMPLETED(5), FAILED(6); private final int databaseId; diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/file/VideoFileStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/file/VideoFileStorage.java index 0cda4e3f..93c68c33 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/file/VideoFileStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/file/VideoFileStorage.java @@ -112,6 +112,10 @@ public Path persistThumbnailFile(Path srcMediumFile, int mediumId) throws IOExce return thumbnailFilePath; } + public Path persistAudioMonoFile(Path srcMediumFile, int mediumId) throws IOException { + return null; + } + /** * Returns the path to the original video file for the specified medium * From 5ec5fc5e51cd8a409f81923addaba112ca7bed69 Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Sat, 16 May 2026 09:18:53 +0200 Subject: [PATCH 51/70] TIMAAT #57 - Implemented task preparing a medium to get transcribed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` Summary Goal is the implementation of handling of TranscriptionMediumPreparationTasks which should has a similar API as the MediumAudioAnalysisTasks Goal of the task is to create a PMC 16 bit little endian mono audio file out of the specified medium. This file will be persisted inside the AudioFileStorage or VideoFileStorage and will be used later to pass it to the external speech-to-text-service Requirements •New TranscriptionMediumPreparationTasks can be triggered by using the TaskService (equal to the MediumAudioAnalysisTasks) •During execution of the TranscriptionMediumPreparationTask it should be verified if a audio file is already existing. If yes the task need to do nothing •When service restarts it loads unfinished tasks. For TranscriptionMediumPreparationTasks a query will be executed on the Transcription-Entity having TranscriptionState WAITING_FOR_PREPARATION or PREPARING. •Add a placeholder implementation: When preparation task finished, the start of transcriptions referenced to the currently processed medium will be triggered for transcriptions having the currently processed mediumId ``` Model: GPT-5.5 Reasoning: medium --- .../TIMAAT/service/task/TaskService.java | 20 ++++++ .../TIMAAT/service/task/api/TaskType.java | 3 +- .../TranscriptionMediumPreparationTask.java | 19 +++++- .../task/execution/TaskExecutorFactory.java | 5 ++ .../TranscriptionMediumPreparationTask.java | 10 --- ...criptionMediumPreparationTaskExecutor.java | 63 +++++++++++++++++++ .../service/task/storage/DbTaskStorage.java | 61 +++++++++++++++++- .../AudioContainingMediumFileStorage.java | 4 ++ .../TIMAAT/storage/file/AudioFileStorage.java | 29 +++++++++ .../TIMAAT/storage/file/VideoFileStorage.java | 29 ++++++++- src/main/resources/database/db_update.sql | 17 ++--- src/main/resources/database/fipop.sql | 19 +++--- 12 files changed, 247 insertions(+), 32 deletions(-) delete mode 100644 src/main/java/de/bitgilde/TIMAAT/service/task/execution/TranscriptionMediumPreparationTask.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/service/task/execution/TranscriptionMediumPreparationTaskExecutor.java diff --git a/src/main/java/de/bitgilde/TIMAAT/service/task/TaskService.java b/src/main/java/de/bitgilde/TIMAAT/service/task/TaskService.java index be8961ae..fc0f3294 100644 --- a/src/main/java/de/bitgilde/TIMAAT/service/task/TaskService.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/task/TaskService.java @@ -3,6 +3,7 @@ import de.bitgilde.TIMAAT.service.task.api.MediumAudioAnalysisTask; import de.bitgilde.TIMAAT.service.task.api.MediumAudioAnalysisTask.SupportedMediumType; import de.bitgilde.TIMAAT.service.task.api.Task; +import de.bitgilde.TIMAAT.service.task.api.TranscriptionMediumPreparationTask; import de.bitgilde.TIMAAT.service.task.exception.TaskServiceException; import de.bitgilde.TIMAAT.service.task.exception.TaskStorageException; import de.bitgilde.TIMAAT.service.task.execution.TaskExecutorService; @@ -70,6 +71,25 @@ public void executeMediumAudioAnalysisTask(int mediumId, SupportedMediumType sup } } + /** + * Triggers the execution of a {@link TranscriptionMediumPreparationTask} for the specified + * {@link de.bitgilde.TIMAAT.model.FIPOP.Medium}. + * + * @param mediumId for which the tasks will be executed + */ + public void executeTranscriptionMediumPreparationTask(int mediumId, SupportedMediumType supportedMediumType) throws TaskServiceException { + logger.log(Level.FINE, "Trigger execution of transcription medium preparation task for medium having id {0}", mediumId); + + try { + TranscriptionMediumPreparationTask transcriptionMediumPreparationTask = new TranscriptionMediumPreparationTask(mediumId, supportedMediumType); + taskStorage.persistTask(transcriptionMediumPreparationTask); + taskExecutorService.executeTask(transcriptionMediumPreparationTask); + } catch (Exception e) { + logger.log(Level.SEVERE, "Error while trigger the execution of a transcription medium preparation task", e); + throw new TaskServiceException("Error during trigger the execution of a transcription medium preparation task", e); + } + } + private void executeUnfinishedTasks() throws TaskStorageException { logger.log(Level.INFO, "Trigger execution of unfinished tasks"); try (Stream<? extends Task> unfinishedTasks = taskStorage.getUnfinishedTasks()) { diff --git a/src/main/java/de/bitgilde/TIMAAT/service/task/api/TaskType.java b/src/main/java/de/bitgilde/TIMAAT/service/task/api/TaskType.java index b568ae12..4188df3d 100644 --- a/src/main/java/de/bitgilde/TIMAAT/service/task/api/TaskType.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/task/api/TaskType.java @@ -23,5 +23,6 @@ * @since 18.07.25 */ public enum TaskType { - MEDIUM_AUDIO_ANALYSIS; + MEDIUM_AUDIO_ANALYSIS, + TRANSCRIPTION_MEDIUM_PREPARATION; } diff --git a/src/main/java/de/bitgilde/TIMAAT/service/task/api/TranscriptionMediumPreparationTask.java b/src/main/java/de/bitgilde/TIMAAT/service/task/api/TranscriptionMediumPreparationTask.java index 8e9fabf3..e8082bbb 100644 --- a/src/main/java/de/bitgilde/TIMAAT/service/task/api/TranscriptionMediumPreparationTask.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/task/api/TranscriptionMediumPreparationTask.java @@ -8,5 +8,22 @@ * @author Nico Kotlenga (nico@nko-dev.studio) * @since 12.05.26 */ -public record TranscriptionMediumPreparationTask(long mediumId) { +public class TranscriptionMediumPreparationTask extends Task { + + private final int mediumId; + private final MediumAudioAnalysisTask.SupportedMediumType mediumType; + + public TranscriptionMediumPreparationTask(int mediumId, MediumAudioAnalysisTask.SupportedMediumType mediumType) { + super(TaskType.TRANSCRIPTION_MEDIUM_PREPARATION); + this.mediumId = mediumId; + this.mediumType = mediumType; + } + + public int getMediumId() { + return mediumId; + } + + public MediumAudioAnalysisTask.SupportedMediumType getMediumType() { + return mediumType; + } } diff --git a/src/main/java/de/bitgilde/TIMAAT/service/task/execution/TaskExecutorFactory.java b/src/main/java/de/bitgilde/TIMAAT/service/task/execution/TaskExecutorFactory.java index 79f0cb5a..5b718357 100644 --- a/src/main/java/de/bitgilde/TIMAAT/service/task/execution/TaskExecutorFactory.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/task/execution/TaskExecutorFactory.java @@ -10,6 +10,7 @@ import de.bitgilde.TIMAAT.service.task.api.MediumAudioAnalysisTask.SupportedMediumType; import de.bitgilde.TIMAAT.service.task.api.Task; import de.bitgilde.TIMAAT.service.task.api.TaskType; +import de.bitgilde.TIMAAT.service.task.api.TranscriptionMediumPreparationTask; import jakarta.inject.Inject; import java.util.Map; @@ -55,6 +56,10 @@ public <T extends Task> TaskExecutor<T> createTaskExecutor(T task) { return (TaskExecutor<T>) new MediumAudioAnalysisTaskExecutor(temporaryFileStorage, (MediumAudioAnalysisTask) task, audioContainingMediumFileStorageBySupportedMediumType, audioEngine, audioAnalysisResultStorage); } + if (TaskType.TRANSCRIPTION_MEDIUM_PREPARATION.equals(task.getTaskType())) { + return (TaskExecutor<T>) new TranscriptionMediumPreparationTaskExecutor((TranscriptionMediumPreparationTask) task, + audioContainingMediumFileStorageBySupportedMediumType, audioEngine); + } return null; } } diff --git a/src/main/java/de/bitgilde/TIMAAT/service/task/execution/TranscriptionMediumPreparationTask.java b/src/main/java/de/bitgilde/TIMAAT/service/task/execution/TranscriptionMediumPreparationTask.java deleted file mode 100644 index 0eac148a..00000000 --- a/src/main/java/de/bitgilde/TIMAAT/service/task/execution/TranscriptionMediumPreparationTask.java +++ /dev/null @@ -1,10 +0,0 @@ -package de.bitgilde.TIMAAT.service.task.execution; - -/** - * TODO: Add javadoc - * - * @author Nico Kotlenga (nico@nko-dev.studio) - * @since 12.05.26 - */ -public class TranscriptionMediumPreparationTask { -} diff --git a/src/main/java/de/bitgilde/TIMAAT/service/task/execution/TranscriptionMediumPreparationTaskExecutor.java b/src/main/java/de/bitgilde/TIMAAT/service/task/execution/TranscriptionMediumPreparationTaskExecutor.java new file mode 100644 index 00000000..b97fc2b9 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/service/task/execution/TranscriptionMediumPreparationTaskExecutor.java @@ -0,0 +1,63 @@ +package de.bitgilde.TIMAAT.service.task.execution; + +import de.bitgilde.TIMAAT.processing.audio.FfmpegAudioEngine; +import de.bitgilde.TIMAAT.processing.audio.api.PcmMono16BitLittleEndian; +import de.bitgilde.TIMAAT.processing.audio.exception.AudioEngineException; +import de.bitgilde.TIMAAT.service.task.api.MediumAudioAnalysisTask.SupportedMediumType; +import de.bitgilde.TIMAAT.service.task.api.TranscriptionMediumPreparationTask; +import de.bitgilde.TIMAAT.service.task.exception.TaskExecutionException; +import de.bitgilde.TIMAAT.storage.file.AudioContainingMediumFileStorage; + +import java.io.IOException; +import java.nio.file.Path; +import java.util.Map; +import java.util.Optional; +import java.util.logging.Level; +import java.util.logging.Logger; + +/** + * Prepares the audio file used as input for generated transcriptions. + * + * @author Nico Kotlenga (nico@nko-dev.studio) + * @since 12.05.26 + */ +public class TranscriptionMediumPreparationTaskExecutor extends TaskExecutor<TranscriptionMediumPreparationTask> { + + private static final Logger logger = Logger.getLogger(TranscriptionMediumPreparationTaskExecutor.class.getName()); + + private final AudioContainingMediumFileStorage audioContainingMediumFileStorage; + private final FfmpegAudioEngine audioEngine; + + public TranscriptionMediumPreparationTaskExecutor(TranscriptionMediumPreparationTask task, + Map<SupportedMediumType, AudioContainingMediumFileStorage> audioContainingMediumFileStorageBySupportedMediumType, + FfmpegAudioEngine audioEngine) { + super(task); + this.audioContainingMediumFileStorage = audioContainingMediumFileStorageBySupportedMediumType.get(task.getMediumType()); + this.audioEngine = audioEngine; + } + + @Override + public void execute() throws TaskExecutionException { + int mediumId = task.getMediumId(); + logger.log(Level.INFO, "Executing transcription medium preparation task for medium having id {0}", mediumId); + + if (audioContainingMediumFileStorage.getPathToAudioMonoFile(mediumId).isPresent()) { + logger.log(Level.INFO, "Audio mono file for medium having id {0} already exists", mediumId); + return; + } + + Optional<Path> pathToOriginalMediumFile = audioContainingMediumFileStorage.getPathToOriginalFile(mediumId); + if (pathToOriginalMediumFile.isEmpty()) { + throw new TaskExecutionException("Medium with id " + mediumId + " has no original file"); + } + + try (PcmMono16BitLittleEndian pcmAudioFile = audioEngine.convertAudioChannelsTo16BitLittleEndian(pathToOriginalMediumFile.get())) { + audioContainingMediumFileStorage.persistAudioMonoFile(pcmAudioFile.getAudioFilePath(), mediumId); + } + catch (AudioEngineException | IOException e) { + throw new TaskExecutionException("Error while preparing transcription medium file", e); + } + + logger.log(Level.INFO, "Finished transcription medium preparation task for medium having id {0}", mediumId); + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/service/task/storage/DbTaskStorage.java b/src/main/java/de/bitgilde/TIMAAT/service/task/storage/DbTaskStorage.java index 02bdf7e0..193ddd30 100644 --- a/src/main/java/de/bitgilde/TIMAAT/service/task/storage/DbTaskStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/task/storage/DbTaskStorage.java @@ -5,16 +5,20 @@ import de.bitgilde.TIMAAT.model.FIPOP.AudioAnalysisState; import de.bitgilde.TIMAAT.model.FIPOP.Medium; import de.bitgilde.TIMAAT.model.FIPOP.MediumAudioAnalysis; +import de.bitgilde.TIMAAT.model.FIPOP.Transcription; import de.bitgilde.TIMAAT.sse.EntityUpdateEventService; import de.bitgilde.TIMAAT.service.task.api.MediumAudioAnalysisTask; import de.bitgilde.TIMAAT.service.task.api.MediumAudioAnalysisTask.SupportedMediumType; import de.bitgilde.TIMAAT.service.task.api.Task; import de.bitgilde.TIMAAT.service.task.api.TaskState; +import de.bitgilde.TIMAAT.service.task.api.TranscriptionMediumPreparationTask; import de.bitgilde.TIMAAT.service.task.exception.TaskStorageException; +import de.bitgilde.TIMAAT.storage.entity.transcription.api.TranscriptionState; import jakarta.inject.Inject; import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManagerFactory; +import java.util.List; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -56,7 +60,7 @@ public DbTaskStorage(EntityManagerFactory emf, EntityUpdateEventService entityUp @Override public Stream<? extends Task> getUnfinishedTasks() throws TaskStorageException { try { - return loadUnfinishedMediumAudioAnalysisTasks(); + return Stream.concat(loadUnfinishedMediumAudioAnalysisTasks(), loadUnfinishedTranscriptionMediumPreparationTasks()); } catch (DbTransactionExecutionException e) { throw new TaskStorageException("Error during loading unfinished tasks", e); } @@ -71,6 +75,9 @@ public void persistTask(Task task) throws TaskStorageException { case MEDIUM_AUDIO_ANALYSIS: persistMediumAudioAnalysisTask((MediumAudioAnalysisTask) task); break; + case TRANSCRIPTION_MEDIUM_PREPARATION: + persistTranscriptionMediumPreparationTask((TranscriptionMediumPreparationTask) task); + break; } } catch (Exception e) { throw new TaskStorageException("Error during persisting task", e); @@ -86,6 +93,9 @@ public void updateTaskState(Task task, TaskState taskState) { case MEDIUM_AUDIO_ANALYSIS: updateMediumAudioAnalysisTaskState((MediumAudioAnalysisTask) task, taskState); break; + case TRANSCRIPTION_MEDIUM_PREPARATION: + updateTranscriptionMediumPreparationTaskState((TranscriptionMediumPreparationTask) task, taskState); + break; } } catch (Exception e) { throw new RuntimeException("Error during updating task state", e); @@ -109,6 +119,20 @@ private Stream<MediumAudioAnalysisTask> loadUnfinishedMediumAudioAnalysisTasks() }); } + private Stream<TranscriptionMediumPreparationTask> loadUnfinishedTranscriptionMediumPreparationTasks() throws DbTransactionExecutionException { + logger.log(Level.FINE, "Loading unfinished transcription medium preparation tasks"); + return executeStreamDbTransaction(entityManager -> entityManager.createQuery("select distinct transcription.medium.id, medium.mediaType.id from Transcription transcription join transcription.medium medium where transcription.transcriptionState.id in :transcriptionStates", Object.class) + .setParameter("transcriptionStates", Set.of(TranscriptionState.WAITING_FOR_PREPARATION.getDatabaseId(), TranscriptionState.PREPARING.getDatabaseId())) + .getResultStream() + .map(result -> { + Object[] row = (Object[]) result; + SupportedMediumType supportedMediumType = ((Integer) row[1]).equals(6) ? SupportedMediumType.VIDEO : SupportedMediumType.AUDIO; + int mediumId = (Integer) row[0]; + + return new TranscriptionMediumPreparationTask(mediumId, supportedMediumType); + })); + } + private void persistMediumAudioAnalysisTask(MediumAudioAnalysisTask mediumAudioAnalysisTask) throws DbTransactionExecutionException { logger.log(Level.FINE, "Persist medium analysis task for medium having id {0}", mediumAudioAnalysisTask.getMediumId()); @@ -146,4 +170,39 @@ private void updateMediumAudioAnalysisTaskState(MediumAudioAnalysisTask mediumAu entityUpdateEventService.sendEntityUpdateMessage(MediumAudioAnalysis.class, updatedMediumAudioAnalyses); } + + private void persistTranscriptionMediumPreparationTask(TranscriptionMediumPreparationTask transcriptionMediumPreparationTask) throws DbTransactionExecutionException { + logger.log(Level.FINE, "Persist transcription medium preparation task for medium having id {0}", transcriptionMediumPreparationTask.getMediumId()); + updateTranscriptionsOfPreparationTask(transcriptionMediumPreparationTask, TranscriptionState.WAITING_FOR_PREPARATION); + } + + private void updateTranscriptionMediumPreparationTaskState(TranscriptionMediumPreparationTask transcriptionMediumPreparationTask, TaskState taskState) throws DbTransactionExecutionException { + logger.log(Level.FINER, "Updating task state of transcription medium preparation task to {0}", taskState); + + TranscriptionState transcriptionState = switch (taskState) { + case PENDING -> TranscriptionState.WAITING_FOR_PREPARATION; + case RUNNING -> TranscriptionState.PREPARING; + case FAILED -> TranscriptionState.FAILED; + case DONE -> TranscriptionState.PENDING; + }; + + updateTranscriptionsOfPreparationTask(transcriptionMediumPreparationTask, transcriptionState) + .forEach(transcription -> entityUpdateEventService.sendEntityUpdateMessage(Transcription.class, transcription)); + } + + private List<Transcription> updateTranscriptionsOfPreparationTask(TranscriptionMediumPreparationTask transcriptionMediumPreparationTask, TranscriptionState transcriptionState) throws DbTransactionExecutionException { + return executeDbTransaction(entityManager -> { + de.bitgilde.TIMAAT.model.FIPOP.TranscriptionState transcriptionStateEntity = entityManager.getReference( + de.bitgilde.TIMAAT.model.FIPOP.TranscriptionState.class, transcriptionState.getDatabaseId()); + + List<Transcription> transcriptions = entityManager.createQuery("select transcription from Transcription transcription where transcription.medium.id = :mediumId and transcription.transcriptionState.id in :preparationStates", Transcription.class) + .setParameter("mediumId", transcriptionMediumPreparationTask.getMediumId()) + .setParameter("preparationStates", Set.of(TranscriptionState.WAITING_FOR_PREPARATION.getDatabaseId(), TranscriptionState.PREPARING.getDatabaseId())) + .getResultList(); + + transcriptions.forEach(transcription -> transcription.setTranscriptionState(transcriptionStateEntity)); + + return transcriptions; + }); + } } diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/file/AudioContainingMediumFileStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/file/AudioContainingMediumFileStorage.java index f39401ae..7607e0a3 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/file/AudioContainingMediumFileStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/file/AudioContainingMediumFileStorage.java @@ -28,7 +28,11 @@ public interface AudioContainingMediumFileStorage { Optional<Path> getPathToOriginalFile(int mediumId); + Optional<Path> getPathToAudioMonoFile(int mediumId); + Path persistWaveformFile(Path srcWaveformFile, int mediumId) throws IOException; Path persistFrequencyFile(Path srcFrequencyFile, int mediumId) throws IOException; + + Path persistAudioMonoFile(Path srcAudioMonoFile, int mediumId) throws IOException; } diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/file/AudioFileStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/file/AudioFileStorage.java index bfe5a48b..b02f0bc1 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/file/AudioFileStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/file/AudioFileStorage.java @@ -102,6 +102,18 @@ public Optional<Path> getPathToFrequencyFile(int mediumId) { return Optional.empty(); } + @Override + public Optional<Path> getPathToAudioMonoFile(int mediumId) { + Path mediumDirectoryPath = createMediumDirectoryPath(mediumId); + Path audioMonoFilePath = createAudioMonoFilePath(mediumDirectoryPath, mediumId); + + if (Files.exists(audioMonoFilePath)) { + return Optional.of(audioMonoFilePath); + } + + return Optional.empty(); + } + @Override public Path persistWaveformFile(Path srcWaveformFile, int mediumId) throws IOException { logger.log(Level.FINE, "Persisting waveform file of medium having id {0}", mediumId); @@ -128,6 +140,19 @@ public Path persistFrequencyFile(Path srcFrequencyFile, int mediumId) throws IOE return frequencyFilePath; } + @Override + public Path persistAudioMonoFile(Path srcAudioMonoFile, int mediumId) throws IOException { + logger.log(Level.FINE, "Persisting audio mono file of medium having id {0}", mediumId); + + Path mediumDirectoryPath = createMediumDirectoryPath(mediumId); + Files.createDirectories(mediumDirectoryPath); + + Path audioMonoFilePath = createAudioMonoFilePath(mediumDirectoryPath, mediumId); + Files.move(srcAudioMonoFile, audioMonoFilePath, StandardCopyOption.REPLACE_EXISTING); + + return audioMonoFilePath; + } + private static Path createAudioFilePath(Path mediumDirectoryPath, int mediumId) { return mediumDirectoryPath.resolve(mediumId + "-audio.mp3"); } @@ -140,6 +165,10 @@ private static Path createFrequencyFilePath(Path mediumDirectoryPath, int medium return mediumDirectoryPath.resolve(mediumId + "-frequency.frequency"); } + private static Path createAudioMonoFilePath(Path mediumDirectoryPath, int mediumId) { + return mediumDirectoryPath.resolve(mediumId + "-audio-mono.pcm"); + } + private Path createMediumDirectoryPath(int mediumId) { return audioStoragePath.resolve(String.valueOf(mediumId)); } diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/file/VideoFileStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/file/VideoFileStorage.java index 93c68c33..03a37171 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/file/VideoFileStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/file/VideoFileStorage.java @@ -112,8 +112,17 @@ public Path persistThumbnailFile(Path srcMediumFile, int mediumId) throws IOExce return thumbnailFilePath; } - public Path persistAudioMonoFile(Path srcMediumFile, int mediumId) throws IOException { - return null; + @Override + public Path persistAudioMonoFile(Path srcAudioMonoFile, int mediumId) throws IOException { + logger.log(Level.FINE, "Persisting audio mono file of medium having id {0}", mediumId); + + Path mediumDirectoryPath = createMediumDirectoryPath(mediumId); + Files.createDirectories(mediumDirectoryPath); + + Path audioMonoFilePath = createAudioMonoFilePath(mediumDirectoryPath, mediumId); + Files.move(srcAudioMonoFile, audioMonoFilePath, StandardCopyOption.REPLACE_EXISTING); + + return audioMonoFilePath; } /** @@ -211,6 +220,18 @@ public Optional<Path> getPathToFrequencyFile(int mediumId) { return Optional.empty(); } + @Override + public Optional<Path> getPathToAudioMonoFile(int mediumId) { + Path mediumDirectoryPath = createMediumDirectoryPath(mediumId); + Path audioMonoFilePath = createAudioMonoFilePath(mediumDirectoryPath, mediumId); + + if (Files.exists(audioMonoFilePath)) { + return Optional.of(audioMonoFilePath); + } + + return Optional.empty(); + } + private static Path createOrginalVideoFilePath(Path mediumDirectoryPath, int mediumId) { return mediumDirectoryPath.resolve(mediumId + "-video-original.mp4"); @@ -238,6 +259,10 @@ private static Path createFrequencyFilePath(Path mediumDirectoryPath, int medium return mediumDirectoryPath.resolve(mediumId + "-frequency.frequency"); } + private static Path createAudioMonoFilePath(Path mediumDirectoryPath, int mediumId) { + return mediumDirectoryPath.resolve(mediumId + "-audio-mono.pcm"); + } + private Path createMediumDirectoryPath(int mediumId) { return videoStoragePath.resolve(String.valueOf(mediumId)); } diff --git a/src/main/resources/database/db_update.sql b/src/main/resources/database/db_update.sql index 903157b5..badd6b4a 100644 --- a/src/main/resources/database/db_update.sql +++ b/src/main/resources/database/db_update.sql @@ -624,16 +624,17 @@ BEGIN ON UPDATE NO ACTION; CREATE INDEX `fk_medium_transcription_idx` on `fipop`.`medium` (`default_transcription_id` ASC); - INSERT INTO transcription_state VALUES (1), (2), (3), (4), (5); + INSERT INTO transcription_state VALUES (1), (2), (3), (4), (5), (6); INSERT INTO transcription_state_translation (id, transcription_state_id, language_id, state_name) - VALUES (1, 1, 1, 'prepare'), - (2, 1, 1, 'pending'), - (3, 2, 1, 'running'), - (4, 3, 1, 'completed'), - (5, 4, 1, 'failed'); + VALUES (1, 1, 1, 'waiting'), + (2, 2, 1, 'preparing'), + (3, 3, 1, 'pending'), + (4, 4, 1, 'running'), + (5, 5, 1, 'completed'), + (6, 6, 1, 'failed'); INSERT INTO transcription_type VALUES (1), (2); - INSERT INTO transcription_type_translation (id, transcription_type_translation.transcription_type_id, language_id, state_name) + INSERT INTO transcription_type_translation (id, transcription_type_id, language_id, state_name) VALUES (1, 1, 1, 'generated'), (2, 1, 1, 'imported'); @@ -662,4 +663,4 @@ DROP PROCEDURE update_to_0_14_1; DROP PROCEDURE update_to_0_14_2; DROP PROCEDURE update_to_0_15_0; DROP PROCEDURE update_to_0_15_1; -DROP PROCEDURE update_to_1_0_0; \ No newline at end of file +DROP PROCEDURE update_to_1_0_0; diff --git a/src/main/resources/database/fipop.sql b/src/main/resources/database/fipop.sql index bf50f532..2526d3ad 100644 --- a/src/main/resources/database/fipop.sql +++ b/src/main/resources/database/fipop.sql @@ -8953,12 +8953,12 @@ CREATE INDEX `fk_medium_transcription_idx` on `fipop`.`medium` (`default_transcr -- ----------------------------------------------------- -- Data for table `FIPOP`.`transcription_state` -- ----------------------------------------------------- -INSERT INTO transcription_state VALUES (1), (2), (3), (4), (5); +INSERT INTO transcription_state VALUES (1), (2), (3), (4), (5), (6); -- ----------------------------------------------------- -- Data for table `FIPOP`.`transcription_type` -- ----------------------------------------------------- -INSERT INTO transcription_state VALUES (1), (2); +INSERT INTO transcription_type VALUES (1), (2); -- ----------------------------------------------------- @@ -17202,16 +17202,17 @@ COMMIT; -- Data for table `FIPOP`.`transcription_state_translation` -- ----------------------------------------------------- INSERT INTO transcription_state_translation (id, transcription_state_id, language_id, state_name) -VALUES (1, 1, 1, 'prepare'), - (2, 1, 1, 'pending'), - (3, 2, 1, 'running'), - (4, 3, 1, 'completed'), - (5, 4, 1, 'failed'); +VALUES (1, 1, 1, 'waiting'), + (2, 2, 1, 'preparing'), + (3, 3, 1, 'pending'), + (4, 4, 1, 'running'), + (5, 5, 1, 'completed'), + (6, 6, 1, 'failed'); -- ----------------------------------------------------- -- Data for table `FIPOP`.`transcription_type_translation` -- ----------------------------------------------------- -INSERT INTO transcription_type_translation (id, transcription_type_translation.transcription_type_id, language_id, state_name) +INSERT INTO transcription_type_translation (id, transcription_type_id, language_id, state_name) VALUES (1, 1, 1, 'generated'), (2, 1, 1, 'imported'); @@ -19717,4 +19718,4 @@ INSERT INTO `FIPOP`.`audio_analysis_state_translation` (audio_analysis_state_id, VALUES (3, 1, 'failed'); INSERT INTO `FIPOP`.`audio_analysis_state_translation` (audio_analysis_state_id, language_id, state) VALUES (4, 1, 'done'); -COMMIT; \ No newline at end of file +COMMIT; From 719eab0b7babcb30dca45cf6c531808de2297f56 Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Sat, 16 May 2026 10:37:32 +0200 Subject: [PATCH 52/70] TIMAAT #57 - Refactored task storage and state updating to use registry pattern per task type --- .../TIMAAT/di/binder/TIMAATBinder.java | 10 ++- .../stt/SpeechToTextService.java | 2 +- .../TIMAAT/service/task/TaskService.java | 14 ++-- .../task/execution/TaskExecutorService.java | 8 ++- .../service/task/storage/DbTaskStorage.java | 68 +++---------------- .../task/storage/TaskStateUpdater.java | 6 ++ .../storage/TaskStateUpdaterRegistry.java | 39 +++++++++++ .../service/task/storage/TaskStorage.java | 8 ++- .../task/storage/TaskStorageRegistry.java | 51 ++++++++++++++ .../transcription/TranscriptionService.java | 37 ++++++++-- .../stt/SpeechToTextServiceUniErfurt.java | 10 --- .../transcription/TranscriptionStorage.java | 55 ++++++++++++++- 12 files changed, 220 insertions(+), 88 deletions(-) rename src/main/java/de/bitgilde/TIMAAT/service/{transcription => }/stt/SpeechToTextService.java (93%) create mode 100644 src/main/java/de/bitgilde/TIMAAT/service/task/storage/TaskStateUpdaterRegistry.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/service/task/storage/TaskStorageRegistry.java delete mode 100644 src/main/java/de/bitgilde/TIMAAT/service/transcription/stt/SpeechToTextServiceUniErfurt.java diff --git a/src/main/java/de/bitgilde/TIMAAT/di/binder/TIMAATBinder.java b/src/main/java/de/bitgilde/TIMAAT/di/binder/TIMAATBinder.java index 7b50c679..921fb179 100644 --- a/src/main/java/de/bitgilde/TIMAAT/di/binder/TIMAATBinder.java +++ b/src/main/java/de/bitgilde/TIMAAT/di/binder/TIMAATBinder.java @@ -20,6 +20,7 @@ import de.bitgilde.TIMAAT.storage.entity.music.MusicStorage; import de.bitgilde.TIMAAT.storage.entity.TagStorage; import de.bitgilde.TIMAAT.storage.entity.segment.SegmentStructureElementsStorage; +import de.bitgilde.TIMAAT.storage.entity.transcription.TranscriptionStorage; import de.bitgilde.TIMAAT.storage.file.AnnotationFileStorage; import de.bitgilde.TIMAAT.storage.file.AudioFileStorage; import de.bitgilde.TIMAAT.storage.file.ImageFileStorage; @@ -30,7 +31,10 @@ import de.bitgilde.TIMAAT.service.task.execution.TaskExecutorService; import de.bitgilde.TIMAAT.service.task.storage.DbTaskStorage; import de.bitgilde.TIMAAT.service.task.storage.TaskStateUpdater; +import de.bitgilde.TIMAAT.service.task.storage.TaskStateUpdaterRegistry; import de.bitgilde.TIMAAT.service.task.storage.TaskStorage; +import de.bitgilde.TIMAAT.service.task.storage.TaskStorageRegistry; +import de.bitgilde.TIMAAT.service.transcription.TranscriptionService; import jakarta.inject.Singleton; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.Persistence; @@ -71,10 +75,14 @@ protected void configure() { bindAsContract(FfmpegAudioEngine.class).in(Singleton.class); bindAsContract(FfmpegVideoEngine.class).in(Singleton.class); - bind(DbTaskStorage.class).to(TaskStateUpdater.class).to(TaskStorage.class).in(Singleton.class); + bind(DbTaskStorage.class).to(DbTaskStorage.class).to(TaskStorage.class).to(TaskStateUpdater.class).in(Singleton.class); + bindAsContract(TaskStorageRegistry.class).in(Singleton.class); + bindAsContract(TaskStateUpdaterRegistry.class).in(Singleton.class); bindAsContract(TaskExecutorFactory.class).in(Singleton.class); bindAsContract(TaskExecutorService.class).in(Singleton.class); bindAsContract(TaskService.class).in(Singleton.class); + bind(TranscriptionStorage.class).to(TranscriptionStorage.class).to(TaskStorage.class).in(Singleton.class); + bind(TranscriptionService.class).to(TranscriptionService.class).to(TaskStateUpdater.class).in(Singleton.class); bindAsContract(MusicStorage.class).in(Singleton.class); bindAsContract(AnnotationStorage.class).in(Singleton.class); diff --git a/src/main/java/de/bitgilde/TIMAAT/service/transcription/stt/SpeechToTextService.java b/src/main/java/de/bitgilde/TIMAAT/service/stt/SpeechToTextService.java similarity index 93% rename from src/main/java/de/bitgilde/TIMAAT/service/transcription/stt/SpeechToTextService.java rename to src/main/java/de/bitgilde/TIMAAT/service/stt/SpeechToTextService.java index f944290c..dfad18d2 100644 --- a/src/main/java/de/bitgilde/TIMAAT/service/transcription/stt/SpeechToTextService.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/stt/SpeechToTextService.java @@ -1,4 +1,4 @@ -package de.bitgilde.TIMAAT.service.transcription.stt; +package de.bitgilde.TIMAAT.service.stt; import de.bitgilde.TIMAAT.model.FIPOP.Transcription; import studio.nkodev.stt.client.SpeechToTextServiceClient; diff --git a/src/main/java/de/bitgilde/TIMAAT/service/task/TaskService.java b/src/main/java/de/bitgilde/TIMAAT/service/task/TaskService.java index fc0f3294..f10cc0a4 100644 --- a/src/main/java/de/bitgilde/TIMAAT/service/task/TaskService.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/task/TaskService.java @@ -7,7 +7,7 @@ import de.bitgilde.TIMAAT.service.task.exception.TaskServiceException; import de.bitgilde.TIMAAT.service.task.exception.TaskStorageException; import de.bitgilde.TIMAAT.service.task.execution.TaskExecutorService; -import de.bitgilde.TIMAAT.service.task.storage.TaskStorage; +import de.bitgilde.TIMAAT.service.task.storage.TaskStorageRegistry; import jakarta.annotation.PreDestroy; import jakarta.inject.Inject; @@ -42,12 +42,12 @@ public class TaskService { private static final Logger logger = Logger.getLogger(TaskService.class.getName()); - private final TaskStorage taskStorage; + private final TaskStorageRegistry taskStorageRegistry; private final TaskExecutorService taskExecutorService; @Inject - public TaskService(TaskStorage taskStorage, TaskExecutorService taskExecutorService) throws TaskStorageException { - this.taskStorage = taskStorage; + public TaskService(TaskStorageRegistry taskStorageRegistry, TaskExecutorService taskExecutorService) throws TaskStorageException { + this.taskStorageRegistry = taskStorageRegistry; this.taskExecutorService = taskExecutorService; executeUnfinishedTasks(); @@ -63,7 +63,7 @@ public void executeMediumAudioAnalysisTask(int mediumId, SupportedMediumType sup try { MediumAudioAnalysisTask mediumAudioAnalysisTask = new MediumAudioAnalysisTask(mediumId, supportedMediumType); - taskStorage.persistTask(mediumAudioAnalysisTask); + taskStorageRegistry.getTaskStorage(mediumAudioAnalysisTask.getTaskType()).persistTask(mediumAudioAnalysisTask); taskExecutorService.executeTask(mediumAudioAnalysisTask); } catch (Exception e) { logger.log(Level.SEVERE, "Error while trigger the execution of a medium audio analysis task", e); @@ -82,7 +82,7 @@ public void executeTranscriptionMediumPreparationTask(int mediumId, SupportedMed try { TranscriptionMediumPreparationTask transcriptionMediumPreparationTask = new TranscriptionMediumPreparationTask(mediumId, supportedMediumType); - taskStorage.persistTask(transcriptionMediumPreparationTask); + taskStorageRegistry.getTaskStorage(transcriptionMediumPreparationTask.getTaskType()).persistTask(transcriptionMediumPreparationTask); taskExecutorService.executeTask(transcriptionMediumPreparationTask); } catch (Exception e) { logger.log(Level.SEVERE, "Error while trigger the execution of a transcription medium preparation task", e); @@ -92,7 +92,7 @@ public void executeTranscriptionMediumPreparationTask(int mediumId, SupportedMed private void executeUnfinishedTasks() throws TaskStorageException { logger.log(Level.INFO, "Trigger execution of unfinished tasks"); - try (Stream<? extends Task> unfinishedTasks = taskStorage.getUnfinishedTasks()) { + try (Stream<? extends Task> unfinishedTasks = taskStorageRegistry.getUnfinishedTasks()) { unfinishedTasks.forEach(taskExecutorService::executeTask); } } diff --git a/src/main/java/de/bitgilde/TIMAAT/service/task/execution/TaskExecutorService.java b/src/main/java/de/bitgilde/TIMAAT/service/task/execution/TaskExecutorService.java index 6a854f09..a8ffe74d 100644 --- a/src/main/java/de/bitgilde/TIMAAT/service/task/execution/TaskExecutorService.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/task/execution/TaskExecutorService.java @@ -5,6 +5,7 @@ import de.bitgilde.TIMAAT.service.task.api.Task; import de.bitgilde.TIMAAT.service.task.api.TaskState; import de.bitgilde.TIMAAT.service.task.storage.TaskStateUpdater; +import de.bitgilde.TIMAAT.service.task.storage.TaskStateUpdaterRegistry; import jakarta.annotation.PreDestroy; import jakarta.inject.Inject; @@ -52,13 +53,13 @@ public class TaskExecutorService implements Closeable { private static final AtomicInteger THREAD_COUNTER = new AtomicInteger(0); private final ThreadPoolExecutor executor; - private final TaskStateUpdater taskStateUpdater; + private final TaskStateUpdaterRegistry taskStateUpdaterRegistry; private final TaskExecutorFactory taskExecutorFactory; @Inject - public TaskExecutorService(PropertyManagement propertyManagement, TaskStateUpdater taskStateUpdater, TaskExecutorFactory taskExecutorFactory) { - this.taskStateUpdater = taskStateUpdater; + public TaskExecutorService(PropertyManagement propertyManagement, TaskStateUpdaterRegistry taskStateUpdaterRegistry, TaskExecutorFactory taskExecutorFactory) { + this.taskStateUpdaterRegistry = taskStateUpdaterRegistry; this.taskExecutorFactory = taskExecutorFactory; int coreParallelTask = Integer.parseInt(propertyManagement.getProp(PropertyConstants.TASK_CORE_PARALLEL_COUNT)); int maxParallelTask = Integer.parseInt(propertyManagement.getProp(PropertyConstants.TASK_MAX_PARALLEL_COUNT)); @@ -82,6 +83,7 @@ public TaskExecutorService(PropertyManagement propertyManagement, TaskStateUpdat public void executeTask(Task task) { logger.log(Level.FINE, "Adding task of type {0} to queue", task.getTaskType()); TaskExecutor<?> taskExecutor = taskExecutorFactory.createTaskExecutor(task); + TaskStateUpdater taskStateUpdater = taskStateUpdaterRegistry.getTaskStateUpdater(task.getTaskType()); executor.execute(new TaskExecutorRunnable(task, taskStateUpdater, taskExecutor)); } diff --git a/src/main/java/de/bitgilde/TIMAAT/service/task/storage/DbTaskStorage.java b/src/main/java/de/bitgilde/TIMAAT/service/task/storage/DbTaskStorage.java index 193ddd30..91e08cf0 100644 --- a/src/main/java/de/bitgilde/TIMAAT/service/task/storage/DbTaskStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/task/storage/DbTaskStorage.java @@ -5,20 +5,17 @@ import de.bitgilde.TIMAAT.model.FIPOP.AudioAnalysisState; import de.bitgilde.TIMAAT.model.FIPOP.Medium; import de.bitgilde.TIMAAT.model.FIPOP.MediumAudioAnalysis; -import de.bitgilde.TIMAAT.model.FIPOP.Transcription; import de.bitgilde.TIMAAT.sse.EntityUpdateEventService; import de.bitgilde.TIMAAT.service.task.api.MediumAudioAnalysisTask; import de.bitgilde.TIMAAT.service.task.api.MediumAudioAnalysisTask.SupportedMediumType; import de.bitgilde.TIMAAT.service.task.api.Task; import de.bitgilde.TIMAAT.service.task.api.TaskState; -import de.bitgilde.TIMAAT.service.task.api.TranscriptionMediumPreparationTask; +import de.bitgilde.TIMAAT.service.task.api.TaskType; import de.bitgilde.TIMAAT.service.task.exception.TaskStorageException; -import de.bitgilde.TIMAAT.storage.entity.transcription.api.TranscriptionState; import jakarta.inject.Inject; import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManagerFactory; -import java.util.List; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -45,7 +42,7 @@ * @author Nico Kotlenga * @since 18.07.25 */ -public class DbTaskStorage extends DbAccessComponent implements TaskStorage { +public class DbTaskStorage extends DbAccessComponent implements TaskStorage, TaskStateUpdater { private static final Logger logger = Logger.getLogger(DbTaskStorage.class.getName()); @@ -57,10 +54,15 @@ public DbTaskStorage(EntityManagerFactory emf, EntityUpdateEventService entityUp this.entityUpdateEventService = entityUpdateEventService; } + @Override + public TaskType getSupportedTaskType() { + return TaskType.MEDIUM_AUDIO_ANALYSIS; + } + @Override public Stream<? extends Task> getUnfinishedTasks() throws TaskStorageException { try { - return Stream.concat(loadUnfinishedMediumAudioAnalysisTasks(), loadUnfinishedTranscriptionMediumPreparationTasks()); + return loadUnfinishedMediumAudioAnalysisTasks(); } catch (DbTransactionExecutionException e) { throw new TaskStorageException("Error during loading unfinished tasks", e); } @@ -76,8 +78,7 @@ public void persistTask(Task task) throws TaskStorageException { persistMediumAudioAnalysisTask((MediumAudioAnalysisTask) task); break; case TRANSCRIPTION_MEDIUM_PREPARATION: - persistTranscriptionMediumPreparationTask((TranscriptionMediumPreparationTask) task); - break; + throw new IllegalArgumentException("DbTaskStorage only persists medium audio analysis tasks"); } } catch (Exception e) { throw new TaskStorageException("Error during persisting task", e); @@ -94,8 +95,7 @@ public void updateTaskState(Task task, TaskState taskState) { updateMediumAudioAnalysisTaskState((MediumAudioAnalysisTask) task, taskState); break; case TRANSCRIPTION_MEDIUM_PREPARATION: - updateTranscriptionMediumPreparationTaskState((TranscriptionMediumPreparationTask) task, taskState); - break; + throw new IllegalArgumentException("DbTaskStorage only updates medium audio analysis task states"); } } catch (Exception e) { throw new RuntimeException("Error during updating task state", e); @@ -119,20 +119,6 @@ private Stream<MediumAudioAnalysisTask> loadUnfinishedMediumAudioAnalysisTasks() }); } - private Stream<TranscriptionMediumPreparationTask> loadUnfinishedTranscriptionMediumPreparationTasks() throws DbTransactionExecutionException { - logger.log(Level.FINE, "Loading unfinished transcription medium preparation tasks"); - return executeStreamDbTransaction(entityManager -> entityManager.createQuery("select distinct transcription.medium.id, medium.mediaType.id from Transcription transcription join transcription.medium medium where transcription.transcriptionState.id in :transcriptionStates", Object.class) - .setParameter("transcriptionStates", Set.of(TranscriptionState.WAITING_FOR_PREPARATION.getDatabaseId(), TranscriptionState.PREPARING.getDatabaseId())) - .getResultStream() - .map(result -> { - Object[] row = (Object[]) result; - SupportedMediumType supportedMediumType = ((Integer) row[1]).equals(6) ? SupportedMediumType.VIDEO : SupportedMediumType.AUDIO; - int mediumId = (Integer) row[0]; - - return new TranscriptionMediumPreparationTask(mediumId, supportedMediumType); - })); - } - private void persistMediumAudioAnalysisTask(MediumAudioAnalysisTask mediumAudioAnalysisTask) throws DbTransactionExecutionException { logger.log(Level.FINE, "Persist medium analysis task for medium having id {0}", mediumAudioAnalysisTask.getMediumId()); @@ -171,38 +157,4 @@ private void updateMediumAudioAnalysisTaskState(MediumAudioAnalysisTask mediumAu entityUpdateEventService.sendEntityUpdateMessage(MediumAudioAnalysis.class, updatedMediumAudioAnalyses); } - private void persistTranscriptionMediumPreparationTask(TranscriptionMediumPreparationTask transcriptionMediumPreparationTask) throws DbTransactionExecutionException { - logger.log(Level.FINE, "Persist transcription medium preparation task for medium having id {0}", transcriptionMediumPreparationTask.getMediumId()); - updateTranscriptionsOfPreparationTask(transcriptionMediumPreparationTask, TranscriptionState.WAITING_FOR_PREPARATION); - } - - private void updateTranscriptionMediumPreparationTaskState(TranscriptionMediumPreparationTask transcriptionMediumPreparationTask, TaskState taskState) throws DbTransactionExecutionException { - logger.log(Level.FINER, "Updating task state of transcription medium preparation task to {0}", taskState); - - TranscriptionState transcriptionState = switch (taskState) { - case PENDING -> TranscriptionState.WAITING_FOR_PREPARATION; - case RUNNING -> TranscriptionState.PREPARING; - case FAILED -> TranscriptionState.FAILED; - case DONE -> TranscriptionState.PENDING; - }; - - updateTranscriptionsOfPreparationTask(transcriptionMediumPreparationTask, transcriptionState) - .forEach(transcription -> entityUpdateEventService.sendEntityUpdateMessage(Transcription.class, transcription)); - } - - private List<Transcription> updateTranscriptionsOfPreparationTask(TranscriptionMediumPreparationTask transcriptionMediumPreparationTask, TranscriptionState transcriptionState) throws DbTransactionExecutionException { - return executeDbTransaction(entityManager -> { - de.bitgilde.TIMAAT.model.FIPOP.TranscriptionState transcriptionStateEntity = entityManager.getReference( - de.bitgilde.TIMAAT.model.FIPOP.TranscriptionState.class, transcriptionState.getDatabaseId()); - - List<Transcription> transcriptions = entityManager.createQuery("select transcription from Transcription transcription where transcription.medium.id = :mediumId and transcription.transcriptionState.id in :preparationStates", Transcription.class) - .setParameter("mediumId", transcriptionMediumPreparationTask.getMediumId()) - .setParameter("preparationStates", Set.of(TranscriptionState.WAITING_FOR_PREPARATION.getDatabaseId(), TranscriptionState.PREPARING.getDatabaseId())) - .getResultList(); - - transcriptions.forEach(transcription -> transcription.setTranscriptionState(transcriptionStateEntity)); - - return transcriptions; - }); - } } diff --git a/src/main/java/de/bitgilde/TIMAAT/service/task/storage/TaskStateUpdater.java b/src/main/java/de/bitgilde/TIMAAT/service/task/storage/TaskStateUpdater.java index 425232b3..2e48be97 100644 --- a/src/main/java/de/bitgilde/TIMAAT/service/task/storage/TaskStateUpdater.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/task/storage/TaskStateUpdater.java @@ -2,6 +2,7 @@ import de.bitgilde.TIMAAT.service.task.api.Task; import de.bitgilde.TIMAAT.service.task.api.TaskState; +import de.bitgilde.TIMAAT.service.task.api.TaskType; /* Licensed under the Apache License, Version 2.0 (the "License"); @@ -25,6 +26,11 @@ */ public interface TaskStateUpdater { + /** + * @return the {@link TaskType} which can be handled by this updater. + */ + TaskType getSupportedTaskType(); + /** * Updates the {@link TaskState} of a {@link Task} to the specified value * diff --git a/src/main/java/de/bitgilde/TIMAAT/service/task/storage/TaskStateUpdaterRegistry.java b/src/main/java/de/bitgilde/TIMAAT/service/task/storage/TaskStateUpdaterRegistry.java new file mode 100644 index 00000000..06a8d853 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/service/task/storage/TaskStateUpdaterRegistry.java @@ -0,0 +1,39 @@ +package de.bitgilde.TIMAAT.service.task.storage; + +import de.bitgilde.TIMAAT.service.task.api.TaskType; +import jakarta.inject.Inject; +import org.glassfish.hk2.api.IterableProvider; + +import java.util.EnumMap; +import java.util.Map; + +/** + * Registry resolving the {@link TaskStateUpdater} owning a specific {@link TaskType}. + * + * @author Nico Kotlenga + * @since 16.05.26 + */ +public class TaskStateUpdaterRegistry { + + private final Map<TaskType, TaskStateUpdater> taskStateUpdatersByTaskType; + + @Inject + public TaskStateUpdaterRegistry(IterableProvider<TaskStateUpdater> taskStateUpdaters) { + this.taskStateUpdatersByTaskType = new EnumMap<>(TaskType.class); + for (TaskStateUpdater taskStateUpdater : taskStateUpdaters) { + TaskStateUpdater previousTaskStateUpdater = taskStateUpdatersByTaskType.put(taskStateUpdater.getSupportedTaskType(), taskStateUpdater); + if (previousTaskStateUpdater != null) { + throw new IllegalStateException("Multiple task state updaters registered for task type " + taskStateUpdater.getSupportedTaskType()); + } + } + } + + public TaskStateUpdater getTaskStateUpdater(TaskType taskType) { + TaskStateUpdater taskStateUpdater = taskStateUpdatersByTaskType.get(taskType); + if (taskStateUpdater == null) { + throw new IllegalArgumentException("No task state updater registered for task type " + taskType); + } + + return taskStateUpdater; + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/service/task/storage/TaskStorage.java b/src/main/java/de/bitgilde/TIMAAT/service/task/storage/TaskStorage.java index 0978cbc5..c2a067b0 100644 --- a/src/main/java/de/bitgilde/TIMAAT/service/task/storage/TaskStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/task/storage/TaskStorage.java @@ -1,6 +1,7 @@ package de.bitgilde.TIMAAT.service.task.storage; import de.bitgilde.TIMAAT.service.task.api.Task; +import de.bitgilde.TIMAAT.service.task.api.TaskType; import de.bitgilde.TIMAAT.service.task.exception.TaskStorageException; import java.util.stream.Stream; @@ -25,7 +26,12 @@ * @author Nico Kotlenga * @since 18.07.25 */ -public interface TaskStorage extends TaskStateUpdater { +public interface TaskStorage { + + /** + * @return the {@link TaskType} which can be handled by this storage. + */ + TaskType getSupportedTaskType(); /** * @return a {@link Stream} of unfinished {@link Task}s. diff --git a/src/main/java/de/bitgilde/TIMAAT/service/task/storage/TaskStorageRegistry.java b/src/main/java/de/bitgilde/TIMAAT/service/task/storage/TaskStorageRegistry.java new file mode 100644 index 00000000..2f840150 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/service/task/storage/TaskStorageRegistry.java @@ -0,0 +1,51 @@ +package de.bitgilde.TIMAAT.service.task.storage; + +import de.bitgilde.TIMAAT.service.task.api.Task; +import de.bitgilde.TIMAAT.service.task.api.TaskType; +import de.bitgilde.TIMAAT.service.task.exception.TaskStorageException; +import jakarta.inject.Inject; +import org.glassfish.hk2.api.IterableProvider; + +import java.util.EnumMap; +import java.util.Map; +import java.util.stream.Stream; + +/** + * Registry resolving the {@link TaskStorage} owning a specific {@link TaskType}. + * + * @author Nico Kotlenga + * @since 16.05.26 + */ +public class TaskStorageRegistry { + + private final Map<TaskType, TaskStorage> taskStoragesByTaskType; + + @Inject + public TaskStorageRegistry(IterableProvider<TaskStorage> taskStorages) { + this.taskStoragesByTaskType = new EnumMap<>(TaskType.class); + for (TaskStorage taskStorage : taskStorages) { + TaskStorage previousTaskStorage = taskStoragesByTaskType.put(taskStorage.getSupportedTaskType(), taskStorage); + if (previousTaskStorage != null) { + throw new IllegalStateException("Multiple task storages registered for task type " + taskStorage.getSupportedTaskType()); + } + } + } + + public TaskStorage getTaskStorage(TaskType taskType) { + TaskStorage taskStorage = taskStoragesByTaskType.get(taskType); + if (taskStorage == null) { + throw new IllegalArgumentException("No task storage registered for task type " + taskType); + } + + return taskStorage; + } + + public Stream<? extends Task> getUnfinishedTasks() throws TaskStorageException { + Stream<? extends Task> unfinishedTasks = Stream.empty(); + for (TaskStorage taskStorage : taskStoragesByTaskType.values()) { + unfinishedTasks = Stream.concat(unfinishedTasks, taskStorage.getUnfinishedTasks()); + } + + return unfinishedTasks; + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java b/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java index 30dc7a32..4faca9c0 100644 --- a/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java @@ -1,7 +1,12 @@ package de.bitgilde.TIMAAT.service.transcription; +import de.bitgilde.TIMAAT.service.task.api.Task; +import de.bitgilde.TIMAAT.service.task.api.TaskState; +import de.bitgilde.TIMAAT.service.task.api.TaskType; +import de.bitgilde.TIMAAT.service.task.api.TranscriptionMediumPreparationTask; +import de.bitgilde.TIMAAT.service.task.storage.TaskStateUpdater; import de.bitgilde.TIMAAT.service.transcription.api.GenerateTranscriptionConfiguration; -import de.bitgilde.TIMAAT.service.transcription.stt.SpeechToTextService; +import de.bitgilde.TIMAAT.sse.EntityUpdateEventService; import de.bitgilde.TIMAAT.storage.api.PagingParameter; import de.bitgilde.TIMAAT.storage.api.SortingParameter; import de.bitgilde.TIMAAT.storage.entity.transcription.TranscriptionStorage; @@ -19,25 +24,45 @@ * @author Nico Kotlenga (nico@nko-dev.studio) * @since 12.05.26 */ -public abstract class TranscriptionService { +public class TranscriptionService implements TaskStateUpdater { private static final Logger logger = Logger.getLogger(TranscriptionService.class.getName()); private final TranscriptionStorage transcriptionStorage; - private final SpeechToTextService speechToTextService; @Inject - public TranscriptionService(TranscriptionStorage transcriptionStorage, SpeechToTextService speechToTextService) { + public TranscriptionService(TranscriptionStorage transcriptionStorage, EntityUpdateEventService entityUpdateEventService) { this.transcriptionStorage = transcriptionStorage; - this.speechToTextService = speechToTextService; resumeMonitoringOfActiveTranscriptions(); } - public void generateTranscription(GenerateTranscriptionConfiguration generateTranscriptionConfiguration) { + public void createTranscription(GenerateTranscriptionConfiguration generateTranscriptionConfiguration) { } + @Override + public TaskType getSupportedTaskType() { + return TaskType.TRANSCRIPTION_MEDIUM_PREPARATION; + } + + @Override + public void updateTaskState(Task task, TaskState taskState) { + updateTranscriptionMediumPreparationTaskState((TranscriptionMediumPreparationTask) task, taskState); + } + + public void updateTranscriptionMediumPreparationTaskState(TranscriptionMediumPreparationTask transcriptionMediumPreparationTask, TaskState taskState) { + logger.info("Updating transcription medium preparation task state"); + + TranscriptionState transcriptionState = switch (taskState) { + case PENDING -> TranscriptionState.WAITING_FOR_PREPARATION; + case RUNNING -> TranscriptionState.PREPARING; + case FAILED -> TranscriptionState.FAILED; + case DONE -> TranscriptionState.PENDING; + }; + + transcriptionStorage.updateTranscriptionsStateOfPreparationTask(transcriptionMediumPreparationTask.getMediumId(), transcriptionState); + } private void resumeMonitoringOfActiveTranscriptions() { diff --git a/src/main/java/de/bitgilde/TIMAAT/service/transcription/stt/SpeechToTextServiceUniErfurt.java b/src/main/java/de/bitgilde/TIMAAT/service/transcription/stt/SpeechToTextServiceUniErfurt.java deleted file mode 100644 index 6b0bc38c..00000000 --- a/src/main/java/de/bitgilde/TIMAAT/service/transcription/stt/SpeechToTextServiceUniErfurt.java +++ /dev/null @@ -1,10 +0,0 @@ -package de.bitgilde.TIMAAT.service.transcription.stt; - -/** - * TODO: Add javadoc - * - * @author Nico Kotlenga (nico@nko-dev.studio) - * @since 12.05.26 - */ -public class SpeechToTextServiceUniErfurt { -} diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/TranscriptionStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/TranscriptionStorage.java index 316ed104..6c21ec09 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/TranscriptionStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/TranscriptionStorage.java @@ -1,10 +1,17 @@ package de.bitgilde.TIMAAT.storage.entity.transcription; +import de.bitgilde.TIMAAT.db.exception.DbTransactionExecutionException; import de.bitgilde.TIMAAT.model.FIPOP.Transcription; import de.bitgilde.TIMAAT.model.FIPOP.TranscriptionState_; import de.bitgilde.TIMAAT.model.FIPOP.TranscriptionType_; import de.bitgilde.TIMAAT.model.FIPOP.Transcription_; import de.bitgilde.TIMAAT.model.FIPOP.UserAccount; +import de.bitgilde.TIMAAT.service.task.api.MediumAudioAnalysisTask.SupportedMediumType; +import de.bitgilde.TIMAAT.service.task.api.Task; +import de.bitgilde.TIMAAT.service.task.api.TaskType; +import de.bitgilde.TIMAAT.service.task.api.TranscriptionMediumPreparationTask; +import de.bitgilde.TIMAAT.service.task.exception.TaskStorageException; +import de.bitgilde.TIMAAT.service.task.storage.TaskStorage; import de.bitgilde.TIMAAT.storage.db.DbStorage; import de.bitgilde.TIMAAT.storage.entity.transcription.api.TranscriptionFilterCriteria; import de.bitgilde.TIMAAT.storage.entity.transcription.api.TranscriptionSortingField; @@ -22,7 +29,9 @@ import java.util.Collection; import java.util.Collections; import java.util.List; +import java.util.Set; import java.util.stream.Collectors; +import java.util.stream.Stream; /** * Storage responsible to provide access to {@link de.bitgilde.TIMAAT.model.FIPOP.Transcription} entities @@ -30,13 +39,57 @@ * @author Nico Kotlenga (nico@nko-dev.studio) * @since 12.05.26 */ -public class TranscriptionStorage extends DbStorage<Transcription, TranscriptionFilterCriteria, TranscriptionSortingField> { +public class TranscriptionStorage extends DbStorage<Transcription, TranscriptionFilterCriteria, TranscriptionSortingField> implements TaskStorage { @Inject public TranscriptionStorage(EntityManagerFactory emf) { super(Transcription.class, TranscriptionSortingField.ID, emf); } + @Override + public TaskType getSupportedTaskType() { + return TaskType.TRANSCRIPTION_MEDIUM_PREPARATION; + } + + @Override + public Stream<? extends Task> getUnfinishedTasks() throws TaskStorageException { + try { + return executeStreamDbTransaction(entityManager -> entityManager.createQuery("select distinct transcription.medium.id, medium.mediaType.id from Transcription transcription join transcription.medium medium where transcription.transcriptionState.id in :transcriptionStates", Object.class) + .setParameter("transcriptionStates", Set.of(TranscriptionState.WAITING_FOR_PREPARATION.getDatabaseId(), TranscriptionState.PREPARING.getDatabaseId())) + .getResultStream() + .map(result -> { + Object[] row = (Object[]) result; + SupportedMediumType supportedMediumType = ((Integer) row[1]).equals(6) ? SupportedMediumType.VIDEO : SupportedMediumType.AUDIO; + int mediumId = (Integer) row[0]; + + return new TranscriptionMediumPreparationTask(mediumId, supportedMediumType); + })); + } catch (DbTransactionExecutionException e) { + throw new TaskStorageException("Error during loading unfinished transcription medium preparation tasks", e); + } + } + + @Override + public void persistTask(Task task) { + // Nothing to do here. The transcription lifecycle is created by TranscriptionService. + } + + public List<Transcription> updateTranscriptionsStateOfPreparationTask(int mediumId, TranscriptionState transcriptionState) { + return executeDbTransaction(entityManager -> { + de.bitgilde.TIMAAT.model.FIPOP.TranscriptionState transcriptionStateEntity = entityManager.getReference( + de.bitgilde.TIMAAT.model.FIPOP.TranscriptionState.class, transcriptionState.getDatabaseId()); + + List<Transcription> transcriptions = entityManager.createQuery("select transcription from Transcription transcription where transcription.medium.id = :mediumId and transcription.transcriptionState.id in :preparationStates", Transcription.class) + .setParameter("mediumId", mediumId) + .setParameter("preparationStates", Set.of(TranscriptionState.WAITING_FOR_PREPARATION.getDatabaseId(), TranscriptionState.PREPARING.getDatabaseId())) + .getResultList(); + + transcriptions.forEach(transcription -> transcription.setTranscriptionState(transcriptionStateEntity)); + + return transcriptions; + }); + } + @Override protected List<Predicate> createPredicates(@Nullable TranscriptionFilterCriteria filter, Root<Transcription> root, CriteriaBuilder criteriaBuilder, CriteriaQuery<?> criteriaQuery, @Nullable UserAccount userAccount) { if (filter != null) { From 234ef5caa1799f60796a20fe37833218c82c4ac2 Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Sat, 16 May 2026 15:20:27 +0200 Subject: [PATCH 53/70] TIMAAT #57 - Implemented TranscriptionService * Implemented creation process of transcriptions inside TranscriptionService * Defined TranscriptionFileStorage responsible to persist the transcription results --- .../TIMAAT/di/binder/TIMAATBinder.java | 30 ++-- .../service/stt/SpeechToTextService.java | 30 ---- .../transcription/TranscriptionService.java | 157 +++++++++++++++++- .../transcription/TranscriptionStorage.java | 123 ++++++++++++-- .../file/TranscriptionFileStorage.java | 58 +++++++ 5 files changed, 327 insertions(+), 71 deletions(-) delete mode 100644 src/main/java/de/bitgilde/TIMAAT/service/stt/SpeechToTextService.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/storage/file/TranscriptionFileStorage.java diff --git a/src/main/java/de/bitgilde/TIMAAT/di/binder/TIMAATBinder.java b/src/main/java/de/bitgilde/TIMAAT/di/binder/TIMAATBinder.java index 921fb179..81ced318 100644 --- a/src/main/java/de/bitgilde/TIMAAT/di/binder/TIMAATBinder.java +++ b/src/main/java/de/bitgilde/TIMAAT/di/binder/TIMAATBinder.java @@ -8,33 +8,34 @@ import de.bitgilde.TIMAAT.rest.security.authorization.AnalysisListAuthorizationVerifier; import de.bitgilde.TIMAAT.rest.security.authorization.AnnotationAuthorizationVerifier; import de.bitgilde.TIMAAT.rest.security.authorization.DbAnnotationAuthorizationVerifier; +import de.bitgilde.TIMAAT.service.task.TaskService; +import de.bitgilde.TIMAAT.service.task.execution.TaskExecutorFactory; +import de.bitgilde.TIMAAT.service.task.execution.TaskExecutorService; +import de.bitgilde.TIMAAT.service.task.storage.DbTaskStorage; +import de.bitgilde.TIMAAT.service.task.storage.TaskStateUpdater; +import de.bitgilde.TIMAAT.service.task.storage.TaskStateUpdaterRegistry; +import de.bitgilde.TIMAAT.service.task.storage.TaskStorage; +import de.bitgilde.TIMAAT.service.task.storage.TaskStorageRegistry; +import de.bitgilde.TIMAAT.service.transcription.TranscriptionService; import de.bitgilde.TIMAAT.sse.EntityUpdateEventService; -import de.bitgilde.TIMAAT.storage.entity.actor.ActorStorage; -import de.bitgilde.TIMAAT.storage.entity.analysislist.AnalysisListStorage; -import de.bitgilde.TIMAAT.storage.entity.annotation.AnnotationStorage; import de.bitgilde.TIMAAT.storage.entity.AudioAnalysisResultStorage; import de.bitgilde.TIMAAT.storage.entity.CategorySetStorage; import de.bitgilde.TIMAAT.storage.entity.CategoryStorage; -import de.bitgilde.TIMAAT.storage.entity.medium.MediumStorage; import de.bitgilde.TIMAAT.storage.entity.MediumVideoStorage; -import de.bitgilde.TIMAAT.storage.entity.music.MusicStorage; import de.bitgilde.TIMAAT.storage.entity.TagStorage; +import de.bitgilde.TIMAAT.storage.entity.actor.ActorStorage; +import de.bitgilde.TIMAAT.storage.entity.analysislist.AnalysisListStorage; +import de.bitgilde.TIMAAT.storage.entity.annotation.AnnotationStorage; +import de.bitgilde.TIMAAT.storage.entity.medium.MediumStorage; +import de.bitgilde.TIMAAT.storage.entity.music.MusicStorage; import de.bitgilde.TIMAAT.storage.entity.segment.SegmentStructureElementsStorage; import de.bitgilde.TIMAAT.storage.entity.transcription.TranscriptionStorage; import de.bitgilde.TIMAAT.storage.file.AnnotationFileStorage; import de.bitgilde.TIMAAT.storage.file.AudioFileStorage; import de.bitgilde.TIMAAT.storage.file.ImageFileStorage; import de.bitgilde.TIMAAT.storage.file.TemporaryFileStorage; +import de.bitgilde.TIMAAT.storage.file.TranscriptionFileStorage; import de.bitgilde.TIMAAT.storage.file.VideoFileStorage; -import de.bitgilde.TIMAAT.service.task.TaskService; -import de.bitgilde.TIMAAT.service.task.execution.TaskExecutorFactory; -import de.bitgilde.TIMAAT.service.task.execution.TaskExecutorService; -import de.bitgilde.TIMAAT.service.task.storage.DbTaskStorage; -import de.bitgilde.TIMAAT.service.task.storage.TaskStateUpdater; -import de.bitgilde.TIMAAT.service.task.storage.TaskStateUpdaterRegistry; -import de.bitgilde.TIMAAT.service.task.storage.TaskStorage; -import de.bitgilde.TIMAAT.service.task.storage.TaskStorageRegistry; -import de.bitgilde.TIMAAT.service.transcription.TranscriptionService; import jakarta.inject.Singleton; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.Persistence; @@ -69,6 +70,7 @@ protected void configure() { bindAsContract(ImageFileStorage.class).in(Singleton.class); bindAsContract(AudioFileStorage.class).in(Singleton.class); bindAsContract(AudioAnalysisResultStorage.class).in(Singleton.class); + bindAsContract(TranscriptionFileStorage.class).in(Singleton.class); bindAsContract(EntityUpdateEventService.class).in(Singleton.class); bindAsContract(TemporaryFileStorage.class).in(Singleton.class); diff --git a/src/main/java/de/bitgilde/TIMAAT/service/stt/SpeechToTextService.java b/src/main/java/de/bitgilde/TIMAAT/service/stt/SpeechToTextService.java deleted file mode 100644 index dfad18d2..00000000 --- a/src/main/java/de/bitgilde/TIMAAT/service/stt/SpeechToTextService.java +++ /dev/null @@ -1,30 +0,0 @@ -package de.bitgilde.TIMAAT.service.stt; - -import de.bitgilde.TIMAAT.model.FIPOP.Transcription; -import studio.nkodev.stt.client.SpeechToTextServiceClient; - -/** - * This service is using the {@link studio.nkodev.stt.client.SpeechToTextServiceClient} to trigger and monitor - * speech to text tasks - * - * @author Nico Kotlenga (nico@nko-dev.studio) - * @since 12.05.26 - */ -public class SpeechToTextService { - - private final SpeechToTextServiceClient speechToTextServiceClient; - - public SpeechToTextService(SpeechToTextServiceClient speechToTextServiceClient) { - this.speechToTextServiceClient = speechToTextServiceClient; - } - - public void startSpeechToTextTask(Transcription transcription){ - - } - - public void resumeSpeechToTextTask(Transcription transcription){ - - } - - -} diff --git a/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java b/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java index 4faca9c0..e8cad28c 100644 --- a/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java @@ -1,21 +1,37 @@ package de.bitgilde.TIMAAT.service.transcription; +import de.bitgilde.TIMAAT.model.FIPOP.Transcription; +import de.bitgilde.TIMAAT.service.task.TaskService; +import de.bitgilde.TIMAAT.service.task.api.MediumAudioAnalysisTask.SupportedMediumType; import de.bitgilde.TIMAAT.service.task.api.Task; import de.bitgilde.TIMAAT.service.task.api.TaskState; import de.bitgilde.TIMAAT.service.task.api.TaskType; import de.bitgilde.TIMAAT.service.task.api.TranscriptionMediumPreparationTask; import de.bitgilde.TIMAAT.service.task.storage.TaskStateUpdater; import de.bitgilde.TIMAAT.service.transcription.api.GenerateTranscriptionConfiguration; -import de.bitgilde.TIMAAT.sse.EntityUpdateEventService; import de.bitgilde.TIMAAT.storage.api.PagingParameter; import de.bitgilde.TIMAAT.storage.api.SortingParameter; import de.bitgilde.TIMAAT.storage.entity.transcription.TranscriptionStorage; import de.bitgilde.TIMAAT.storage.entity.transcription.api.TranscriptionFilterCriteria; import de.bitgilde.TIMAAT.storage.entity.transcription.api.TranscriptionState; import de.bitgilde.TIMAAT.storage.entity.transcription.api.TranscriptionType; +import de.bitgilde.TIMAAT.storage.file.AudioContainingMediumFileStorage; +import de.bitgilde.TIMAAT.storage.file.AudioFileStorage; +import de.bitgilde.TIMAAT.storage.file.TemporaryFileStorage; +import de.bitgilde.TIMAAT.storage.file.TemporaryFileStorage.TemporaryFile; +import de.bitgilde.TIMAAT.storage.file.TranscriptionFileStorage; +import de.bitgilde.TIMAAT.storage.file.VideoFileStorage; import jakarta.inject.Inject; - +import studio.nkodev.stt.client.SpeechToTextServiceClient; +import studio.nkodev.stt.client.api.SpeechToTextEngineOutputFormat; +import studio.nkodev.stt.client.api.SpeechToTextTaskState; +import studio.nkodev.stt.client.api.SpeechToTextTaskStateConsumer; + +import java.nio.file.Path; +import java.util.Collection; +import java.util.Optional; import java.util.Set; +import java.util.logging.Level; import java.util.logging.Logger; /** @@ -24,23 +40,76 @@ * @author Nico Kotlenga (nico@nko-dev.studio) * @since 12.05.26 */ -public class TranscriptionService implements TaskStateUpdater { +public class TranscriptionService implements TaskStateUpdater, SpeechToTextTaskStateConsumer { private static final Logger logger = Logger.getLogger(TranscriptionService.class.getName()); + private static final SpeechToTextEngineOutputFormat engineOutputFormat = SpeechToTextEngineOutputFormat.SRT; + private final TranscriptionStorage transcriptionStorage; + private final AudioFileStorage audioFileStorage; + private final VideoFileStorage videoFileStorage; + private final TaskService taskService; + private final SpeechToTextServiceClient speechToTextServiceClient; + private final TemporaryFileStorage temporaryFileStorage; + private final TranscriptionFileStorage transcriptionFileStorage; @Inject - public TranscriptionService(TranscriptionStorage transcriptionStorage, EntityUpdateEventService entityUpdateEventService) { + public TranscriptionService(TranscriptionStorage transcriptionStorage, AudioFileStorage audioFileStorage, VideoFileStorage videoFileStorage, TaskService taskService, SpeechToTextServiceClient speechToTextServiceClient, TemporaryFileStorage temporaryFileStorage, TranscriptionFileStorage transcriptionFileStorage) { this.transcriptionStorage = transcriptionStorage; + this.audioFileStorage = audioFileStorage; + this.videoFileStorage = videoFileStorage; + this.taskService = taskService; + this.speechToTextServiceClient = speechToTextServiceClient; + this.temporaryFileStorage = temporaryFileStorage; + this.transcriptionFileStorage = transcriptionFileStorage; resumeMonitoringOfActiveTranscriptions(); } public void createTranscription(GenerateTranscriptionConfiguration generateTranscriptionConfiguration) { + int mediumId = generateTranscriptionConfiguration.mediumId(); + String engineIdentifier = generateTranscriptionConfiguration.engineIdentifier(); + String modelIdentifier = generateTranscriptionConfiguration.modelIdentifier(); + //TODO: Validate if engine and model is available + + SupportedMediumType supportedMediumType = transcriptionStorage.determineSupportedMediumType(mediumId); + AudioContainingMediumFileStorage fileStorage = getFileStorage(supportedMediumType); + Optional<Path> monoFile = fileStorage.getPathToAudioMonoFile(mediumId); + + + Transcription createdTranscription = null; + try { + if (monoFile.isPresent()) { + logger.log(Level.INFO, "Mono file available for medium {0}. Creating transcription in PENDING state.", + mediumId); + createdTranscription = transcriptionStorage.createTranscription(mediumId, engineIdentifier, modelIdentifier, + TranscriptionState.PENDING); + startTranscriptionTask(createdTranscription.getId(), monoFile.get(), engineIdentifier, modelIdentifier); + } + else { + logger.log(Level.INFO, "No mono file for medium {0}. Creating transcription in WAITING_FOR_PREPARATION state.", + mediumId); + createdTranscription = transcriptionStorage.createTranscription(mediumId, engineIdentifier, modelIdentifier, + TranscriptionState.WAITING_FOR_PREPARATION); + taskService.executeTranscriptionMediumPreparationTask(mediumId, supportedMediumType); + } + } catch (Exception e) { + logger.log(Level.SEVERE, "Error while creating transcription for medium {0}. Reason: {1}", + new Object[]{mediumId, e}); + if (createdTranscription != null) { + transcriptionStorage.updateTranscriptionState(createdTranscription.getId(), TranscriptionState.FAILED); + } + } } + private void startTranscriptionTask(int transcriptionId, Path monoFile, String engineIdentifier, String modelIdentifier) { + long sttTaskId = speechToTextServiceClient.startSpeechToTextTask(monoFile, engineIdentifier, modelIdentifier, engineOutputFormat); + transcriptionStorage.updateTranscriptionTaskId(transcriptionId, sttTaskId); + speechToTextServiceClient.observeTask(sttTaskId, this); + } + @Override public TaskType getSupportedTaskType() { return TaskType.TRANSCRIPTION_MEDIUM_PREPARATION; @@ -61,23 +130,93 @@ public void updateTranscriptionMediumPreparationTaskState(TranscriptionMediumPre case DONE -> TranscriptionState.PENDING; }; - transcriptionStorage.updateTranscriptionsStateOfPreparationTask(transcriptionMediumPreparationTask.getMediumId(), transcriptionState); + Collection<Transcription> transcriptions = transcriptionStorage.updateTranscriptionsStateOfPreparationTask(transcriptionMediumPreparationTask.getMediumId(), + transcriptionState); + + if(TranscriptionState.PENDING.equals(transcriptionState)) { + SupportedMediumType supportedMediumType = transcriptionStorage.determineSupportedMediumType(transcriptionMediumPreparationTask.getMediumId()); + AudioContainingMediumFileStorage audioContainingMediumFileStorage = getFileStorage(supportedMediumType); + Optional<Path> monoAudioFile = audioContainingMediumFileStorage.getPathToAudioMonoFile(transcriptionMediumPreparationTask.getMediumId()); + + if(monoAudioFile.isPresent()){ + for(Transcription transcription : transcriptions){ + try{ + String engineIdentifier = transcription.getTranscriptionModel().getId().getEngineIdentifier(); + String modelIdentifier = transcription.getTranscriptionModel().getId().getModelIdentifier(); + startTranscriptionTask(transcription.getId(), monoAudioFile.get(), engineIdentifier, modelIdentifier); + }catch (Exception e){ + logger.log(Level.SEVERE, "Error while creating transcription task for transcription {0}. Reason: {1}", new Object[]{transcription.getId(), e}); + } + } + }else { + logger.log(Level.SEVERE, "No mono audio file found for medium {0}. Cannot start transcription task", transcriptionMediumPreparationTask.getMediumId()); + transcriptions.forEach(transcription -> transcriptionStorage.updateTranscriptionState(transcription.getId(), TranscriptionState.FAILED)); + } + } } + private AudioContainingMediumFileStorage getFileStorage(SupportedMediumType supportedMediumType) { + return switch (supportedMediumType) { + case AUDIO -> audioFileStorage; + case VIDEO -> videoFileStorage; + }; + } + private void resumeMonitoringOfActiveTranscriptions() { logger.info("Resuming monitoring of uncompleted speech-to-text tasks"); TranscriptionFilterCriteria transcriptionFilterCriteria = new TranscriptionFilterCriteria.Builder().transcriptionStates( - Set.of(TranscriptionState.PENDING, TranscriptionState.COMPLETED)).transcriptionTypes( - Set.of(TranscriptionType.GENERATED)).build(); + Set.of(TranscriptionState.PENDING)).transcriptionTypes(Set.of(TranscriptionType.GENERATED)).build(); transcriptionStorage.getEntriesAsStream(transcriptionFilterCriteria, PagingParameter.NO_PAGING, SortingParameter.defaultSortOrder(), null).forEach(transcription -> { if (transcription.getTranscriptionTaskId() != null) { - + speechToTextServiceClient.observeTask(transcription.getTranscriptionTaskId(), this); } else { - + logger.log(Level.WARNING, "Found pending transcription without task id. Transcription id: {0}", + transcription.getId()); + transcriptionStorage.updateTranscriptionState(transcription.getId(), + TranscriptionState.FAILED); } }); } + + @Override + public void onTaskStateChanged(long taskId, SpeechToTextTaskState speechToTextTaskState) { + switch (speechToTextTaskState) { + case DONE -> handleSpeechToTextTaskCompleted(taskId); + case FAILED -> handleSpeechToTextTaskFailed(taskId); + } + } + + private void handleSpeechToTextTaskCompleted(long taskId) { + logger.log(Level.FINE, "Speech to text task completed with id {0}", taskId); + Optional<Integer> relatedTranscriptionId = transcriptionStorage.getTranscriptionIdRelatedToTranscriptionTask( + taskId); + + if (relatedTranscriptionId.isPresent()) { + try (TemporaryFile temporaryFile = temporaryFileStorage.createTemporaryFile()) { + speechToTextServiceClient.saveResultsOfTask(taskId, temporaryFile.getTemporaryFilePath()); + transcriptionFileStorage.persistTranscription(temporaryFile.getTemporaryFilePath(), + relatedTranscriptionId.get()); + } catch (Exception e) { + logger.log(Level.SEVERE, "Error while handling speech to text task completion", e); + transcriptionStorage.updateTranscriptionState(relatedTranscriptionId.get(), TranscriptionState.FAILED); + } + } + else { + logger.log(Level.WARNING, "No transcription id found for transcription task with id {0}", taskId); + } + } + + private void handleSpeechToTextTaskFailed(long taskId) { + Optional<Integer> relatedTranscriptionId = transcriptionStorage.getTranscriptionIdRelatedToTranscriptionTask( + taskId); + if (relatedTranscriptionId.isPresent()) { + transcriptionStorage.updateTranscriptionState(relatedTranscriptionId.get(), TranscriptionState.FAILED); + } + else { + logger.log(Level.WARNING, "No transcription id found for transcription task with id {0}", taskId); + } + } } diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/TranscriptionStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/TranscriptionStorage.java index 6c21ec09..1927343b 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/TranscriptionStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/TranscriptionStorage.java @@ -1,7 +1,10 @@ package de.bitgilde.TIMAAT.storage.entity.transcription; import de.bitgilde.TIMAAT.db.exception.DbTransactionExecutionException; +import de.bitgilde.TIMAAT.model.FIPOP.Medium; import de.bitgilde.TIMAAT.model.FIPOP.Transcription; +import de.bitgilde.TIMAAT.model.FIPOP.TranscriptionModel; +import de.bitgilde.TIMAAT.model.FIPOP.TranscriptionModelId; import de.bitgilde.TIMAAT.model.FIPOP.TranscriptionState_; import de.bitgilde.TIMAAT.model.FIPOP.TranscriptionType_; import de.bitgilde.TIMAAT.model.FIPOP.Transcription_; @@ -19,16 +22,19 @@ import de.bitgilde.TIMAAT.storage.entity.transcription.api.TranscriptionType; import jakarta.inject.Inject; import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.NoResultException; import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Predicate; import jakarta.persistence.criteria.Root; import org.jspecify.annotations.Nullable; +import java.time.Instant; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; +import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -54,16 +60,18 @@ public TaskType getSupportedTaskType() { @Override public Stream<? extends Task> getUnfinishedTasks() throws TaskStorageException { try { - return executeStreamDbTransaction(entityManager -> entityManager.createQuery("select distinct transcription.medium.id, medium.mediaType.id from Transcription transcription join transcription.medium medium where transcription.transcriptionState.id in :transcriptionStates", Object.class) - .setParameter("transcriptionStates", Set.of(TranscriptionState.WAITING_FOR_PREPARATION.getDatabaseId(), TranscriptionState.PREPARING.getDatabaseId())) - .getResultStream() - .map(result -> { - Object[] row = (Object[]) result; - SupportedMediumType supportedMediumType = ((Integer) row[1]).equals(6) ? SupportedMediumType.VIDEO : SupportedMediumType.AUDIO; - int mediumId = (Integer) row[0]; - - return new TranscriptionMediumPreparationTask(mediumId, supportedMediumType); - })); + return executeStreamDbTransaction(entityManager -> entityManager.createQuery( + "select distinct transcription.medium.id, medium.mediaType.id from Transcription transcription join transcription.medium medium where transcription.transcriptionState.id in :transcriptionStates", + Object.class).setParameter("transcriptionStates", + Set.of(TranscriptionState.WAITING_FOR_PREPARATION.getDatabaseId(), + TranscriptionState.PREPARING.getDatabaseId())).getResultStream().map(result -> { + Object[] row = (Object[]) result; + SupportedMediumType supportedMediumType = ((Integer) row[1]).equals( + 6) ? SupportedMediumType.VIDEO : SupportedMediumType.AUDIO; + int mediumId = (Integer) row[0]; + + return new TranscriptionMediumPreparationTask(mediumId, supportedMediumType); + })); } catch (DbTransactionExecutionException e) { throw new TaskStorageException("Error during loading unfinished transcription medium preparation tasks", e); } @@ -74,15 +82,79 @@ public void persistTask(Task task) { // Nothing to do here. The transcription lifecycle is created by TranscriptionService. } + public void updateTranscriptionTaskId(int transcriptionId, long transcriptionTaskId) { + executeDbTransaction(entityManager -> { + entityManager.createQuery( + "update Transcription set transcriptionTaskId = :transcriptionTaskId where id = :transcriptionId") + .setParameter("transcriptionId", transcriptionId) + .setParameter("transcriptionTaskId", transcriptionTaskId).executeUpdate(); + return Void.TYPE; + }); + } + + public Transcription createTranscription(int mediumId, String engineIdentifier, String modelIdentifier, TranscriptionState transcriptionState) { + return executeDbTransaction(entityManager -> { + de.bitgilde.TIMAAT.model.FIPOP.TranscriptionState transcriptionStateEntity = entityManager.getReference( + de.bitgilde.TIMAAT.model.FIPOP.TranscriptionState.class, transcriptionState.getDatabaseId()); + de.bitgilde.TIMAAT.model.FIPOP.TranscriptionType transcriptionTypeEntity = entityManager.getReference( + de.bitgilde.TIMAAT.model.FIPOP.TranscriptionType.class, TranscriptionType.GENERATED.getDatabaseId()); + Medium medium = entityManager.getReference(Medium.class, mediumId); + TranscriptionModelId transcriptionModelId = new TranscriptionModelId(); + transcriptionModelId.setEngineIdentifier(engineIdentifier); + transcriptionModelId.setModelIdentifier(modelIdentifier); + TranscriptionModel transcriptionModel = entityManager.getReference(TranscriptionModel.class, + transcriptionModelId); + + Transcription transcription = new Transcription(); + transcription.setName(engineIdentifier + " / " + modelIdentifier); + transcription.setMedium(medium); + transcription.setTranscriptionState(transcriptionStateEntity); + transcription.setTranscriptionType(transcriptionTypeEntity); + transcription.setTranscriptionModel(transcriptionModel); + transcription.setCreatedAt(Instant.now()); + + entityManager.persist(transcription); + + return transcription; + }); + } + + public Optional<Integer> getTranscriptionIdRelatedToTranscriptionTask(long transcriptionTaskId) { + return executeDbTransaction(entityManager -> { + try { + Integer transcriptionId = entityManager.createQuery( + "select transcription.id from Transcription transcription where transcription.transcriptionTaskId = :transcriptionTaskId", + Integer.class).setParameter("transcriptionTaskId", transcriptionTaskId).getSingleResult(); + return Optional.of(transcriptionId); + } catch (NoResultException e) { + return Optional.empty(); + } + }); + } + + public void updateTranscriptionState(int transcriptionId, TranscriptionState transcriptionState) { + executeDbTransaction(entityManager -> { + Transcription transcription = entityManager.createQuery( + "select transcription from Transcription transcription where transcription.id = :id", Transcription.class) + .setParameter("id", transcriptionId).getSingleResult(); + de.bitgilde.TIMAAT.model.FIPOP.TranscriptionState transcriptionStateEntity = entityManager.getReference( + de.bitgilde.TIMAAT.model.FIPOP.TranscriptionState.class, transcriptionState.getDatabaseId()); + transcription.setTranscriptionState(transcriptionStateEntity); + + return Void.TYPE; + }); + } + public List<Transcription> updateTranscriptionsStateOfPreparationTask(int mediumId, TranscriptionState transcriptionState) { return executeDbTransaction(entityManager -> { de.bitgilde.TIMAAT.model.FIPOP.TranscriptionState transcriptionStateEntity = entityManager.getReference( de.bitgilde.TIMAAT.model.FIPOP.TranscriptionState.class, transcriptionState.getDatabaseId()); - List<Transcription> transcriptions = entityManager.createQuery("select transcription from Transcription transcription where transcription.medium.id = :mediumId and transcription.transcriptionState.id in :preparationStates", Transcription.class) - .setParameter("mediumId", mediumId) - .setParameter("preparationStates", Set.of(TranscriptionState.WAITING_FOR_PREPARATION.getDatabaseId(), TranscriptionState.PREPARING.getDatabaseId())) - .getResultList(); + List<Transcription> transcriptions = entityManager.createQuery( + "select transcription from Transcription transcription where transcription.medium.id = :mediumId and transcription.transcriptionState.id in :preparationStates", + Transcription.class).setParameter("mediumId", mediumId).setParameter("preparationStates", + Set.of(TranscriptionState.WAITING_FOR_PREPARATION.getDatabaseId(), + TranscriptionState.PREPARING.getDatabaseId())).getResultList(); transcriptions.forEach(transcription -> transcription.setTranscriptionState(transcriptionStateEntity)); @@ -90,6 +162,22 @@ public List<Transcription> updateTranscriptionsStateOfPreparationTask(int medium }); } + public SupportedMediumType determineSupportedMediumType(int mediumId) { + return executeDbTransaction(entityManager -> { + Medium medium = entityManager.find(Medium.class, mediumId); + if (medium == null) { + throw new IllegalArgumentException("Medium with id " + mediumId + " not found"); + } + int mediaTypeId = medium.getMediaType().getId(); + return switch (mediaTypeId) { + case 1 -> SupportedMediumType.AUDIO; + case 6 -> SupportedMediumType.VIDEO; + default -> + throw new IllegalArgumentException("Unsupported media type id " + mediaTypeId + " for transcription"); + }; + }); + } + @Override protected List<Predicate> createPredicates(@Nullable TranscriptionFilterCriteria filter, Root<Transcription> root, CriteriaBuilder criteriaBuilder, CriteriaQuery<?> criteriaQuery, @Nullable UserAccount userAccount) { if (filter != null) { @@ -106,10 +194,9 @@ protected List<Predicate> createPredicates(@Nullable TranscriptionFilterCriteria if (filter.getTranscriptionTypes().isPresent()) { Collection<Integer> transcriptionTypeIds = filter.getTranscriptionTypes().get().stream() - .map(TranscriptionType::getDatabaseId) - .collect(Collectors.toSet()); - predicates.add( - root.get(Transcription_.transcriptionType).get(TranscriptionType_.id).in(transcriptionTypeIds)); + .map(TranscriptionType::getDatabaseId) + .collect(Collectors.toSet()); + predicates.add(root.get(Transcription_.transcriptionType).get(TranscriptionType_.id).in(transcriptionTypeIds)); } return predicates; diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/file/TranscriptionFileStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/file/TranscriptionFileStorage.java new file mode 100644 index 00000000..73cf863c --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/storage/file/TranscriptionFileStorage.java @@ -0,0 +1,58 @@ +package de.bitgilde.TIMAAT.storage.file; + +import de.bitgilde.TIMAAT.PropertyConstants; +import de.bitgilde.TIMAAT.PropertyManagement; +import jakarta.inject.Inject; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.StandardCopyOption; +import java.util.Optional; +import java.util.logging.Level; +import java.util.logging.Logger; + +/** + * FileStorage for transcriptions. + * Transcriptions will be persisted inside a dedicated folder. The files are named using the following schema: + * {transcriptionId}.srt + * + * @author Nico Kotlenga (nico@nko-dev.studio) + * @since 16.05.26 + */ +public class TranscriptionFileStorage { + private static final Logger logger = Logger.getLogger(AudioFileStorage.class.getName()); + + private final Path transcriptionStoragePath; + + @Inject + public TranscriptionFileStorage(PropertyManagement propertyManagement) throws IOException { + this.transcriptionStoragePath = Path.of(propertyManagement.getProp(PropertyConstants.STORAGE_LOCATION)) + .resolve("transcription"); + Files.createDirectories(transcriptionStoragePath); + } + + + public Path persistTranscription(Path transcriptionFile, int transcriptionId) throws IOException { + logger.log(Level.FINE, "Persisting transcription having id {0}", transcriptionId); + + Path transcriptionFilePath = createTranscriptionPath(transcriptionId); + Files.move(transcriptionFile, transcriptionFilePath, StandardCopyOption.REPLACE_EXISTING); + + return transcriptionFilePath; + } + + public Optional<Path> getPathToTranscription(int transcriptionId) { + Path transcriptionPath = createTranscriptionPath(transcriptionId); + + if (Files.exists(transcriptionPath)) { + return Optional.of(transcriptionPath); + } + + return Optional.empty(); + } + + private Path createTranscriptionPath(int transcriptionId) { + return transcriptionStoragePath.resolve(transcriptionId + ".srt"); + } +} From ae41d3237e773e8d60b7f33f4e8e5954e600f51f Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Sat, 16 May 2026 15:38:58 +0200 Subject: [PATCH 54/70] Add CLAUDE.md with build, config, and architecture guidance Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> --- CLAUDE.md | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 CLAUDE.md diff --git a/CLAUDE.md b/CLAUDE.md new file mode 100644 index 00000000..1400289c --- /dev/null +++ b/CLAUDE.md @@ -0,0 +1,83 @@ +# CLAUDE.md + +This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository. + +## Overview + +TIMAAT is a Jakarta EE web application for collaborative video annotation, packaged as a WAR deployed to Tomcat 10. It is the successor to FIPOP (the persistence unit and database are still named `FIPOP`). Backend is Java + Jersey; frontend is server-served HTML + RequireJS modules in `src/main/webapp/js`. + +## Build & Run + +- `mvn package` — builds `target/TIMAAT.war`. Deploy by copying into Tomcat's `webapps/` directory; app is then reachable at `http://localhost:8080/TIMAAT`. +- `mvn test` — runs the JUnit 5 suite. Surefire is configured with `-javaagent:.../mockito-core.jar` (see pom.xml:67) because Mockito 5 needs the agent attached on Java 21+. Don't drop that argLine. +- Run a single test: `mvn test -Dtest=FfmpegAudioEngineTest` or `mvn test -Dtest=FfmpegAudioEngineTest#methodName`. +- Java toolchain: `pom.xml` sets `maven.compiler.release=25`, but `.github/workflows/maven.yml` still pins JDK 11 — the CI config is stale relative to the source level. Local builds need JDK 25. +- Annotation processing: EclipseLink's `CanonicalModelProcessor` runs at compile time and generates JPA static metamodel classes into `target/generated-sources/annotations`. + +## Runtime configuration + +The app reads `~/.timaat/timaat.properties` (Linux/macOS) or `%HOMEDRIVE%%HOMEPATH%\.timaat\timaat.properties` (Windows). Template lives at `src/main/resources/timaat-default.properties`. Required keys: `database.url`, `database.user`, `database.password`, `storage.location` (filesystem root for media), `app.ffmpeg.location`, `app.imagemagick.location`. Async task pool sizing: `app.task.coreParallelCount`, `app.task.maxParallelCount`, `app.task.queueSize`. + +For Docker deployments these are surfaced as env vars (`DATABASE_USER`, `DATABASE_HOST`, `APP_TASK_MAXPARALLELCOUNT`, …) — see `docs/docker.md`. `docker/timaat-entrypoint.sh` writes the properties file from env on container start. + +## Database + +MySQL/MariaDB schema `FIPOP`, collation `utf8mb4_general_ci`. + +- Fresh install: load `src/main/resources/database/fipop.sql`. +- Upgrade: apply `src/main/resources/database/db_update.sql` (it is idempotent across versioned blocks). Schema version lives in the `db_version` table; bump it for every schema change and document the change in `docs/database.md`. +- JPA persistence unit `FIPOP-JPA` is declared in `src/main/resources/META-INF/persistence.xml`. Every entity class in `de.bitgilde.TIMAAT.model.FIPOP` must be listed there — EclipseLink does not auto-discover. When adding an entity, add a `<class>` line. + +## Architecture + +### Request lifecycle + +`de.bitgilde.TIMAAT.TIMAATApp` (`@ApplicationPath("timaatapp")`) is the Jersey `Application`. It explicitly enumerates resource and filter classes in `addRestResourceClasses` — new endpoints must be added there or they will 404. Filters in `rest/filter/` (`AuthenticationFilter`, `CORSFilter`, `RangeResponseFilter`) wrap every request; auth is JWT (jjwt) with Argon2 password hashing. + +REST endpoints live in `de.bitgilde.TIMAAT.rest.endpoint.Endpoint*` (one class per domain area: Medium, Annotation, Analysis, Actor, Music, …). They delegate to storage components rather than holding business logic themselves. + +### Dependency injection + +Jersey HK2 is the DI container. All wiring lives in **one** place: `de.bitgilde.TIMAAT.di.binder.TIMAATBinder`. Singletons (file storages, engines, task service, the entity-storage layer) are bound there. When adding a new service or storage, register it in `TIMAATBinder.configure()` — endpoints get instances via `@Inject` only because of bindings here. Note the multi-contract bindings (e.g. `bind(DbTaskStorage.class).to(DbTaskStorage.class).to(TaskStorage.class).to(TaskStateUpdater.class)`) used so one implementation satisfies multiple registry lookups. + +`TIMAATBinder` also constructs the `EntityManagerFactory` (it has to run before the persistence layer is touched) and exposes it as a binding. + +### Storage layering + +Three parallel storage concepts that are easy to confuse: + +- `storage/entity/**` — DB-backed entity storage classes (`MediumStorage`, `AnnotationStorage`, `TranscriptionStorage`, …). These are the JPA access layer for the FIPOP entities. +- `storage/file/**` — filesystem storage for binary blobs (`VideoFileStorage`, `AudioFileStorage`, `ImageFileStorage`, `TranscriptionFileStorage`, `TemporaryFileStorage`). They write under `storage.location` with the layout documented in `docs/fs-storage.md` (per-medium subdirectories keyed by medium ID). When that layout changes, add a migration script under `src/main/resources/scripts/fs-migration/`. +- `db/` — low-level JDBC helpers (`DbAccessComponent`) used when JPA is too heavy. + +The corresponding domain models are in `model/FIPOP/` (JPA entities, generated/maintained against the schema) and `rest/model/` (DTOs used over the wire). + +### Async task framework (`service/task/`) + +Long-running work (audio analysis, transcription preparation) goes through this framework rather than being run inline in a REST handler. + +- `api/Task` + `TaskType` + concrete `Task` subclasses describe a unit of work. +- `storage/TaskStorageRegistry` and `storage/TaskStateUpdaterRegistry` route a task to the right persistence handler by its `TaskType`. To add a new task type: define `XxxTask`, register its `TaskStorage` and `TaskStateUpdater` bindings in `TIMAATBinder`, and register a corresponding `TaskExecutor` in `execution/TaskExecutorFactory`. +- `TaskService` is the entry point — it persists the task, then hands it to `TaskExecutorService`. On startup it resumes any tasks left in a non-terminal state. +- `TaskExecutorService` owns a thread pool sized by the `app.task.*` properties. + +### Transcription (`service/transcription/`) + +`TranscriptionService` orchestrates speech-to-text via the external `studio.nko-dev:speech-to-text-service-client-uni-erfurt` client. It plugs into the task framework as a `TaskStateUpdater` (see binding in `TIMAATBinder.java:87`). Transcription file output goes through `TranscriptionFileStorage`; DB rows are persisted via `TranscriptionStorage`. + +### Media processing (`processing/`) + +`processing/audio/FfmpegAudioEngine` and `processing/video/FfmpegVideoEngine` shell out to `ffmpeg` (path from `app.ffmpeg.location`). Audio analysis produces waveform + frequency files written via the binary readers/writers in `processing/audio/io/` — these are the only components with meaningful unit-test coverage today (`src/test/java/de/bitgilde/TIMAAT/audio/io/`). + +### Realtime channels + +- `notification/NotificationWebSocket` — WebSocket endpoint for user-targeted push notifications; subscriptions tracked in `UserSubscriptions`. +- `sse/EntityUpdateEventService` + `rest/endpoint/EndpointEntityUpdateEvents` — Server-Sent Events stream so the UI can react to entity changes from other sessions. + +### Publication output (`publication/`) + +Generates standalone publishable bundles from annotations using template files in `src/main/resources/*.template` (registered to the WAR by the war-plugin config in `pom.xml`). `PublicationAuthenticationFilter` + `PublicationServlet` serve the protected publication endpoints; they are added to the Jersey resource set alongside the REST endpoints. + +## Frontend + +`src/main/webapp/` is plain HTML/CSS/JS, no build step. JS is organized as RequireJS modules under `js/` with vendor libs vendored under `third-party/` (jQuery, Bootstrap, datatables, leaflet, wavesurferjs, dropzone, summernote, select2, …). The frontend talks to the backend over the `/timaatapp/*` REST API and the SSE + WebSocket channels above. \ No newline at end of file From 4d13d944b41ebc82b90b06a152fbc55d8649392e Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Sat, 16 May 2026 16:42:58 +0200 Subject: [PATCH 55/70] TIMAAT #57 - Improved engine and model sync * The tables transcription_engine and transcription_model are now only used to persist the information about the model and engine used to create the transcriptions * The default_engine and default_model are now persisted inside the system_setting table * Added a method to TranscriptionService giving information about current available engines and models --- .gitignore | 1 + docs/database.md | 4 +- docs/img/db_update_1_0_0_transcriptions.png | Bin 152264 -> 159979 bytes .../TIMAAT/di/binder/TIMAATBinder.java | 2 + .../TIMAAT/model/FIPOP/SystemSetting.java | 13 ++++ .../model/FIPOP/TranscriptionEngine.java | 11 --- .../model/FIPOP/TranscriptionModel.java | 25 +------ .../transcription/TranscriptionService.java | 69 +++++++++++++++++- .../transcription/TranscriptionStorage.java | 35 +++++++++ src/main/resources/database/db_update.sql | 29 ++++---- src/main/resources/database/fipop.sql | 25 ++++--- 11 files changed, 148 insertions(+), 66 deletions(-) diff --git a/.gitignore b/.gitignore index ea7ce18f..151d0dac 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,5 @@ test_output .classpath *.bak .vscode/ +.idea/ .project diff --git a/docs/database.md b/docs/database.md index f68f3a6f..953bf7a9 100644 --- a/docs/database.md +++ b/docs/database.md @@ -55,7 +55,7 @@ The versioning of the database schema follows the following pattern: * Added table `transcription` which is holding information about the available transcriptions * Each transcription is related to one medium * Added column `default_transcription_id` to table `medium` defining the transcription which is currently the default transcription of that medium -* Added tables `transcription_engine` and `transcription_model` giving information about all engines which are currently or previously usable with the connected speech-to-text infrastructure +* Added tables `transcription_engine` and `transcription_model` keeping a historical record of every engine/model used by a transcription. Current availability is queried live from the speech-to-text-service, so these tables hold no `active` flag and no per-row default marker. * Added table `transcription_state` holding the difference states a transcription can have. The table `transcription_state_translation` contains the translation strings of the states -* Added table `system_settings` containing the runtime changeable configuration parameters related to the whole TIMAAT system. +* Added table `system_settings` containing the runtime changeable configuration parameters related to the whole TIMAAT system. Columns `default_engine_identifier` + `default_model_identifier` reference the globally configured default transcription model (nullable, cleared at startup if the model is no longer offered by the speech-to-text-service). ![db_update_1_0_0_transcriptions.png](img/db_update_1_0_0_transcriptions.png) \ No newline at end of file diff --git a/docs/img/db_update_1_0_0_transcriptions.png b/docs/img/db_update_1_0_0_transcriptions.png index 05b89f616713db358bc2d6e146a6114dd3f39746..a0921d30b2b5d2783cc42dac2c81b4642bd490de 100644 GIT binary patch literal 159979 zcmeFZcRZVK`#z3RM3uH^t2H_iMYTpzqefLwBsQU{YE!j?*wxytS$i}HV$Z16K}(HT zv1!$eSz;u@_tw7OpXc>_pYi?u`+L1Ue~64b*L~gRbzbLr9LIUyd8PeOl^MhdqN1W= zR(qffrJ_1sKt*+of#EptP8H}$2=I^E6{@O8RnmQN5qP0&WvKR4Q<Dk|JZGSy4zs1A zJvs#V;{^VIuVztG9RvPTAHA1F^Y^F63$l*={rnii(Sfg&H0-IU6sXjc@9BC`FHg|D zkJmeB-{6^;cpwO2I4*JBBci?yWKVI&xJSV)@y27-Lk~4rk2Rb+)vCZojcRCUIGFdD zj_l#G7T)>L=*lM-hQGP7MSfeq`E4(KQwB9u0&l?aGw=pb(fsF!cMr1M!fQT0WmTY} zrv1+k>ol|lURVAfL+J)k=|Sp8&i$9u0V7a@Cy)K-`5c`>fSp$%0qP|2;=fItS0NyL z=f55hpa7v`&_>0lMqT=^CSc9_A^Tqs;Ejb+)94D!KDGSs^9D@B^1mkfuNL@U6aB9j z{g+MjzZ>m;W6}SH>;IgL{{NcM6pR@D!WLOxv=UC^3kL5kJ|6F%dDb6cVO%GYA^Ql! zz*{CxgMuXdidd8z-%|9txLW&k;zsaMhS#p5!6x=q4`JO2`{7|)X_hR_<lv~(^4=lm zVK*WDDw8LU47{<gXc9V-s*ia%*%`P`jDZdK?X5Z!t8ZC#7%uizP4s-){3>@PKw+C9 z-nhX-$iQL5RZi;k5#k9HJN@!_-qsxiQy}_T=KY4Q65iNNnoCsd{ybpOoYMKb98^HW zQeb3SAlXq!L^%ai_}mreWm`f0QlamSk2ir+m(Zk-iI+F@5Po=S-2+o5daJqUj?h%r z6WWD)dbd^`*pFWEcG9tVfrJoxwx^wNyn4L657@8Psq)Iw=1}v?>VFOmf|2%L4Aod@ zp?eulk6!`2;2K|+y#U;P(fL*@`i%^W!}&lB)^lRdu~V9GeCU*eX^+*1x0XDo6nISl zpkqaNJ6reL$`D=N{b9z0YtGCUEgMOPcAJUCH*l24Gk_(%0>g!`eLGl59iGyfY%g?p zNLIBU`yf+6dt~MTn(qifF)Hv9u~Lqf^^08K!W6S?-tT-KUra?^_=adr_#M2B_*p5q zT&h89d94c7sY6kwn0O^cUP)SgjFGi@UC%~Eg8j+?6U(M7+Qv5Z!hA-qGF9N#Sq41( zyBuXFSr&NphJ(Rh#7*no5$NPMqP|aa!^poT`e?CZKhxNC6;Tc5D_wuGq4V5^;b(M< zXKo&OI$jQ+{rHM!bjB4G;9GsL0MOjlU6EyWnnhvOlGzV_*fkMy7%;+<B4DZxvXvLl z9^p`hSBxP%QkN#a^(ELt9L$Gr(lD?!D(ps{rKA{LIXa+ah+*B++kU|C_}}=K-y1-C z*ZfZoAN%bdH`o~1uVM3np|%;6<;T9eY+vM34LUkeA{E}~t$Wk3$<cAYSJ(_d!0#D) zPW^t#PeTpX2&a0j#~YhRLz~yP^{LF{XhtU)<Ao|$2BlDtw+X^42f6QbvwTNx>1Uf7 z#U0kf-$K<=WXpuctd0JR8m<`NT$!W&gzLBE8LqNsotB{niCl`MqoK{JoWA;;0kE0) z(aI$qNHjllG$3!kW?C6;^c-K>G|YvlkoPlIC8k@M9KzbFYZ0<H47~!aOXa?1Hmhq5 zH>@)`oBfD|8;|ntaC^;|TRXUB*%x_U4n7-sFu@RWd-vI}`;p`39=X@nqUHSW3+vMi z;JLHtaetWS@9Un9p+UiS5>!QGhF0&amB~NU*fg-iPQO9)h+zzJ6?{?_3_I&GVB&?k zWsuoU<6vVwrm74~`r;?b=<p`qt@@<U1&0-I_>=mFm<wdeou{Q3mSy&@(GF&6d(W*v zRamanfeo@B>7GpcTqzX&KEbtdA!VS*$*PmhLAE^9`%k=7;AD)~%=NP{_&d@h)5W); z(#WS8a1@hDkH)DK=%-?n=IrF!Z%e1X2nVu84mCp1j$Qq6@Vgh8k34UihJJ0dZ`*$A z+fyOKr#{P7=?&&fJZo5`D<<`Jn5cBoscqY_fsVT7H45^r&8(?$4cu6~%y<yoK*%F* ze=M-A8Sl!6<|C}^M+y?VJP1I@+AdM;3qlF5ByHRllD>$hfq?pojcO<FYo%Mm=7qOA z34+S~qY_2d7sl}&UbQQXx6c}<=DB0+W<e6Z9~@w@IXdZf+cOJ`9)}l>Vf-RU+pAfx zk$do3XB(@DgQ&E-?b0iC=~MGMPL$gdqUfvAL$<C-!*E%8L%p*L=k7kmW@;Uxt@Ttr z(;)XG2UZT>e-_*qL!k%@HCIw?Hxq}=x*bM3#JBtF-qs*iu*1JLSio4S;rg&OJE03h z6|x=<4#qt>vx1T`PG#9n-U(Q7unCi7PoX%$p<`L4CRb+LN>G37gOwl#UP(GICbpN~ zc9>n#oHK4)D+)5}cK%l7E#dS1d1G1`{{zpVY%WdxGf#!fq#}~WUcRctJRJ-d{sQ}$ z*KM>MghUlb$<W`P7pZ;?n<M$zO}%f@E79)e*?g&1X*utjf88CE!n6)tFg`QFu6x5^ zzH|r1kLam#HtR_lEVbQCDqhd{E_-H<aR)O_wkF@N#>9`&V{X5f6r+4ol33XpSLt;8 zP#k*Dc>B@r6QAXYHOKI=wdz$0TZe~x5qW3$^1Q^iMrVD8?LvdxaB*kDejbzh3KXTL zN~>8TnO!EY?Bwd7P5l4`L>FDVN}(g)4@^7tvh@AKq+{~lhaMgu-_nynp~nsn($dSE zFOcz4^drx9j#1u|r__=rp2)L4FbP~Ac{s-Pr2V&t*6=@j$@Fl-r}Y%F=|y$XXurQq zs{!ed_?l&ZhFQ2!3`a-9b~AY<h{l{b)rRL_{vuBqgP=Kqb7!3NT%No@7OgRF$n&tT z6+R#pLO%a0kGH>Vnl<y&1VN(exNVTW8^*1C=(X)i{x#3&f!_-ov1oAS(O+3RbW?S1 zn5*ipX&?}9dystX8{u4sh+3bi8bbH*6nzz2ve)<i%$0*fnGQRHq9=l;>jlq0KS#>Z zMI9V`;?plz90_ShY<yfB)3oOKIZx@L(??#s{n0JmYsQHF^S1e!%srczvKt31a<NzV z5>SE$Ce;x3eM>rpDq%XG(+QK3>EC_!Y({7KR%WdCTHbQiO38kAk!*bYoYZW&Qw2L| zV=V{|Si<JZS0C0-I!dz?!GpoXU(oYwH0l#;D>F2~_8N^@PK3$NKq{U6E;lt2kx99j zF<0NbmUBhZc0<=K4J*)_|H9Z`#@n1{!FB=h25r#q%ERJ9T?N_xVjlDL_Wh(F_x#DB z&cwQwktwZ-o^7{#*n-fY*CKwR1KdcmiGN9^o0-K_H9S2txYXN>Ws|LbfA-77ulL(s zFTZ+xw&dA!eaCGB4)YwHoXT(~=Ld|U_*PdM<qmD%PxUnP$lvWDKUky2Se7x_arb7| zn<oW@<8}&Y68NS@<J#=Jx4e&X2X8Ed8oG~yraJ!7CSsq`*ohahi3)KJKq_S|J^zYf zRDnNE87_er2WPIw%N<i4H7H5a<p&}7@1Q#NH*Rz6a$h$;nLZtSQv@kD(44nrH-8bU zZun`6fQ8(<LKm;g*}$!p?&&m#SP=`S%a<d&r1{<TDkkVu_BHWH4HBalS((5E?QdvQ z;@~VfWhXJJtpY?3gSCsqZ=gnxkBxIWI?mUKKSrjp7HIkbcKD79b^NDxPUdC)%cz;g z@5RUbo<SND2ac)Fez24_vc~t{FlI~Zb6bf+oDF>hbIVxwdPyL%bvTz;#}>=)dQ`E< zExOaq4G=W$DJ6)QmZ`MLv#-oR&z?wGML3{sc-TKdAs<W{xPIgx{v4WeUdVIxM9G*D zc_F$3SHN4>p$Z!0><ry(u_E)2^!aSDX^Uz89<mKj>$q()S<X9``bmA;ISmsjo!K4{ zxbb7nO4R53t*L&E@`{r5F;W)ZmcC{OxIBh_pQj7EM%%=7HO6E25Noy#&PYm;-;c=) zVDj4dc%~=uok^8Lg1@G0M%9#b;<HsHuhnH?F3YtmLb-l@KGT=ZJ}LUyt;3IqDKV<; zZgWJ&fK{fOO7eMs13m!QoX(=xQ~O#8|C1Yk&~9Dv^-Ll?!PpBF>Nof}ACwnxpdq*l z^`aO0?Ub7b?tK>zb8lnozzVwF**sfI%qX7CY_S5p&jykF=^83KO5(;_xeej=wim#c zwysoLtk}s>R0~en%tPaJJurcMJ;qO5;nHj<Yoj%=T$@I!Ga1YA5fYZu!CKuiK7vZs zK?M$-O^k7hY5#*C0Q{lG#II>~Xc6ZtU8}ZAn%g#L`qiLYWQQ6qK^t^vifl!pw0xEu zd3<BeqkLgm3by<4L0Z%)HucNpEPk9#BC9K_KH`8skf)-<yK>lk8%fNSGUnvb9a^Zg zEIWKH{cy_jbe;*UC*5_;Pf&|gHw?PMGU+;2-^CSy7)tXWSREQg(dmL3g}93J%OlkN z&Iak{PaR-|%$i0g8&_`F|14p0UpdR1EW7hnORjM|-D$rhciX{{b4<Xf{xHh<#ugP+ zt2nUv;YKBLXG}Nq@y5%CGRcT%X!_*vVn{<9EPKC5)%<K#s?*wpM-7YIS95%_-6Pa3 zT)I4}Ql`w(_0U)~>6Zvjya2(K{xe8b+8jhn93JntQ%x!qi7(0|UFBHrvrm#IWv@)+ zy;`HrGlLQB;)(5r0ebu(kM!L&{J6W%8TmXT_oO#2^gEM=RlYE7wR=h^c3rL7(g`17 z9i01CbqPKh@nmp9TS}sH6?0*4IvEim!2Ug~WPU`c#4|Cxf>${L3M=IIa^HqKr$AY^ z-*1TVT(zI?<G9~>t)x8_N+vcO-t9lIlR0J@BLq4EssJ6h6kD5Ecy&9#@$w(Y6L3~L zgA^;RA|FHy)={xkVLmT;WeBUYsFZQ&2KyY4CulW=E=hRGZ-@4tok{KUE`a`gtsb+d zG^>`p^HR2^Ry}&Elm2})_d!MakG^y_na7d_Iydp%^<+)?G0P;LHF{jrO!dL`P{7pk zE5Vo@b}F2oE|YPTIjdvf2%+e^#~NWOMAIeaD4rcn=t*P%VlSlJZ-8ok&mK$45Z&Vn zD8V6JnP2JV)o-BK+;n<XqY!59_n3)^g|NmqEWC@O7_y%;x%{oz;c%C1_12xH6VF@I z7KZO{^nY}XVn*F+#i*-{m3(hg13%DVxy+8rhOG&+i_1X+AW<<nDp4riJnSMkTQbHU z+H&Zoi56`cV1-!fqWOn&xea_)2d>s|tOT2iZ@)pP3TXG|-0K>4BNl`w#{RfTGQP)M zlmuOPh1x6i5ZLdICR|Fgk<B$#u%WzQmYX$87LG}hKl~ikKlmwzEAReO7WnfjmYV|8 z96}J$;hE96Mx`y{2RWzJwtA?}k~}*~=>#fJ-ST`m0#BLSHp&D2)bngD!btgB`2A*b z0K3J|G)t<F42hTD{mWczZv%`?kc7Ubh4$R%-v!rmb-5t*KaiWF8^Vn*S6MtU50#!3 zmR|U%fVQYwUYTGal5=$VvaQyxCJA3}3Q4T+_nIJvgRb?x6o3D7t=eoQ7rC(1UcId& zTRc!`sDhDIBIqB|9R82?ZF^n2#NmhC>jbC$4DIeab-~R;xMVpHn6lFqXaUXep{r8l zl=5Uu%D+3EsMGUK3mz`dPUk0G>%1C#3sI7>j;(>Abx=R@=u;2PtDib%%zw=&Fi3(_ zc2QpxH-<u5wBK+Q<q@P|sNzj+ty|)0pnHNS#z+pLArw~^87eS4A+5BB*nN`8q1BVn z{ctvT?LOJw{P4-9|5DUD!eAazg07eCQ@B~b+0HlXybbJ!m5F=JJNgkNd?Z8s(1wbB z_5z9cO-Y)RzqH}L996oTp=N>DlG}<Owec2m>p~8tJ14iDhl$80<nGw5^slNUO?44{ zp|KBDX8h9KHtoyV!f<<AcW}rs?+<%LYq$6cmdm`q-I9%ds&BYBscyHQ2mR7NpY&b+ zPv8zW4&c^R5$YiQ$;A9Lff*$UnBxe2=W8eq+@s$1LxP^n^B6AQbu_XIoR<oH5t36C zz$tid=Auo?af(xe6iRjN;L7r<*|BAaB!gRR7e@Eva}%G#=*~cY>z>jTq~wBI(uDC| z8VTZ35yPY_`)os}iQaJYxVS0uFw~@hF;VI7icGl5qsh7B;!6peyX@_$;MK!T$YID> zpL=pRA|<WP+=Ni!{r+9ZZ9Xp@*)nc7S)1c^S&^KZAvxR&5NA(?usJ!+Uk$=h=?KUo z$!SV3gRzo*_n<)5*hJ~<E|l|b0?sK-i0%^TdGS<C%A604z{{-<)o{nzrRwqw7^J<n z+G=*mUCt)|g(g0usadNM-;cVp@AOm5$Fui=%;Cbra=qp?8r_ZAAt$&mtH@Rg6eJTh z|ISPubQPT+2R#Qa;FE-l@Cn)}qpF7Ud8#UR4xWCB52*yN=j|x5C;c$S58%^=q&zg! zp9Rv2O#YfzD)#=Eg1k{Q5|L=cv|}hxF>}mlshlIcjWk;72kYN`iaYJNKlrK9+<hNH zJ|_fvCqS%0(ihZbM#EIr;HbmZ3j3mk<-7O)FmgxQUq}L~%c=azpBVMCM&aBU@c!<_ zMsHp_loX>%!qxBXShI!}N(+nB0r5RD3S6!$1`*1=<+0i54-GgRzit{+{N7S9<nv>4 zU44*h@XI118af*CrZ`MLxm)(Hz09k9ng;ZRA70)e=d{mD_xcSx5z%Lu0h)AkpE-vy zX~s!7tRmmkPHFrQ*Tv{gqPB~cgKy6}JiH+J8TFXl7Deu#sm$JvQ@790nGSCAf#Sps zEg}+iVlEP^beu~YOqDJt1YIoRWCJ$qy{4UL#KV=JZFs28m3(Bg##T)2oV=9ZMn7$H z0jHM0IRigemU6k0au~mSLwUvNC@xeyGCK@+Q_`t#Y-)ebhj2*ws^zQ2OH_uns72K+ zVats-8@BfyzT{2XLmCUrOo*oI0y;Q3|MiJ;@@leUCtaw&KGQTyHnRk=E%_FezwIzN zhKwSb{Sv7=WK%wYUzG0l=#q$X$y-dFdYre>yJfi8Ts?JZmu)DUjBn<&=*Y{;QAnq; zU+VHC7f~k8!Bg8l{yMYA@>_2S6gvX|rj&G65Bfj)3uEzk+S9B13?~;K|8S50p^Ukv z*Zut1W#?xYHNBydu}5(eRlV3My<Fo1_v*=SrFAdTn+k%I<<~ujOSXB8U0%#8f#cU_ zjD$1={s-_}XDGn+*w!{WHPm(N_X$^*(}<}Xl+-Zsc;VL$k{44scNSg+@#T+?cG8#Y zH*DDit7^HnzT=d`R3JE+Nsi&>!nByGZ?YxxSj6-<qpI<!!K&fz_cP4)izV%Bo_&To zcE0bjk~&man&#Vc?3QShQsjL59HwqlnkJ8Fwqk5b1-tw|Zkij?oxPDNcewLH9RY7# z<E!T;TA8w>wdUrxLmSw)41I_foXoMjVKjoq?S|G_1hs@v;V-8g+8$1cHQ{`wqJNDs z;zN*aw1*Sh5P9-688_5Ir^!*bfkAo*p!LA<<VFaD0MYICz}MQviua><bps%1l-|Gv zOlP%-;e{ljtk+DwLPkxa4Rrm=1Vr`P%?r{_iECZ&szRIVG9EypFrw8zk{W7vsK^6! zRW+`%uk#wJf|eGC%B_y2E+XpC{9Tp+mwVjU@0Jl9^X*`!&55#37S(U3>q=~Jv^{}& zgg!y5XBu-WU7naj?xgq?$6b)rpGOP~)UUqBxU7Yxbo<9uLV2QH0&k#JOcoKQ%&xLI zx>b$q8U5mi)mr{bFct7%ZXd~3!wAKx3*?HclFejCR^jmp`%%@E_TsKZE=uJ7k;Dgp z*l;>zGv|Yi7b6${+JO!Y0mt7A1&o0Y<;c7jet@-&#fxYCm(BKeRVDf;Hz!6Y$@<)W zC}zeza-5@gN1A2=D=BclgP2chZH(*c{3C20jeMPne|<BQkbYVSTLVy!2ENgcs<P&a zZ`Xo^u`22dw%lg@`#7r)1gt@<#r`+C0}emgk^L(Y^!z!SOXUbnfeCmHwAWHE%c?s^ zeml8u*LXvMlLaD~VA3u7DeCp;980R)Y)uC8L>>>k<pvuu9J{z2Y$+R2<($d<)rb4T zd*kLl(lxMM3p*k+bkW*<aiQ<P{iK%V&Y|zBD|wtQ4e1_ueL_*E?ek3}%u918eCC8Z zeh?e_YbJSW>OwXimYnC3{=-j9-#+ISc-4#Tr>-;BhS8St!G6?iUt(q+_Z|dZ;xHdL zc4Lc%ssG2$mG^%KF*F-cc856Dg#NMcDNuoDf^of_!YotF;!l&<LUwfc^ZufOYb#fh zxa<>53B7YA#Kp&WY}Ne)Q29_IGVhB&$)#Ao3G}4e1r6VtF~z(ZRMd@OGEpq*{vh1G z|Mz~RqIr8|{S!GDGu119yk_o(+o`O&3V8aG$2T(!rHE6Wn0S`FCtCXB=~!X@(kpi6 zt1l7?Bv1X}SAg)Vl{GM0ZC{&%6`-69kyZQ?=DBFu#GomS?u4O{6mk3gm2m5(aMZ#V zXPyM8*39vONY@!DfM0av^P*vx3Ly_$>9+czSP1*fF;%Awn+ToRJ_G4QJ7LL2<LrYU z(5!-M`Qgud$u6|xl1**A3)2W)^k=kjt^`2K@(Xl~&oE~d=Qz4K47S)|H>i=WoBYI= z(ELabA;|>cC!R?`%8S<5vAWlo5=*vPZ#XKkpRijr`HBMB)=FvT#owVt-xWNxdevgE zljgWe8tF(9ah~l+aJ9{bG`J{2_Dm8lUJeWVjiwdq=K7|r;GTNLhPad1)r82A!<<pv zN12sJ>=Sh`2=g7=p}fg;mFm?WhB1gGp6NDdA910KvC`6Z;X{pB;y{yQDk<M$zw~C5 z4{f-j0^XI>m`A9uu<9fcq~QHJzmW}8L?Hl7oO3w!TfdH=tGT9-@cG6?P8y>tzz6mZ zuh9c?g%Qwf0cLu5ISeR+FtBEUsof-A0W-XMD$85p^f|LXsrGNQ^0##HC!7QFJ~tqz zf1c?u{v)9Mr#_Q6z`ziikDdSUl7IK?Gcc<{FH<AIzw_=NBJ|s1|M8%38aSoeBd_y+ z&*9&m6evY8XtT!%+8@;u{_k1;;~Nhy0~gPDLgc6*^Y5ng=RLL<Ko|VsVg=N({@ZbC zv>n&I)06(y6oHYa7yQ?x&Q~`t-=JZ5XZC2OEebuwZ=!rOw+H+REQKLA-oN~BGvL)W z1)6li)f0(-vBUpx@KrY6&*q98X1_;P$XcMyX#AC&V{+bJkt*;sJMT4(SHCJ<{@EUZ zH;z;dj&zNafA7M7YpyS}fZ5+ZOB`1H=db^>b$KHIvs>Z5{?z`rgZyQ9pwb0IBS!02 zet+iqAC{=%0Z?)I|1hz@innEP%fAag|7;d*T^e&gVnX9)x6F1@^ZsX#5vwHmVvpXe zdqcUZEQH?dU^sGb)<2p1@B`l5-*L)!GfK#$=G$nkvvYph^Kf8miXtU4{^1+SK*f)} zb^6l3xXP2}mfmcol`tM;nR7Em;(M#GX<hIA$a5BP*EJz`WJy0JJf|FYCOk6-iwt_U z$DHK}_|i-uo^^5DFl0@S0_2<6m=+V~MypKUUutr$HyMwt%6s9cGBaZ|oBS`f<VCl9 zK5OovB~PhJ_dnS4o-?Yld5tluyxwEKC#%zg4m?Jm0>+EHUsn{=D~zvpni!RKUwXnK zyQPhcxW!COE5TH3QrrE4g~thW@od$%4B0Wc{dJ`a;&!_C&RPKF!K1?IktcCxuzCEM zizgj7a@QhN)bhmyf`DP{|8SSIkSpOZd{bs;+|}`rveR?cj<__~RH2OVFVe>>nQU?U zuD9+9e^mb4U3kyZW_bNz^qGm0Tn=IqE&~>&XRa&N`fz_<ex-H_S^0dn!>B!)i|JEV z6_PLQSx|zA`D9P&y!^p#?qbSnhhS+H^96~cdM~pu>-F2S#R_k4SuKy+mlCNb`9HKp zU7*+lC$1n8@Fodhy~lBb4K6JK)I&KcOiY`fumAe(W4x9}?)eS<SoQZNeSUAcQ>3}7 z-gSQT=hryL{B#e}$4dlvy0mzY>&-bs&35ODd0hC?-QJ)>zaL|{J8iN%=`|CzC)6QE zd+XseFzIdT3Cn1y>oeQwT)*Qa|9NV<XkFcM%&%d~n9o5l$FZ8~OG+<x@wHo-C0!@w z_t%FVfJ<$_nAZ0h6c#D^t&CRdXDfydyKw{H#4Jz%mNz^TBfn~13~#7`drr6?Y-}y| zulOI5GZ(8rN1P=;D&-vG^8WdH`&XyPSZVXY(tN)qJ6#B{azA-Cd5-*2VUD3UlFzl9 z-6#BLGsGUF>AAZZ*|^oG?i~axyz^GxADL}@T<+JGE6A3$`3#@#XqnYJskg18wPbF4 ztv`aXMg}R=FckdKx;K{Te^B2N_O2%w`k^4<?qAV?@dT&X7o~Bxe$DNlaazVZs}q#X z{R5xxp=W(>+O>0eMt14fI2Zvdk>a<%(LPjV3k!mYp6BL`HOzXLF745F-r6vVQ~Y#y z7Vnyob^2_u7KOYci8{7CUSBy_YChG|yff)Tp0yt=OnBz~CyYIC1|rX*A97gcw_{#B z(|d;jG9~HqL)rf)XPrr-Vzm5$7h$xzNb9in+G)BfF^&)D{EQ`QJ;BK)KXOVC4012m zmW{STMZq?%q={tLuvA#|>mt<VRB8Op&LokZ+nPe|38(L~U$khtd)r|quH2GuxaD4O zt&7l&KSgUWb(B=K+ak2NetTt%O!inAoo(3TmPPE|m$zeM0}l-f+J6pb&&z0B8gv07 z%xuHS>z4xp_99stR%%l93Uvi8wR8I{TaZk_ti?Uax74ca20J_^y{+W|G`nnR-1PW! zIAhYh%I~Y&;sCZCB9mwP<nIvBPOE5Dzp7VWA|?v4#bw<)Hbvw4A%xL{&8X~A;NeCd zHC7L7P~zZ6+S-smU@PF1dj69G-+F@KNl;6bZNJ7$1$v;^s6U1)r~S5d_m-u<GVH^} zXD!rn!()}!TIAUzbFtLM?NR#!GxnF7DPkKje~26J4y_n6zHi-j|Dj))nA7-hzUss4 z*~gVLktDS3MM1yAg;DhxqsG0t)TZyjC1deW?;hD5jT(@dDpep2C}d+o>|p}rLC<*( z5#Z{*zWnCV3dcdLSsg8LZNk6f>CYDdeKEE-1W@7L#6bhUB1K{er##XZN>x3oXP2^D z?p0_|x|-w-#7s>Ls{q53-~bwJ2;=66b>_8YMij>egfX`&k+aIoGNd2@1Kmf{Kr=&u z4LKR(7|YCk@z~K$Xc=O%8AoR;g^`Y*4C6)=Gy<NbW{}5ykxRy7t5pDHq3?|5@!!Xp z`EIE6iyI6U>ct6n(gM8^f>{A^oIe+_LR+z*X85n}w>w4)F5<R*S9wf_DvlC_%$c6w zA-V6UC15o3vIpz$#WJ7+;@Lb4T)t|631S6A69{J(6fBRDhV`JEDJ#xMBt;tr5@Wtq z>~^~_UY@emPZ2v%;_au~s@H~`MG;`nB%0io2EOKp;K=5ZdY6|r-^Je~-QYLW8_s|M z>*vwgT>}Kk`e~Q*JA0!8DUzcI&*i#T!kB3gtgzVzcMHfUK-92ZL#PZzJp3X0I~*`F znLht|O%A?X=Q5)q>DRo_aM?(w6m9YGg;6t-0)T13l6BeAH(fmdNs2Xm^etI5FaB-z zxNDEB$090;G<EZPwek)KT=cq6X6^k9ACK2`AZ@|vdmEfb!DS8rC4Kv}<vzcGQN19m z@yYHK@y?x-I&{0sBb9MMcei?#jzX|`eUA5F%KB=<ngr@z|GB%6+qw6ei*(U%+_*Fp zcvETngsw#%-#bYyES0&JUm}ds-E+7+Z+Mi4B2Q@trwhZeh96%rQ{+4sdRr01C95m< zBg>4d?M8$fmVfx@hHjv8=<^6d;wKQK#e7O<k~y*-jb{fU7D%MG*ywh{LQcf58wFx- zNwT^4K})l1TfU{R{Aho(S||7vzgAT2mXzb<`+EQM!{5t#OC4C&r|BZw9KV+}jCSA* zWRW6fvxBLfv?Gb;C1SsZ_jS3gj1C?qr`~bNneg50YI;5k1k!c+(JEmO&B#?&O~y(j z1tD+aQEfL^<Mk33f7AG3;1v`}@PX|>LEsu4YB~v_j1J2IYr8Q4jZqyE)~mjR_vSy! zRrN8(j*Vvi?TGCq%ZY~cQyeqgzo!vOqnRopK9QrsK1t8x`)nBn<OlKXJESalgGae2 zYi{Z0xufgN;@-d*S3~L^ZMoA$yGL+P<UrI#3xq$C*_VrfeQzs^mIaPngNmm9S{9GV zM1$uJJ!Xr&(PyVd!g2IxL{>|DkRiy%me(T62t{N~>qv@vbsn6>rU5yY>y`}qxm0e9 zb3!k;zN6|VuQfZz$RE_%zOU6y3}+V{HnPrGmXz}DsM2*x`K$W*55ycRL4z`lz(v_s zN-i_}nZbGCGMAbA@^x!R?OzJboXe7tJbJN87vy~FY>j4hOAX6&%$2=I@*k!z1;duO zav*yg!qplNJWmZB1+WWuo@MzLnsG@^dgWf2&%2lWO_s)pFUuuAp60f(SYG_(AuLa0 z1LH8*r{Bor4pa9gBA~e8OAvpfVPIoL7PadkWedc%b%DnZ2ism7?m*fqOn?5X{QI>( z9RZ+ASs7JWrz4`~8fu@fSR7;oG-T1!xyj}?b73=JN^)?SrTf1dogOp-9AO}}@=qAQ z!7)4pVAuX<HVjWf74FgK(#iHtHcnNtJDoVwx6iH{xp(B-?}6>}3$cCzShwo{^?CI0 z+Yvo~rx-9tjn;m8;rAN-dHBQ_FVc*bG#Kx^`+pM}UOoWR%zm<+<Na6SapX9Ez;)o( zDFAZI%?HW;p6x#v&_6$Wu9)TU@ZvT4BL?{IxsC!S$i_ho;=~va)&tj`yz>=z`u{=g z*pdQhV7O`BiuTXdenY98fi^e6cZceSX4dbD`@BJ#TvA9t&i_sJ{|y!R0u5w+Ia+2B z%%Z*M?Im;|r_T6%sZ5a-jNl1^;mB!<Bfe#{1<yB%UBCT@IRn+T%d9j|khY5RclQ-t z2Hk`&Co6E5*<Z3~BnZPt-2?$Qagedd7-o|C1#JE3G@FxW{$aX*ewOuwPLUN7hz4+G zyAw_!VLO&e?`uYW&L~1`os9-|=?==Zm^UGV;Nmu!Gm6BPhEeHZGcRrb5k&uas6UWY zkXA7O(khT(W*$=^Ngr9Yr*81{^M(tn2}glmb&mUlGatdjP?aZ3_fa_2VB$pbv41nj z-&U(p<fYA5Ttn~ppR?BT+v?XZex-8D=+XBIz3qMLX2Z|Ftd^@NW4qkC^_=g(>0kNY z_^JN=)xRC(e@5qx117fAf9cFE+u9NQWscqD{8w_A%t@9@UPhl%ACL!6WkJZWPbdE) zA$@{XU{DO%$V)6Sjav-+bl@DUaOV&q|I^OmM4_qd=0(Z>=wc8$#aPG=8|?=&@A!NQ z19hRP%*;iR|9JQ-h7bkiI+54uk8&3;O+SwR?#H^?Z`ls5Jxf~vweCv%mrFak<}XIn zsB$2M=)LClU+hC+6hlGCi%FN^qJm0U=jhlXzYGQ_i&j)Doj4NC0{Nog|5gYAjHF*` z=Gd7iB$x=<1M;sC03&X{3ij)|M;!!}^6F#q{_<TGTBwUw6n<M@nbbWFxBjbx@Sisx zK=;nj4!9Q9AtG%imeN)3@ut#&;|1+!I}^UnDSi8D$#f6>gG5eVEdVku<wUvvzqopA zC5_UH6Xmx3d5**le*jd~*x+(7W^xl}O`Ck{{Wd<IRr7TH^zxL)m}Bj=bZ+^3jlPrK z^ISel==|k|wWf&7Z<}HqUj{oS#N@6m8=nruFh0;NHEnJ3`>9A?eI4PjGZYn9{5I*- zm%B$ofM@rx<^KeizkO!-I5p}R8K5S$7R+dqD$ljap=SR>8b|HM2ggsGi?yEQ%kcVu zB(K!oEoCRh9f5NV^_)l^`AGmCi<&feIDY67M2!PL<@Cb{f0x!EI*-`|gHZsA%yY31 zlh!}7%vg86nm@z$u&Ug$or6%`v6CIfP5LMy+_d|{(7C`m({ISB?)!0*W~5)nUe$69 zt<z?4Bp<_*WQDy7-9_tR0ZY%#Q;$v*`aVkz`Ii8<C{p(LGo(3=T~Pl<Z+A4Ocn1mS ziiBg`1bX+cN%eDij$2rDauk!EF7#&0Wj$}9rvK!zH)vokwEn9+6twZED@A;}`H<4H z4RHO(6AvrkOT*>4jT>zj#@;&;KVc6@1V87>!-JjXnwe;sQOeGg^IGFh2AAtM(M0u` zz%QgD@c=ltAz=s;hnx3?Q!COz0dB2Tq?3C;!*);h?OpE*bkZXr6}~xwfe`XSZp`xT zOpKN^%Nf=$DuI0{b)$BDW(-iVtZ||oC%bI9nN&Qk1~g4nPPG%XeNM#8q6lA7S<|&N z@>p^uzx=i-m6v6tJ<w0*7`9?(^7a;r@}3~+RP}Z<iR6|RMbNL6VoDl`mx`e5JEja( z7nbnhb$5JgeBh`k6X#8mxI?4K{Q9fPaY84BK+;-d7!xmb?phiwV=uyw=FArDSDEv5 zl_#v$=hb@l+v^qmtQECrqZym7(fTSB7zF?RGm%j>;`b^jj52&nm%*=M3BnEJ)dr03 z-Y=7Jk?LeWKvvMiSc}yEJZ(Q#v%-<2CiW4y%9XiP=k3}L`z;z(C2oG2^4L@fM>~L1 zjuygo)xQHMzhU^erCG(3R}{cHYJ%O!gFS09z*T)!Aoorx$S(tef@P|tbH+*&d9?;$ zW^7MH=l&!`UJTt_kNKmIs*x1{6CcH?a@o-_Y75M!mS8wU%pA^|J_~H-sH1F;tz;hV z=chmWz_<;}Wi*8G%yNd$YWdP&(OAEh{EE*T8{Z3b76)sG2R-IVet^Gk1ItZz1V?4e z={;IVbM4+}Jwa6PUa7`A?5=;GECYbu_L~3U7$iw}1;6tnLS%FSmrKDO{7Pyb4y5O{ z@uv{XDVmG3PkS;}k_=c1(mf|fqVN8Ca0r*P>R@YL3#MnO0qYeGm$!4<1GFP$aqlCG zyaT9ep{`~M>EoaN3^>#1-hAd7KAUTCq%wbv>)oWH@mlCvGaF`3v2}7m23Yzy{5F97 zKLQfjSsCI0EY1wJgiz_^f8Y+V04%8cR!xr_Ioa%xJaxE=M<24C*eBx6DMWOMXmw8` zg7}L%cEV$<3xMOd*7Cgv$J8W1munnG`nqLz#)q5i5x%&6mb>c#vIn~}$i4wIYz3#v zLnNTho15fc>{^|cJzTEr(ZEjv46Ssf?Bhu!2V4-`l^G;LSI?nUHL2mZvemEE<N2Q7 zk9*7Pq>Aidyq(V4%m+5d`2+*Aa)6cdQT73G>D7TN+TJ-G2DH>ToL=z$Xgh>xkQR+5 zuDb3`n@o+`o1d&qHyNlsgnJaToX~p~m~|^vz7$aMt6)wmRuS;Bg%`J3s$eV*JSK8? z&xyL!FrO105tc%Vq>9<UPWQFfl3xsrh^YbkIkAo>Dw3LaKOgi{v}K;IaeaJzZ~*YT z%ER}gQ%ky~4qB8ITKmBQ{ftG#ua?x{eNtuv>1xqR5G?z|zI!;F@{_OTDSVPU&O&-; zL|~mPspi4Wqxx5A<~|cYeG@Y6?2{IAJ=z8O>L8ZFc$=Z(5q+KpsEtiSp@X)7O*qSn z^F3Iv1F@SO7eu;L9F7WNqfB#)*=RfHqsnx^Z+~d`+<N-$TyxZ}+jR>*w<bMr{n(t2 zM8T4}4`yE9>HLwpQi)TB%ydT9(p^`I)Z(tA`i09ye&>|W{8{BPc^c_YdHjE&h=(MZ zB6vey`m_Dls|PU&k6w8wwbIk&q=?!6xIhE<BMu^Kq+I8A71}MrxaN+@f}(Yc^t*PJ zwPR9Doa#TD%kZ<l%W2~Q+1b<|IdL9uKcI5X20u(W_;Mv?_r(qD)81b|;HxX`HJDy( zyWqUVY&D>y+UTJxRhp9(8>9j1;3paZ6%@aj)9{Fbg##eARs&R_ZD<e3GGq$q-VLIc z&M`i^NZqI1X|~w=Fdb|Qi`;Gt{Y$oYMcUax6M#-tz9^jts5Qetu2?D+9CTI3YkUo- zd2$x+_Bzv-fT<;|c&v_(<ZGGMJ+p8SB_eeK9^%EZ$UVU28sC;^#pj67CW+}Mrnz$! z%@_o8VkDbIs|IeWw-@BtKSd$?eUx_q*(*)JE7@FUUErPXfcw_%p1U)pe(sK^5F@k3 z&z4&0dBlk0{XW->w=#yvTJy^DivUC2h$Ft$RxnU$Rz29vJiMw|zhE7{j|aFiOymyT zi#T?_lY>5xHBG>m_l4JId(Jp~tJ;$@6#GDgKv|d4lswD(P>|103r(}r{O{T=-SsaG z=(T95tw_-m92KB<Agy|%)<m`kMdJ3|+#g|Qs!J)BlzcPeY-N3d`O;3Oa;k*$E8?=` zIDOjI4@Pp0ODh^OWQ9+ZyMxMrfegFg@6px?h-W}cY2<`!>nXWA;uAupSwkt+1dJ>B zsRwi(WB=sB_G|LDGXOmDo{yCMt0f~l0I6IwSZLh4q?!Rf5nfmTy|ho&<(v+%_s-<I z6gyj=Utjs=J@1s;LS%Bn<F$2-azWhHyFw*7ptpbqKatt*IP!wV$nI1LNJ!5M{YH&l zwb1lS;;m=X3R6LiS?#%Q;zzQib2YrzD)~34&iYBmrhHD^E{*6te+4gS8(;0%KZ?z8 zt7;Z8aDvg9-rI&Y7VCb;tZf3qff10UEh7Y8zH@WxN|oG^eOd@;)xj5+EZ&800epIJ zAVSKRjR6{<)>tI%wlEFLwZ$gtT{%UkSu^G&b4V$|`;!*=iu8&SS(a^NKsQu;+%nyV zjF4uIB09JO@VPwRZa|@0@sUKI^#fS_zJyiw3^b->H|J3l;xU>&Zm4u4ajqxR*>3q% zc(jtNK7c>1jw%g{Bw^aR4|l(t;WONq9PAoPv)<MeaqlmAv$gF)MMUXha~9cpWY+FZ zsjD?sS22szLbcTdKtNAzz{5GLe!s;1=!@qi-mWzwV49h76Jtwh3wKzg7qZ@U7Mz^` zM84JFSJEucwVhp2L|B#zzTY~{<$m96rF+n1KV&d}(hHYEP!l(WJ=%y>I$4gSkoLZU zmeENW;fU@<{obB;-3<sGfiEa`K5&X^rlzC(sLc)B`}Z#tgc%FY_FJy`t@&IOGOYN( zgGJmCFN6uPe2fy=s;*r1{n*xHI&D7H=x$j=K-@_fz34*%I@`BboMHQblrK5FV4E6b z<gNc^`YZk;-xx-OxY=0FabqOjuC`d6eYo68smR0<=J(0B)*PgunbA00YO$R&TVvOS zHS7_gD;p@Xp9?}E5n+j`h^_0x7e%bl3L`gUg-<g5hNFRzY}y3v*>wYz0I>MhM-k%z zMO|AnwwpMXr+POR!WxhTXwOKnQ@qF1X3F+$%DO+`mwqXCsvkMxOVZufCMWWJbW}dc zA8fEp-O?M=!AY})=tO+6(J3-*Ea9ku2;_qzl=r5pwd@?xJkd+7DE)RjF5f{tgFT*Y zh)eFpO*?P28?Rk@A%u38*NPqZwSYgr1+Zz*qD;ns81&Nk=_0{=Y+eO`(qC%0+n;&x z(^H+D9?&(t#hSr9Rb1@MR3$DPVlmqWLI`$c>|BbyFNxE8VOacOAeif?+j=WKd8qsr zP!LZn6@!LGN5drR3-n5t-AxPKbkyzjo-UYS%80o}fjnJBt_2+eTv`QXIA7I^E+JaY z1^WGk<4`Nr2Rt*La;x%spKScub)h&GkLs2oKVYX?3SnkA$RA;JXZ7}SI7SO!LUlqD z`<NFg&|XoY{UBSCd9BmLn`owN*IW}Zx~T5g2ogFc_fE%f`5A}q@x3AMX4wc!V(}4& z=8q2ux-!$QRiPG_KiYS#(_!QnJKfS-ctI4~<~O|}eHZ-MW`lT1r{%V>0)uwHd0~$! z0@MD^TSRM>V?%BOa<t~S^v29e0d*{=dqH+|O*VlVE+3K;pt0M8x5ql^C^4|p`EN~N z>?;5ryOSQy77Jy$?8nD<p`Rbgv)^&~P#~Edu8+TtJw6J>RVVaK+4?K$^zgzB7D$SC z5ipJoC(SLCPnA%D0U1Y2FY(JijSbQQJ+|?^gi)8R(#@fkA{O_Fzbg4$#e;Qvbv$%S zmOF8*Z=0QUKvbX(=v#XO8L~H%opf_7;C2VCqa~BN(R~VF@f>c!<Yar57hg+G5y?u| zrJXM^pzWUv<xcS}5e<fOX1nihYWN)N%^$9tTrF0|KS!(;zJ3eUg0g;b51eDR8!f_T z+GU67BDpy?)vT7%uH}j54}7%y@GVrLoi0KQsTX7K?_9U{b=pPEK+o3I`9_yE>ajP$ zea5yX{X#xiXAe0b)-b*BaA+V(e(*4Gv)CA=Idv)X1h>5=0q-_tnVJX<|6r5yp@W@i za{4OH!&_+cs4zAuWf}8ZM5-`UpysB#S<<j7ZC;-}tzE@08;PtEjEV$<;<3u|X@hn; z@;}Az2SKq5^flo@%7q~YtdRbAX{A5`Ju&{!NboU59V<u<&mrhOTD%A>Gyu{Qiax_m z*Agv9vf-J=8Pbwo7v{|1T+n*64`o(<ny}hO3RZXP#i}OINORA|8_b3p+aY(qhavZm zp-$=u>Z4BJ_6rAa*sWY$OLiNx>Nk3CB^*=CW43i#FG-<iG2l7f^SQinH2Q_CI2I?p zM<M#zpu(^Bg%Sr(?+Kp03Zv2tyhs-pKX;$~x*ano*m~gfop%bl&mgkTtBS$*#A<^3 zX8DH;97EltQiS=sN(0iNE7t@IsbDP{D)VZAAA#y3IbHzNBEXt7wfksPk`l|3peT*3 z_83HnKYUB`^edSA%?eDq2|1tcNpdaT(Gr_}w-X5-7K={0sJocGGX<o!6~S+AHz4v? zjuCI>9!YB>*Kd0N5+m#kwm8TXKbFr}@XRf_<m7_COj>PPYa;vdLhweo(<SverJ?Oh zI`1|T-MUa~NVw_(*+e$WZQ@OFL4|yCj(wU9PCTuq8kIu?du0uT;BqF1K&&BerbI)% zYurlh`NT7z!592?UbqEYNO1+1Sm;$9KF7O91sQT$+StSD7kAy5-&ulWXL8WTKW@91 z5-i}&0?dzW#NJVKKVBE7>KEsljR9_$MR7w(k!*UnVXLDmxmN0V%EkNm(w35vy?86$ zk-NA(???p+rnL9|4TjH_-h@rnB7}S0OlpN0S-f!-n*KZR{>I@gX5rmKAo{NWw+8NV z8(QY~)H;vX!TgR#Z*4jZ-z`EsNf0q<Tf!GU9uz#B)c($z^g)C+e|1&71(|xc-Hg;O zP)>|V78~ObGPkWR)URMK8XEPyl5Ygu?%)tWa7Rri)|4uY$T;~lHgR&BIBkEJy72Ck z+0T3WOhDynslT)Jcf0hHHvz~r!D`@+TnIWlN8#a@uca+P2sYdIRLlrW#o+;&Y!%O~ zBELjb651aI?q7VSi(^?2hHG7_{vqUmi}9gQ>BS0SS9gg8x0E(Rs&3&HL7W1-r^Aim z;AB(|MSop=@i|)-RHx_>U8&-lFv@7}dl-*z0EC?%v|AvK>1$ue%TWmFn^!iWBM`M; z<(f&5zNZ!!5X+8>8{pnAoyz0+x)g|V1WzX}@3Qyyi5_>>QxMR5W&9wlgPHjp2E>{G z{PYXyQA&4bA~+jJ6`pS2Km|7MPtXC$4JJ~dtP-3d$cmm$K_q|GHv?&WRXgBZzk4AZ zk#Ebp!|HIN{asIVP*UNOK5yL^0lI>LCHR^x%4Wbj=Z{ZjHSd%*ZPz%DYnPZB$*c}v z8TWMj(RS^v$Fg0SsMGjWvg1#isZ=$AgPO6DY<YdUYw_69tZSxP1wpc-of6ph2n}?0 zBmz;C6pxrj0{ne1FET>7bnUvMDzirX8!bE&DO$hh3~_GAv!3$|TKNLA3jXy%Ip<e? z$BZWYz?b{@uqE`noR!ey!mkqbIBke8@#61FYTfRF<`xhZ_7OGc90~|ufPK*~F`xix z1A&zzID12~Vi8N7_wdS~<8lCXZ8AVCpgA}v*sk(s6Bmqir^ri;r37oZ(sl4?M#;)R ztXk#;Vj`^6SG*0Hq6+y=>xL;l?j~(sp~ov`+IiMZ6MNhs_lDp08}>%LxKnCLt^mW& zik5J_)V7Gk*36TOk5*Fff@1A*j;Xs=ZC%N0?QiUK8&Xzkl&+8w!%tFgS;H(D=<?0> z<^}Xo(7n3^bMBD?;Ql;kpg-C*V^KyNO$de&hMddH+j=Sn2}35GFG_Z-`muQ%W%nCQ z#-0+FzsQ=HczZTh^r1*&Kvy)`AVx%UMpx&#DxgiTrrAfc9RVEPF1mqSRh0yeY-QN{ z1=Y%M#D&l*VUlQivEn`XlY?=pjhO?_4P^a)k<0Vl*$rNCht*^cAVG;XQ&n)f`2k}I zHoEj2d7IqD=kZRnM{Jy3c1aH<3SvtJEk6Gs{bOxr=MoYjHW-;Fzz}avr)4O&<pvFf z@E7vJLc_oriUDA0czf<9td}Zb@<QRh&NDC@M$!mSvd_}lu!+HNdj`DPo1I$ih4UlY zTTS|*dcL1C<gOH&Lb3P#@;;oiOEF+K06{}JT0&itrCe)@0#aA-IztpgK{x^?xU>Ft z0NWOwx<K<(Py>CCqcVmusjXSTs{7y@O4sFia|yqzo3R?xpOX+|wRRrQ5T?Q>26ne7 z%+CE!>CYyQOy)gIU2V@MS*-U6_u@XJh&!4V09iiMjX7uXvyf@&32~d3BBW?s^$Ucu zKY*p=LZ69I;QRX<J=IQrQ%iZ1J)n~UhNx7|)%_J`|4lq2=#~IxQ;jd3tvNiT$DJ!X z!w72zeWpTST1={rI#M1>O{jT^cVakDg8CxP;tM*xn)oN640Lw)5Qks>5*Db-k7=NZ zZsW$aoL3gHN{gF6g4OMAo@q;kI{Tn5>*I(i+nQ0&-F%H}w{@6n25uwORW=Xzdi=Ko zMNv}vT7JZrTKa6Cpf6~|p?%eHC8~q!!X_ngZ@6|6&HMpz*RMqfUkGW)C#>wco@+jt z&I4~Im<nj4URZ~5c^K|H?8)JYm3>M}#u7$2_nPhvB^KFu2M#k;pnOC+nQr4R=U@PX zybqSHDFg2799ya;6bCVFv%MQAfZ{spG|qq<oTk1^ZS4*m8ynM<C5=j!<j3_<)!6BF zdOWk;)lDomT=CICFHHloqGQ`WYG^phv${Px%CXTtvaFXl0F4nCyun|F$`M6J4_ne7 z8Xl%kpmMpqDe4|8{h6a@47k@|RNR#YgyF5AcQ+!tz6BSv@(;^M2%by`{v(w0Hqt2) zVATW63ADKQtA&x;I+Mg+Y4PSOOSs&yHK`o^mxW$BB5&4}gmv=-9{}Nai^Jg6LDryz zUSPJ_<53>soX$1%s-H>5_vMj5kCun|rCgq#rF*$mQiZX}x2zy;;@;e<JC}Mwy0ium zcZ}J@BBBLOrE~ZdcL>sPvjO)N?Yc>Y+75ETW4Hxlb0|0=TD_dLsD=GsD`T~#&T5#= zlIK7V3<-1@buRL_0_D?<0};c;{ZIK>jG2MD+)Xr}F14Umh6*ycWI3U>Uuu92>>qeQ zq2D_X;2*D|3ig?npUvA_Zws5hccn;_Ump|qK!?l^ub;{_EwilS@*Bt&Rxxc2dQOTq zP{Fo2^@)dsBY4^+4RtsTqg3CmxzokFMdc{G2#4Nir<VtYtTK$b0k1^6ylhGpPs|It zlf6$Y^(Wf?Y>Vb1;Ol|jD>8u*RS-2r?-x_ls=^N%=g-RXGYD-8lFmMx%(=2qcRz}g zU7egyC@#yyMnhu|#BTjZ8uyBAruoF4Fpfd9?vvR{U>^w^JD{Zk(U(omO3(OAd+x*5 zU(Ckmc)qdsMIFDsq{h=!DGqOZ&pzBM2Yy*#ri1f4L15TPK>~tFNIue=INV2?&CPnt z$$SkAQ7PCg&Dca}6}YG)@!7A2UPqM*$S75Xa36wBgt}(id(quh!ue>QXJr%9%L0#< zfxn&c&*Yz|zI8IB_*jZOHmdBsoR3K37SyXlmPYDQ**NNJ!+M}6r93+A7GA%OTNSuR zx8K91^%`B+i^#VY?u7;wDZ&b3ev_w7YMyI493<FFptk+@CwP{tn?5?U_9b|<0>RWN zsw2<+NGCaLl--PtZsHrtZm6z^Y2vY*pWIAzKWY;;7!#Z75Vyy?y5MTJyhT^zwFj0V zbW0u;OyDd9w~p@hZ+0FV#LNvz^-S*XoIltD?$me++=n1Z_o+nM%Dl+1sdxong7zcL z+>zN!G^_EmJWFM7+Fs>E_vw0%S^Sy#xZr(w0M+0c$K5|2(OJrLTe*gkvx^4K7bq<} zVm2_9I1ddWX>s_>Z8*^F(R5m=RM78!4o@GXGH0ljge&3M=_uz3M{0u~<${ucZi?Lw zYE+n-zOFzv(Ggwn+(La*AU5|=a$l2;{D90tekL-UxINM*p@_Yx*UiuT5(rW%ulvRe z+$-DM8025h_zeE6UHuxz*A89b4~^+-bp!aaNX`soC>4_M#12y|=6Xpyw>ul03+nHX zZuWyIK;=o*X4T+9DTB@#WtBy}Ejh+kX+2*ws;VuIL4e_mP?CD-*9U7?szF2Z8uNDQ z?9Q$EI=RQ2&c+XAw<L8(Odi7p7$krb9RH%1A0K<K8vNBL!67oD+xph}ver>a9mCe^ zN%^D(1G+7xpSV8*X8`q*(StQdvWE<ow>?kv&dj{pw&_$9r1e60$+aI5;5qSatE!Mk zuW2q^s$<U!vuBkx$h!Ux&D5W}1DX!u{Xcx21yq$?*RBOOt%Rf?4bq`>mxOe8ib%I~ zHzK8Uw{&-R3n<c!lyrBUwe>yU>-V1+V-Lm#ar4AlbImp9b>EMyvrc>BMdkyks$bfL z%b!bfo?yeF3!@ADSSb}hA;j^LHsCvizbg5`znLhxx&QMctRSfkZklAhTpIt~6}>_y ztxizj*zn=@n0<Z0xhA#QY6iUQq3C3<nyyPut7EwA4~I;vj4om|XPxtzh?_G?ZtD`> zaIcYomGH!^%8bRQpfr<zgD)al8kaeUJ-+f&*GplSYFkL(9O8~n%Xm7UEIPP*OuF)> zQ0ZHrMTS>NugK4JVu9mxv3!RD%d27fwe^zq(eoI4zSOPpqMf)DR&%9D2_fb%LTrXg z9Qu!ZDiH;xp8c~A^g%791y>EK=Xb|9mTb>oe?0dMCdo}jW+9nhzL)jgjJwyz;%Ede zDgaDx$Z{csLR&Y$9Op_XNB<-I@`So_0c(URqe*Mb!hRru)q&yTyzWBZ7m^5BFT#Ef z3Ly}#x@qOFm1@2e^D-$=6l@Ox5X(1&rZICVp|H0!55|#IOix)+KhvUoURzU37i)Hp zo)L|~C}0j|Di~9s^j55AwO*LZ5h6%pl`*)faP|ByihDWmEDSCEJ(t^VbsXCJd{_w~ z%A5)X6r(V{oLk<DB|psKb+l3%^)K#cW(Gw#wMWP+?@XW3o=%L$i)x+&em2?IC50m; z>3Bq7Q7sSJhTPAU{+O9}B+gJu?6QjC2H>+>mq?w8%=c`P;;evm-A^AAFq?iRlN4_; zE$ynauXYM*r6MYye?6lysn5wA5b;<T>(FkOX%;^!6r3BqLgs0H(~aynkw7(T&bP?8 zllc`Yr=`Hgd-*m#ZK8Z-pT;<9I5_|lD|se%VL(GdF*_)GUn2)LlnL3f8#l*Rm7Fdt z3VU}NOF+*c6%dZ;vrJ!I6F912%}#O_IlC23bRY2{eKfo+!t}AgbUs@lb<_{Sndk|7 zn4?AQ=b7?G&V!SacfP<a2Y>8}Nx+ntC*OW{ikrRpE-K8fxrQ1M;-k11blY>_@AgkC zcZwaR+C(MdQT5C52&VZ=8Y$!oM>rp>Dg~5R)mAEIc&Glz46xO*w@YeF6rch}ru;+s zJ3oLAd5dwz=_J~5su@+bHF6}8icP9ZXTn{1^Vza}@wObY9)z9=d@V$V!M0R7Hfvay zQLVbyR4x8oz35tWD(*+Fd4I6n>0$P?x<Ywd`xIGGk{}E_eMylu{mZQ)EgxZNxYqU< zcNH=67#zWFlrJ_idcO{X=cx$WojPk;4~zV^;k>TrrO~3B<fbEQsU}NrsakJ|cl?>q zb<u(`a!0^|`9O84G7mRu&WwUQ4OX#|5C+`1atD_(ciOL(pi76+Dp1M|JkFVX&u^4* zt3)C*;=um|`>|_DIbl`nmP1TfjN=vzrJwxUr<zAw4mn(-*J=w}Fu0=xrk*)w$cFaa zxr)f!QtwMg!e9+APt!-Il)zWy?cKwl+jj=%R!O6J{*(1k(4t06&`aqg#c3~1ZZ@%- z#V)~SD5rJsN-HgF(czFvY|**_M{y<LJwpSk5;?6ABv=>C)N4FSx1BC0^2aGL<vHX; zW8A@A0Y_(_5;^wyY+%Vo6`H2l;FdL2d+}S%Cf#V*!&A7c$1aDM9+m^iO`Gc<?UF8w z3jw+cRQZ#$Ew+|gTdpE9cAKYPhINt`$pR85(qjvM*w7#j)-3|dn4+@pN*kB9Mab2k z>C@_khG@@b9D1*_LhocGRplbXo<Z^|4vXxhf47M!pQC%V=M(D(JeH4{8pgHhME-iR zGkuI^UzjQ66Dds(s2*xGPg|mh(XXbD0xvS#LVS&)PcW$^ybIFZZbzk>E&U2fNCj2o zU#yEf@VS9trEitl6HH2RS#vks#P*+<*5joQoY?o=kw>CJDZ^#@)ph=^N!;l7-n1Me z!mfmDFtjYdWn<FqbMrsl+g-S^N*aX_?3}(VELp+!!B?^M-(Z_;6sNgrt+6*?m9fAm zPtSvZHm#O&;Tyic2nwu50B^madiU_p&)&v)`_f8!#mVH@Zw%LLmo$F4iNs3pV;_tr zuMmPx6`y#)aWj=S5&yUo{pn&ifHH&RIZM~wpE5(XH!Rw6>?edsLmooHecE2slum~1 z2Wi{FzAtzH<fWYMOCT5U+b-k}At(3+F?u+f&`97fj7tL72R#q@e6vDt2jPF>F9}fT ziqbIF^>0=y5(8FQ)ws*_4b@-&{Xd9_q&nC-BBecG|1IZ_Y=(stR-Dh-y{%_RA7TGL zWgj&%Als<9ENA`mH<94-+GP7WJ_3~OLHkA#Cm0C-eK5d34G4#pG27PvR1cL%l=U(5 z28NFZ71l}wPbvwCHcH^df5X)O(tuDtH+ud`RO1PBI}2vV6C{7hZP4FOvH~{>csLzA z9VyBBY4SI{LoyD_q-QT&z|ns;Dy=`?;9y!Ko<C0rtDJxO&iwbi<Dy7kQU<~RyI;Xv z%8&{@!L)7k^ijV5%Q?z=znj<E=u!N0%PFuCV<t%jv1zNK7~7x_Fd~dc>}09lzMI&S z<bhzN9@+oFIc1kW;L97mSS|bWcN6H)eU-O_a*%gzW&x@epvBn`M!*pm1PlTM@e%z; ztn1L)-+8D4P$<b3hW4%}yFDpHhngM6x4T<xFyya$M(qgjnr_*z@W0R7PJu+Tytp^R zmj`fN0k(A`qU7OEecodurY&B$!6l1C^f5E&L<n8yv@(5febG;pd;Frz8nFxIS0!!; z(Y6PnF3LIRG5<BvNg@}Zv+4S#%<1<}pVFs?yqw31Mvj?jP(#A*Ugq~hi_#G%*@g&H zI$b=XawXE0>h+skjCsYeYkrZ0x%b2Newqq$go&8e{A+`Scf!uV)pJ`PN(2Ar)@BER z*>u8*wgU(KsUQxrzvN4}oXnW^ej;O1m>_?_9%TQKQdAP&@K(8AzaNXZ^TO6cHpIGU zUS1s@+(Zwr{RKT?ubzonUxkM)R9RdUt=AHL`8}zkL%mC603fT9O)z;b7=Vm@ajlnK zPy_%<bcrx1f5};i{d;~s!$HJ0%@B?cseI<iV)N@MT_jDK)@_PHw;bL%<J>lz42oA! zheuB;x+AYKT!&M^o`}BWCWixxVHXmW5`QI^8yS}k7zD3<fM919i0a-<l8b&Qvzq5F z1T8y-lFtsm4<}m?Oe^Hb>3^oflk|$va~R-3mn(=UNJE{|+bWY{jn>LC)ib27zs+Gm zKP*#e1(AFuxL7!}rBeGbVt)Q?I$vSOP1T34#a?PPx=aBaJc%C6X)<kz*h@{P-;M78 zcPHNuzpt(-Wtk~SXw?j*<A3bzpz{WqE*&{7a#Zeol7DtmOfE^zrl2hHYuXD~*AcnY z$|)<?@>ZGT=C0QJkA**34CSZ3!=ku@g2CBWmJuxHJB#?k?b6m7I20TTzG$zT6=HVV zpIzBMR;X?OZ*?}NB&U(a?-9alq;*r{94;sXxj>~3escV_q76zgfwFdUu}&lVvH|Zw z+e1f?lT9zR`(esPwA2AY$qmq3H&;-s=Ne!#nNgrbJOJ7ZIiZP<e_y^oBSyXnwjds8 zSYt~iZ#t`;&%LY3BVBz?8A+}$M=)>P1hOloZ*|MMr7`0Hvm=wr%k{(2E$QrhGdHbf zxig4Lrx&m?GT5<Nv{xlAKR;0I#A;cU!#sqa0%@H!6t}9a!u!D@E!aNrn;Fwx1pM3C zHxaa30|Hz<_j2p^=}3TVDVn$Ge0*o^{$7lM$8x6XmlUrUNg>=x?KxB*ba#6_dvke= zNmR&R3kA<bKjKg(6X}jQE!A(Nnw!;?fugY%Q1a|T@pia2>UUCcjMY%$pv<6iNx}z= zODvK~q(4FK_pA<45)@E(K;g>^vDYdh@Oh7=USnrjgb>4z0wUi<mN)GzD(Kz{$WpJ; zA>%cHPj9hPD&EIVRt)%cakzp~|NNbtG0bTsopc29=`Z<_E}#s;-73SPCVKf+qGgcU z<_gsF)_CL$o&y=$6kHQK);o-K(ey63=#~q>{2Vl=;<H=e%@XUJQ|sqk`+ni{1O+h5 zMUQhfHf_$Wyey01WUjNx*1Pem({1C22&kdOJZi+$Z5(D})LwLXKI>i}F^+;qLup9W zPL6o-KgnAFU=!yo$2uVN!jP81`5Y`vHizt?XuhrtP+{Q`heYq~18TfB00mcbw#E{a z^{jyPr#bP3azi%2CVuF8-8yIic54@~OpX&8#u`8>**pw|M(9R1hEvP|PG14F{RGUH zdt#1xNqtYWT|Q{+doF;U$uLyK)(H44!@&YYy%;|R&8ma#-Ld?rv@@U$nUP{@e)}U= zuGVb4Km){%8$6x}{;ND7o9oG)R6@@HG91S#gP`fB#>vZZQfFzd8NWEeVBu(O3g=RO zMFdn=aQKbl#e0ix`+PjtJC(a~URP0z%9ZbiZf?IOuvh}lORmO6cZAsoKw$It41gIh z!^(PbFRW2xk$@&o2$U1cIk5BQJjm~BtQQwr<1iWCg8@5}WZh!ww%=R}<WB<M=>uFX zx2iTve!3J@n@{#wI#Cs_@{3?WLKK&B(}L=Wf-!ePf5_1fj9&%9Y|S47WM&E+<A$5y zylpRGOK*g)>Q(BLqCyRvM=SMIPKEoW-6D(Bqzsf$x!3(QSAQI<8a4hSiPiLtq#Hp? zV`qEdwp7YPkMmeMwPCr@ZIK|<(^>$JC2xOwpxWjJxOM+G?0=2iQ4JF1uerzk71kii zdGkM9R!yEYn4hLeU;0KG^z0{H7U1Bxw&xpb=Yde}PT%-zyg_NpRRP)nHC~o&99Fgh z{>$q4i5p~2n)K7f`@2ciB6WjFUAJQ5{nvwHy~y9IrYntm(Fs^h^y73K6Y}3EU>_7P z1Fr)<vAw2a+3P{QyPsOM=GSQ+X9<fnIG(GY#HF`YzrFT>&EY8oiVig8ZdIal{fQ!t z8rM^^d$UsAW_QZ$3DB<A0h`3h8qV<Ov)B1KSl&wB(mwT=vYhRpXQFQfKJLRTnH-CX zU^AVv>3q4NxL0_m?JtkXCKr1>q(aF(C0Q=0cobJ)A#4GS7D}nLs;yb&HJvh1T*{^K zS&Hx9+YfV5Eo&oxBl5aA<X@X`nAC~0N$qHwDi`6IEwLq^+_wG<bf~=(6{0M}c?AlF zN+k8n+i!FsiZtjY=MJUm2VQr_#9oVe3gpDhj1pU#9tbKW+S6XK)%(aDc^h&7EB1JZ z%r?=tmZ|#|s>7m^_ls7N;~N)HjTnUzPavx`HjB*M7iOC<0R%%U{I~PQkd_GSCPjR0 z$##gR^_G0uWx^je;-7?TRGCD1IEc8^v>|B+2Q1Z*j<9BjO`WJb7y3hhS+W2MC8bmk z-m@vgT@Wx&h4O&bv1iQwwP=h_!5px~ItSQr<NjlnZ$$3+*CKr4tam|Y20)$G5*G`s z5+0;4P!~uj(>{lLghioQYn5WnR=OaM9I{*WL-vaY5wEjNs>kqtznY%MnxDqZ7guE( z`4~MHD1{-K>>5bJnbVf6c|i9qM|CAm+wMaQgA~E9n@23BGdXd(W^Q}+xn3ip=UUi5 z@mJQN5+)cOmDPe@9zYDcaor2_l8Z96zL4B1?-Gr%kCOX(#XJh%d0k7*uKnO2OR`F3 z=mDxW5v9PfB1)EbhE}EIZJPVcNXsvtws*rfeBRo>Vk*Fs3b4M#`(8;a7by3;p6zV9 zT^4M}d5Rv>F>HhInqtiE;gv6*4Xc7&w`%wO&}nyujYbFvPu=C%L08R0WGy>NHe{%@ z)tD;H-EM~qt%kmByfZfJZ+zdU3WtOwW+FEz1?+%Wapl`YH?N_vYMQJZLmD<D1SjVf zMYK6USjrSGPI)<ZpgopBYi1+OYtK*AVBu!(v{s8Rj`de_&#nSoMu@9+zS;-Zu%?@% zL4Jvx7iq%i(lHk^0@b6ca0ww3IS;giJ}RElOkst@%HSyfm{Qz&ake3FKaKDMOIgX> zLnYjdaElE}CI_n6roq9k4aUjg+bDBOc)-8kJ6%xuel0(k_fr*SyaR_J*Lxefw$?7V zns;=oxOf7J{4zRWtGb%OXlv{#yY+&*S159k**wqAx6$XJX%=aoXEAyXfV9`~whGwK zsAHIYGd+hRzr><>Qme_qCa7L(RebN}HCHZ9aeGam!+uxpdYJcXzn0&N_DYM_a)$Mu z^G?7+O~+werA5Kl_Zuy#%0@Jel6$FoPWjO3Qiv=2_H`|&w;lT5xq#YcQ)LUnsZK$r zZn|Vro^mbnloB$iSrypmehvG*Py6SKDTREEw5e8Y*u#`KTBDXX`kjGcrtjbGNM=Ch zxE{suFY69c71}V3H6(Ct!?E7UEVg)fgb=|cL@)dTSj2$+9I_@b@+kJ~!Vte`i|)}= zEZn{*=gDj@0hv^n>Ty3++J&+&zQC)P+XCe=l2h6ORy9Eh82ZN(B}>Y9v*PVAF<=lI z7iu-o1*6kW00Ygwlj+yWRcQsmD2B2$9?L@<ix!ejdAjV;b59Uqs81sm*BlkFbApwT z8FDJ5CkW(xw8BJkyzMGnLd?9>(V#}j_-xek=G6Ej%)m<T?%IRg4?S6N<zdd}@t4TD zn=BWAhNdD!VVrig-#tZtq^!?>XH7DhqIGUXB3SKUMgIps{j-(T1Y0qe`Hg{ytc_Bx ze(o9zlSzU501y7RbE+v3_$stBS{(QNv?|ob^Ls9XJwq4GN6v++eZnAw*n$vJ6wMDL zXh%Z$Dv`KVd9_g>81!Z9s&0M2aAl*3%nm66;={|6x5&zmpK&tRm|4~W%|Z>dB{A6% zk82PJ7UjNS&Xq@LA+NU|V;`}ZPgDW^BI%2`)^MSk8X}Ru14W~nSsQe{N0`KNCt%hW ztk3{%l|nD8izb_p7xK@eds;I|&><(flX%8kpYle$M-|MZlRBcU<{K`Fl)u}~{*0Tf zQ-db2`#w(uiql6xHnFoXd3w8H-)z46^4$)EV8hB`Ype$3xPvn0^50a}PTc9{xc26+ z`K-Uy*^2O7q~9i+)+e(gA>98M>9p9H`rtVBDab$Wrn%$?_Sm;`AAY*4uNJ!wjiZfQ zjRto&mv=l8X|<oo#n-2GPx?CoPz((RXi|!LG?XLMPj!m`;=jZ5yg{0gf5PQcOvrFV z%l%1nV@{^>N1#YM;wyKMWz|j7rqRLyx5|io{XhG9uv;*PlWg1*LDO>$WzZ>~v9j?= zm8NAYRJ9ZMDy6Y&_Q8$4i}+*sDTY(g$NBPwx=Y~Iyk@SPuWvMmb^~8sfMf2x<?k^& z^*UvCM#LJe!T=L*h3xL;;2H3`lpo0kH2%olVT9L32<2%et%*Y77vLi>C2)T!*Bb0A zLCF2Stgy6YCW6jkOhJ4a%A9WnWD`jxa$tqg<&3$27Oy^j5bepBBITD<0nnMh`+_W; zW7Tl+^W$y2Qi1vyJDXsm?qs~mjOwp7teQ_dEpF#~Eq03M1!H4p!sa&@MyzKMu68ud ziLht|-i?5OyQxz@JU-&(fj~98X$6w|);aS~1A<z0m*OgQSEhV~Kw5|K?R|id(_u*f zF8$`Z4yaIG$NeyV)r>;y`YR**80&4v&u%Hpn~T@%9zFEt)0qiq6gL8H8!*J8)whS_ zd?yPa8Jni@r4IHEfrD7^()|?i@Vdqv%bhy>z~AUgMnbFOijjRz<cdNW2@!rm0=YkT z`rIfTJI|_EbAy^T^mTZyevPMcaOZZ2D_6a|i#f@Zi+^fR@Kx1M<<{#xX0Be&?&SGN z2(Q+D<37I+?g3Evv+WZQMNc)kR8E!%#&_H+fd*ww;A+=B=>*;6wvbSb;oe+*;s!=% zPbVJwE!2ZRnTF)+;zY65T9h2W!gq{CC9FKf?k{j9FZHNXJ?efq@=ASrfE4-H>#cWN z{0mIVc3vSalco8moZOeBXRoEDahCE0cx9&7jP|2=hO>Cs3rY6{W@N%eQ$MM-q%rl9 z4flNtHZj$0^iAf&Wy%PWle~sk3H7#*p;vEJJ6i8&7&42EdLoLP_{|lm!tR>%0~bN5 zN-V9WyqPj}hJzqyfl7JyE3w}Gt9kLSs~b70ba6BVsd5`k6cWEOFzuEuXy#4V^?+6S zo6&T$r$SZD^9EE#BcCMl^>V7P7~}QW_xYYX(8hd5&I##D{MM;hD*4n@ySYgE&b;xg z)us4oUEIlPy5_#Fsz^!U2oIG<`qqFdtNKos!EC_I&pI~iU1;eY^CErLnta`dYA+oT znrENoJay|{5BE};XgI5~v8~YSKi8hv=cirHee=FCe6i{wJHk-8<+jRa7TXP@-4b#; zMt+xJd_Iy*IZvgLDcrqCO>D^lFRIeW$6to?;_E2FagCa}h*TTYh4OV<{F8aSgw6;* zzBHsSJ{3<6j}aRm7=W`MDnfl6#rdO!ZP)zqaaHXyuIsPtin428qv<RiOP2ySdk=gf zgIwlIU!>bm{+OMJxt43sra6ZV%Xc05=>m=dA|8(SdzC+BHEBim!sFxd@^zaVaK!H( zuR3->xSH~rNdrFcBXY#=_#s9Ea|ecx@)8JWL}RxH$-X8(TD`nvl!*xmi@EI3uTZ0u zI6WszbbQgJ5fRk$6)C4%y;?)0^LD1n4WHoS7hEzj*9TM_tR@0Yb0Ge+mv4h*Z45ey zGhtd*Fm%xZ9iDxpss;tDLIYT(hV@$O#gbj}TKGpq3V2lELbAl6NVlCzOM8Ky9hHyd zZk=|fzIP8bKU+kAhmn56^Ei{C1XG(FJ#&cx?hrYRAUFNv2-bjLUdQR46(VKAXQybl z%afMgSB<Co(wkF{32OV!c6o-3n_G}vRON(2e+9TvY0e-m-9J-*H`n{6S>>L_lrL{@ z&&{nucI6&&?S<RYc{m^b%)+!9c!c~qyzm;hOY`4%<jwZBytwPxz`c*CbGu!-j|9Z2 zsnSLA()|-&L?J2J2lu%@8wc>!+X;~GTUQofh`!b>dgHRTjG*sL;J08Nwjp(i%*kbs zTTtt}*Zw5JSrn(a^-7&^z0G+BN9)C<v_tjRBoh?GIDqph@WaR@nG%$)sQH1Y=qHd& zhO*!$D4N43PNr<aZA+`#aJP8=a(fp>@yk>W@#x`m*5TlC6r-6V!qH|Oou@DIDv@ae zkXKm*ik_GUERA0;u1J3-`NWjEY3iSLRKumya&Y=Aq0uqoW+NkM^-FB^=iSDQA*7=n zoyphR4ZzaVPY}*+X?}5a@gcWlwO#j`68VMuZLem+@vxwe1dchR(iiTD$X7ud*Y)EB zMG`$Cm-A1nhV!-u{=8R*%7k=V&u*6AVtcs~Fy+QwJJ_5OU$>;zi}9yaD8gk=TcdS7 z=d$E255Zr4gkucJ>E%!TInJ_mKDi%NU=$T}`Jj?$cYE`&w)rUQ8NaQjZrwS2{dS<3 z-Ne}W&i%W7ue7a_jpZVYR^hLB`slmx&DVu?EjcoTPY(r+eVpQ}<vjHm7l$>C7vZ}< z!^R-O6&y3}XYDlo!ub41SE_c-?j!rh*Uz2b7-Sv*CC7k`8nCY^Sx{wHLwwFA9)_QT z`NsKZJ_)M%x`NbRdm`$f<CsuHMnOnI-YD`HK8o5k#YiM0%arE)iq4Xt*T(iVId-L@ zVDV0M|8RxsZO>O1p>z3H?~-%ru=8GKp%rzWBSIPlMen5+8=p^;KOuqn_tl33Yy5LK zKL~?2R=<^D{&{cK6TW~0qC|wI^d-`__AEnMwY|;^F;Q$hovSl}D%mv{p;t~;UtqDr zecB0-I=<blD10E2qx{%+8dhj(!bc}Nq*1BW>@zb_NIzIh_}Ptz-S&ghL0v=SK`llH zashRWdZCF9ZYT+S`Oe$-JCp`Pq{Hd-U3m;W9}9dA%Ld{&Y9H;|S2yw4=DV7YJB5!s zhj9fEKB@~m)OF2Y4C6lQW3lZapb_J%BWlQr36Yyc4V>M}<AnQ!5=ugJYN9q$C<v#k znm*%5qFs};@~(J>rWRiT&EwY_|9ax}qBz+hbF<qe_XXY*)XoE&k|j}<{Pzm^rcGme zO)a0ksz0UeL~s~gnS6>y?_Ag}wUe*At8&1D=efBlR~+mm;SG72^1$vD5DKX!Y9Y&& zbY>yRbpq3v>yVkPAGr}tM+0;f){Fce9fWd5E1Q-SRdW3x#h?Jyw8kPt5l)>ze*!!2 z2X@&;F@kU-epMmTl#*CV)@{!O(a~julYOyiv3Q9ZVQhbLB0f1#fW^vlhdzjdLJ;=f zSL8SZoz`kOuo+*`x)q5EL5><vxJScJ-q&3Qu@`~BvMG2bzRVFlUlv~|yJlLo){e%f zH~L3lXllmt{dyBipEFy4Ngp4g{)Fb!h&)>q_I|G(2343x%P0DXE9c*?TMH*68O-CT z!US2CQuNp$8T0F=T$bIam*;3GtB0wUYX;=><0a~n?1_=CAKCXX5tXmQb@9!SqIw5R zhomp~=`>FXUkJ%|Cu2JcsIVHqeK*b(gkz#~rfWWIld&_O<>nSM))_uM4;6$Tp`Y4N zQtMAkI^Vw1(?acY5Nq0=DTuXTHAJABiZ+^cFuiZOns?VQ=%A5(x*&&6R&G%JlJ)_a z6OP6HcM0q~lBKo&6sbhKRIEIplXy+CjW`FqoDx4GxzM7+Bl@cB&Ro1}dTBmaSHA8c z%t<Bv>wITgN#r62r{$4BfC<G?Aq2evxqi5)R`A^^=BaRcrV+6Z4nyKwJwuBR5DAiW zB>8mYUjVcHuhgS01|#0A<C}&pa%Nxc$myphu?Me*YIb-^L`gmizW4c6Iq3h3fXCWz zZZbbVn*Iry93BkP@(y|lYN}LOiU9^uH_eV#&8dFDPpkn_4lIk>d=z-J?96~CB8QuS zSa-@&$elrv9_U^Acn={3N0i7^Ja)$|h9$S^<sGUO!ud@JCmX8Z%#$B)&1g%Ji%*zE z85XL{OO|AzB^-D$`)m6Ps>~spkIOiVnD=F^RS92Wiag`4wM_x%V~*Iyvk6d!zLSCF zPvbzXEL|Fh{aH}<iFf3y7c^8OZ86nhbB1MCr=Nq~wp3{P?VGIPR+KIg@QF*q_JeC7 zIqbI&#{a)B5^5w8tW+uyMhbH$CzH&dSRLoLD_Jz7d9E5!#9Nw;v(>M33*sx;d;MSY zu9cxt-BPv^$k95pJFr|v4d5_QOtKfyf&_<6naECBNdD!f>R1#Ck@Q5eNBJx-gLzV< z8}n+eZwkw05}9o8CimUy(29;ek6FiE`%(Y|<FU&Z3zHTT%&l*x3dWzW0*AkJ9&xL8 zM$z6VhpwOcQei(L(%(}d3thtK%#-}=4X=A0I+;}M<-sO?MhyHb+2mrjAFKU!E|`d~ z(q2D;OA+vzA-d`Jf35+C1mT4Vj$v+mbOF=&I1)C70KJ9suc%4lqfch@@^xLl{?RLs zvlGiFPJ6yh{O^3kA?3y^4%aI6C7*qCv?S~?QJMJQ(TXC7TUBB$_(`ZfH$~a-c8prG zab=ZQD-QXi($huB;PE(PWZV@7xhJGPud<j_tyZ}Zb}RcPLbaBu;BJxBx5DZg{B--$ z*~M^&jKT1}XwFmp38Stu>E7&yD?tW>ZX0}!#jKDP{rq6%7lvR*#DI%rj8m)DhL)Qq zn<&?S+m`o@ymsbvYAH%_yEetMF_Q@IqdTcGbyDBW$}kp%xrNj61cTYOV)ocTy-MHH zRH4!L#Ql`YjXLhHz(WJc%)%sI?T;StEqmfB1GoHIZX?p~5dZM*mp=D$Ip<%w1IX09 z?=b{*vy@(JRITi8sl`5L8*nA;DjMg3TTntgoXpU0!1iF&ty&Oq+&r}biR_~PH63-W zo{}DPX@SGwxBhTQc4c+us?o?IU8}+lt7smzj}&_%m{F2@iWcr85hY+vbebxhN{82j z96_yq4IiWO=m$r*K;PQQo_`K3QyHyM$m?6$9Ebg`ZmqX1{k<^?e&S<u)gOA}STbNq zd#1JZ4yY?@7FGw2qIr;wikE8oR||wq1cN_z^52W}26JC8OsO}IO5)PRlUmiFX@CCD z=EIu`c4LI{{Q0?Z;OwXv30^>O)hB~|eR5!Xs1NmZ_^->riTI4YKI|$Sk7+2hR*`Y# zY4wIgcJhmi9imJ9idbYem#iWo-p%7HPVzS~ESVC%MKiYQv@wiiq?bnpx!>(p4E$G; z6~}o5m|k=!^K%hlXLSrVTg#3`y0{##PMq_grrNC4;omG{ouUil@jx1;-rDiDH*Ph5 zkjf6ms6|H}F=g^#Q4`JUq{2LAnf6G#Y0*9-3L8C4kNEyNbBr`9X{%(pzZaj-X|JMO zR=r9C$7;$Pl2Jk1<I{eZZR3i5OrMnU+TsgdMDBQo!Dmgx4h%!wfs>dF#bJN8(BSYW zhsJP|I1F73SRDWA{K1-80}8E$`!k9mKDcm#(2Zzpcnq?#ANGr{A4YW+2={l`&77dk zkx-2OJMX+9?h)RP*WSgoOp2UQ^B_%aw=q^$TI!j6gpFZJhCB25E8ciR>>?ldr`4M~ zQEj&;Qdoa^OE5&R%HJ`F-?5?LCm!+msY&fF=lhP5ttb2QwbQVOowe5z{w+J~^eL8{ zwblzxK+08(diV%7ib`r*ofJYC(a;orfr9jNcwORE)e@XrwHLw)>BLgSmwo)h$`G%@ zF#UIrGvI?x%$OLqmE~=>y7JX84Nn;xd8VIyt&L|6PNm<|ZW_G)`oq(T{IAGxKnROY zwlnDD+MT+J1w$u2Z6te2o;#Bx7^Ad0&G=u#BT}#p<6`kdB@t!7L%)}dX=K{lT|q~4 zd^EF9?$kQ!8s!aU*k4zGgc(WQ02ric_sphEJHZ~)=Xxo(yEA~;e1F<O{`XY{@7*KY zB%*i<ynz?nP$ex-gFF38u>;AEgq)s|=wFy8f)xqQpGAROsvmXMyn~_T?ACoAr!yI? zf9l}zzsGpN0)zMj7z&<kke2Nyyjrrx6osAi!)9X1*KExXgpFBDrge<|>j=U6Ktc&? zKjDlT5jXmRs~$~PiA8PqWF{ag*U)I|h*0<39^v0lkM#D!C?oT46omWai=z#(kPtwO z!OHX9p0ls|H}3qM{QT#A<SwL00?vSpl(hY{!TB(A3YS~-JMFBTOf0KO0JSnI=|GFk z-R__+rp71?acMM>GQX$q6yLu&@89|FKkt3oNc6iA5wV$@dbzu3f)!QcD+b%}9Bd*w zLX?N?BkWOq2COQLe8aHd{x9?V@7e_Py<j*-Stf+r+aVZRHPTLRU7c#$<_kvI&nSD- zQkcfCRXsOFWXQ^%jvZ4v|KEdxxu?_*K+a_j_^xg{;4$wdK9K6?&9|63k#g<(2?rbr z@Afm6zb@#1qSSxh2!=l?TVPR*M|LbH6PFWX=NPt6K}?2KVb^oE2><Up_xIxd`#n8O z2zD$au3e1e1*TS6SmMfmEr5Rw`M)n`-wTkp+CAbUc>e$Rg@1q9XNjT>U{@{+TxNe= z1)m30WhQU$9}trUiG$1|na_>=629f{83sP#z!df*{b=(?=kR}}Xa6~E=sj3M=XBVL z-dSwD4}q_8*jBB#S?<6dZ})rs`{e9W0r6sY_pA&7I@Xr#A$NDz)@j?AJg;CW(A^>N z)SMT?Tp;%W|Jou5?ZMd{4{_w?)5VkMH9409V>=p|HH~1%O+Z__AA%8R{*HnUr}Xa2 ztz=Mdc)v5HP@qz{UT_UM?G33+di;~@jj(9buyDvzwGG<UW--8}R0}kusf-4qU)Mxf z|CzkNF&vKeo=a_q26|85a={=f$=VLgy2d*BKL$U5P{QPr1UR@OOj|lWjn?Nh`F+)V zEXZxHPE4QjxxP<?qjk2uxx3!S%B$FYRGzUzhE7Dp2+EK{W9zcXoTQ)y76q_2rI{+z zEQd56C)u6|VkREPoyfU*dnwRM%C=r?X&}PDAT{g_k0~o-&R56^eDsX-8>RBR*Zu8F z;2HRo<y|N*u=>;FSK=8Q_;b`10T18`EZV<{LBDOQMN%i-`q}-Fn>6&?G3k1=R=i^Y z+#?W4=!CiA>h0DtCDul$Vmzpz!-JU8yWd7S#Cp0yl&S`_amhgMFTLq%tMCaiF%z1= zP1)HEKo+8bCtN=;8l}5F+l}INIg$uMC9K-{B9ruXweOR!jS;n8`5V!vz+|m$b_Miu z;sE6$1#C#i9zsp*BtCTkGut)5QG5a}D1C=3y*c1vn|7e-F9p=|r*$B@4FJ2;HNagc zmS}T9#RS#FQ<uOJMI1CCsZekkqdSApq`(%=q2ms;t72p5)XZ94&-WOh759ml$Vd{X zD=)oPjr76&&SQ?bbj<s+dp(9O0Z*9+t=l$M%}+~Uf`v@ktk;yxdp!iY=H3k@)_2iV zwZ83ta{ILjSeedjfF^-NcR}D|f&t)jnf-oq^y=~oSf~{GV)1^_$I}DM$|^8YRb>)$ ze*68Op%MWdDm=zJFMbadZWua=Wd#3YquMMXI%Ol*m7+-K<o=8}_2C8mVMmwW^<XS1 z>p!!s?g{LE>wQa=)x2gZaOee&7on~uzyM7$AQ4<;Em7hdV*h(5WL!r26dtEo-~w6r z-~<>{6y_=A$`aP^*37>Bo+)~CwOuN;(Bx7rMeKgy^GZw%d4SYnIv9hT74p=d#2S8i z6F6Z+0@$Q*>I5_%3cb%dP?&y^Qc6ZgA`m$X0z*tj^g`ftgtGha3b7OmQGu!DA`^5c zUxR`*pUcU2@$tg#FpdRzm<Ma6K)6eY_KG9e9O|x1NkQ>Sv>M<INU!J<_c7yviLW4Y zM>T@qR0BXmv1Ks$(K1naBSNrf$bcE3nh@gJQoaA;d$+TlPjz*i&3B{+ZGK1{zrbmo zwxGOW;7!)2J_qfozTp%eU~)i9i$w}q1g0F23}(_{;FF^baEzQuhH#$?Bm;I<R^?JJ z#4Ld7DJ|n#t~A)=`{&eH&PoDvCkOlf&y>~o&VJlb`=|aifmW-|x@7oIk0;r>^pTZi zUuypz@%N;HJ_BCB&sGu|Su}*(LgX(#t+;Ds3?M5xCQzp6=Rm`eKBD?ze~422`!Xh! zK3SZZ^M4XhZL%dAr@@?NZTlx}5N_TWeNX`$$DJUBv?p^}(kkbXIJYxzLiqrVM#o}T z+GW0`0t**sIU#yy5WE}&!rLL-knCs(ZS=N2Z{?CGT&KT)Kf|2g%6&J$&^8^L#AQi> zHR5-IYO#s{^}|?-B|T>N=Khm7kwV4;5AoqNfX|o=r(GUz6nev<VdHIaBN;#c-(CPB z{KUx0A)OodOHJ)rXfC4%3F7guoyXg4()`U4Qk~F~(P7a@kL6L{VETW_O?8zF!C@%a z=In9Z<vae$a#cnaUM`I8{{t{EVj_DU!1!{@b_&>sGz&BWKp_Vhg;u=jMs98)>Fao7 zXgI!&E{w%baIoc<!H6hx5NwBk6*_|P$QRd6Z`t14CaLc*@CaCpj+swRtnm_cOaqS| zoiywX{*tKQE5rpq46<^ISNN0&bVl?k!d`qrd4W85;orIz)o=cG@2dHUJv+bDtkD|u zW<=uqfP{QCcA|RqJ5ljhr!lyc)i#P0><UGm)NANsLZXhC%;TgRl*qy4^)vT0S>XQW z*f-Ju1k_Qa3jlAKQ1i<50&TFu@sc3AF9-JXVGQ4qsNKa@z5PNAT6D~P<~d^#3W=d2 zeSf<HGM}jc!^3-`CKVF*b}jg*%Q~;#)#mD>wZU1H(-5$;eZ`3vi;gT$+*G{u0v@db zG}|^ktCo3nIgTPmo_OOD@-6@)>vUa@I{tgm>oW1e*uwZp(R5|w(dM@g0v)3dHW^LH z<M`&lWtpH67~Twhban#}P)E067i5?b>kl6Jvsull1Ez-&MMnK~m7h5+H}?!BtB^je zR!vcCceMpWjvFU0{fDw7U>c}q&2T~x$efI>Mw<RJvAfz@Kx=BmO+-E&x-5I&KUtbD zyieshONIuclK2Onp+5tX+^57_OCwF`9Cd7)i+-=gFZ~4H&$%QVY_QkUPO2O!kFa0q z7*UZbCNA}b)@c0B7%wn=4i36LXnSqh%bsKFiXPbcru*Bt0(%D~jDco7^sJ?Rh&8rz zaN98?_4&eA*&gz*X{T04suLb=KCp0e9Gh<bOr2f4b|+J1K7Dd)tcdcm_FmTK8TSXW zVtgRDS0>e;u)qRXPN9_dCf4sf8XFIwFXBjOXt>T?r0(R8$YR(KwPgM3{Be1ccoT{r zUZZ!6-dVlE6L=P6<IT=WEDWb9M}6*S!^>}v{(3pZNPubzRiqg`_nTU<5i?zU`!!ky z;|s>IZLC~*R3f#!r1QXZq2Ec(J^2!!Vdi~U0N<aCsqX;{o&2(RdvdiKi~K`0Qm{_? z6j3sppAupJIP?%5bcb~wa0RYyiE<rEyP$y)1@e!^)T(pko_fo}pWTU#aP{)c3W5F9 z_#g+GcrsPtAU?s4?p@v6)%7b6Bqh%eQiV-kIQ!^V5Mu7fKMHE6gBbC|AGo1A0q3b) zUFn7&H{}_yyIp+3x65om4e_?)K}Vs{SokxpOiQrRjpG+s0;2Bf{*Bm{NFE2G@j;)R zrvN!U!H^eX+cgb6y|m};said-VXj``OgjkdICTde>1Gm5W3LDh6M!Y0@;)z*tM&@b z)24$ZnG1krq8v%p2kjg?($92MpMw?lIi2q{Pq2I*)DCad{23fcb_cp5W*VP!NJgn_ z=LTwOfa#(9d!k;4Kg-!7Y2*zC!Qv*aoAB>CY2;(bfngi6^2H%&caaik8e#sP#Qd-a z*%gZ_XKr-WNO33C=yN$3WQg?&%rO2`CG(G$-6MNp4T=>jK~ozULQA36t27=(B{wk% zj>mKQ$7ud|_wAjWJ}C9#zbg=rAS#iUyAz;YeAfPnyf<5VQ?X^5i+C6N`6R~HqeV-^ zB!okRg{KD(+9@tt?@pP9N*|Ut1G{kOl35tnv(W6;{WPQ$Ox(m?hrUQs#VoPMr(Lc9 zFCANXh`GUulQC)qB%PZ8?h7;_xgP^79IF$0N4kOH!g|wyL;!H7P7W{CYxTsJ-37g_ zEg2(`Mx$(5qNrvFN$5}RxoY#cC4B$(hiJ?9BxlfN{d~EFhOM*u64*^4HQg<}4!A#u zI`fwXWmsu@fmF}I!?Ov;an`4X|LPa{Z4s;GjPg0z{WMqvPwtUcRYlUu(dtWq0lv_w z%?)s#gG|yK8FLM-r~1l^{YlFY<Y3jhdwX;5T4TJz!<zq$V~KzVo^wBu6#Nwh^ZZfo zuU^EE*Cj#YKt-CM)$wiBQi>-xOz^===gbLym89F|{wAE>&;)9vbvNg4ZL0=}FGqcE z`8m$dO7`FLQl{Z_Vot^{`3kP_KBuLX<U<0>ckXgAc(y@l6p*iUVSe9lIu7R_3Uht; zH9kX*XGMD&U1K49?W~Q$8>~J=h@$JSZ%$aZD5YXeE~tW&H`%lY>&_1Ne5g)I-y-<M z6Ta)ppRU9m;B#6m!5rIMTOV1QZ@q2`=sRW=TdfsBC7eSM$+HVw@uR|SVzcoIWp=Jp z3zUyAfAr=-csoS{_J<|QYRg&n$FJW}&D%cmXYyweL1bTrm)vyiI_x_%JQm9+2Dwzh zRK#5tQFJ>S$eZl3o6#p883y8o+L)lD>R;T6rICbdh};9O_%-C~z!&MB(pQ}i;fbhy z4!jBpt(oZ$z34i&rnk`zdyHX;<PQ+L*uu8c!Mf-=--d}s<eS>D-|mOnyW9}?EyV8N z*(<&Yb0ml5tIoqZPm+nBb--E2jOReCi|zfzfdRwHZadCu^c65u$_Dq}H(4DIp(!^x zaC<rsrpt3RU6_YGnPh;Bm5RR?_}R;yi=g9C^>`mH-J`fq%!?p!Uw58LK^*rNsJs|8 zKGB?)#+j`_gAFtE`B=<p9^ue>^Dm^Oo@Y$)I`Dj0u+R<LYuMp^y0jgAc89IrG|!k8 zr};0K2MOa8O-awC<I@cs&@~aFUiF=NBT-17%=S-=&G?l)P=JZzV|GSuV?l9II_P3~ zKE!z$h2Pya9Wg@xocP5jE2^Ov+#9#>&-q_`H>KJww+3X2V&*F(2IE@e=P|Yd_lzE{ zi)Kxb(dSF=-py(#Oa`DJ(aHw+V<B?eZb`cQY^cikKDXV`#ofeF)LsbDm0oxR>!U;= z$mNdP5jAESFOT;4v4hp9!)lcsngaZCzYFj4?UdVqVExA(Q9qdLt&h*Ac7ZISrm&$a zn|J2DHHQXi%b_VOqT7bmg%^%+I9n1X@;<4FD+{84?1*5rpSl^GQj?SJN}XpiY+fZH zVhhdFSGvKvhzf|EoV;P(6Fwe$lT2qBsbGU(w8i(yGD_-qg!9=U7xbaMR<ERletVz+ zJKRr}woAby_9xs?LU!(9&?EJ;#3LL(D8<)l1Lx7ineHD$V8A)Xh;q`eYPY|Ax)sPF z<l01_jcwb_gyep?7MGX>Nr66{z~KqTHq->g)iRn%PdA*1uORAI1m9Ww`kfFW6<%sz zkVHtoi$6)0%X4&0Ogc=jgaV%Hg&5BWmXT^ZbJZumfW+nHr~aC?{;cl3mCq2^PY;M* zwQWll0ryxnJI;tdC4&PDXftc|RT;tWSUeBe@qg=BJ9zeIFXNun21E%}etnJ5J@z1A zD04D}C7T1)9tgi7l}=~l)d{02ppr?<UJjs^)p*%n?thNekvP5G?=g08VKQBj6X>g5 z`7Vsa|1H4U#*@&DFmMheshH+xA4Q*+i(RC!nP(t1J7@-twJs7eGF1saHB1lh43tC} zJG9k?9?zdwq%JtdQK`_iKlOo|RKe7_`c+}!%-pt^N6#y_>Ob=zs6Rnuhee;<rK9Wc zGJ=<LM%kUN)YHq&8i{{~THfE0SYLZMf4(x$k#hm;()|~tJP9J$F`qnPO@lp>2h8jI zs+EKnBFnRnW#-HTvQ*Uva_G71!zpwJp5>%D--uV`5`g~|$?_#YyQ6=`*RdQRlAK`j zX7C~@_bH4vyE(O=25K82(tS8kM5Ov)6LpX*X+BIVg*th^J~Yb~huEc1<+G1?zK^tO z{`CCV`i!|%x5j*S)Ze%<+OV$_!5%K9c4PWhTTdv47ZmMC+K@O~Id)vV(Gog;hw(JZ z$eXz05yvRPKT*988P@SL?x6mq!eTM#Yx9>y`4hcFa#*~h>{L&yU%}s8tWS^zRpW)H z_r`(S%Rb;bnv(0cmX4}&8%qWRrA2SDtglP2B#hD8fl23YV#2=~C`j}H1RR%QkISRA zm-g$@m%u4gIXNUa_*)m$30GMGm5BAA%WSr$c#^x0`~p#sSNNAWy#YFF3J(1_#qf*V zDpVo>yR#B~2ngeN1Gkc|E_H;D5&mZ?{O?<NC+qE0edh^3?e#moCxwMJ7OYyo__%X! zGEG-aUauOVI*gcC28bLX@un5T(d|`-UW4bBF{tKwW1PM!h?8^U+dDnt`&~o2FrPMy zy6~(;%@aRoRBU+PuZ+O)?(3`9%$Uc1@Czws8d^)xc(y)7pc9M!4D$w;QCmI&Yt^-5 z)k|z>Jq4f5EE@WFk(Ul;Z^8-WPDMpU^CwY+%Y~BhK`Et3yIyfgB_Mkp2nf#J<JH2! z_y8n^%Y*v`gmB^zZ0O`e$b&X8UyYKBha;90gGW6`G&=4o^7iccPmR~vdi2LJrA_!W z@bY1|T3$15{<u~J8_!#!z#0ZdkDv$L(u-WUJ4pZ52jBXGN=>Nz$_wa_M_+{?uMUzw zY+#MUUz3smyalCR>Rg4RT6_zWMpe2$5ijYQBo_Nm8Kmik`#LBBQ4q@j1(;sS-K@tF zzPn$@`otK*V5Y__r?Bx^#x49c=)yQ$12}3;`KyLng74+AWM$%7j&ixL9V?k8dwj(q z?vwWduW|uLBzgHcV9i-Mv}pS2bI|LMOc}_bm}?Rsw3khspr^9kVCwTdb<3{9h;s}Q z{Z-ES#V+BE9sSSH@GP-_Cr^xKbO`XD<Axb0)Ru>*)Cz^id(ux=EspnUgQi<UjFi-F z2&K{fCy8mRo)7)T>cz;EIj_E>Pn+`AnkC#)e)Ojf@>~9pQKcPY69DQ}`-nwats33= zXS<q`w^w(>R!|-~#yHhQ3@mWPO#YgF95Ebz%+<iyU!%?@<7*O!T;QXpWM3<PhN&J{ z+=IFZv~<M11T8KBE2FpIDLwhHg7E^Y*{(oBp<*FiC*Xgd^+`|?!u#P9P0R-WpRD!I z*F_Rg4d57l=q3b>LY|`f9fM8;3b}b_mjFC);JN_q)a|V+JM+c{+Pg7U-$%Tmcc<ge zHs><G07k;0;zh@{*;1dL!z@C?0$Dfm8i(%~m(Ck<yH}5i8|A++ERyocG?$*VD%kPx z!tNZZaTJjeC$1c?$vndJH?;i<o(;X4)oZ2DPTM+-5RvQhZgyZd2-@VQJd#ePpDI&p zs4gKFajjK5Eb#8%^yTlwDO#lKygLtaCNLj4JIxMqVarq04D@7Il6-2gw{6g@94u8N zwAyy4baa5wI`~1U{AHb+`Q~Ur?5p0CD6oaL#7MZAbae6f3Ongm0_vF;xG<}g(`5!9 zS<Pqqth@6Y_Zp;tPbCS!wbd^A_)bABZxB@ZAgKzVQpaLAr{D1ryMAXCc(Tga%Rnu_ z8}`AYaTH4n2a)YWzG2jX(jDA_`$Q23a5dp$^{1%m95g*xYTvRn9z5OrA#N|<PKQ2; z+f5@CC}j=#CAt>&s20=%vR}0!&pIY3YV7?J_PD`1P!Y~x4ozcyyeS``QPRm<&J#28 zpr%AdiTRhq1J8J3!jHi(h@_3*ZY*OamTry=T~o#>c%#28eH~`E<xxH3OsnB10XI@$ z*Nr084(pOL;_z76Vr#NKKST-iyp388y&Jw5s9;AP5eR`g50zYRe-EE{jz;m(m#?~7 zInfNMc(RDs%f)Z0UP#ZpS9@CIk5^jeA)b}(ybOD_HPsYYRigH~xtuo)d&PVDN|*SX zLN^VI#dO_y-WW@&@&P^pAg_4O4s#CF(Q`@Eg}nXFCm1ZZ`>tE*V_0nCo*!1dxdZ#k z0~A=6dkL&~ttyjbhTB~yy)<d-T#!*dFO|tWFDPzO&R3+>oIXd-=Y84%1GH!Nr&S+k zeUrVf*^F#Sm=b=NO%!dq7rNwcfyaMYXuWHxKTp+7&>-ACf`N6kn`Zn}8TmUd(_oY> z;-1xNOB&Tj{O&lAm;;_*K(nO?<cZ!8*w1Zlm~nZ1{_P&@4mtGmb|llB7?S%wPF^wc zn8T>>3>%x@S+Xr}2f&kT>-{+Wc;!Jm4u}#@bCKeL?9k@sgqIS=i{8OuS7i=U1YQ-& zR|G55swm&xcDheD?bikFR;DVAcpL_i(5F`uB&yaH9`)}JuFYy}pLi@1@X3+sHC@y` zdg&n+-*UOnpKe5;%0QkUh7CumDun0fAz+*mdSzK3DCj?_ZeK}gSPf5F&^u_D<CydL z<=Oq-Seb8FVO-4GEb25Fv_yA-;ggrAlz83~(eSkd+A|hxLobW^+SlkrS$_@-kB9)a zsFBZMFZSA;;Nc2bm*0^7UZE7BBMys+4q71uO_8!`|9$%qrL@QOGTr%OCKd}$(jT8a zl9Mhdk(Csi^KCo1%bL%YE*FL!dEUf-vBtzj=r*j9V>wdYUVgOw*)rTIRZStT7;Ql{ zCp1#E!&xb(TQadC0GZ;smVimeRePi#GCUKLvylc0+rqmInLT<QF^df}a;YGxCkITh zhljXToniRn$ED$wwZGR1eTWTH43Cplb8aSrig$`OY7nF%*c&_VLW}<6gGx>48Ay=( zNJYHQJ$!)kXAY6TQ2DsKFs^x4%#Prr(V9EZ#em#&1;^s^9#dFMd}V6qw1ynb`G<gA z1i3!T(i>`WD*Eqp3VDrSo>0=0&9IZ7N;6X9K}egD*LNc98||C(keJi~mx>)#hAJW< zl<R^|cP9R-_jS`DvR@2?f_faAOuPtQ=GRxfy7;BFFU$;nk8e6yDp?BG4}n;96v7*; z518BE=y6S>)yP1D?eyyhi*B-Lw6g5RR30^=uy^7Q7IFLRC42_%hY8(4-v>P&@_A$l zZXJ({_II%Mk$#R2Adjxpk8xmW8?g5%jnbWDj|2>rs|Dry9Hs3Shxw4vHvgf@1u-JD zgEEYa0}|L>PP~%(5=ktv_%;X<TZfA8rR}HLn?C1#Vva$B6&ICu{|7hi{?oH*tNp7P z+!0CWU-pxX-I9puyrdSgBi(1EZ%v=lg=@6zrfV<OB?eNxQWt2_-*zJYWdB+hhlpTZ z3>;c3B|0JDO09=+?`sltBz2#O`bS;1cGCSwQ^$|d3Ly4g!5@t2ce#n&E6@a{jgIgy zK;IAgi{<!IbZ=JNU}LG|h~{yESJva9>3G{BqI~*MElbZGbo_dwq1Tys{u<F~6nE9t zksFAkFDl)n6X84CiNpva8D%Y15!zCw%`uWq4pFhrsgixN%I=ae!;x3Sr2Ig^>?U&v z|MPzJK5pNEP>M7szyB)A_p9%%q3Ua+qB=ph70w??lu79s3<<eBKPc0yyfRavrrDJ) zVZiITTbKLzJ_QQg!A1zqO?TZmw=lotL0UoaFd&8=B}pUF6p~4m`Q!@>%WfLC5!1No zd4U>nFuQIcJIxreXK)z<fe))^D_V^$KK%|lZLhsyW1`?E|77<-Z+|fb_Y#n8G-^$e zui}$swnGsEZX}@qWbT{Kax?q@AT?EK%nTfveTqZ6tnfmth?d6f^ARiG@${opU+&1& z)2esI@w`XvZ+B6eqKMeH4<u+cnOj{IcX{0v!;`r6Swfj>-Vef<DmNFcaxBBk0fJga zOq~|wn1$iaQOEr=AjL7N-Ruki_t}xB<MQ?xFs!q|CVj@$gH;9$42FE}Kda`>Czxi? z5LLv<hY{_}QX=FmuDyP!^+U)DrqR6)1S<`@oK2vag9M4+8)wz<G1(gZ*U%~Gqfe^e zdTi0hNMFne2M_IK>o0fMeg<3gvPBgAr6vJ8J+yaX&v>A@;RP(T8g7F#g#aDr2O_ZO z;i~(b$weF2;bKU-d+?v$B_R21Q~?B}q!tW4hhjrGGSpYJ=IBj0mUG67x;0&Qt)UWY ztQPhY2Im23As9`(PyK0{<`{|%1JG+cCow$gCqGg5h&Hfi$;#c@V=o~?|7v!Ww>{bO zl%NVuBnSj%Bim5$QLvu`E{xk<N(UCLO^D*~>3fyo4(Q2=x81h%wbU+RdvcIC#{XV3 zqCq12fUo=+&cDfRq@WE(878CSQ|+t`lh;e5m`C~sRAl{>7l>2)f^=esnusmt-sI0= ztRWX3OMjOBNWo!@bio+=o#~gqKL?C<^$M5PWL5(h47-Tmi`ShbFpHR>SaN(bq1W5# z86_x&ICWr^?EMw7xs4}qQfMhfDLnZ10E3Ro12A`xo9qWL{&c0Y{})|X0an%4Z3PZ+ z0D*&a2!}4El<pLyC8QfsNkO_BX`~wkBt%N2L`oVF>F$#5uD6cfd*Ahc|NHK_ekic_ z+H0*n*Nid8@NZ;`jlyIH$q`V!MMhHSpgHA5EfnKRrI2)kilzB!$FK;um*4r<Lm<wK z?=acAu-@d#F_!=M1_PcCpSf^8pIoM#igtt{tnrigTr+B@n%9fUQMq463M~DvPqmZ} zrFx>4-M`@@K9Gxq8w{%-&^06^{P+xs*$vc7Sk|@86TJkroP?eN@C}7LYe%!?k9wx> zXq&lBzQ2nlVCaZVLJc;FmrMVs`5*V$k!n;LH_g<qqP~Vd)Hd#76CP@^rkm}Cq#?(D zY5SmJ-pXv1_j@vaUk7oiKdLXk$BQ^a@R0;LZ5h|f4(JqAvmW9r5$%a1ACa~9PjsVy z?qU0ni?|>>XA}Y(n!lg;*LA$<jTkq<{%M;h$W2?n5>Pr4<O3EFGrMYit9zF2tLncW z34u||5?k^Hbnky)6@1k(_ySo7Dq~LyC_4Z&-~q%%|Gcl$<neFQfiOP^I~f5Au)J^& z`M>iAzoJiHDIfe3-<Lf6M1M>Z7#x%Wxdz#SiQ-@3*grG!pI`Wh!m`lgMbqeye%Y?_ zSB-CDE<YB~^GG6Ywo2QWCbzoK+7G_|&(G{S5OrNzw+OlX`yl?$ar`siaNiq<yi%hQ zQ}D0L{^zCsym-A5FrOtr`sud|_j?ZhpFfeq5pSp98w#91_wTQb^dHZ9B7iVHUO}Ux z|NlV$UScQ*@RN`?0_^$zJ=QDnSy0VBii#}%7h3V3!AGM)m{iP>)HUV)n5zQ3YFS?v zZmCJ-KmHkUU05Ud4b+{^r5}H-^#Ajezcv9e#^P?PQknAa0o5zQ85m@yJ@yru9~Y+~ za1xY)f-irnyo!hzvIj_yU9C2oo4B}%hTfMNAiBIu$f6z%y7=TkrEtTB?T_vC=S{(k z3jgnuN8bie%xrT|gy(YIGphmkr*?)a>j?%R1Cszs+)?M7GI69FMn0ix05}o9ztY<s zO)a^2JmXy@T}=lpyf|?3b`gRazgqc^z8`;nxif1#vrXqN`+sHw)Tm{BkTr;!&4+$X zPCf*vfU|=fPCRJama|`~Jut*zD59mM9T2h#(FI6}M9?Ap2r&3F14V*FP{Qa2v=L^5 z`Kq^wh!U1-wE!#u?v9bh?;ulYGX*M&R&ows5wMN|wY)AMZrSglkVTZn>n)ds6S45; zyZvi__}<4e3Te1+{M&IxxS1d`A`7G+a{#!9%l*h|>JT*UbpU9_U04Cgy)53@a=aZo zw9~fMpBt9I?{QLkN3U8Xun?qJJG<gpb03!&7(}h$fCDp)R;AA6#c9L!xhMt(hTQP0 zhU+Wc;@UM9ai$*#%n8UXJBn6He$%OaSpYy9GFCNa=obB{`S}C(d>bK)wJeDsT<Y_9 zOxTr^axX7M<Nb)Gv~(x|&y24HSKg!H-?gcKw&kxcykx*Tm6^`rl!&k>9=<mi5{!B3 zW+HD3E`rc^#2WN$s%}G}$^~OU0XYY>nZ5=<qPv)?&jEf1k>~!^@btJ~sOb_c&6qMm zvxy7n$XZu}J+(LMkGpmTI!%W@mIFMA{obM+VIiCgY!gippcusOc95Td&|G@SZ_)zo zOyw;pwiwR5tLxN}@If%g?U2QubMCFxXmxAFjKuTd`~+=9JyqfE$3^j*6V4CcCnzdD z9q@dtPK^79;r#18^=7bRW{VY#^81bPxz(YH%!957_V^;`u#W`*ob{HM57Px)cCwVT zK<2rpGgLfHVw%O}iFn;xVC7FJeZj(YfMQkpotC_hi2$IJ0G|IL0@1^I>wHJM-AN17 z;SOES4S1h4XNH6@;X84tgS3stc;z!{z+d`Wx7LwoI%)meao3o_Q|bi`pvL<E(S;TY z6pZgDGANRn)p1e&X%BwCzer->)I_qo#ScMjwvJ~Yd`SDj2Ctx!a3{R0qt2pP!~`8% z>4Ym`lX6K>dLF2*0-atWUtXd;ZBRLu+t=j=r87XOv$Sf5fP{7!BZGPqK^=o)%3>KK z0xmQNG=W_>HAZ@0f+JY0(FQapSdEr8K_6@mZ1NM5)lLLphYu~lt>(^=XLyw+>dZgi zw^A7ixP51KT(3wAk6EKICp?p5?9<(kkKsbOtv}d9EKso+aKn-kOtpi49ZUaVH^3oP zC?=Rqfs3%ji#L#<k4gcqOW%Y`fQCk5MEKGbFbpgq@EuW@8-`!pKGgw*FMHrq@Oxj? zP1<+gMJPYJ3dBu-{dwWzgFW#~ILAusN7}lZiB|uH71bN8Fal;e`cUF~Ci=HQ229<F zr?>LIn9ar&5b^Jw0)4$-LB%${j|IdEB*eMg4xR#$-;kiy{o(!me5M+3d&gry46q0Y zaS{Nlq%;DmW<a`SfH%E1=Y)7osbK&bX7N1@FQiW^Dm*+6K+W>TlaWzx38x-yO|im0 z*eL*z*&|^b)V1Lcxtrn_emjAQ=g!hVg4ukluC+~f{WbAW!9X7am1fT5)bWv7hQ_n! z_v0nVd8}d_*Ll0Me4X<iz5e`PjqxOS3VX)p<KMewmBDVxaYPOzWX*tJGFb+0?04wq zC(!;=;t2Ft#}tTyJMfi-sCg&t{9gibbW80mu&H+LBA*l~r}8KYqL!@!<*OLL7jkz< ziRW2=%c8#yGolicunBNWDX4|&th}fX6Ykj9j|{~Y3_MBQ&ieIMZcKQq?5pyBy~@pH zOF*Cl{?DgF2a!)mV7L60Pw=5rseSnjq5s2;eiIGK9s~{o!{HJ`_B`dx1TfWw&aHjf z4}_IO3<0SK;#4sA*W<SRa;Pb0Kc6KFSHTc_Dv`mTCvFF_o0T^yg+>o+wgCxE=!okc z-L$=l=w5GNaByn0vw02>9sJJ1W&Y(ww%encN2vT1PEz*z@$zmjw`o9ryDP3%`@cFr zV#^38-1Uw&K4OzXu#o~rpM$fle0RAkUOtfdGoEX~BxC7jJy01ME4Byk?QAdvsIxM- z)aU}-RW2~)#XSJh=lEfQFyxUowZhn0*&Tzr{Q9(sYNcQ28B7aeFVbLaw7d8e5%^XI z`{T55+AAPdadsOV_NV8hX4n5^!Qrw{u_XIYwdrAh2zoH$#_(B!oYKf`gg<(_wdNOu zi*6PLafwDbBjW$E@qHk5_@&Kp=eHhc#dNWK8EF;<clA{Os4uN?N2#;Ybtlq}n|wTo zMcm;9t9G#&Ue@q?d;RezObSxO<hVO8{i1%u34tkxy_r)1L#BWfahNB<@^-%X&>L`s zs^b{x{i?W8A>3nhCFIY4o;ZJ9b2j+~LlU(DK+@5<8<QXX^4mw6KOlyt)X1!$t;*uO zHR(qjPNR`!h(tjJ(g32jfTtW~5#jk?48AWMZiLDdqE>o4n06_9MpO3Z98|9Q#2E&g zg@GY*Nx+?p-{&Z`zTSIT!qcDikU4RMK#Ijp)jWVH>NmQD8diZ!m|4`7f))DdHMrMo zPl0F#_fhh{EE=2yI$QM_dp-EolCj};ki}f_H~vXMixJ&O2=npza`{8f_2|7TmqUy2 znkQ(cEzZ)R{JlKUoe)2zta4>T?MS6JT{Skx4qzc+E|4@og5lk<s)-G*9hsiL;<dkg zQy=eJjh6yK`F14$eJk2a?XHN-FAZO|s=Hct#+>3GBCh=H^xN_KX5r_jaTb1nFV)vk z;8!8G?=66HHD0}H=G(jyBfHoB=ed6+bE9Esx4dED^27B8Xch6Xh1q#Ujq;1l{3QKd z1E7P&A;)_@Z=PNpzfRkDorntJK_h%S;@sI~Tf@;{$53@&Pi(uF|K1!|;x`%w(%G+n za=Rn;s3m0M7<v}yc(r`|3D7qp#>9#kCt%OYdV>U`Y{b+!iNbi2*yP4(H%SM(g9z0K z-<1N*!YTj{JNYCV!=hD;78(1m$!|==7@b*lTJ82UpFwyki8tycL5G8TX9glF6WhUq z3iz_jz3s>w80p;LcBe~urQyFFx)LJSh~j%I5KDI3a;-CqO;Mw<Qkv<J_N{+))BFl| z@n&=Ezn58b)4`Y^O!nwq$%}m8F31sLKQPoYm2~gMCRpKC?04*fN6|y_?YL*LlsZP9 zV{}z#uN*9M@U9Ly0a4HV*U85fc7rkQUKri_zs%zdU353^=Xl32ek%mOqGBPuq)$(( zLe+Rg)AP6{|EwT_>D5+*D{rx87IUsTDthVf2Pb4h>{IRbPWP8%ScUWWGV{X{ULX&X z53t=cz>fl6HNs)IgDie5O8)iCd^q>38zLJpdyd3g2x6A)Nqeb3mQ1cuiEbj-JCerp z%hi1Hg!yTHQ~&xn+N$6W)mqu63$F7`-}1$;!MR@X{gJ|YJvPXo#qLhGj4(}X@J!;| zJ4uC#C{o*Lc6kvu*_1)1#5p&=Q!$U=zakcoD8$UwJ7bO_I(-dkjcoNc`$x{&5qsg^ zpB#l7(+pIiUhnJn?MC9T&Sni3I|5hK;<;M;2L+W)183CBBv5n2>V+QFo5kE8iX995 zag=ynr+>Abu|A;T*zjF(2_!4!5BFLJ9Mjy5UC1LS?NjSOo%p<%!Znj!dFy`F`ITsG z=XsQqLwx(`9aTOl;WC!EuH^mIwVQu;-@)-QAo@6k3TEwvh((X~@#Kn~SHF>=hXcAW z|5;P`Q>flZb&B3hPD&adA?pXgX|NDuvH0WFK!3TCG{5_mAEI8lNv_#fYPmnM*=LTZ zJeu|S*;7-CYubq3;k4*wEqNp@nIjYUS_hqHuvq=!TLsFA!_Sc&(!q~qa{Hxo3wCX4 zqU}^Aa5LjB+u!QdQS)#YY0AugEn~bR;gtM%sw+1qA1?;<da`|DiHi<hK5-O`>OgO} zpjQN}5e3~&KX-pV2D0ns6IToU<xbLoPdqVzQh+(Q$Hge4%?+?axLQt{5EdlZ3g$2E z<mK-cNqEAdcsBT1+OthwQZ@H-m*|U+QE*(^JZ>mY<6JPbXoDIsYa7tk-7hrIEKK3d z;JeLA?nK48F`xV3+^xTBM<$gI9bGXqGI`&pvaXCx9iDmfXTM$-0V|#Ln&#{Ipk7dl z{p4CPkoEl8RB)O9Zfn@|7ZaQ3+G>dW?8@y;Dt^+tb5H6NE#nil?p011$Mk>S=rt#( z4<tXrgwSpH!(Prw_!W(M$(r=GT2A~_=B7=06ImDJeb+%atwjr4vYj5T(M=TFwoJxn zkpw!gBya*5GiaT?S|gxiId1&S1h19PE537lG(|d(?6K@9Ncz}??b-I}piMdK+bC97 zf6ux8P?H+Y2*ui%5uY#nO=QO6!~I=iGeDW~^-X9b>dHN~X9~p+tN%8k{D?plr`clQ z-*3`CUnk4oXdVoXntmIfz=MBgcyqHL_P~GoQe&jdG!c&%eqTD{73fx03p&1+Arq*7 z`xP(EfUXQI2^1ussg;!19nLDUXi*Q6L9j_$e5S7{88Kw&PG^2h<hXvoEM6$v+pF4N zj2aSLiV#oF)lC)XJemTHZmt(cmG+<TaGX-=2RS``v9IjPZ+>3aDR>599VH%k+&zKo z9Ai(9Nv=w7fJxNxexjEgX=&`b=hn;C0WI{%G`f<b?JRTZw!8OeG<x5!cUvAi51PIV zKHZ<%aO7I6T6#oB*AUjTI_ki}@<t&IPbcHVEG6{C5y?t<4c^PyTu4**I4Qos<-$xt zXV~#{Rw@Ti8p^@kE7gHT1c^Z?4m%v`1{-)%Jo)TsiZwS}7V1vDdQxwz5DiYx#Z==j zvFX`|GJ~#rv8!x&a<~uA268p5T?f+cX_?bryt(X=fqEQyd;fH6ZVf}mE0H<9#d2_2 z^Q_^U%eoh{HXU678Xkw&;rS_-`ym^lpy8Ht_G-JUZ%D#RjQkrzD~B&q$kz}x;eeMK zMw&sMSHb%qig^n)HS0Z#oy*hIVcBP?mTw;>zuoJMo%%!}H2cFA`rf(j3b1YLLHuVc zo-T;gwCbtRQvTeirF`*2d7rlnR0$u3@Kf;-1=Xq&Z=~TBWl#zaKud!Ugs=ayYGO+G zAUlvIf?}2VzqZ38P0Y{rwGa;vkD8%HZ^q%S>PPqAyXNZQjcLJ&2qx3bs@w^)t25!F z4{X#*O_I+?=AfRUwo^7^CPHyuNgoZq#O{%?XI`bJ(hH(B2e>^T-KHmz$_B;6#I`o~ zj!-p+k*x$$nWwKnOJqYOW%Os8r;E4pX01OyZ#O2SsJsnz9>PXK_v`EnxwqzPhFU5` z`b|RtbFnwuQ%c+A9Km+r#^Or0uAwR3H203i<*3fh8=X*d_VSZ(!KFB8A`X7S&Bkpq zJiA-*b;n;8{mlZ;0>)C$R&7~XsM^l`v+2^WB-9ycLbn;+qh!{McWyTGYgN+s#ad?I zL8`WJ9}ho8r_?aItU9e?xc_ZvFeTmCO|Js)8|)n}vdKvS$*-RB^~Q^OB}M(Ebk@Ey z3;h+Mi9V4tb8G-0Rgxy3!}7yTY7Tpzy(-$~TkrqEyXp*!Tse22m@U8YRV@p-I0lU= zK#%Cp4^q8%>bgVwyvf}*mw#rfa?_}K<K7`V$7TdTX`J6cDyZt@M~j@eNpAU*x0re5 zlaGULQ-C#vNPcXnTAs;wW@QQ#N`2jt%HZ`|j$apW{B*DCTyrciSMH7Zdi<TD921-E zr)3-aL6X`bf?Pe;j6EDrW<&4-Wvdr$<fx_8`br4%NLUa$It%;G;jN{7w7@1P(9DB4 zNE(BopnH<FHeh=+I$B<t#X_3A=(m#tKY<o;H={wA0|xz%I{|?SA#w|<B@Er*<as2> zZcki?=iQR%q86Iy{HgUZH*T;{tAEMWB+7mHV{*CGy7=jWC`yjit^~uP0V-*O-N&iB zAHr33_x%+2zMqJqHa}FuSHeXT|JiixB~OI&of6XY^U9f_M&f8}b4%WZ<jdZa(CLHY z;k_tI>%s2l@9~Bnk+ZIe%L=o4Oq~xyXfs+mZLjMeqY@pE&dn8x=bZl>F=xRPPirRm zLVAY7`c$YpCAl<U=9?a?H$z~Sq>FHf*v`xHl^f=Bgu`tClm4aX)VOF-oP)cai-c^x zOWAVW>d{|q-2%S)r-v!4l<=lK4v>{%l2Wepn4sQ7?`o9nsf==XV*L*9wZT2gM^4{S zGR%GwHxtsRQ=dhyBfUXQKN@XU(+JVsnf7N{{#2ya6e61l`7yjKKvrdxUAMa+K?qB4 zH@WRMrQ&d#dcy#)ws7mw35~*DZ#O)-_&B`L?*zK9y*{s$G*@$OqmW0x+*EK`vRN7( zA6&SJ60(jzvLJsv#pJ9vqcYKlavJ>Cd+gx@vh7rS7|BzCk;|)jRaC1iA>>oX5xbPO zJ_G&B3&Im!l2baJEv>0bK+RgAn_A>?TM)UAynD$=TY(@bE5E+|cQ%oVAv!)o3Dy9D zww+Fk5yaMj`(P;O)_<i}8Y+3DQ}13M<@POy$80go@Agg6Tx3EiDwm1I_2sM7lxJ6O z+iff@h4RR-Bru0LkRdnu^U`WUUz+w)Eee#M=A=zbjo>Ep7=MmvkK!h;?WsSmEJ_)~ zb?KuBQ}`z6IO`IJslF7!m^7egdY^j72o_Q|hU+j)YFzR*NIu}fK)bSfG;?=lcZ0Xq z>~6GMynOfZ^+R$?U8FM$Nhpop%-5=l^3OTZc%QhQt0{_p;0vtrXTNs+EPt@8$=H(n zLB^`3riGtX=To@IkLtt57s;hhKV~=w#CsGzcCQ(5>BXivT{qVdwsXLm@*azPX_fy( zXufDpCt#Cz1z*CD|3UsktC_lO5+b)Alhv2SU)_I|t$=A=q(cfik@ppuKlR$TvQ=D5 zmf*~s2wY5pKDhCCU#KQlbammw$BZ`2DzC|EIB9-^j%<CM8*LaTUuMGo$ZqM(Z)@B1 zzzDG4YV-WOt6K?eK3<Az@(=yn>(-WQoZ4@xbR1sPEFT^TD3Ih2sBqu8oEe&E*>YfG zPr0s&&cs;0G8|=!by)pAC)yoO_@<VMrqwaxz1(Q$Q_rYqzhVDQeRcaIX)O0slqj|& zLdGA40Wlw!t&2vZJhV$EWvnD38C_<y`Y<yLl)~=gx-|FiHQbjto!VcPa-Cb}FP{;j z!&;v%w&5!49V_{4W0i9bzbR~{m3P2lHC^{=pA<HDCmVJBIOT|;+Mw5yQ+GmPHR>~Z z++EA{mUDN3`>G7kGV~}q7d6-N>iu2&X_psGX(Km==W<_Gtxizjzs3#X@Ys26Uv(wZ z5kQ?byIFEYCtpQj$NqME{~brBskBT*m`W@R&oWN_n=a99cM)yR;qHiI{m#<A+Od72 z5GA2Rd|&eX^UwE*h2#RYnqkj}w**XXX%fY9wb4^xXvh;X=PTz0q&QB7h{FmkGtipL zMxz*Wiki|Xc^{`9QN&grvaUt|#LQ*{au@a3bF~E#oW%X?<z+m!BbQnX%?>&V>!-J# z&7(02vB(T3oAxQ`4>ZIs2NBrp_I$$^T~Tb7r#rqFtPZ4|v#8^**Lx-LDA($RFwR20 z#+#g1FFXu1gDEvf>}^d0$z5_@j2PN96Kj1{R89}g&53*wJ7dun&VhRLDtm1yO#T@y z#CT(<XFwYkc!%7*u8RKb2JhJ|25RQBFYTpYd%Q)y-lWDeQM9s~9Hm`EHj!G;8%>oM z)b13L*61y598jwkkK&!f&b}FYxE!=?>R?K0erqP<KHC{RX0YsshxGBN67YGCbS_gp zi#192;U8=gPy$vxu_LO8e#ZH<b8G&;i!C=GKxvy9B+g?&M(GI|%!Mt2N)&;DW&u+2 z9LIQx888v&t+e{yc!Kd(9x^H_TLvb3IU8JjviuS;-xkPN<;81yc{7lQvImUQa-FYV z#TqzeRxKeCe<S+N>63tcub2jrX#?!u-QX{I6M*mz`!F1ERwuo`sR{UXUyuTb=wjzr z-5+K~C%==p@Bs|1IkbinQSUPzZ0zIyDhJ_8d{Ze5l8XSe$-&8s$|DLMB`ntye^-Cy zj1A*}pi2fJqclw7lg)^kuAR!&!ME?e-&G*(Q^v^@x_dV~ukWzeWAn|sI9^8^Rrz|# zVR<r=lG~$7v5%n*mIGXxi}e!Tu(oU6efSpX{%5jj*-~=`3IiGImaOk*?i39LQK>bU z0Y&n%Vm!=!Gqd@`4y2hvWBMz1VN(z^kz;qG+s{tss(4%K=1>HZU4vz@F{-D(MZwKx zKSdO-@zM0yUc4vQjKNhT5nGJhGfP78G4`4t$a8!8z3iBQ?ND8PgZl<j2>|{arn%nv zX-+FtDkEb5F^CX?Zix|8^O^bq*)jviwQmPEN$>#ttSL10G=x2)Mt=o#4D>%s>TUAC zTYgl}m0{Q+8OTpMx@VoZY?sz<_X}DEY`aIy4GZ+TwD_`X=iu6WQ(hCnuNhY_gC<9d zYNv}fL~gy=4S6vD8F8Fsx?JB{|CDy=Z<cv^wI4RE_vO-#*s~B-S-0sPMi9B2(A@w? zCT}WTLUq~Kp10gBa`opC7;8=3U6bE{W-B*c=Y?aZCaLfu&zDun$h6nX%V=d8E5&1X zl_#f_=D*<^yV&QM?x*Z|%&Z^0qMfYMI=*Q5rY4~5DWG2$ad^fsG)Vs?u%^##utlq_ z2TyOB+D=>W7TyPCVd~`dtm3=5D?^9sViFf-ma;gZc?ET(HbxC+7VP^3Be@g=A*+|) zR_<v)E=-;(e`$Jvth<gHn3sa)&8Lm;OM~%Kbi1zY@P3Ll<M8Bx@bS_e*IH-ysr&7A zzN06R7~UbZaOgPWs2$4K%FM!jYUZ}%q0))iR<Z|NLn{qwA9#Z*z5ae#8gBt|+jJlu z^rOBfZV4od=mi9HGQ7^7CGt6f`cm>ei%3w-5D&t+&9c;`pCXnD(ClJ%pk9~>6t(nq zDy<4G`J6VAE<h^U{^I0C0V1DF!qKQP14?#xz}YZx35%LUWmiV=RjITZ<EjA^nK_`E zk`el|5-@rHs@GXhR2p>K{mmg^Mu-IEf=SMP7_9VKGQ$n7t>T}!c=Banak(>-H|ixv z!zs1b?6E*yc>lcPqkJ)uOW}$AwX@>F7}{sM?>yID41KSNnv@}wC+s6$3lfVp_{w?r z^`7{gZx64xPL4*7d67%L(_#QUf{$+P>!(WVZ>--q`J>=TW`oi4nCzDL*OPA>(yu2y z#3-w4a%H%EO9S{{^S0mRG2S6_HNJb6>QTUtvybNjB`GP}=fSkMji3aQg(S)qY#*MF zz01jRO&UoxHkb={<s;sQ!hDN(Q}gz`lRVUg73%Nmp?oQ}&f34@5=8iIz#iKO2V&sx zrKfE8C^=aFn#<GYLGl1h2WAZ4y>Z_FM)IQQP+J$D?8$i4fF-5_Nz%0)Z}^gE(9-pk z!xzke_=k)MVn4f9S)HDWupgVAWc=+^#Wd2lekFEK^!L>HxE~^)g~_c<Z_WAYL6kIo zZA-Q;jB`gFcXDyJxo1Uk%A}{K9mz8VU3s!GdxgvazmkqwoGH?u54AVDzb%)NSI#-f z9+nR;2dEYmWN~yqV!e?Uk{5joRe+n#mQ^Tzu*F5YhxfdwNtg<aoyCPpyvUFKYDnYK zKdGmh`K}IA!?ed++Y#<UhUvEFfp>Igx*6WQBg~r(HJEUD)Ret0it8AIK7H9U1he_} zgSfhT0j*BHTZha3;?|c=XF~g;S(gyC>Zayc5#ez_2>)Pm^zL-Ep}dLg?5C;8AH$rK zDzX{lQ*jfuqI$M2)c5Bev@+A)n14bXM6SguHs^VZsE918!h@{d*kV*pSlOkp*uQg% z+tfTioMKYLyM+Q%^e(G2#p{W0QQ_pNn!J~VtN<wXu6-XD10v`P3heJ0Awo<XHJ;1g zNYev?h-E-`17UBDT&x*jIu&3xKs5OMD8*k!bnZ<8X$CGp1N|x_BpRp^cA7>BGZ=d8 z23mmvBB1i8_dGv}C%UWiRR6_`7kgtCnVq0>D@QhlrvHO3?<!z6D9uER6vc;*VxXUU zr@O~Py;nNPG1^@P&?a{6iQVert2S$@K3a~jUEZ1fIDg>QY>}mq%$0b!+USe22bvkX z0L3aZEN7>t=y6E~0gJlqJB4H#jY9Pp&_&t}qzu?W$==!1i-X5w7$HBPUGGs7s#K{w zoj}}^Ll${@G-10m^w{u=Rnbv30<Ilc0!qyCO@6PAS)8c;#$N!Ax*d)secCpxx5=|r zN0hNu82Fb_9vs@KZ76Ssc{YWgP-<O_No_Ob#RzDUZWCM#OVi;Cnbr0$hLpFDnNFux zOYKbX0w%93oCl*dDNizPG>FIGKW%@5Uz|@Bm5eSjH}z;pil=G&pobxf(2L#Mtj@ch zxmr_+&h>1xc2}3EVP*<7UOBHQPDPEKQYetg{44f5$D)Qi(==f`8v{S-WwB<%UHoL} zox(?P{C|{9e-lr;7o$@*wgb2;_Y5a;a*`86?%}?gH#Ybt-w1nwYK%*s${*gKxWzD$ z@nCrQxc;!%?I=upS$qofNk&%I9Qk`spQ;~U7~+f~_UIMp;vTIDLy(}GuJ^uqPjWY> zjgT!Zu>kI;bGrbUS7i&6&!%-zdIb%rECMR+Z&?)M*Offq6QUM^3-!WzME1nv=#tKb zENw}AVXAsCB*t$pZBrJMDwX{0I4S%zQ2UVQ{^;Rlkvl%6>=s3MAr>xL$4SX3Iu^^B zv%Zd80(}cuBZI=WDV8HH<8wmB6uZkAgGUoG>j>!my_uI{txX;>T9Wt47bX4Ye9e#d zK1RS^@e`02JiyxfRU}6E`y2q1W1!UddHKoy7EXlYcH%wF?m9>J*YPdhKXJbtf5v<~ zinO~>aIKW+1Q3m;86HhN3^p}Ow|W2O0$|cjNoC0s3nbTdp`Ds2dnII1m$F7a;^DG4 zs^SfMIO`S3Xgu2-NzNX^TuR)KYzj$}tc?_fl@(puo;_bUs(&aPk)~`tcIk9lT0`32 zGdzz=`AE4iXsAo}x#_2N9%Z*j>nnk&>UI)oHbNi#8FQ_gAH}uC>IoZAzMmgtFPYBX zgkNMaR=GnJNoa3g`jrws@sjls$9KSghRU*W-5kEV|LpxB3g+9#@&i<pNyO}FKR<jL zh5ELKGbR$|+hvF5#ng>`%)EX>X)!RfQ6eg0R}4ER<*nlg5EAoNVayo!;{Z5eazz_l z8DwK)V*!lm5<^jJ%cIkk%=fd9sGC}2<>rp%6n;Z3uke=u=s|wD&llqW2(+l8=Hb!G zbkIf#y^USY$HiY0z1Z=W&vFB7B=kHynv7q|q)s>nadC0TFkEPF?Bb8m3q`{R8)c#> zKTJ#S2%Q~{7@7mL48!CHj8mPe;z@^IQ0}S#C1>A8fJ=EcWmu%e={oC+KB$YqpL%t& zfa}YMUu+G{MbJdlQd5do_>v6eDN|veqT@0RqBda+=g8sv+Mys}Ia1eA3S}H^jAd`m z?W+MGjCGak{<2?X`tT>q$DW^Ec1>2EjFp)N2O&vi0w$R^=SSN!B?}T$&`*hgrT3CT zJj5Qe?&<Z~`;uXvfxTqEq#*m9;S?Zo1F$Fb+J+nCcD_szz1P49Z9e(ioq$h38}GGV zR$YLM6y-#4hkqh>o=@ORpbI}XZn*$9g2e06rJ4|#)IiCha&9sb-Ap(cdv*Jnp-wyI z?$-fZhY*e}D;P5>`>6b~uZB>_x(#eOZJ%K4oVvUQ%bK~YZ5QS!G=vd(lD<ulyHmQp zQH5T^%ZkOj6>q%ED{9Z(^J+5Ps^Oe(Q%NW%G?7~fZi(%&YflE@%bWXh&a=_(-|@ZF zdlW6^7Q5w^ryu%|N0lqnF&7_^@lCwl)+shJ@gHA=v_>a2ww6x+K2hyM0p8-~>-GWm z@2PE3l%F;9f2h5;33Js!b^7sQz?5<^23RGP$A^3LSeC+e7F5<5kpe~;b>+*O%Y^6N z_iRoh(OoyFI}>0%RyUta!f0&OcJJ5jes#y7h8UyAW(1AL9+=_O)fEvFA1yqitXQJR z9&pDnFA^6kH&Bv2c^+GDBATJ;FrJW;$~z$<R0k(0=2j-B)@y!$DNr4{FgaWB36Oud z-wQe0c}bBG(2oCT7*08F-h&x<B#bcLG*wehsR-^O)yDT2_*a@)wO3~?rFlt3?GPR* zMup+8D44^aoo#(BP;bUgeYEJ+#JiCxt+4eqn+3q$j!h*z0Uytrwt07n&Zki1`2IO6 zTS&ATh6!!}t;>dZsQ>_afQ~lthW!|J%#m>b2~gLP7_B9@t?OG<l#Slmu`4ias9)C5 z0o*0S{(36Vc;}UL=faU05Sk5kcVeo;0y12eNySeQ{3Bw4dh&ovUmaIMuNT1SK5f}f z)qbiB<8a}f@%U(PUj1%!1qGP{Qdps5W|o7g2g^hBg&Sy+uvaeJLnS)#prOkoEKPGX zy}9)^(V-#lP~0D_Kr6h=WuMER<QOp3bbJ~yct3|KJoMH2pAtj8@(tWA0jl~>!cN4Q z8%G;D5*@Aw3(Sdu6(1d_#)fb!|4vfUMI%VC`Wvwg1h&wS+Q=r$shOH!4WwJ+3kG%a z4m@LAPNe20+Fv=0*Y69-4XuC5%vs?+G~fB~f%}RhL&@#x{aCSyBWt22ubl-Y^XGvv zs?R;180?H8kL*%|&xLQ={8ZY%uetGH^2wsLpR8J?l(BG*W}uWZ?Po*Y6w&Fnr^kYc z!Afad%Ehz<{Tf`YEyh>Ru4G1RgvL;CSuJDaI@M!i@qJSTAS~76Uk`5^s6aVqgGMzM zbYxoT(y>N}`cxo%IDX?&_*X`+U!`03i10s|L6ptmYh}j#M#vO^D8wblh|A+}ZD@`3 zQMKLtF<QV4OCAFFbZ|g`Y`TEsOPbr;VSwLdCKjk1sfi;^7`Uy{k9c_m^H`4)q&}mI zra@X1)v0(IgQ;FkNgdj33PszdT#WRya|66uzD#D=lu9st>N<e$SK_suuG5w#B6sT# zEj>yC(n%V^8E~tndze9%<kWYlMW_iF#(iZ0Q{Q$`$NGW69)ZXY%7tg7R8%FIpQ*er zRKH}y*G$L_NU)@80l?^x@*LPGw)e=JxmAiDLDV8qr1xY{E4x{^$vM1Sq?<olo$So5 z+I&?@|ED6{Br|(yc-3Ee4ed=(TkgbS$~&8%W^3O4i--xtm>01iImy0){T8Eni;!JU zEa<?7eQJC#Moz|K&kSZ$L>)Jkiu>}2NokBLBf$`No!&xG&tlRpgM;l@HX4K2y#*G@ zE8lY4YrToB&7JvS7b!byOQcNN#=$so??Ify3jV<|QM=8(45MeaSzo);R2YcHvcIqI zED4Nu)(L)LT2=PeQBvTlC5dDRkRi)wKQ~u=J21|`<6`rQTd2fZPs8Bcs~+@kGPn3u zJs0FIDfo;-9>u)FVlMP0B~_~jZ&|MJfUK=-VllVS`c?@|3^RnQWkN<`1cZO-)XS@z zDBZC>qIivq9~mWW3V`fbp))GOdJGkM&5N`I-fem$vI${VBO}28_R)4K?>oRn9dW#( z_N}<}bhs#4AzeVjX={?1^>J|=V8Z$NX2<CasHf$C1Bs077WIwZ4B_=cqV1^?xs3-& zLbgvFr02$iWU&C9S}KsRHE^hy(~<cCGx$&wyz_BlZVGjq1#0!I>=ymQd{{8d2l^Nq zB~=l;2@3*%uma;NSUqfFauaB_krfVjx<B9k?7Yp!-T?G<U%RqSyi+9ai3<D?vcr`9 z50*S9>V`eZ|1Kl~9khtqB5ppMG@FdVY9SOfORZ6-f)u4ei?ds9jqYf8H<sX&d3tE^ zXiI_X?kMK&pnYm>yqQtrGMOe@lY*5euX}n>m;3HIKMM^ZYn)+hSOT-AY`9kfHLKy< z5C)6Zrh$a*=pi{}vRw0`ZDqZ}SHdwymHL-mEYooH*&R--dxOO8KlTm3Y4+yA7UmoQ zVY2-ScEtTfN_&UgCp#xBCe66baF)ZThRSaG6JkNQ8+5o%mdWFDl*iZm-rgj}8x@hb zG=xH9cG!GhYJ?~|B7pH?LvD|v8mSZ7(QFF1&(MAEIkY_p12jbDz2}9l`J!v+>77ac z3_tR1KV?S>k%q<x|8RpITYTN6zDd>cK1103A@DdHse~dPaRszXerF-4*#;U9DPb(R zrn5DWUM82v;#TF<7mozc&dKgSg|Cm4Jl-xI>@pFxf8I1Z6nLSvgXSL`OBe$HcKP$8 zpr4Zs|1I2zx{kVK@qkQZrlXe|s4NlS268}SHZD%(aSwA`Za5=gg8%0O7<on7Qkt2) zEG{y+EP8Cj4f16d6hDCuld;m3{BL?SYHt_VgfGKcGDwBhbOwvFYLc8%DHLEfYnp8I z=L#MCBz3m%ckrCsH&3Gw1gypF$#%ZVUR;VPsS9C*-%2uc-?ZWX)G{;SdPL{Ad2!*~ zU#dgO9L*cGDxY?gEi3Ew`1X!ec@WGwpBzIfJt(I*%Im)L8tHbPelV>WB08A@&02bA z=MBPgWRKZd<GTpr7v6c31Y@(GY!(3#;(%2_!qg5ln$+9b_g)pe@5>=9T?5>&1=jW| zLx59z{(HOSo>ss*%01n7gV>vdN9X<4<&!QBZzv!IZEdkwbH_0Jb3G5g-IhXnUY-wZ z>AHh)oDRIzk?1Rk-kf8iUUUXM3DvKc0dj1Zl8*)rO6ZT!`OALbd|&m=nbg(!#b5r2 z&IiNQMHT1@C^*c<vFQs)_r?;i-V+4OJ{qo|rI!1F5@16@ou=$SfxPgQK`y}a;Rx_h z{SI@3`OJ<5pi9A*;Tx3A3h&GmQ|`wA_KU83)ok^je!=*VH-JISUHIl(T%q7-Z%hMS zSXEKd;vxJaitBs$4vpE2B(5;s7G>~OJB=Q-)H}fLry>n^2^w>Pnc$kX^7UN-nm+wt z$qi{fr2w)3l|;PvAVT%Qu4}C$tw)))2BcJcw$jyq=k*X}n}0s=4yc~FJwDxIPGkzP ziM;xoJ9q{nb?yQ@F)QZ=jIewgE{VrVTFkNg&(}h{Ue7?Slu~QB)D5m|G91)uhpFmw z<AtU_eh78#Fa(MR+Yu4D?>eJCxh#l~o{e39bfz?VM5s;9M$d?c5ekW6%1>&&vmCB{ zGk>Gl(!g2&qou*fMnkQoj>C5(6cY#@3ImLuku%x>2lMK1*kxQWaVr`8hcPwdnvt<p zQw21mfY6C!y@L{V2a_m0n-zq|s=ra#dn|^Ug2;Vvmel8g^t<zNbz%Zl1)%pPP(fUR zHcp27ETQnOUbmMJ(>rTXs-s<T<EVM6WPXQt<f2|4J0wkNfiuzaalXV4fxynKX*%GV z;haC7d*e6T=UbjycZZI|xDUkX#87r2NvLT;$uWaZmZ-M0&krX6TV@_^AH#jVx7cai zdk-sc<gIiV%n!GjMMG8&`iM3K+8S&ZZi#`^QLh{=KAgGx)Gy61rz!iD#RnjB<XZt; ze1rVQ<!$ry&^KSFRYBYQ6L`#>+ndh-Mc(}BET1td;O!t-Gs-YY@B#>Wo3+7$InoN1 zfV9s*(@FB_S0J}d*Zgdp`$+NjU9&g0yO(*Zb7*;<a4vI1?i6fr8nuL|+MJBg>d&aT z=M4mW>OWZLZM>^ho&Rm5B>oK!6p0!R*}I7}E&2`1wTjDd3FP-)=j|26KaYgLkZWXS z{Zo}O9X#4#Hyf-dwZ|Mf^{NDkPnA>dw_>0Eyw_vsfK<FkfQ%X{_M$RNOkCxoLsVmV zyy)j{kNoE9ZwCh2OED{GQ7<2C8xZ(yUt~MWnQ>p`)d0C`Y^945DhV;D88H&Wo{NH1 z;16>dr56<2*!#1y-W_*hU6{%MKhZ?N4mLAkZ)U3$fUAe)4v0#?^&zig6gRFbdUz&^ z;!!>CYP-op`&t=U`mVJP$oQqnI+#RW7>lxq6hOGvqr5Lncdp(lsmf`JhLorq7{Tm1 zk1}X3sHY#xKpu3L&gfK=-#Q~g2IKfO4*@>lng9Mv`70l2q19V$>3y=b<M!IKGGCh| z_V=tGg1Uvpxkugao9hyt+xemEUj<B<eLd74sqB%g7C(wgnU$n_`1getQILh*4mz~& zLA|w7U{|=foqDo^sjS4Otjb{8|Ng0e-8*ZI2JTn5Hl12DWYrap8mTOTb*`}+^S?ha zCf!(91;t2FY#J!4`0}Y-J7e$GKSTcGf`vrLH2H<Ymnzo(`e&6T7{}|vE)503|L?c% zBCl&sq`aU1dm8@r%l~b}L${DzRW!OM-aW)Z`Y(^fBm_a5>Cf9C`#=P~ufhfa%w{9@ z`Xyn3zor`Q4DIk|aUNx{_%FZvzf1AY7<}oVAz2TRLvb+v+s*#(FD&991)g-@uI$qO zbAi<{AOz#@9!{cZy!C@=S)@C%<kJz-LjJkWud9o>!eHVWlm{<A{A*W$AIWcqiYZ8U z7N|G8x5HQGrdDA=R+R{yIdBksGL!q{E#yCEPMr@d1Pg^dA=95Xun+UWQ`@zD$o;yj z-a!|Ci49^O<rAaQXX^!ur>au!fEqC+AM&3Q!zG?I3oUG_I_QK@<q{(QakC*zB-&iS zv%Bz?O3<by&hzp6wt{jAI0mwe*sgU8!6JcYnyp9zL+6qJ-Je4V5TmD7v4d#P&lQ>c zUYWn&2(du8&m&5c=O9jL6`@#2!&5ubr;dL_EddXPlAM|?sz;D<BQv-1Qc2Ni;Mn?< z|HsQ@E+q!hAoU$E|6`mIS%uU_5HOyG2iJTfQ)Am$yf4Ous@!@?G(OZ8M!`BTkR!+k z9fJ>l{#4o;8v_0?FJRy_AdQKSm549+b2VVdq_l897SoQGzJGorKLslGP+LpX%kZS} z+-9sR^ZgTZ4OZ%CS_l!F{#*tHU;hy3D;IR#zI)5~+Fm`a{KH$Q2Ov$|Y9%&&nU`iC zIstT4M+%of#&-+B+%^KzIL@Hgqr_3f%jW_Rn9PG5^CDn)TaM&kCQ<eo4r3g+{^K!8 z;VKoDR%pabe+`*{n!|ZZh}V8mi`Qn7uFB&Svx(-fb;x=MzrkrfcPXW$@k;mYL-kw8 zw%&*OE<`R28)|YIs%7y$jer-Hf^HDR2Wb@tAbdZsxsc@r4RJXu+2}wW%*h#01lEE! znd&L0iMucj&_Y(8de1`XezF&M@uHECg|ZQpR6t2r4(&1XUjtes2Rn0bGqO+^j9VRw zZ0K?NiTt36(WW&t-Ug_aZ4He~+Yh|!$&W7A2>EMvea)ar$kRgkuXFo2sa0g5ceLwS z=2W$0H#K#`V0=K!a}rS1ZUec#aFggeTBVI2^lG>^qoWWCrS8|4$5ViqY4N+zzQW^= zPZWXllwegi+h@KI)>q*2=8{GiC%ZP^k~nRO4VCj~zd1~M9_s^wt?k@cy=T8)&a4!8 z7R-BSQKldTG3MKlcS`A7;Qu+CZO5$l8t<Qyq;tDRlHdPn>U^LY93X8uRPf>XU$Yz- z;1i?nArCHOhtbRI&QpP_F?WF3Q2>tIw!_Vdk#w)KRdEcjG4n*!5@y+VA1cRL?s7mk zoqxUwt_ABHbl_sPTLTpEra(>McHP1A!TcCagNNW%62n6d?|eY%nls@%<LPhlcFts< zINTaA-);;WdV2~k0cKdjj`_P)lU(7OWWD%5eg-2ZGfM|-+(Mlh5e)+<6i`re7&kA% zOtPNz=tKrC*RB_TPH<crp_Qpgce6@_=jBU=E%*2ZZpA8piPMbNn&q(^Zm}*qePWXx zp_AhnaqDl3$b^lgwh@=0v=S)x25!_6mk}XRv(QjAu*Dy0vsiz=g|(;-v>2P~)d273 zx$p~&hWhI(cV{3w%<xDLP*d8h_UC%tRbef{2THtiAR3A0`*lvoMK%J4-;JFoQs4Pk zC`LdGvU6TJVS{yEx2y2N3+z1{gJ>6BVW8<p-2)hq*WsyvEqE0NsDRrkc>lF@XEcbV zJDx6BMl78vM62WKVBqEP@Pz*)*qkd*zNhF%=w=uGK1jqgB*ZXJ3t#f8Cw9p+%7%6o z2X~ctK%hgxdiI_4zC|<;qi1`7N>SjbaNO!+&n-Dl6Oh?BoSd+2*yNeClZ;WrFguWh z=0r6b2j5=a33$i=IAuRhxUQss^|Bp!r-)^I14vD89?f`PN7n&n$zmW2SPXc+JK07! zf7{&rC*W`@d~HL*Sp?E!j>mbTm&{A@HFX-M*_}WkeHtiFcU>;Ad&{Lv8D5_~2JiD; z>6|6FbnH9kZE=PJE2aq$>cez=FT5^x+hMpAmLO9FsF0V?a49JmKwb!o`uhoMN!@&D zCCJ)&CGBi{Ii9Xzdgz*ff^;Vv)U1|yMveTrR+^u52yT>q)yYs^H5)BZb4N&!SC4<P z3|8^%6v|KGwq2{gun$=OVH|73FIOLMLTjBF8@W4@OEvFbZs1na0Q4}k1Q%yL^&K*+ zr2aYw#k673H1&7#SINM$Vj>~c<!dF<=vtLYpKO6EpC}!o+eUz7Lp4G#{naOo)6!xO zkVpi}Btq6vtUj_{4K{EA-Y952oGQ}(=;y_dfvMjJq@GvbDQ9j$%lJVXY1QGdZm>n7 z1@7MSRO`xDhVQO_pDbA^G;rL)hqW(2r>iql-|6B*A~wCBh)UTAVB~~l@@n$~9zGmn z9MD*mu<^33J*iam;D@A5O9<X8%dwr;a;=snUlRD7fP!_vXcK~u-9KkuVBSS?d`SXf zk*{`wMIo$JKyLjc`Z;-x;C9^rLhHGPiEVp-(Le+c3u{|5YCf_OLg?9}V->h8r!g*9 zU|>nsMQ@<=`2*|o^$XC<-2!IEaeukz<D&MZ%~WA7qZhAzN&S%%yinw7(Sg@)_JPgu zl$)89k}C83%(2MUj-CEB@24@#1DQUm{#A>Eh=%LSZJXt9$$i~nmj++l99^#DQWdHb zgdU|UJ1N$-tB{x)%V%=GiOK*H#c#d=D$^PuJO52-Y0({|fVX_nDeXY5QxBRP6Dtw- zY?`*w!H?#RkY7xQY}_6^-%^cQ<)h4LBKLaHLS5ObYuZkE2#NbfY$CRL_Cu)~l3Z9{ zgCC$h>KEJuo8=`?+<p#%j!BdBFm&_`DulfKXP~+1|F*8h&+!p3KH+$cS_EZZrtUj` zBazUDBMzl}O@wO}F@fspe{0O(^{zbpaY#gJ*Mccvu5FUf2d%WP<iP+ZVXRev=lYfD z5eh0Z=ZEZ6@p1lo{s;OYuKKTM`K4u%8Rq+XXgjI43&Gh$AV}GRl`CpO-Xznzn~H%P zd*DLJq@7%?COYwwsJEb<(!EH_edo3K)#bJ~dX?4MgV6vp1HEYZiY5lex#kY4HRLvz zDX9rkx%sWyb+!>u&UJ1jd>l}VzkPym_47wSp=ce{R~w$%U$UVhZ5gr@$=BRpS_KL1 z0R-8VaSZw^62h~K>&uzz8mG<i8c@mQPpbv`@L|m37`S%*a*U{ZyP#han{EiekLFy4 zA04JYB~8AXHa`ELf37&;_P$uV7%=+VOjy@`b~_B^QTl$Ly`RdV!tkfaNN?4%GF;OB z{5#r<Q`}nL#P7s2gd>4AZ)`L3!iwm4E3=4P$~o$J<Wo7yF|7-+F6CsdR%=i$ctg_0 z(X|Eo0WAUdA_t~VNMM#pS|*3FAHX^t>($M)uWJooQ=gLfV@Q8JzxiIWgN1<m^@XI5 zmxA|<d7^&#IN$U(;26c7Q`f0rs<)-whi6cy-rGqvW%%~y1YYL=n5oy4_~szQ>BQPP zo{3aQZJg(3=lc3r<4X*|57-3yt^0}tKQHf!7hhXQJA6}+e?FO2?7q6Tp#MeS(_{f} z!y<!HcSMZ*yTeCkd$dNqlBW)jaE5Lp3BA*@E#;x$wb6Uk7E|O17_lOHZHI>tytq3l zCRgvAwH&vx3%$*0OI>#7vnJkBUNDp^0}0lLMG5KcKayAM`*Y-M0KpskE?GLkFGtq5 zFbc$6x3=&eo_Jrb8_wkh)8IBQfuj&B=O(6Toe$6=sGh|Lka*ogzT3~g7%eGL93^_? zlGGuACXM<UV(BE5`dwhXD9f$^;9mUtOMw<cQ*(Oay#Q?LlklH&DXBKKot~gjDBkBU zfA3IyHA%tc+41T?J0dX>zyQa7_>dqwTAgSd?sj+BY|tE-0`VFo-=kjdt9upJvyHyK zv;4qld~M07h?W43n8)aSqCos-cy*6YE;enwv5H3kDf@Fc&JJ1itREJI3v~q*au_xn z#wL0Jg1JAyfeN^hDr?}d;Z{(0n(=f#2D_FP=74B#bq7bNgzF^w-q&*$(kAIAE_UKi z;Vzso6TIAAyayC`-<Pn&Takqd!{@zQBKw>O1`m>%o|%q_L#UtVlU(h3@3bu>F_Uca zEh6zrsLQn0r7$rTLaOYOd|oFia_qj%zWy<?YWQMKyR3GM-(4mgl9ici7hc;pvqLip z%;|=@W<x5^RO4|?c`!}5<~y4yfw>t@Q^smaK^t=6+!<}LEKtjQBieFqM^tXWiq)11 zdUF_|EN2X!eO*teQB^+yn-XBTS`tj@_EYE7Y~e;P&YXn{JLmLXk@)!hm(K%Ag67%K zCDm3KJb=yAi6>AbY~_vvLCA15OoUi6=H7Qc+BAt*?c7IOW5Da4Qhjin@O$5NQW!^6 zvkDzPfJGHEI(k#B->cDlCjY=l-}cTyrUQ->R^o@3*Dlp=t_Q{2ow;OQ#nbOx-7aah zbuC?b3)-;P0z5!wsPqxE5Y5rDMzB|8G~)C{<mb!4DEWqG4Y_=d*VdC6Qxi4ssmOnN zrKL};h;BY)dIQTxgYIOQq<0H#0@-*&t-KUojq<hZ8`mJ|-t2~q66WxopRwSLTDhg8 z0x+Gg@v6Z=hmZH@M>>#ou*ofch2Tu!nR=<l3y1`Q`#8_g@YLxSiasJj1K%|tu)ztO zF_v%^F*8(|zNxO=WBvjp5B*!?nXgn!OF3DFwG^C^e}aIcX$z=7K*>wqR$EZz=Vf}0 z<0(Zs)VU=8q<La&b^1mYwB$SN*fnFOtgDPmHi~VCIo)<$jA_y_`;jG1EtQVPzWYuq zLlf;(RTP4X|FDS3744ZLP-f?6ScUPxZZYv<xJyG(x}#LkE5h9Hy0)9pscwcc%3?4; zjnK+kgFF4>ZAVO9BaVre#3{1!Bl4QwZi2E84(1dvjGS84#)naFiAzwryZgngq%lI7 zh$iLNo{&$N%te%w*hBXG?7~jrMo{BtBz+8Llm-u&&{p5ihL)leFR~>4@M`vYVHmP` zv$Dlq<Y$(@-vbQeVR#(8LM2CXje6Ft`)*Z$ZAjC{UJ=2KDJg?HXE26n7j9MbxTEOM zIMccNO#bEH99nsVv5Bvbf-M50RaB|ds4j!uF_2_B+W7c8Db<B&g%WFM^4~gk4R5>d z6PdBTPh0j6h8$l2wg#L9lto5Lu>;omgY2{?13Fuxy?lPi=RolV7b5J5(x1HluH{|S z?4gXn8AIxfOy)W`=>qE?UYmIE12PhQP*xdu&M3uVItENPQC)%xpNjGs5mBkI`_Y{Q zTnH20IpE$UJlh55chb-E@PPy2Gom1rim0-5uQt9`<gk^PAD%|`UCeoqKr}R5t?4}l z&ZBZp-f1tFG>IP)gS64IB)4|HXL*v4X@xuT94@CrVxr2Bd*R#RX3f>@(-=aJCt2;5 zwciNU4bW-eBAqG54Mq(|mnAC~?)Oz3k-rsr9&Xew&l2o#K<LhPn(4d@T>jL!wD~W7 z+ydL~_!*h%W<-}!E0npA1$Ty2-6(R=vEaS5&Eu_&HJ<f;&Sw)vIA`A}d^2=y*PO=c zKBRKmzM80)XTAQycQIXSDqrQ%+H2EXQDc)=Y^{eqBZ?Mr@_lIU{I1QAm*hx}s^@Xo zwq<72W#`?))#!KYL(Zv{R`XBJ>Y&LZ#tYb!b*<e~A#wwrqE}yRKBShc)Y{g@=pJ@I z=e^3~-wM{2UJPZYiB{B~;BmI}IFqa2=p0!2+%taP0egMq1#Ls>s=%k`YdSpEi}hrp zLsQG0X+2-ihu&v~V<g*78Pkde7tOVKh<00#)M(`IYbl>899v7g{&bi(7B(5td-DbM z`jC_1iICz>(c0F8cAlo<@u!mOv_NU&GRyOe&*%1y%X$1^laZ7k>AN4-7~|)Cju#~k zyj>|YKcgq_Nj><4U2knaeJ-KoV(f6-^<I^AUW7j}@$qcCHrC{~Q+fH8+L-o*Mb9dG z^81A=mD_bMPAEBDWtd*O5B8Xj7QMI>)0-o#L=&Tz$P$AYWpsJO9tucEMS#$g;oJ3& zpNTU0@W;-&H#}ozv8B^STcI3@0<%6S&9;|#AW*!38s)bL4Ybfe-&}Kg;<_;od-Oe( zCJB^O;be^bE_#>B^RJlcP!gnDLfwP<Z@mrdykmyVE_);^k?dzO96(GT>P^7Ugrr*Z zwulo|Na_c0Z*LPEF_9-<NX+Nlx-*Vp9&}99bvrJBDXISIY+dXYU}#}jY!9O_XIqqD zK~=B2NstYtE{1MPotG9?C5mF2cQA*f0>?Ix2d^K!ya!alU68UU0vCPmm?~qMyv&{j zuZyyz+ql)6(Qtw}9SG_=`m`XX9||iEK`E1cw!~*@ICMfLi3Tc0&>Dvy@04*;y^`Vn z$RyP72r$Cpn#mss#4SM0bh(tvpN_BXrDBk|ykU|$y@?Srg4g8`x9U-C2#W%WHzrR7 z>3pWVw>TG(kFjj=C8XX=qOmf(N<;T1h=TSaVY-H3Y%yMv_rJdK?@vF=3JH#DHWAUm zF>pT6$HEUxq&N(XRbbksmMg1|I--4#(u+!!Au7u!%Zwk1*VXese7$v8RBPM*k4OwT zLw5{0gc6Df3^jB}gP^38hzJ70&^2^Q34%kH(hU;Qsf0*KcS?8u7SG<#`|kZ7zvKHK z95XCd-s`@v>vNuGH=lO(@3YV6MCe~~)O@wgkP~>xQ=@kYbZ}&8n|W+tJHR24l21|@ zBh4PGi*~A_l@#T>-)$50zJg2aK?2vzcmv_NX&+fI5DfmoO(E7?GxSTi@8hEQt+Y%! zRZzQ`kn#uxIA@HqrnFm>8K&I=UHOOWUS#_?9*LY}UJ;U&q!o+}T6I(R#l<3Dw5WXD zDPJ5sUJoQ5wH?SIB{%#vs6t%N_tSt>AO3C4V_<Sag;qh!Z2a&iW>*1{EwX;8U9QlW z@iI$Nx=@p9FewV7<ql?)4bz!K6fpLy046we(4!%)ZU+)|2tB{ki2-MYjYN#I6OzpI zMwA`0Z!?(lW%Hm_cn4`_p)%0-5RiVc`RnCR15Ry8{Rbiz-7$lFYXcEy)JWz-x0$Yf zALRYL4OaCPp%ET~ZmDycMfji0HyrfVyjh;Tp}}k`b?MO$B&-n{f9m^)-*omHycura zna+Q|2p5@bk;MIU<)r8MnEK0yCT-Tz51e^#MC@(=S9T)W`imPt%W;7EF>&L@dTG4a z6}e;8@5=D(&79Re{SArJ6|u3Ka|yrGQbQl(#!jP)cIJ~@a9NE?&7<w#+9$-QCjs?U zUTNIQLU!9PTt|ckP(Is|%^x_uAC>pDomhe!H)rS`O-!HWc}+J>y1-nvPkqF9uD$z< z{ZPsL@7^%yEA9qAH+f5SGIK9RT+$<R^L<V5*U2A``5{7ma5tS<4|ZsbyifDVy{9#5 z-?Qz+4}OeIQ*i#F8IC$`AN{bHSC{1iXrJCLphM4{_WgvL9Z#CB>z+58P5TmcQSzCr z)BgI>re4!e_GAe=G*OlL{kG_d#?!BQk?re&Do=ype4=k^90*@T0dcOAJJTjRZa*8} zUMUs3E#ib8nqCcXN;(8Ip|_0dR#1a_YQ__J){0KqU8huOD;We)4);cHu0(%3&rDxU zhv~ADy@ZkhLyDU(#?E7p0Rty}`@;xojxuj04r+|O`w2jwA%+g?x0{igV5mezKh#d` zwT*zw3kEh|6uO<hTuT3Ee8DpakZMXdj8={>^z#+$AV^%_62s*3M}Rhcc*~hnHL6*1 z;bALOS41QMQnFB(h-QAKFG6EjezVPuToYEJOct*i(%4_7Azc?bOj-6QOaHvj<eD^U zf=Q+AMn5jY5RuPGJ+$&VtcofcPl98}-GPwZh`TjfG=tiDp-mWHnEWMdy&JcK5seS? zIgs0RKyVSA$=qZW@z$57&jK_sW+Fu0v@Q7B++UEC1*C!~^?$ttNBO-+Lh>O>AoRUC zN%PJKDUJ7hadN$W4-t4^Jn5Sd<(-*E8JZXys|j_t9+XGBcmSLH`<@El;hzn4-FGpG zSg@Ag#HW{EYAxHX9vMksF@FI440VvCj%G%XoD&->gN)VT_9%!Dk6t%J!-Jl?IU)ms zqXi&0+JYZ9msSnskQhT5ef53S>OAtXY*IzKZoO_U0=zqB#CRwN##s6tHu4=%uN(TF z_V9DXr#~`Af>i^Y7tZ{$bD|N4ED;49aACL%1m9)m#~zUghCsL<<^aDuR!k**@Dzf1 zcUMA{9fE^&o4?mdjZx-TL)DHufERS9p!2(q+XnKCWbTSs+QJLeMyMTTcIubMZ~#JM zZ_mq78Ij`$())k2WOeaab;7)h8DYHJVBQc|S=Hc{_A@w%4hRdo!ILG~u{~#463Av} z;~9gTleB23tWqt+Uq<u`#fDx}Qx)5<&X(zyAo@QJuDVsPJHgfU>pRo5(RA>i4**y9 zkM(+VHHSN;32(M)L;q7!E_z;d=#+AQraMC^cY^E69>jZ$mPGQ~t%Q;+B}8}C8XWk5 zHJ>QLySd;f4mUpfhIAZvN35OHl7_CqH!}zLd<7C0uPH#EXUmCZ6u)>I|7kiwOCjNQ zTjFS!>C7TdXFc}r0@vn`OWu1s=L}yfU1Yj0m(<2>`>;d;yN3C`_#7>%df{?eB8(yY z$Oqqz8hHDkKc@0o9V;^W8M$wvJ@)8(0PcvJ!uHY|pY^zGyPQb8v!cciX|=%vKjWHI z5^>cz;I-GDyDr;wI~n9f;3aa#XAI&vM^}t`!N+T<vFW032JT^sR5^EWpDe@-y?MTq zfs^Y*dCy7P>b}FDM~0G>e~vO1r`l(KUtaI_ct;lzO+O{etuqoo8yl)&D#SfsY`YX- zJ=lGbvY{lk-?Th{i{<z#w>g?A`n-jq(tK5F`)Io^$7Ac$We8(Tt;sp`?=HgsG;ONn zZlBZV)_UtOjn^jZDzAEVuZ4vz#H?ratuhqlY(n$M=958|R$<;MR5xk~X}@q05#oiJ zu^S&>(t4*Lh7n@Yj8fc5`ZU=Oa>_pi#3O8ivY(@ko+sLW=_~%aO&f2M82o4c#SN!+ z(uBxwU($(gF7k<Xu1;3MKpG2Te4B&Z^3Bf&u3{yy>>X*1jBG!coL{IT*#KUAEF>QG zg+yCwfASm`->zLzA^s1?&@NSsX2^S0h!P|mEPklL%nWLg7a0;%v|k>7N53dB4-NDm zX~<_L?5~Kr2$Is8U-!4ho8jTme=MJnMc<`@a>?3_<SE<|y)AC+3i;JODtR3Bw&XkO z>oCrpx|*RqvOp0F0UPG)^#_`vLB*`83~XZpUG#B^t;lch-gdaMNQW`46j_)_DpB4G zuV>kEv-S$UCO<mlH^&^-1pf}p({&3h@4?0VfhsThLBA*-qs&Y_K8s6A0EgBh-#}}b zyO4>@r0f*Y7+1Jj2_C9G^F|ivPKa*AhlqfP#)v><f#458J;XWUm>DjERNqr;qkF#^ zHIQtLPJT&l-h5<_R+>42+fzfO^aYLg8QH*Oy{%bc^?L&IG^MNGqV~R@M$`yrJXl=h zyNW*EzxHjX<u{e0uE`oZ5Ho1ndpLB{6`i)U*~m+c<ELV0uREC`BW4oa^JaJ{v-;tl zht78sjXe*5d>(fi`fPRiwPEbJU-NZ+XS3^Bq05&mxP9NY(I1`AS(B)g4IG~b><}Go zD_+oyh~Z%N{Em~aYw#1tr||uzHWj?Oi>iTXVhO_Om6S>cC-FK=X>7l{(qsuvja|fN z&8{l5bL%pouTLduQWVQSoxt3!25Tf5W`Y5e%v45y+~Kr0fQxad?82<K#tfHmb1G<p zO49zO`FLI5bvllz)`@s${@Qu2x>$QNciUDyKVej_c(ylq=fUtst&ha&uA}==J(*D- z5iNT|ZDDHg4DHIc_t68_Hl~wzxZ8t0cB_*~%9OlZf*SyVNWiqRbA4@sgBg1G)jbpJ zkI#Y+=8E(1ZljHTRSZrDF;KLgr9?xw14wjksJd(Fplr-gtoI3MX10cfhfF~+9wS~q zSv=c%Fi#f)vg%jSKEI-Kgk;9M-i;NJIP^JRa)EUYvv7#$PK6X?YLq7RW<b_I+b`?j zXB*G{-LH)S-!`n@QfX3V<SY20Iz;r2VOo0#ZY7bI6K2c(Xd;;X9_hC}{1>=#<_46q z`peo(g_)AO^CPEB_T0Q*eind_1OvG<P@r%Hj|kKpyd4__4&&oJ-a}<H#`nzVtcScO z*t!Z3B$9h(0Ah}R`MNxcllUkna^&tnfb$|@R(?mo-3CpN@uIl!OI8$XukeAVN}ka# zE~0k2#61wBI!IYIUN@M*MZYw^%Om@trMsBA3lxYbBt$bJ5z?gTNL6-9H8AO&WvDUV zTYv6}Dwx*#7~mD^tq~K86UgJSlVlnh-Gw(_q*0B~$?(ielQxtMB`IzJf}~>lzx3{p zxSo-ONGfP92z(S<lp2W(af%Rvb)4<KK8R2Vym)OPbVB3LRFYdO+g98;z<x2?fC0S| z!Jk!<L`~uVG#o@dh__O`6hfbiB}UpST7<AQm`CtNt)}3c56{2HL?e5cV<=Ht7X9X` ztEt(J5Dbr*>4u+c0sRklU%rTF*T>8xdl70LLZWjSMHe*wRV?AXe5KER#0x1564iW` zb79nLxcW@OVPh@CDsWHo8Po9L&aC92<}pM2V%R{6eG|>hR}{{}`9=b1S}H<NCe(0Y z^~mR!%v_{;7dx=}NeJeH5C1CEv>1u~T<!gPQ(irpLha_EhZ%Fe#^@r=;nD@`RH%n5 zxa-GyRhF1b^mn7#=O!*GZ*-RMgy)6Ti!9uHM9;gldbo<s?O_(>0|Xgcw?(VjoGY8j z%r!S=)wwCTJ{ia30{`^irAlotK181vMM|C@C@ML5As~q1suK@qX^TC#9uKXn&GnX! z{YsyDyWuHu$05yPJudy{?oE3-6^E6Jl>yZ%sns#Tp?A;UJ7Iy|19qpeyUCC2f-aob zo@Vq<yKa&w9;ZH)!v0^(<Ug}L?ugrBl`w7&`^6`K-Mx_Cm3EnW+eQAg(2Kf*gOOc$ z25G*)X7**l;}e@&;_hAb`^W5lhS1bxJp3-_z{(M(W$Gnxm<Bwn-=8*zdLD$wD*IAM zLJ_`Vue3bB*WOtHp_o(XW@-Iq$qnIw>1qBhs|m-ucxk}`;f7ghK4cx~Qmj<nFHp0A zo@i*1{qAXv%V1s_&yv`pVzUu#^;-2VKlu%$#X|1S*O{h$(m{x1uc8e^3gWkh;A_EC zPObQv5825%lz-)SL3<g=zl;#rlXep~R6)p(x1=rogE6kC{HX`zl$KdB@IuEppg*?I zbGm*Av<Cs+cX4xgrldnOjY33vrhS?96bg@wG#k#wBWso0N-br=a>#vzaAP9kR7{SD zhRs3U*TN6275(xTBz5azz>kV^mE$%Z|3TGWd?Tx-93DWt?d<tx;ilob5o%3?4uz1$ z^rO_sMG^?h!o)kp#^Lc3Dnw9KZXDKzSsFe(3WJY>!Rr^umy_Nvs9*5!D6*&K*+brd zp%Ip%tzS_mFsI<#9{*ds89ggsUtEf_#ZO&MYH5qp>S;inG95%Jkwowygf&WW>BEoc zAKn98z1e)vLz;VLobaPjz4&{=FWO<kmz(d4cM2MR+O$5iIX|MCqvSQzS=n5q5k$WQ zQwuXww27V84PWRyOnW927pK;D#i+)C3JpkoVUqV?8~NRCz0vXh?uASTpi4ZqKrB>5 z`*_%=c}v7IFX0(0Y$c#@NiKBe*JY?BZ`^kmOTaupN8!YjdmqkH;(VgP!jxTfqKv2| zwr7dcv0H{`?8SU!1jBn0PfOk8pOIwpa}#)iq}o>`hMe|hE2!?j>oU4Y6?3>y+m4W_ z0ee_8R69|*{;ZIDkFRL*)he>x(v)aIHea^1^T9@|`B<l@`?PcPJa@GCS;N7y?8)wA z8|hhDus$^O<j%XsXfZhTynu@-;WsBu($FMZ&qQ8>jq~O+G~ND?^}JJWkDN!%O1<GS z-@m6+pIHD>Lb;X)rm2~p$<`4EVvh`zN9_4y3o5I|0X<wnm=ALXvpaJhv(By|BAJ-0 zT_9c^Wq(`4@yC3>sY#uYU#6j}FGnX}uB>!CZ{~xy5nz31hD{T@=~r8mCg^>z!DI!b zEf(!nrs0dQC>_J=70_lR3EKtodqIrCD9miHQ7gDpHy`avWaH=Vw)hvYl(I`s9TK~_ zXOsbk)_>ByQOSrNi{%9hIob+(P9h5}0DVLl!!n_C8Z#^?xmK~yY@4>czci(Mjwh^J zo_+EX&7AK>$h)25`Ui{4WrlhDeo`xV&V=u>&2tjzAtNb|XOCvnRNSp?y&Kx}&1+Sn ztW*+^Ly-}9^j3&J>848M>N@@{P(ssyU26jS9*5_#kq(zD3vCy#QWN`ADVwr(fl5H^ zDP4~cU~~IZ5wr1IesXBV3%zDi+fdJeVnAh^8y2I)5Z!!}i#R!O%)QW6CRzOU&m_8f zX5@>={)~}T_#(j-q53aX><;n^{%QBkA~R2^P`aHPYEFnmqyS2QAzBxHmnKe`4F0Bo z%0klI^dYaA%@}DAQR=wl24H?lyu)z*@Lkp0>TI|RQ22HrGJh~2YA!xN?9s2p4RpcS zXFR6pSWRfs_V_KLz9sdGH9Zv2V%%Y$sfi(hkg>ao{q$kJ&(8w26J6E-uMksXn9>K7 z5i+s;W`fF|4f;US_=(MmTN?1dPvJdJkSB{IeV$z_R4(^F?MyhW)GLuSpRgSp-du0Y z-J&Tz!k3Ie_dmhoIYcnG{7{vzs?lFp8``G!btS)UrqQQ96!4&j9!9shu5TRAxc|&v z*J5brS^H4|c43OVgl;ujtdBo^RXO|M)yX|!y!jpD#%(rX^BK~bDsWBBfg4!Ays{bU z_h^4c4F#3$JoBn%ZWy-NwDy+F`*m&Lx8$~z$vW+*UYWc)qOsGWt5>(Keo?oAjsQ&1 z2yqQYa^1{L)JVJ()(|NE;2ZH1i11`uR{(*5_4K=`f(v`HQV_29#oc-Nl*=NAu^Tg! zlYrTs@EG6Ob4V!C`cIwiS1IEA&#H(2Y@L+UPmq~yDX|y8v1rd7d}6E!#6_;cI18A3 z76J?3k0gw7C-DCJ$?6RPUNTw^GCkn;WK`s;^2OsK1Q}g7C>@#FL@z0gH<|I$b<qf> z4#F^cGIDWGRgH86We0YjXGmtg>9Rd^I<rd?tLs3jfWi)}eD&DOv|Y>at!(4s89M== zqW2zraZK*SG2_P^y?Wc*UfFrt5BagY-aoFp>QmIAVO)?byI@oQ$_HiFeS5I=m#cs1 zmTgkUAFw1mghXrdiJj|IMjJ@b3zPOl$u(>C1LnA5F~vQ@^SWdd=Qhr>%wh`D%!0eu z_=$@yEa9^Ol9wY@c0YT`%;my<^I93%l`k~OJX8o}2vK2ew*i^|em7?H;U!r%+$&)3 zeHq~nJ8MqeQ^3;LYkVxo!6V{cykGew)_z!H*LYrVS^Pso>vy3i+FzsW&mSLEL98Gz zBEFAcJNgQQiofe7n5V}gvD9SRufE2aC*OJg!O&63-{G4B#sE9{0X+Orw^!aE+H?+b z)M*(J-XzH!w~Oo`i#fr0OiSalp7VjD7caTv+LwSai~6Y)!hFQE-J7@Ix`+*n**5bk z*m}jE;6CUo@cPGTAZ`W?jZ`J)!DUX`P;)MFfc>0$k^hP+3-h2pE0mgca7W1;2MeMT zQ-rE}*rL%nL*UZi)I*mAY0z80**m*)GfDkKBqkHJYtGjKup^=Z$J%`GtO9H2G$Ee6 z%AIJ*v({j`)IWVY8)@%9VP-r{HiqQ<s;U1J9OKunU*gSBqdhiCte&Q`UwzUm@?xym zuR&zkhYT~C-wHLzlle@`$iTV5tWmUh-Tg?suF8OAK3W26PJy-g<U-?${<xZj(AZWz zanG-I-@uyJu;NKq;=E`><M=ARQeIJ9-hgXO^J%Eq&6*J@THEmAa_;?`!H^yQE~=Xk za=VWg&G#>HXK@6#WSYU_Jr{45H%30wH1x=y5BlAlEOZe^*p7XkcXuzxL%fRQtQ<W; zQFz;ge<*U4>AGHX+5XKjLdM6}3NpSP^w^$hW~4;mF#_pRJiWh8JWP~6;{beP$*S7p zYtTu5#nqH=4NiRk@zmE>I;vIw2V$iN`6g;?5c5N{9P>;3WM+Q~YfVlqWQ9<UrB{xO zH}~earWxDvJwsoo@Y2(A2QAoIPHhiPYj4&d<Xay`E1{)i*wU#}JdgjzP#5|jd&_-0 zqz(KT04(L&spUNGk?X{pevVPLsDmIrBl=|nAIXK5uZdg%5GS)27Dx^hT3vAR?B18T zUxcBQ?CZndZI8D^yd!v7CXvNw?Om(R2fcdr8;}M2W*)Tq*Sha?7gs|KHKa?pSl{Dm z4yN_~2;+}MpIpe_JH|@HL+fqHRSgHDFJ4TkqZMCmZHyML%d4X2d-B|ir-Png+6Z|r z96Iz^*?p|TLDRR`f&@RSY+Ctg6fBF!pZZKiJ0bK%NoAbNsC4PntEJjJ#Vm7EDjbqG zr|JuAmwN7XS1?)KBRt!;CQv^f**jDH^c99QYy=jir8U1kl@Joy<<HA3c?rCERd${? zsfPeB_{lMn!Et5>3?aQaGt)k-$(`r*i@KdN>RXy}uolf3GT!8o5^WyS-|glo*Acd6 zNy<OMcb>MMUTrAB_Lu3;5HBgr#D96z2{|6U8pGFjVlXyFs@TmPV3{;jfJ(Z(Ue68( zs~lz!KRv&xOPd-)#CD<`yjC&;?kbrKPZbLaB=eh<2lz_XsShz0Cm4MA3<QWca|J;X z#E+lKrRs13>qupJ-zvTX{Z2?k&TGbky=;rA*iWAx+9-oGpN~SudiF<dK{b3j0Ki^e zyOtp?GdKl;0{j=KHmw`5`&mR&Iu=4Hjyij-W_nd_u`i8J5az;HBOa)F+ab+Q+vyw6 z5=cTk6h7n>1B^PX&vO1F-~&zh;F8NpzMh{Q6C$}ol%lhB2~?&iE@rQjMXld2nj=o( zWbn_Yve@P9+}Y8_Wa7cXquJ{Rt(@+jm+H+PS8~zOhx1#pc*fcRjZd`%m1>G05*3u5 zHF}f~skg7kCBwmvx@l<WrP*bx`OR73g|q4g#P6+Poy14Jo36K}%>@>23pPSSaj!ht zbgBH*KK;h^-yl=h`qOlwrdyNwIr(o0_0C_b?Cv|jtjrPPv!&8F?6@rU_87e&-@+)s zsUL;H3qQxYX#foouy=F<6FpjIA`zQ_QUqSWjVNWgI2sc&p8v{$)cjTSyo+J>A|wnZ zYHg{XRF+DS9`RoSI@|Bt&AHF}c={BP=GqVTv<6&CcbI|hx|guc{s~Jy{+#ib(A$O5 z-+KeW>>vSvaeD9-=f7WZC@CTNxs_E3$9GrgCn%gk-eeJ<f<;ym%ys5cx0?Ig2Yf+! zaXNnkuK(R$R$H+Df4u;tjG+MHT=FK57GTt++(?-Fm2EsU?ip5&-@b2l+J>teIw-z2 zac@cM79!3S{>%6Y$<9reaOkx?`_da2A$36cgrM&1)z^QXLa95frEl)k7(JoF{MUi} z^@~OU=;5pJQmwwH^Z))dz5JGpH|YLi`0r{5^X+lNkXWzAigkCXK^Xu1)UQ=m3VMxy z(DdaOu(9~Ne&Q$Nb@Wd+wf^~~|2dQY_<u3D3FrURW&8z`{`WNf>l3NKTlEBDUeD|w zfB%05)PH@#l0Sm`|JdF?H_lCd=Z~~*hQk;B|Hlq%JO&l&m$eodRB+f583VckLqG{; z1R(O|iFty5DK7kaZ+j@qbH!T!z0Lmj{`sGMlbT_{;Hq+%N7MkkXkpD;zzn5WDUO4< zT={R5`4`n45}p5|wEx&Zy6k`S7VQV3Tv+=IemN>1Ry@dlN!;$TRDzr-kQX2V&3nne zM1?j0i2g6-f1Y;yb^PhhSe3ZC>(pF<|GYo`c>)~$zwOSqP2XDIuQULr3o^n!*O!7O zCe!!n#oa4Y_{|W#uOxTB-Q5OaC!V-TcrO4jo>Me@Kg46dhjY3=`N3k|kq?FZ95CZ4 zYOT`#_1FJpX26ow$O(uY{>MT5^V<HxxzoS{^r{<QY0d)f4?|wNEx0znD5B$$zX1|^ zzzg8VY>d+W$O1I8lhaDSlGr35L$6Eoxfc0z*hAU`gduDf)yycnaMND^OM>BIGX3kL z5}$W>aR?ns8ur7)PNtluf&2sQl}`hlz*2BQ0_a+&KH39f1>OR^`P}EFrqX4Ow>cFj zJ)CJMb08|k8L*dm2L#*SPYkkk(_{PVn#Gs^b-vz`i-OVr-{a^O!%E~cnQwC|QvGVQ z*cI){*LbM)d!6UOJfM-^R1;Z_ul(%0e+_t3@FgDabuqbmY?UdLnNu8rE!6>9tZ2de zY?;axa6=P0CgzSdM9v5LDRQeb8WKPqC+%wL0PyIC_+C5Nc1AEG{`}f!f--}d<F1n6 z@y*%h=74<Vr$9&F7Kq$Ua*hjjMlH2HFJd#Z=W6)P{E_|d-Jb=$1b@D4YJT<U7W_0- zdTMN2j|{LK$)5-0W@M6uf3v&)du0Gfsz0Uqn+I;>9(32+8Fy>;=Z>&;&B(JX{^t20 zI>h)b^7Xyy<q*rI55Q>F-UY)4k2c2!o}@k=GV-}PDh7D6ZGf*z3mAL`gl0_I<b9f= zu}+-_5+^pBP8SFiP8$HMYM>F&xB<YW{2Sod-vM;p=jXsfh0t#Te&j~-k-RE&TK%#8 z`Ae}QU}Qiz!vq`e0yKKpl4nbC(|2&`=hP&xoLxr^tVLP}zXM#a^lnTs(DL3MlmQcE ztmjVxk=awXlF6&{qiJbeh9&ot?LW+SnRS>UFP{RSkBr*~BbVgOpLx-fuf7yvKH_WG z^#>aN4!bPCUOrd+3fx@5P5|yxHTkxSK}G~Z3WQF$Dloi@pL`L1PivtbIQSDFL#E!o z>8!J?gl^f`bFTw$>P^$xiiSG;{qGw4o$aQJH^P99U@+)U&8$Q`7(GJfxY2O%gCJ=N zSnm=8MF$eCm-DTGQHQIkPHLgHk9S`Uru&Hj>u{M*d-?7_206pg?Kgk2e5*A9^d0)& zwg7g*6(G|ct8B+y07|_nMZ(KnnRoxJ-73Xyg;~WwhLa2(eJY~Z#NaXxHQ0~uV%A=t zWR;IlJe)u-0QnR_7q<>Y!PiWZC4XOZW*=a*Pmny(x<`Wfi}nts!E1+)JS0j9JQfKh z{~j#5?_<8^Ify&y1vXKJuGC)=b$JayK6TBUA+))=gSjbhHlpDB-H>XcO#J;j$>JW> z7eFNHpIc(Pw)t|I5706^!p|OgH2IoLkqhxPBRzO&9PnqkJ9I|?JL7I$$H(Qw=Wp=X z@KMCF{XukZs2lwCiVbNLxw;F0gd0)CXkg?Kk9iOy3TSGH-z7b=`}h?oF<@%`0@Mmp z-Xtv1o)EyCbpt4kIRFv`kKKK@m1Ju}K<|l3;?NBZuD#{2jog+K{50liL+(FUk#3S6 zO+_w*`gtx0zsoB|7WaP?>J#5+D|m}`Ar&NwjQ}D{0WeP#sYH{AB6|&J^~El>D(>3g zWZ;tEOknv90mE;MBpc+coM{BOL#Pm6=dZ9raVHeqK_Cz}V$%=zB)I;TbynB?1f+B) zGRM%P9;3bm7`ER94Wm3hDl_*muik10e7UljmS`Rau%k>f@J{X^60bdOS8*TJZ-PsK z#46*{ph5UNiVRb;r!lkn8o=7;B@m^<dBY@#Q)&0%yx5{&0)~O06*m+{R<qLI<E|u$ zMo9A|;G2{H$#(&jruQY7dcpo`^Z)N#IQ<ptZXe&5#;zf@v7KMS;(PqR->pxzFu1i# z7e62SfsWu}NglSjGb4%=&v@M>gI_`&2WS|?klc3VJsi>kQNhE2_<|C|5+(h*v_wm1 z7wI44k0E{M25|Wa{)ya^x=&J149>Z&X3}^44E2OMbd&Al`1fE5V()(jg121q$Ay=^ z-@+|(1*i`YOE8Tf8}gmd>v4X_o60`LlC_Slg34R+^pWNxS$eisAVr$2N8?mxPI`#} z7(rVm@ks9_45~H6DazEDf=IA!d^u@O9qAj+Zh&*-TJ*fe1u#-2Od?{Em?{FSxQYQi zZU(5BRb0?vPO4_7=>mr|=5T}{lg%ij5otG{F$yGX4bE7gf|qflVk|4MQ#n<WAf<q4 z=BdoM$OiHKK#r-qA(N*w8ihaig4!;2E)NF4&48@}4SbxLWPP=Z-bt02d_8X+)XvVR zg?wGM^HdN@<b_oZ!PNcxwSE@v3(x1CpYaB^X|~^odcuPBSrk)WWumpX@Lfmi8vu>u z-E-tfuZuNY`SeAU$K>C0kr+J8ez#^ufnJ^|&WpiU%ae<oagG)5tEB_Z(fp^=`GuB! zMAJd{K4R|_0K+dXCMY@#kgvNh6lm6kq1r=wfp_~3Gv{u*LDj1S87LExLC}Y2H{rL_ zICQTeh_OAok~EL)I!>e#$;T+KY-V8&bu@hlSNBH?(h?as(Xw2LTrv~q_l2?X8|_?G zJgkVTfoH_~5sO<@D5<36LB?}pMtz884;BJ<r#$?AJuF6=^OLg{O9|4wp=%q63WFRE z{*Z>}!~!S&ezw=2sxbuV24b=RENgD#|CC-f7_XgXo-__mb^*A>=oA&Z$-6}&Xu6^p z=(fe6OaMneY4Ks@O29!yZfjmB@F_iJPq%n(G(v6u6G*yeM-_XYLcPt%WrBS<2es7B zdY^1q(9%lu@6NgIe^jikcDGqhGVnEJ*fY5mE=>J4uk-ah1A7KHK|kwZCMpECY$IB~ zzbvE_9Or|=?gXSIWK$<)Qz{Djp5?V3n?*HY?ACjyB|cX?Z?}LNiUT0fcUbW8cDN_d z#}3TcD49?aJqe{4%W=vew|xL7&J{H(UfkmR);Y>id2oxlk5-``(L8*qQL0vTFmcV1 zinpBp@S8q@1xrvG!`7e`GeLo0f3A`FZyINd1<(_Eo{TRJc*F*J`Fy4lNibql9w2J% zM7feW2{hP@E3AidqCsf53);SQA%`^n2=&|i4R&4IIjTWpeDQ6(a^^e5L=NwJY+-Ip z>?%y+LBSNZ<@qrt@luMxr=iB+w|>IZXkKKDk<)h}Gy9^Kv=>)CHzz)R-<V%BX50Zw zoSKRy9MbtmR54}Xok>yde|p2v!qCdb4fy#*U#FaYKc@skL*%yape19>Y)1?6jI9He z)z~qV_gH_sGG~9|;noxsa&M@dMV8J#=|;bRSoEM4kuGIpbhci%f<Rz$vc!bhJkY;i zVy6oPpNy-d#OO`*et7|0uNT%8kltL#hVOT)o6{~yjw&hEM3FcTggWzU{%~FN6SXo? zHaO-DnI2}2WZ2sU#XMG3JuV<u?_Os&oh2t7Z3XnLM0an(m;DTy<yUvZ!3Z?H*Wu7| zFXyigU~&iw|D2y=`S6cU^Q_;|;@V#MrIphLFewx%lf+1otnjVgrP`A89S*>j^g<_H zdb%I3X(lcxH{iVR8$XBqi0^1kD+dj+^e|yDn@q5#v#E@fS0*;zAOCrW9h2_60yaCg zJbtd?f~yW-aon{cz9rp~JHBP)i}^(B9fVnybP-cI9Z(;>Dhe}e?Egw1{c>hArw5?H z*MQu)Mbo#<XDcbe0@LS;He(wNz-dZm-94w<L4}{Ae~TT2e;K4eou)jr38NFYN}UaO zRliwpz{x~g@-huJ!&d-@#|qua5j|ieT-_2UR}UUyumLif#Bkr=4V8v9JEMfCvG5oX zd7oUKfu435g6+w=?~m%N+>;XrIem!I;B5UY;H`yYwhodB(O|q_OU~1TOLjUCULF6o zE#c4WI0(CZeNCgD_Ty$$t(AjRIr>E8{iBzhNAop}VyCxrIoy(a+cY@(lrM%th=*gS z{DrBUtl*Zs45-wcdqv)JeG<<q-^Vymqu%=n3IOdy)fW<NXl>6Z(T)6g+aDHZYvVhh zkz%7s57GOCxP#zv@k?>Jo@P+E(#<t6?}^)BsI3PCH!Yh)ZBIu-N&gxgyZL|>MuLN6 zS-n}s6T_?ILQ;Zc{U0Db>Duiq3o}eqX516id*m3D`}&&mdo8H%luJO)<IT0ODskw1 zcxL=}5x0!2%a$j!mQXS_GTt+#E);<+dpzb+vT~AX2KC2>HnA7Lql}n()w>YDPvZet z$F;g~bOWyw+i^(ZY`YIINyLM`t%Bm5AFh)<3bq^$W~U^>R3xZykiO%G2yo%|>!jtP z$cXv;BhWL|BjHs>Yi0mIbN4uyzqdT$aBs?Xd>o9JiQm6e=Y4suTD}W9Bx&HwT;1(I z{h4-6j*yV;TNaMfYn8g42ex>yed-_ySEtm~UnkiVP4<m6FuXbd+}!JSRbA|K;hiiI z)+K^iyw=}8{-GM9)0N-r=xzTkm_VAL-zs>0FxGrs74g){g=S#L$aR{c(}Rv|Lh9op zN5sz<`D0an@72sd4d&xpNdlKY#CDwjTzcc8_*)RVSP9dSm#3YkE%8_ruSl-qOU1md ztVVM!0Kw{o|CR9CY&W2@qFJFnR%@Z1SP|+c;eYupCAChLL(uw%Vaegk)E;)_lslMP zA6loPMT)p+vOYZEv+^crG5R<c=v!U@1Wfu3zCd>)+u+nHZc1iAcI$fqU)QuiI-b|E zy|d?M1Yz-QUTVFOZ`IFile~$6rNC~s0<OL1XbYK+cB8;={gX4QwnqQ@Pqve}y7E{Q z?YIY@4}OU8p(ejB#j1>c2CZtw0M^sfej_cr-x0}036Fd3Oa=t=`^IR-PgL7Y?)qu8 zX5q_-uACNr6&O@h=#H+Voy08t5u_?T>uU;=Vk20o+-f|mX}&7bPo$<beA_`W-x%rb z_eh$%3Yb#p*Q;Ki0U9E*Ll6YsFQjk(v4$i__jd3cj7)#9K2c$f>>QHw#Y65-u{Owj z3#rz0WicrYvXD?^7~+H|Lt<HJMY6K%86CT!ese5L$5WUkIv$GB&KjM-;*sunr!_y= zm12ytK7Fj^lnknjHy|e}pWaW${{kW0>6JTR&3!oGbGgXGZY=*;Ud|Ur!t$5eO6U3Q z%DeU*%=Yb(HHlXnkuVkkef(zo8;<J-WHh`_)Zu%wuD}Gj9+)eO@zz80Ybh;7dc7#u zN}8|THAd54DriQNb|F6PMZO3o;!5@vm<YIhA^44r+*Wt$Q*vzvIZM+Ku&UVx0zf~L z3%N=Q1hU}mQ1k|yvZ_u3N>Q2+LEgk<`UjeM_fc%$5E0)^lOM~3%x@6C$1!_%D*?fK zgceklE#QpPSb&)SlJjcuy(uHTD@>kFO4Uul@y^QcWJrNYgdEPRSK5Eq<Q${dmS4dp z!dLu+$y3wH+^-r?6QVp+eEi5eHvK&#ALgh#GC<q(cYg|N5^Ld5_D?;hgtde7m{^4Y zsg6E%Dbg3q+)-`Ix%IIbyY&%qsLzFr#0XSb?QK{Otk=FlJzuQ&M$=D+-M;YR2@R7t z(@o@s#60s_n!fg1JHd=u>Fr_r0-tw@--UO!%x!&)GM?x!zhxA&^53yFH;N+~9SBMH ze;6E+cQaVCi+qtPz4kmJ0R{`@89<O@3oR11%J<xoZ`22wY!czn&S#y}A!Otq5ADv` z2uLYAB0daxJfSUISL{O2kj_S6BFxGpVFPZD^s!j=lMvs`_Y{1}u`7)_omA4SJ#!f% zy7aAwy*u3>ZF_Ckts=Vd8giJAp!!f0GD^d67e0ktj0}Z%kEE5wmFw?TfL2o~k=n_w zR5KR(@v+3J)V7-0yQ&YWE4r<vyAdhY><KYJ9TGd>cn;8P%=ZGtKRRyf$Zd#egSutR zw<-VIq3Tt_#!R9P@hVax!f?R{ZsoQe`(7JxqbBgcl%<e99Bbn0F3fMiG{+q<tQUN9 zX(373e;g*#Tu?n5z?Li^U+=~>{TsyJ<dC))X3*K`Tr}Q8flal@aTRp&{WJg(a}hWO zJCFq)eBa>SBmwhQWa544z}OU9B$eQ547q~ohPvDgOC7%>m$6pI)vAeH@smxx;$NNj zrVA&W8WucNK_<v=*W!(PFMn2Yw_f5egq}sYZKlJcPoVH#=p4-svlsONZ#yIE3UGcf zEQBjkd#HcB!-z%{R%DvPHmz4Y4^38rAS#AkwBk)nLRd;8poAk@j{^<9(Xb_3Cyb4O zbF?)k3jwrfIrQzl1LaYp$^ZdmR;0Hu!n~=+a1?c{mDd@mP3Px8w1j>3_MWZbftA>1 zVTJ$dqtzs^FO54%!-;@##_Q1#ju>rfIeztd#=T-GAAZ2x!E~;#@x>3L*izT`N3NqC z{a*~k9-LS)8pYPo9=H<v7BJbyF}O~ZWoP2A(AOF;We$xh=+E-w3Yk5j`omKgSeqyU zgap|5zhS+9NHQA4u|}{UdiR{`>e+vn8^O1L&q+KUxiS?m;256OEpsO%lRk&1H9Itv z1d|4XB(RE@PmSC!MoKl2Ifd~Es;N~cmQ~xHnG{MxCQf;{)#A?%S;8DUkS?XY^%_^! zg$Zg3saWyGX*3A}T(hrpn-`<mi<WRE%QCJgP2`J~)}>@TA^c&$$m-!dLy%x7{~gb) z$Cj93h`TK;gxCt7tAk{*4}(K#!z@_clO9eYQZI;p9P&9VH9go<DD}<*ms7WjMqQ)Q z^{q(<FtIYjC9KU-nTty0S7#o)4af)FpLN%wr^t$BNCt#Pg=^J$-Ag&x$OG?H)+Ppm z-$f8uU@VbSB6*KhnTvO?)9K^mMmj?HRoa{m{Wx8IQp6jWwztNv@+I>d1ikdFl(W(N zbg$y;yL&A8fZfN2IK@u_o>;;-=cs!I<s*@_;y?J3I4|VP!!?X6tk$1bRjjq`$H)<~ zJz^s#kU6IhH$5j?5=A>fL{YZwPGqs4Yz>miYppfa*AzNoowQgB!Plt46BD48$8ROQ zTl%ew2d_1;NxmC$&R|)}oV!!;?THnXPVmqN>7rWpgehp;^0j4u=Qu`roHdo%e6#}9 z0HHa<+d~`SccvtrPQm*}fZPVW$h8ctq%Qm-vefh|Ul4UWg_iqTM|Fr@kz?asrL6vp zr$MoniQoMexXZQF_V~^^ZZ1shTX6kHY?wY9Sv-4Xf-9am*e*xSa6sG->k)6PQHlA4 z48~pJPBpp;0jZ1<b5;K_{CTGJokOB-<C$rYS7einNzQ;-yss<QRW~6evjxq~mXRvc zs^|>sA;}61R)rjsqRnc^P|r|YOqN4Z(qw5$?A@PhR7X>nYw&$>RlJ;J>U2Nn`j1Rx zbz1H$o=jNZ6pdQI?=axN`c?dOYtE`ab(!PI<xC{4$d7?!(bGD8>l?I6qj1PCuGywE z_j60&321~@Po(r_ZCNz1%Tnw(Y>Uf^c}069Z8yG{34lg@hn}Xn-7|mCsd-4DUA{8u zrRgy&<NMaHi2{7klNz-bEP&fla|Dfg@JK+9w5Me_=jk)|0*SLFf|3ZkjnLD~GU3KA zpVdBhg#Vmet=brQT=DVspoLdW-;c?!->;HPVo9{h4WX`?(3V&?6hB8t*JIX7eLjVR zy?C=7HSf6l6JoJWAluK6p*WfpA6%MgxPQMr7da67d3XHnMG%}H)6YCNtMmXax%X(I zuC@hF7W^(#6<%^0754qPHVvVF+B)f$=muF)+;`i@1LBoOWjU)8*7uo&kn>k94e<MG zN()H`XqMlqqKLCX8MY1*)7L9xRIJi}ke-nPSJ8AO&z?2a)zrlsuBP?X^Vt72DTX1K zJ-+;g%aB|0__Ke-BNHO{*<QAW3J>K{mWcO;y>_!9tH)es!q?%jC@54yCQo8UcqU_f zbWC(lFJ%LxM0YVewV6esM4YTXnUo6I){eGrhz1g4Tsb~v7IIz6@MPX3sYw+^e<Fcp zu4bDrTpDGL{&U|ha5KCsvF(F(@PEdXN?oT9%Hyf(%keH~j2<27ErZBj#!GnC3hO&0 zSBZsVk;flmqb>qkNx;O%4hv0t(q(q7nXQzDheYR~aL)K)h&l4PM%0mAan?X)Eh>J= zy!EO^!nEsDUPLONGvuM-_k2?kxs;^ctcQVw;lcLG3HA@uPVFf*mI(aJW<>TL&S51h zH$RHyL+6TKf+fU`#(xl9ZSe$K|D5solXxf*pLY-NfFo)jIb5$m<j1!WPtN|@8{n0d z=V+}^H>p40_;U9QVUkrMV=SWqJ@g4-!V*kt3P&*d<6}SS#RT5p&=4kaEzQ0mhm0E; zT1DD(9=9w=mp+Ciyj?||Ngk_D0=0^R=;`crC`C!awlsSuos_QWAGDBRkoq)V9TNmI z&qG6)=TtTJCs}9~FywfTN>8w7k0*=gX=()E6K=!O&U?gV!1^=QI((nxcZmN0Ic(l^ z3H%PVB%drrhxFc4MQOAJ#5vyEdbT8Z)lY)iPqX%X^eOcRH+jhUT@MpeaeO~nrslQG z@KzBtL4--|hbhS!Y!K>xuMuKF%5y=)&h3HP&%E#cA6>!n*bxIU1u)uO(IwhKG|4%E z+t0l2=o69`Y;guk!2!)z^XD$c89{=0_AoN^j&+*XqlUI5bE$UudyYz7PPlhc3Le^z zKGgqNqF*)~$sjz`c>eo&@w+dH==_a^3+ML~Zn<vUUL=_Ef`Zk|EAM=Vf#Sg%eTLTO zDXzk2a{_W{QhstY4fbo{v8}Qgj_9(xX4_#<0)Jun&f}TLehTC&Stkv)SP=iC<N0N2 z6PDJ%C08sCHST9$uf5qMeQxce=Bwh;?iEhyl~Do~rypuFlrBAsudO3O;ymIzF6Fhn zAg08jjIAq)6NMr>0lgb(6R(5+@>L@j1zOBnhZym~s)LM2X!U{+N>=+=OTQzo(Qe*W zO{t6|_GSw$EeY66*?qx4i}KAl29>JaJP8<nX_)+k+~k5;hDLlxpxg_=JDiFEu?-Zl zMo(c~NfB>v%1)PrWeH|sYh^ks5*df{)U8)#*N`1odHiR;9|yTGbkzmJ{AxQ3ccAVI zqdtc{7QJ@eIEwP|8AEtXVRjsTFh)&s(-tsEpn~xTKCyrN6~_W*3uR4hSf0|cBo>D9 zc)pwwoWTNH&jt2aOWbzP_VdC`irwf?(Q|VnrkMkR+q#i;QP`8qrhC<r(w{`D#D^*h zzO1KhhLSZAT<rl-(Z@@U4C)r-Zo~<CyX5K`8SN2KPcE6Nq9S5X<*UmdOAAC|;%kLL zz_8vu{jea$&_wVaEki(exF<wWFh2KC1|{lnqq)JkISJKV0xR<$Brfoe$rma2Fm-sO zqJlN5A9YOHybC9f+f(lZp{Zu1=TL*yYo~<9>{ahq$sI9b!}olxX%Tm`FgtzF2eHKi zwZrv5e^aA;p{2Lt?l$#({UoIsGUTS2RBJ7fLHh+p0Qg)&uW58vV}$=0fjRdirQh^U z3D@SBe(Q@;3~4!#Y6Q#L&qJbp{tVvEXB(7%sNiHhojRaL$Cck;%*tx-nFfUZEH|Q9 zKJtqWm9_S&CYF3sITrW6WHZ^ZoNvUsUuFAipYrP;PjQZ~N^#-8Nf|a{m*0OekCr$# ztSi6Yccd<UHT=vH5YN(<U@TPpE;?T9PMrQ)|EES}AQO(Jk;U{E5@!>K8Uf5A>5rc^ z{iZ>c5znbxOkci`wNY|gGxTQtCPukP(Qp)tcQDmtEUmUS1#TD<H^-YHl_inlFASkQ zX76Klk8oXe8ff0=8vfYCH@bT;PHU#B^5{C^#CVzM;_PX)rIBRRqnG2~ByowRIqdcx z&Q^{$<TflnNt1X0Kl!>dn$=*ie$MTW(J5CD@!ZKs?!m*pcOvUcOlfi1PLabpPq1n~ z^xM(IRj@}au4%_cu1;{voc-0*l<HtEeMF`yu&j5cm6Vi`qyUZX@XXaqGgLs55qu%j z<+d6|l3(%u&`?Xxf%K}AYgv-;>O(1a4Sg}Bdz9CjYb~AX-Lxf-M_JfXNx;hmCiTmD zdCu*Xo%l2&fGtm(Fw#%l0!qf+kfKaReh#}BAG^axge7MU#KX7lSomlZ%LtYYDrh{) zdEl4D3pd!s5(xJ!?uz}zTUhV_-<dok-tPmG2hPx#rhBY{jz;~$k-xQ4F2ZNk0HK-2 zyM=MK7x5xTJxRp-srC9+Ti<T7;Ie|S)fU!G|9wKT^Uot3-8S1o#`HZ6=zQDwhmoV7 zBtl#nmblDG84<{L*|9ojF^oCl7gx!dlDdoqQ9o-y<`fha!z<KhWY4f!nD0X*6qSy` zP2#q1O#2W~-qA1aC(9~*J#}mSvZso8oa7(SNVMDAqRpxNxufLQO`SAGAh$d|HScb} zlyX^qkYX)R_HI3BN4~=0kk`;m*{9~^|6n$itG?Smlm`Vbxa}KuMpDBj2`Mv==4)wq z(`7ps!@y=pW?2D$0W-AkiLv1>KC8XbFInFUqM_(PK9X%qC4Z_1=rj~*)wN}(Ad1bh ziCQ>}n@jRjpE_0&lOS;pOMcQKqV$0Tb!Ze7{}6r1wFbjUn86}NIcje4f!%Myll8$8 zt(mFvm|qq_u3V@_Hc5zY|0=+(ocUvHCK?td?_)Dn$@~W`TDz6G4Bgd$l-Y;arHA^1 zEhWuzK?=Gb)0d#_OiWk<VDj?n8x5PWNw-$xQiZ#W`Y@2jewHjtl#c<*J%g~ikwbqi zA=d#`K(F|?aBq*=Tp(1AFmV<JWs?Jy)-uOajz15<?1po^)DOrESz-LZk=^zxULp`1 z-Ybu~qSwN^igMl>3LqulymZF$$JHXY)OPkGKQjF&U@l)fmYQc$P6f`UkmVi-d;cO{ zVIoH54?Ni_tk`*j<Viql+~CvE?KP2$C)Y^Fd8GvKaIq0xw1Ep%9_51lLOa)tf6b?- zIyLI3(>~PrgH0rym6?I&L+t?aI(vUVe1<H3@=yRC2m5esL}_-(@|u>77@v=gES6s7 zO(ze?yjwlq3|XC|z<gF=#%K0JH5vWpI>uxUku-`7X?FgtJOT5Vu<t`S<UW670YVN^ zVyRP+w^a&EbhfXLDA@EyV}$9(pMX+IStD|&@A1#h8O(ip_Hi(6&4ij)A67L?Ncng` zpXhxwA%kdT<%?FgPUmi|kg7Ea>X<b60f<p&Ngc-6iGi@sv<RYKOb(-?<c~7Pc-u~* zfZF_d1=LpKm2RpbK5>n!<cxR;6bttMaEs;qD6o(+Btf|SJKK;&I??-elN;4jo<}YS z(1d=(p5nz5VJ>YO(|-LQjV}nzXI^A`mJ{O9g>mxC%*SXW|I7<u<F!o1oPiHs0r53} zPYNV`2MT*oVP-Snfh4#o94R#5iBRene%#5)ZE|5<SC7YN_B}<|No>2c3Orr!{q9TC z2G1=|^uPQLCZ^?25G4r7n^{K4u|+(utfBVol$&?xiP=jB2mynoxLziN80l!r9zww_ z@JsVpMuTJp#}YgY%;TykHz5YqHvHk0fCms4@^kuO*GBzAM5vc?e_zK&&}x)hr6JJc zkiJuG(GzPbH-I@9f4#Lx`aMmKzHBB^A1c}En8cD|PfiRQV}>yw^A^S=6xmaC_vF{y ztzGE(CILMJKg!}9Niv|A7xL5MzYn_sMF+Kl3!xF+1UY$J_;olrO!zFr5ZY*uHkRA& zBRD&DSw&J!k9c*Dh0S?304zbhEi(E=6S@>84vu%~q_IYME3a{Z2sRfh!8;h_MzDuJ zN#Z}|wnyeR@3s<T-P8j%SB>L0mv>z}*?LG!@9qLMwFQ7+p*_xYzdCaDeA!4@oK;hA zH(D4nr{rz9mlff&rRxN^3<W^|vjR0VeBy1imR<U5kwL2UG)N_7d2r(?HQoBtWRNUu ziNIJoCN1I@Y<r@Fg~4p665Q~CdjNBQ45bzy(m{vS>RWHt7>OVd?AtKXqJa;<D@?IS z^kP5gmwWPuFnhjAlkjS-jj*QbB!&OX!8=+qy0tRH;+p{SDsa>dX0!|7Gs=D1t9{WJ z2cT}+^PoRhiuv+r&U5meOJ_n#WSVKIDc}tRnz>-7;jKKtl2{_aA;^A`NB>OKB(o6k zS!8SQLE=J}tXm(n1dBip@K$)NO25_mzK_J);citIwA%Hw;09ozgPlsQ>rWzMWLpeV z^NqxZ1D-?P$;m4Te-7s^mbB%}PJsA?mE&n^u#dWJg1&0A_uVP~!0<2<Lw4ic$(}s4 z_k>;JFG}NiV^8jZ#vH~&yqV@lCMui*NLu*4z49&?KFi24QCQxh4}6WfIWpD%w9EEm z9pAy7lrfI4dR_Pgch1?J<WRE>le@k5pHK_0&&JF*Y|@DR6uQ1O&TECo3naQd7?4X% z2Xfu&On8Kjb~cZ5blGiJsm`r$C?s*1^HMzvJuXA31Q`j+^=K^rk7+A6p5MDm%ts#5 zraT2C$>b`J3jiL-xs<+f<MS6%x&QD$Kq{Ow7``jDpzr2gy4nkP!8Pbn!XTgu4id}> z1jYafxsj%&MXp-~A357ILmJ3;+<~vJ^?T(HDraFV{a-ty5)LCBOW4@umB#e)oaP#* zJai%$9<%^J+o;flsaMUw%vb9Xtaw>i{oa=J{OcuRWt#?^CvLI^5OJij^unTB$BfVv z6}b))XLyV`k@=0L-do~uFY=jO@;t|${UCjWO&}?GCjRil1Px-Zq1IT(<~?OuGn|$v z%!qUOP&YVe_i^A$Ih*j-1oy=RkejU+ogAIl#KMWTD|rK427WhHM%vy?7tagF&GIOR zF-Ak4MU(2c%HxOR&D4-V;l<_bS3Jgo5bR29!TSt5)whL97f3popF@tK{1CkT;407> z6oB1nI837a3!b|mls+)LQ&&PwD77s^9+O6sV=C2Jp_rCA@S;?zIWtX@s#m%jcbHd~ zNdQdKz_{2>io-Y3f#y1Y>_zz^{_?x2pSxM9l=vPbn(iDG7Qefi6)kyU-ul|a`)Q5A zhp2gjQtJ{_pQAhXhO}iyU6l9=f3&N6MpB=Q27~MCl1dPFXM{6WR`dsBcP_|r%yEP| z^<#l1R^%KQz!S{+$%P?is$EV|4qs4I%fhGvx6>T$reSg%Ou!@#y+}q8!MXdnJw3Xq z%Y#HK_3Rsfk}<{Zds~QGI&~~YOG==gM6Seb2s=@9R>!WmY+V@)VNo1ePWh}%cwdW8 z!z1i9?fZ59a8)igRAjb`os^e%T_e8YzAAxq<6<Fw_*Vpj_^CSP!pmeAl~!C`hqJlf zbStFw<g+-fIo}e4T(^i2X3{>rJXc#L{W4ftI$j2~>sK1)kr7`-Px%a{y6BG(CX@5L zbid-m;wHG$ZGQglK2|iX#JVz+L<bgY!xwi1Ks;{PNAl~fIxEhwM_eZh;e2XKetC@l zA7ftu71h^vPl-bhjZy<hN~2Okm(n6((1?g49fLFsor09of&wZf&4`qA2nOA$BHj5v z7k>G^{=e^Ai^ZCS<IKJ1p7WgN>}NlFw|^=L641E2F-&%~_wKi&MFXW)Bvc+wW~=jT zzFOK@$Y1SmMM>t;TA^+U2<mCMj~J+kxTw{OW2~hI)$Q=~etx6((6N0cIl05;b=b#- z&Q;N4%|$2-#*y_<t*=b`L=Yi#2SrI57#luEkQ1wAkqmf0XK1wW0O#;`pMgF&0iIyd zghj(mtS2PBk(?Y}WOm%&G$Tacyi&huVTRYb$MZnZeEx=)fu(<#gjSN^pw}XSup*wG zZ{`3qx$eh_Pcop8{gfOqHZAe^+bmggV|}v}pg$3TKh63JY<|4S{f-lth?QpZ=IpD7 z_0J>>QbCdxi4_J53AYKm)p0M@iiJWq;ucq^_Riex6{;#AFX!(cXK%%oqU~=CxPj+_ zchvOyKZetCjtT_EB%oL!mQSuXEaT<`V|}IZR~XNyk;kvQ-m9pr+E?ae8tVJ==+!zX z@lRLJrRRO>Ta}kXF#6}06bq86lj}Yl58bKcAj>Zk>LUkek*W&dtA3};c`lEqSACT` z6%71$R&AucSG57RQ64OVnClU9f{w^_92RX;Skc7O85tZjs|7Oy@+FKhu%GjSbS6y+ zJDRlPlIP9xc717Z-&7np$+0&ALt}6A0a~gs9*hVWZ(SGbx;qaks{PGA0@eSEkU;Tf zcfJucT<5UEl^%^-c3-7^spu<}2wP|W2VY4xlkL;nhgRDk6HRC(h#!3TN8W&z#b%A! z#m71Wi+%PV-A6hspR$zR>AvDQs61zI|MN0ou<;rF>v)UFxmjO{zCIYkSnCy}{owd_ z9^weKETzc3{);Gna?OO;ew*JO>cYBo=>uiUl<PwB^RJFwu^Gs?ZSlJORG;b3WX7)q z;wisr{VoB<ca6d?{|%;9t?nxqgw4q^0gAczd!F8~{9IHaMO`k1d`1|Xc8%-S*5sQh z4ZY2Or9^01AyCDm4p2BgxrP*xGwEJLl+fou-^I>S)LpIjP?gUjJa#FeoBBM?vmWXp zMgxz3QIGQ}ar7QuHcE}TVFdo(s)na+{^lojq|UvW*<X4uPCm#z+IP&v-6#BO9WnVt za*<Y0B2U#n2N?P?apjDAQR@a<;7P&!9t8Mu3oO<Q=^9f1sZqW{kF!Pk&JLRmkB|}D zgJ!Yj)2jCVzb*s~G=DQDkhv=nF(-Eu%i=p_4vdA@(p2%IqD}>lW#d)qs8%}NF3-PR zt5BnUgTUKB>cT(qDF1unJjM3&U(b-=#Q^^F%A{yI5b(V$Yc+0JcRdk&w00z1@C?)V z%ThrlWAOQuEn)(H&Lr(o_{5>!3+2crhKlO1CY#hagNnXZEE3xtf3{H|@cI-?KZa4u z9VZz7=({0Q0I67ax~Xctr5aR(7}kTGn(ikTYgkXN`_l7XruocMAe;Wy8<34;z1iS; zIxCW@I)le2O4KLWt*$8EqEvHD*IfCQ(dbat9--eFt1rb{AQWj<@T$tlz4y!J$*6Xc z%PyDOPd1odNZb9&Zc^;I>(~$M=agi*&%Jz;ZiKmO{cT-02wGuRaL%Y`7vHQ1tl|4M zJsvp9{^c=C%rPv<-+x&*{Xj*I?+?LEPsO^ihjbRVzF_SqIOt1{Ig}CLWjRTH^VsmI zEiRZJ{^l!x(mR5{<DtPOK9dwYBcIeik*o)rOAYT9B5xoBJ+?-utekJ2oC2@l5yoZ+ z%M-Th9P-nrRI7rC00a-Yg>qjXM)?>7yXHngw*f8iSe80Tl0c;ShwB3(%VlKqS?i`p ziQwH~vd&CaUSlEL`{kFu0`p_HIT-QzORbTNlHXEYzTHYTG1Mre6TTbr^V{3!4~I&v z`)ELA``8|$WCPDE)yLA_fUo$$8DfKj2kUf}(K#l>S4?*ALm&Ak!<SQb*m!zCpqZ!E zG#-fY1C~7yy{9Ikl-{EFEYEJYUw)nguTNQaT6RdAJM(mY>*C@qzQ1S8=E=$S(ni{l z<XJWkp&tc#ku>w+T!j>_E2c@^S$G+q1bq4+4Z-ySBlgQcFPzEIYj48=Fx2h(?m~QT zwZxaSX@Ky_1hLLlVVUK?4)E;m=CaSRq;;)C5;KrdFKL3v?6yGlp!-$;=vQUj29%Z> zNV4?phoimF6B2rVm6H`Dm|ppWO{IF+wx-L-<*Qx+xckschBbh0?A9sNav|!w%12f( z3`%46KoMK%Bh8yWu!vh9;t@t=l+@%Yg|TG*Q3W_XTKRb@_*U_!a|tQYzsT0zaH}md z`NhqPm-SF`pYfQVSMke`ywU`ahjd=7F){`clPWmkE<i85I!;rf%?sE$kS<?D_5sfB zyS00TKVNg<K$6T5@qE~^gU<*&iO;~1HQ@bGwd=2E`j08dW0wJw-Wf=}*|t9%xD)1$ z0!%*+Ov4Qh&FQB0_=}7l`qvGv4U*G|ExfRIc>aw(QHs)t8;WNkEZRrOYP<@E|8Xot z%YK!`VwYlOd!cS^a{0ll+c3WoM22@7z2R$*0@Qs^K%gb<$>%q!u7u=%Gj)#vA!ZSx zdK;rA&s3P!<5U0v;2KIzvHCKgdwOXfn6tV7jzcx@Ue;gPL)bh39K%td8$RDHbL{B` zs0o!MR|XK-haf%i4{ikw+DVmLfau^VV%6;o%#}%Ymnx^DCPz+u13VUmwn6$;4Qy%y zy*@+a_NDjR#@p*XGBv;{cH9f}Vo&aX_J&`G2vrKCCPZ}7_9<w2@dIS;#LHNi{1qNv zjk%t5=GHtwW#&g&JV|@JZV0&S3V3?fSo+iJG0|}Ojpe%y#yYD`KzTQG7!Yn_*|pql z02|yMaNS)1wcGyAqcXidXK?OQTU~@3mtab41_?zc-ul_bY22>it5}!=2O<42UZSPF zTkqy8tv}z}*?;d+UuHxCH3C*Zoeg}o?MDBIuwR+5sVHuy-MgV3n~A=7_ttk&(n78$ z4YgS@`r=@T>+0cwwK>gSy#Vy>NK1YIy?l~()DKBul{3*Rhr$5qW$}h#&<-GgLaBq3 zD4;+e6HPXk515C;=WKz%^ioL&zZ1H4`gSWKj{2fLo^bmS@UU|qIQtMBU|r!xG0Je= z*9Vdldp`@wE_{Ln-hr)Q^2B?{K|W9oAZb9G+iko`jlb#wTn)4i7$NF`6uoT6<F|IO z3mC;1kYl$&og`*J907>_zf$n(ujX>}eHi&^Y6TF^=cA<e?nCVsXK*4{9>yLhVgb`w zYBCJ)F1Xa&3Rtq^08N#G*LVWWc&V5-=&%bjY-ZR#JCnh(7Z@KeWZD8oKAXS*5lQq1 zdfQ5tJOj#}FL|%h&Zk|632w<<jJ{;uH?S$Oh^2+E<rE;jGeFrDIXX8gQFG<d?K5j- zNO#(XGMOW>ukU46*bF{+OGV#Fl)qmx1VyYftlHJP>Sy$omHyQGKixq1@PJzST+z!p z$>+>e=U*zmzRg!qImByH%X%?0iKn2M=h{ht_97nu#hC^sQH|$UTu^L)_>8$}f$&}t zZV>qqqd@9_5@lJmP`X+I#M9A5Rwx62hDC`|^eg;;3zLw&2F4CDC^b2IIh#WenxG*j z+l`CbW?dcvlq)<(f<k`GdkL2xR6lH7SjYSD9P_Pu(xP1Dcv4)4tl5om9D@4k_OZ;8 zgzt6ILAiZ3SRvAITF_>5Z)Ju@h%)s}IqcK+F(ltk)^MLqP#Xy8K9z(N6e<uOR`G2> z=fnQ~`0)}!_@0>-m$$;iOE#3tG)rI$&3+0yWuNTQl+@<VbTp@0>}oOaJl}Jata=eG z(d4r9Wh`>%Ua3dUIF_jENYe`My%aNSL$GlfZZBB$oN;`hu<YUrO2~v6Ums+Fs81aU zk+9D@#Q&p>&+h>mD`BFF;;B8?A>plOwk!MilYtQdL;O%+YGubkT_mq1(;>7Y1M@-Q z`ghPCGG)?wVeC4rWp&Q9hoSX(#n|JEaGB7iVrCkhucXtVXNoU5Of^jeHaWC6zj*C1 z-Mj=Qh$GOcPxM&t62*PeG$y%tMlp4jzgQ}#m3Fzn8JuheKQ^p7yal${xaupF{u%ya zz5@?>vjX=)zlISom>UI(wEDb-JDYnS_Sj?>YIXNT<m~02vcfT-NyY_CL^H%IK#-tr zFqYS~<N^BCm>QsSj~n{@$8DH?18izkkLgymbMm;tBMdOoa7B?KlI~PI_>M3QB0c2s zZ2bUO<WZ%uQ!obSiLs+JQ2}r5<C95Pf(Gd@FLs{INva46%P?NUN<p*}0$*Zv=hjnG z@i1y5r8eMOt8f7Pyzbb&WxWnJw68z21T?Xo(dyS!2G&i1<b8o<M?!sU8Hf$v4PRc8 zM--BWTwGnNF6KVp|1~)A4+|t&TXKZwm@hW2{8cF!ZAd<l-YB`5nb**r6(X}U5y0rA zfXRbd1ocyzPu_UJax^gAJ_Fd|PJoDA#D-)ZV@DY$b5f#ZO_=8vpQtbqWNw#_y54CS zL$-oQ!n_ug;m^PoE=wnSA!(wDfpd0|A)9`E5$to^3=Q-_5+XexojQlCzi%4dgekUh z!nlzKSvud2>Ltho<kGOyI_@?&`2%hS$2NfG?p|}|4TpWnEw){uGO~Lg1p1C#ZR5({ zZXQ^Xn^>}grR)e2clH(~mD3bBgM!?273sP-05?WIDAK9}SC<@5;`rH`Ms*z`-8UU* zm46qQ&ohxoW9OX!I}B;CKTf!Ud=Aup5GqC1mlxd!^K&Mr1HE_wx@8)ppWpMxIfJgD zD9|7_>K|Wb)WY$NtE8w%dEf@_Pv?-4+!V0+EXf@2YN-+}-5>Hi*5LI)2Y&d&Ai^;m zs|n78KrdS`Z3C`nwh_Wf9F}sipprF4iK}xL!8PDMK55-lllTe644UIu?Y0){#oD%J z&C=6zfr!#L)P4~qmAkSaNcJj-guWWEDDib7A3wJuGB&zif_P?dAlht{?zMFb(VuHk zYP?!X|EToIv{9{Ty?;guXpnk73R;;P3@hKvC}4;W)6-$5&cO~W^2dILU5ZIJNY4p3 zd4cAqH2C+J4V|>%N9BVY$O>grPK}!la>y6u16dDI38?OY@CO@7t7DRDv=yH<hpVE} zB8uk=(KgN?FNJbYM@WmC!8f1x^a&tpV6rrNGyZ;oV)Ry4FFGOXi>R)^9<ga+HxSut zfV+Fm9os7QMW6w(t>@aSYr7kPwXczZP)p2^KX=)A;S>BeEPTKj?F_tbtYIyn1Lk=) z2EC$)zGTj}W7C=<?$j9cZLsw<&rH4YXD+s!o!5kJ3N9diBgV;P^A3*}Q_rMO>+QEN z>zrq2&t}KNJ3~c{T}&jTtu9!!866qv*S`Pb=fkz3GhBrDH+>01VE)<8ZhWJ^d}`13 zxNJRk+vXpx`4HSQnk?zGCMlAby#9P%9C(NO93KYVe>!q((#yLN#bZ#ABDFPOVM{wj z<)k_a6e*sFI~sfZy1Xq+!K8+XnfZmL)GX?eIUdOwEwK!zEKRC8tH8yU!t5loI(dwX zKb8D5RL}$JbHgDw)(FupeO~nr5IlKIJWD!&ci}L=vG4N|uwRvd8PRnlrH8|VP;RTo zNO`(L$(uq5ea4}L_XG!^FGllzPCV+6g@L?JnB9Vj8?C>@nXJIKH=F%*?Hw~&9^kr* z4Q9itFf)lX3K6%9OhdbpYwAXCToK>PMSQtO4ZPsa<gbPK!a`&v;4!lCq;NenEW{T! za~Y?psfBV1>@KeIq;c~UN7H?30+;cUfnidOsJeT`7U=8>fRx;azU197>U3lhK2Q({ zm_ZIu+6IauUo?tNB-i6rA!j~-K()m3yc)BLaPGR?e>09lWAU(VIPC1hvAd~~ZUuUI zIv=4$$kxP^c?<RPX$d?$R)nd2m1;7RNGlHrV>Obri*U)^PekFzpUaph83nC)(mKp` zjlzgx5Q8flaXI=me^L4gV&j*^J}XTXtrNFvoac`-TyN%yD{p!Dv~g2Kj0XQ_Y<~1Z z3^0e`&%Tba^Wf|c8g!z;i*w|}3-GVc9@_k&IA*NHujM)_dbHhEV9m%cCRuak`Y#G> za=0IZman}#%E%P7I6054j=W$+klWe;KawZX(xB<J+oH`b_tv|6O~Z#diN+=8>kl-5 z3V{7~9=g4e9<?%2?+PY|`1Mzh1g$==&324>aXP8--7amV4xDH@6iC}fDLE8YgWS14 z2-w8XO=58qWrpor&%KyB?gqV??V<NUSa{NvEYk9=!02a_;F4P0yR%HFI(M5V_~cRh z277JqIb8r7q+v8zCDHG`GVJowovNN!GDl3(5^rngHE~kzOwy)!-gim+Am)QHa_&`H zy4C43UloQKVQywSXs(`b3Lty(jlQ2Vy~shJt<15g+^msfe`%jN;EI0PjiEHE&SL!~ z=IxJX@070rBR?=VvLk(gm-XrmTXHxydFwkoRNWy6`bG!dW36{H&Mzaz`Y@oOb9Cae zU4*a}CCff4S0$z1Bjl`;yx*jpBG*}DHl3g>)fDyuNX^xo;){4OPl7>D;R?5zMa<|j zXDJ?8KWL3PwgR?|PX5$5G?{v+aA4TmBseC^&a0-=d?z27VF4T<{OFrnh{BM>OlamW z=J9eKL1fHK>ZNx^NO)H6vDm!=A~VA%*g7spG4RcSWhY<-+%{Curq=jV3*bgdB1oe{ zLp~UK5LXLv1&UHm@tO1EK0;q?m?mVqz?_M_j9J&*ma395^x;fHWf4)M-Aqd}7S|o$ zi=^Yn^{v;$=u3WYqA7o{dH%VKU9m>`6-m_V3Rgh~uTfcN{%7B^L@pl>jC0`Q#yh<o zELJ(&sdo3lXudigaB^Ftz{VdqL`WV+Z3#B3wb3(OH=90s3k33QDFu+Lj<L*`7Wy`i zbGt~`bx+LX>I`2sqcr2J^1KB+EinmmJ=!jKJSb5{z+8!5KtJ%OrOftQGp)H9#aD#X zJWan+sf{XX=RI*4e58AWQ0L1RU~o+CQ{DU0Yk?*ago$y+KUWh>-rOXYoL_Y1$7AV_ zKe;4D#6A=NyrKecgKk*_j(8Lnlg<&#^RpgJY;$1^N$ThAcx*rit*wr=A`g?}$^-e4 z28%G!Um>AA3YYB`%+S;jHGldW*&JEGD%A1a(H<K^4K?+Who{%W#?(`VEyIY6$hCH1 zcEsu_K)Ih^oJ_u#@?mfX<n@|LCrfvZV^-PoMKrNkXPVUTY~;2Xk72<#B?LE4r-mP0 z1lQun+vy3S@7>p*Rpck{`->gJbU}N~GY?#vCxmjMW%G9vP0iiVZ-Luo%f>x<-o|i3 zvz_cX&9DRg9aqNA63?m<{T#=fy4MbgUC*R?YR_-H*L$nO4bT5^#_k0$G7wK%6A|ti zL8Nppn6%XJL_O^NQYOy!^Tr?;4Dj<^0jqElI1%~SN^_!LgRZ|@Pgs=}0YIU8<BTFJ zB4WHRN6iRU&#snGDen1rYcbiT3MIPgV^<oeK%~6<*^RuF2WRBPnhoutzuDu`vktt* z#ce&)2~3;$#Lzl|`)#lz{CK?F^Dmt&s~dPLcx%n{>5~;pE6sJUaTPLH7Zm_N=H)p5 z-LF#VKIK-RLP8VeGEzsoh~ifl)hK_%nmbFRCuUc5pcX|ez=J87dNdBC=WPax%xt^4 zG3DTBI*DvSeU7ik!>5k*=nzc1!W{`~Vyz3PNH3Lod|Wl3_EVl{_1-4P@g`hFTF#Sg zs^9YxWZ9|gUIA90aHq3P!t$=HcPU9@v{Un_>l-Y)lSRfsKC(2VE<<$oQK3-{;KSYb z>oO@CV3%6_)K_jc{nEZ%{Z=~C{n_fZwlEq#^Z9f)<*4;N)jX3S0ccRGlCh5a9b{VG zGaN^=+;lKWPB{KN@$t9~(|XB$?e2V8Plxu1-OEd7AM8kriaHsLJCb3i5xKt%^S-C1 zMpktM5BvO>@nsH4J3zO=LyD2cyP%yzrV@WLf!$+eH|QT;BZ(4W5g{8!@hg#`?S{*{ ziY;`krw%Pp=IoY8G`zf%-fmhbSZ^R}SSc;Q3zhk%A&`jv*Ls5CKJa^xq<uHu;}EzF zi#rmA`B^2Z<CXaPepnJqCr5wofY&ks3@0fw$di%y$7Gq()%vISqn>FaMQE3{SoXyt z1+_D{Q7ZUmFWcvWZ1c!YE|8O8ML0NJ^0E}RU|sjYO=0rZE<BX-Ob&Z86j;Ge6Dybm zG}MnM!HmErziNOp#zwdr6zW1A4o`qTgT?FQ>9C9XMz)Y=o>z`$O1*ms4)vt~ll}VM zPemNv-4PN)UW@&u{!Yo4wh?J!i5pfr$|fA3xfb=<#_6!>AzB<i4fJ7Wm)x&`-93km zDJZuYochr+{Y3Q6Io|Mocna`qu`Qcv;+%W`qxXf%vjV-jl&RY)f?F&{G<az@zP{FL zD}nofrqqgSe)GDYUq-&Mj>C0|Z|cze4x-wB{vZk|K}6~A!P+!|{!Q2q%ZxE88frtj za{m)T^z2vvGenDEnBM`poIzlUXVWxnrO87a{W=?&cDus%QNUTUa{l@Q(d^+;>l;}F zMIu>}K=a}~ly((p;xCiuVN_I|y?~BE0ttiICkeNu#l0e{9;SIY7l7U=a(;Cqzbc9Y z%L0~86|)_Q^jVadB9bmYo|^Aoe(=TK{0GP+me%0LuuQSbL2d}APhBbEB5gLa?eQX* zw=m16G<RxTy#%*gSk<oHw1Vl=mddD2uJz&Qx&uk*|GHBmf*B(G?xW6zJ-xD%M=47~ zUU#FxLx`M`p(iI>enUz038u5GsqWGk@c>XuF!V--2;z6r^4-2mLVxs2ukH$dvD@N+ znF@mgT1af^5l}m+Hxza<+&L>h3GmmBc&+CH-3R(;gZd=OutU0l@4&?V5=W3S>;>aS zj^k{*t&Ed~P_hev+eh4vCVF*iJ$J9VKVi&_2iEE}Ta%N4yAsx9F2aTSK&&K{4&FYe zPfl=vl!1gG^xodSED>58E?Z3@3$u)Mu|tXIz1HvYnl+rgt*|lsc;YrudK~)A%z1f5 z!XCEyj<xls-R1A^v&T@2iM`V{n?KO9#1Bn3e|~iUUgHFVt4|Y|tY_rnnW*%FU?Esc zvtE0orTnP^lo4Dw=$t^Z;~s|(?P_$l4u_e)Dtb|a3<4Vu<;{K@>jMkMrd5RT1N)v- z8}?Z(4Jz<Yn_xlD?kT(>J;_jQaIDF5%@dQ>%WFZ`SrDf|>Ez(-$D#$VJ$@YbNGu$E z<)GdOgACQHH|Y%%b4KfM0tmfLSuREg<K@4}F058UY(qQTM)6bG_)GM^Kp8P49b_^) zx43hlM|SrLWN~XVm9KU3coD;J1OxM!VXuCcV(5Yf^c4wMle~vWz3(I}m)DKrFB)7? z2rSuHdftAzSfL>PkDse);In6T?-!m<2YwFi9MyQk5lI&fyuM(pOzonLtt?gyA@iRr z|8)KT@mqH60*C{4Om3UE|DJ1891}|Ul_Ff3C!cr{F8=wSvSkrIg!^Tn8STI4=YRdB zFCJW-^T)h~|I3?oprFJqe;Tr(IQBpM#1ud=_@X8?$N%`Y(@%(@z$Vb;Chzn9*U0^I z6#sth=M3$SMh^Lc|CcvEg<Z{14UO3f|F2>C=a8Mg&b|n);(HjVqyAsstSF14r;08; ziD>`J;313%z*QKe@SG-C|Md|5_1_WfI25@$tl5YE!|0w>GCe*zyaLkJfcBpvz!0{N zf`a0}fbTRSITC>TsG5<@r~mCoa8rVM&(-$OBh~u4J+Q~a-5#@3`K72%fJ162bWjDK z`?SC)0|OnpKrWq@Ygq6W!0_xta~~Fm$~p>_6M(`;3CQTaLOaUfOX`yc;g_P7VcNay z|M>qiDYz+3We?&FjEhBjkRr29a$%rNvqo+oh}!TKY^Ywq5s%06@2zy0=6&C@sU^MJ z6h_5u4!*+$uPgWZ3n+P6^2pQ4f#hlQYdzh!4}qK2JK&ji2kf!G!0EIc_{Q`-l9@}g zFcgO>Mb-duqv6)Ncsc~)iC~(icr1Q#{N1GSqr;o)PJKump_MK@3eIL$kiHbX9i|tO zDY8Hu0c8~XDp22e1bi9G+{WBnfWPMbGlWz{0F|sc1XYSsfB}C4mFbCEgEu#OLDFYk z<F@R|#6mnLveNB)1Uv<4UQqkkRRbJ-@yiXZGEfW|(l0cA1VH052m%-0iE?WLVoYXe zq1W1({?O@+Uy2<GD7^Z>)Yn2gz5H9gUI%c@y$3q!i^je8yK+7N#=_#$8=4N(eKLC@ z003^hI0wvI%YpaYH;0`XrQ01Ecw%$A>zs@itbq&S(n!>j$o$!Ul~Q&+W1V5IqlL%b z$A@mT3Co~XQs#e#j98B1<ucG-aqOpJrJO$mE`awz{jY@k#>)ZVN4f|qaTP!>t7?4* zh(1NlJOa=$=)`TtCuO+rHtLdCsIPW92^iGDvLKa4J*fUWINim^#-}$AynRh=lsHQ; zH<6zATb-uuLgL=ZOc7763m2$eP|O2c`e?b`_!2s`kyNr1m?B90?0peTnYMGtubUgQ z{^kB~`CIxGj)(#9q|JfQMJ%Pig!6(aD9K#LZ@U%_S&WvOe<bt(#ln<<O)wU>2TLsD zHj#2q_kd>5V*ACy(ic$@?R#6l9s+rycL1&(iFXHYmJpyo=aRE24*-4g@Ay;azL-?l zrc%Cw9I7p3kAdlE;V7uPX<mI{tH>jt+k19z0}R<<Qz+#xfa8@?u&WN-(2|<n8z{C= zF-Sa`;l&B3;d3;<;7^Rh!%CiI33ByRu0ZY3%JyQrzU<I-33D%?0JQ~*s+GUOX#uLj z;l83SZ>U5yigAAj_TaDlRWlS9Z@i4aZQK?0K0vwEPH#4e19Q#WoP?lFuBmJiK=Ku! zrqZ9I0<-kyE)c=fZ-0@dKq}r8ssW%0b?2VoS5!C;f$gx-5h(xB%hLq4n1j@cb$=iz z1Hdfo`l*o7u5uK^ceF);_36GN+szTP@snD-#^k~Kzn>fg2ALN5iMHH&Id26j#N|K> z!1=z}H`?nMRPh@-^zA>wcL)&1#2rS32%35~5O9hK5X)qAA>6ARXAPOYX#vHk?f15$ z)j^5)WAvD-^`_EUSk~|-;8^}p1{eq%0k%!|ejf0>(xfw&m0@p;`wsM)oErKAX^j^Y zFSIwpOq%PEzZ%)XkJ;wCp3`zuEOX)So$G9&3{O;nV}r4rZaQ-mz4d)nS?*@z!#AKX z=n9H}lJzV)N&1dden6D1W}VbdmbgA_J;*80Db9%|ld{+9=wNpXOo2*g;HoTy$KH*r zsH&I)bjyYTs%Qhynr87GU|TBQOKH|Rytn!DEif|vR_S2jR`4$MF;vX*00rAcfW5oS z7s!mSaAg~J+x?g{R8DDtJ6Z%ztxr)|!z&ipnx#1V*}d)-a2Lo7QG(eSCN7s$V);i* zN(WUD$0H$KvcKa$q7epM2t^v(?+L!W-<x$#-}@f5VgB9F&V1F)(@m=B+63UG7DLfD zuv}pP>Jd%RroJedc>q9O`gsTcc>;m!2;@g$`9&7eiK?aysUTR8_S0AvPxr<<XR!TB zR$})igPBtjsV2MVo?1yV+W}~>(!}N1jl%X5*%}-E%H;7PkbA1`0fFf*TA=AZGm~*i z$~9l75^&b-{z>ozX2;f~PRx=3Tw^5W3>w)81vvW5I+xM*=t=63$y+Xq#VrzM;mc!` zguRrK054C8`FL6IZY#WkM2NVU(vEv+JU9IDfqS&QYI0Ixu**<d3IrQzHnEPdH(&M> z>p<#4eqfMLOlSeFiN5OWp7U)e?E{&a57-(@j)ioHPB*$fS>Ir1jzRXBwt6U+9zkLs zv8<T3w_bBcO+XTQ9^qp8HRtNgq|c6}MYNz^tN{T%k%rlojLzW>Ve%C`I>C;%a;JXV z{sYI^OACo{(JzMh!Rb+w05LJq<(IJm#_7Dj9^l>{_1;?Ysw|u|UIiPNLl)Wk_yx-` z+}Gd$!>?<i^WFTB){h+GB|WGPE>;*126TX=RfJh<z!N3+p)1_tsK$i#W=w)KIuPfB zNk_`H45e@y+cA!AD`eEcff`E93y9=EJ^<p;JecqXv*h<7=aw$Zza*Qd9b4-6g5B$8 zYalR(nWC$kh={Zrz`^v@O|o5h0V=Jb<Khs!9bN~k3FQj!HBMtp`W#v04YNIZw!UjE zV<zxgH*ZSRn)~!n96-R;Wb#*NzRQj+&%a_CGa6Z;Z34m7bN7*t7$sfbc)-`JLx-b4 znYbDE+^^7nl&O-eYB+g1lkqk8u9fl&aZxQ6Apz*~?toh{N?%V*0o6-Z@9I4ZxFBfJ zOe_ksj~Se92cDx9gJ6B7aPiIa#F=<lq(uQsw|bvQUIGG2Z+c`2TX4af+hs##NS~vb zankP0(Hrlehl)_4oJcz(ITgY-GNO5>+{R%Wg%)dEIjY0-UjqSXbYchW&t1Vf7Bb%n zs27fp&F$0Vw(UL~enXMB(98GNpMR9egvXA5M9@3`Q|(bQ%3^ZYKM78n^E_cIr<_DJ z{Rj_k3l!6?x}`@AOe@jLt2r)FG?SBeq>s0i`Px4Y$wCpDcM8n*$F-|SLEu%YL-V=r z8$4-`xrmne)2tf$35UrC!LGM}r1wI}l<#|!bJ*AWpV7oy&lDSso^<(mr9kP=h{_3E zxl??Izv4n$V=D!Y`kE)ugt)tJ&w_R~6O<Yggoki98FDh<HxIv7Kc7O~9Dp#pw4i`& zrVqg+(~~k&YSr4GUlZ;X4xqOd!k0^GeSUTf2>gxffAIFQC~=$`t*{%HUYdTAaAoEr zM*Tq-lHPMlNWfpXP-)}&;I&y!#`#$wRz#O9fY84^mSBlvJGP)f1`e}Ef^Y{@;a?kE z0#fZDue$M=>V@!W2om;%Jn3zyd35d5&UIEbPDq(8t&Ay^PDuy)IUpkenS$%*;Ja7* z$8lB8=dak%S(ERt&G*<rC@t-^=tRoxa06raoONQkFTgbT-H4aP1q&X1SY-42O`!Di z-BBosne=;NSeBs<=HpV$vUJT<*hRx}kO=*fZ-DmLJU-R$@5r&2@{%rwc?jB#)Idbt zK$p8?9L9(@dao148J(^v;u=3_ct}<p@19>Nqe7+HUYR&A9p{w#5be>5ig0=!gGMh} zj9n>UPoqRhHxk8sO7L7cfSOBFv4T)a!yvc43(nL|`<_N$4nJ$j3~Gpu&iu7R8o}v( zs%CC+fJgiQD|Z))(=mE@C^61%F*~a@cxR)$PNsa;@W2ZdGSQVzdRrJPstsgE%~Ef) z@#P6vR#6iz`ys&`=rCaUUUPOA7<5;%wzUj<2jG)9?z;Q3qy+fn{^&1EClYPBlY_RF zgTF8wIs{on<rTpv{IeAI0*m<2m+KpY1*yPFbjBqHzA&}xa~Xxi`Ur_${x#u+I#Vo4 z6G#)(R>urqAY{6y4%c!r-Wd=FYOaW!TTx;5nkgrD^{<ER`L2FyrmrZC7Ia5<-v<n> zumEaw@kBj@+%9R<0kyE!_w{N?=b}jLV8YjgaM_BKX3R4D_P(<@%<gY5+pSE!y)#yn ztpSqKVvqG0Y%(VKQ2L&L^yq8L=NUJHuOLCiW2>3ou2Kq#?jsfZM7r}?>xXLheYTbb zljA*u3)yGwu5JAq?w{SvREWK(u&<-#E68iuQ5@j~D>Exjm~Qv22Z{w$7sH2}o4!b6 zi0CVglQ?~y5<<)JqU8wZrcfXx8ZjYr>9kG9e8EEG5H9jP`xPWjDOa%~y)S;FhEMkh zyl6Qy?<H@~cd2M^^GBtV)JP)TEn(-+(K3;Q4a#rrU7Wvr-U|Ab(*OdCqbT;0*4_r= z{XM?jd55`U<{d!+l5NG2^pE?)Jzh-PGBfjO1k04^w1s&f<*i&s^Rkg-_N|Cbjm7NW zEq6E$6<W}`g=PT^xx8Uz4|wfBFuWP7R$!bxWG}!#hNaDuOJt4h%B2TiT4x*AQ}(Ye z%~l%B9VPDHz+YOuFgeS8?89-qTq1+iqH(Y4Ur*yJP2bmV;B~SKk9qQqHYTe&yD(YZ z_ov_evw--at}D`WD?~j-z>tl>DotS}Yzh;$IYlwQlO_9UZNDvimDkt4<B+i*ciT_; zDN_$K#uuF%=wQ1x;unKnXmX+H80c|2-+#7&LhT1By?`tWgT>LvM+F|<FPcCqRLMdN zlrvH$7`oH@Bo5g(SUhvXt@MZLRZh?8F=cptTaTT;l^d0v9+~fw`+?&7XsA+%6f%NM zcQs}e5aDZrUGZOewVq+pg=e7_<fzO^v6%P5&)%yQ!R99$fN{h4Fum=FI?(a@9lyez z&I&67&_@bdU>ulRD!D@KN(|GJ{=v)`ADEP1KPlNg;<_8r6#&4jbX~c}9Y7gkkgar8 z4qXi-utu>wBPX!a50J1`(;y+NdS9gc`GBRTY9=TkZIgxM7*H0JZ<;nEpNy!WYRtUo zdFSR@Obg!FQzEs74VJOGw~qvAaRSI-IL4ncH6Y0FB3bbd5aCMo-`*CN3)5yq76Hmy zpk}Vciofeh!YrVkEhtJV;x)a>=4iiHgr`hL=E$IiFOl@zubicu-3qB48!bvdxdDRL zZIIWG1|V>#z1F<06)^l#W5i~vBo8+2saoJ{oI@eRgg=2w64{J8MbGXb;Q2@vKY1qB zP3*ZVS`qh}5j(*tY$XwmkO1Pi798`BXBlL%eggaH&P#cNsJ>7>o3B4)Vd)hEFSVXC z!qUqE<eIAMHw`Xb{+O*cBxK?3Hl-VRUIp)im)hqXb?Ot8n>D5uuTn<i0V&7QqXuKH z5c#$)(RQ!6;}2geVv!+gX46UxOJ*-3k4>t2i0F6SvD@gkyC=7TmKhH_?nv_;TY1>| zeBfK${CGu?@J9sjUGEp3CzrhxM)PXnOpmHDhIl)Sc6+BuI4#vYo_ee~Jj6I9ix}^Y zz)(<!V)j(r)8goP<t3#<q9?uc&SHf!ZjHk?UojZFhJ6iMC<Tz&NhEawSWLTkiz*)g z``~^y3chC%OfjgdD|W-ZVoYKy^72Ki&8Fhb^ga+8`TSMTZY1WapXsDj3^?XZaJ;)0 zlX{7`VErW%la91H-9E_kXBBywgIEvr5e=kd{B7?^K!KMTKUxC*2;~t|VIqWoso~I( zK0pR03&U1dRX6zwjtY2!$R<yjylr57AA%&FVr*`_iHfODZ0Y+j8^)#R(}2rpKg0LI z{tiqlpdOngs)F3zB6jWELIyHD&Ank_AV-Z>^s3xK6mZFHAW2aqE2)%!akPTZZf8wl z9#Bs*6qKRtV{y)(&e#e$5S!qP9ALeqL+Zs+8q9l0P?sQ{k#s>4IgWREb&J=WyPqSA zqn`}tD-i0PE0`qrQ(+i$Z!;1pzTN2_So9U+zTRr8AjUY)#pDg^Ca!dNpZ&Ex@!~^0 z9s|PepGH?6ZXx#{eA?D8Q_Ydh&8H112+k?np;~8Cj-=att>$*%&{AEoOPh?BPgT$D z2PMxl<Txm@=_k~WM((sLA_OQW2166K`pl7(?WcRcBQt~=EhpuxoIET`JX9k;ucnY} z<Tjo>f%(}fg5j0A6=gbVJJ2YW8-w3Ngp^w0XVqmeTke+HHk`lSgoVUiERK*{d5S;O zILV38{)px6Xm@m-*2`4K{CJLec!k2ucbq<xyTOj9@6`-P&b_)Rz{zp&YVuf2aq4zp z!6tuhe$JeX1>0J{vN5bkv^ZjmRTJL#iT?YlSa?ekJVlhQu>t2$OEn|w(bLEQY&H2o zcml4SsC?_{me8XFOJZ!r{FSP61%VHP*D17=<k!s@?jZ9~7LuN$LF?=l-Nhe02n!{U zWESUe*!@?40QNk3;%PzGP0O7}ptX$*Lsg;DP(npIWL)DKSy$tDTECLyO?vU5u{k1@ zme3ZE0WMD5Lc+){kBVxY;vJwgBixky>GWv!#{rE4z>`;KA3>8Gn_LWrLp%~hQtw~n ztu7H+B*);1iEfya%4--tkYLh-U4gNN=%OSiFE=4X$0Um7Zz)#PCsG^7_CKeMjwN)T z|6F{x8w;<r=z7AozqustTHfU`4x7P}oJeMwvA{(I&ow9Gz>f1EYkv>u6<ffJT>_gd zlV3dgLK9+7iSA<nIsO7|Cqe4Mu3)+XZ=(X~G6QDvz!QdkSN}R#Y_)SA(IJ6j>?<EL zbu%ZC#gnB-*iJ<!sGr&R4w@=reos9=<;_6UL@?at{&yYzY}0t2U@IjN-B%~m$r@** z5iR3>K1c#o@a#X~k<Pg<WL&(Ve2N2A5?o-q79shZ;`HP;<AM`H+ZpY=(W}B4>VJs# zSO@m5bgSp5h^DC16rn_Wz2SDPXVv-!B6}Rjqdn{l3}ng5zBfT%-w{lltq~$1y+MdW z`HR$pWcP|lG?^2TATy0WeVQ8T#f6r-d5s656CV*`4cL#&DQwU@#Lbht@9xurI*$da zP9BT+xeSLl{YbJXkwb>d&u_LOPU_@oLQKY};Cdg$2^LpSb*@<nLSKxqe0mLun#*fY z3oi<Q2yT>%@Z7tDaahI%&`Bhc&6B-_U%XeWnl?oRrL_sXYX+SN?OFk~^TJwM1pmdH z<xcUyZT9(WvegR2N=m-*Th*6=J8F56{{qZoya>=AZ3*-Tx5e@xB)~l!K$933%-1{6 z$bmvt$OY7T#5s}X!0~WBdw{g27?2oWg0X|)g0Ve?q<ZNEO?{vH5Ee4dNt^r9gEQ^^ zh@na+L0~258gv`?>i-o!-vjoNUqBt&F$?a*CUiDlbWiDKJ+sfjD)ZR2&PK)DdWb9S zPSDHo;{(XSJ-2iPR(W1{W1`^Ep2J)r;(72UpmW9~dX{SJ8o<g#ka6%9cp%1#^1Jmu zU|QR)$S+ny_#;RFO9Ah^JJ5`cZ}tQ5(56YN2*(shv{gvDE!lu$Svd)##FuY{CU$5+ z_4eFCaA0=*s%IeHi%V7kX_~MevBzr-f7Ubw+Th9|R}~EvIivK%N-cCQ!+GK`5M{h0 zAZY*;ud`!YM!KsyE-VAEHKHm#GKC0r#|zNVue}VlY8fi~iL2GARDbzHxBDfdPe*TL zOEus3n<HI7SsPlDvfn5_VL5(d#x45?@-7@JTWjk3vnS$>tmPk>jus9|bt2Mt`^k3x zwFgJfZb~84>2S!$Xgg_@&Y}GQo~)lWgE~Zn3HFc#41gABS94-qQsVp5IRW!zL89c= z*Hrd_BD@)Z1+Jhe<eLKLLs<Eo7_Q40--hvD)PG|?t6N|=$hX_*jsJ^0ap55#n5JTV zbj6>ezx-gPef!*15zBTeQ9G(bRy@Ray4LL=!H)-;C=nsCWhGI?%KP{z3Klv<H@hWD zW7m0w=v9uEpjj>Rk1W#4$?t(Gw7Uz1+mGc|vb<KzH3cKCJPDpAc`cZ}aHZE|2$$Bb z_CpBqQ#B8aL5kLNA|<D0>A27FD1jC1fplrgc%fx8T(+pmql<q2LO)G&Rr_wo<rWtO zSX+^7Xhxe$`|4YONei%+C@!k@6!|{!KfaxLTJ!TC4?s_BXZn3DG-z?xvD~a<chc5) zhU}_#uH{YR=Q<hvrVDlNRnlv5H}6mckZuP6!-Mztbex=<Tk|!beFn}_XGgHzaS#Nr z@}D1jQyU#|N%I7=k7)rlllEy&-)azEV%!L_^)lK+XXr*&aP&%J5_%8M0l#>mVBONm zOvTE&&P(Wg2+s}moqSAAm^BY0TJC>5cEQ*8qj=nPnnKz5n4&B2YBkCFM7h94!6Fc# zUvv}3Up!rV+0hjrOe{^4$#4NE1T8^6Yynpfzp$%Rpbn#U{rd?lVF3f+Nwd9P9(2*r zu`omyn88~-W@Ml5dYbF&e9(Y<E0N#m=z12u*O8whJq`}4e$pX{d`{|kin|7=nVjQ! z`tdV<4k$K4V1OqMF>A04@ud!E??sg19W29kFKFf@r1e2_QMQ>J)F&Nm^h!?W?-e%R zmNV;S9|<iIdNue=YB8&Aq|LauAbeio#+M)lSzmbk&Bq?sSwd8)y0AHYpK(Fgc<X8% z8CS<J3lW)rK8>HDtnWC*u_UVl4=sbXiyZh?1L#X$lfIH*JG~<YY$j!JZcQ|#_yr1? zA#!!$x<anjaVM7mus1R6rAg2G2JYIHVzzpKu@U7<n+wmodpaJ2;lAF<@A_A@AO4MH z{$sHnvBIT_-eBKLJrCZV2OfFr(cyk-Yw9yk)jt>;;&`A`ES{nl{>Rt-b4Lx4<slHP z>^w`x)6f+pLo6|UefE9+fpEMYR}~m5ewGOz0eHz_@HnaTk)-vX7ZePl>Y@|x7mAbp z=w#Hv!2j{%$Av@8<<Z0aq1*Qz?JJDnY~uC7O+7Fs(eM?Vc$3H1+XW7{kp2pzp!N)S ze{!Iv5hbSnAp18LH=}_=%ws_;{I0t%{D#eT!&8$I4RDl-*@o?mhZVtReMB3E*O<<2 z-h|4rB?2JF8r&Yp{R09%9lXDOV`IxyGSIxlqNK@b`00Q8DJZ|NwEfKm%dr<(Oeb?= z3(7A%n3>Boe^=n05Wq3Z4Abylx#fE@wVwHUGiQY^)Ie8$R|bMl$Azwk|MnrpvSj$p z-<`Oh`1f7Tz;Sk+u1bDY|8wB}8o~d5;b$lhhKXN1<_9SE|8E7<87gooj_pr$Bu|mt z-(Juke?%lg)p|A3>}r;iiF&#K|3AOQ1EE5nWA+!#|NW9%*&$XzEN-6d|9ZV4vYISl z*k3Vlm)-c?u>WJOgR6EV@bj<AX8zYe$l{X^RM@2h?CGMBT2H#n2WoDe3q~EfW`8~X zf4&fhrf-VVn=d+l-$tu5&TxgDsPs8ApQGJZ)O@!uv4wR%6?R)3N#@?n{oOoojl`px z5)ft5+r0MoMfZi)brVyW39Ig?zAAWiv-2C@u#Wl*ynlZCU$2Wn3=Zp3x^w!Fz-@uT zz)%P|8)>yDh<@(~C^;CMk5Xb*LB{qDY>(`NU(%#JhMscYh#g^mZvmCLK!s!wR23h9 z1S)jw?J|h>zGw9`%Pl($K)Sc<=t%p;_3u0UYk{^3Lo=25J!p{x>n}wEtM?utfezME zf-+V~zp+Qx6eEloWWA5ZfPGz|iTCbDpe-2Jx*c&7^jqXX{2jKisMnp+UV8&T-ZWNS z(&y+vQ9V|jZgB?`&whc{yVA+V;5(o$`U@(i0AdhlqSAiflRA)h5nsQ|2JByKom#{V z&-Qmh()fcLKnZe~NB{%hT{5tJzo|c5<5qb5>|#PB{nsAqLv7CAOkc!1X#e_?MFNHn z$P?EA%bK)b9-m7r)kKq+3KJUvvhoP1xQA}MzVS+PYw=x=a;;TUdkl+$%~Vt9x$Dk` zmcY3s+;uXLwmJSvl_Ic_E{&GnYlYh86gK2DT8WtMw+Xc^dZCD3&Kb(zJTKv#`)lwW z=h90W9^F=gXP~^Od4;USd!*8#?d7$uZs1_@k?+#0mm>ihHTIJfiDeGcFG$N_v%lf3 z_#rhiOw*R$L&-f@YWCWAK#|>SeXi>rDAe8R%~Aqh54M_L>Oa4f^}`98=zDWZqz1@j zrf!puU3%DG0D%36!=P4Tt?}%V!)EL<xHaIJfM0b0G=$#(&j3sP*ZO>5+x_5u<?+V- zJ5`Q3dZ2J_TRDkuuvF`{zX;%Bhk$YVD>nACeKd+spdu^CXd{bU04`bz+8>5M{<_>m zffNPaFZUFj8!m=nAe$JdsSsiZK$_t;prd%JiBfBTC78h+;@4YFj-CRgy>^Op<$C$L zZQT+-dHc`0vXZKUy8nIVU;Loz3RShg&I`BfeE#6$1H5U9sQC>C+!>*Y>B>+R3HWag z;;=ZC!xe@rHc5c{(;W)mh;w!O-uDqcC5VYP4N##nw%|<nEHMJDM{PkY0gRh{`a_z> zz;#50^LCLG({QmxumeUcO|W?)AgO*e&XN>+V7`ZW|B$Vl1U*!Av*z*UgM9!P{fZFj z4yo~b>I95QhQMjn3UZ@~-E=r~(1c*dFzSmmZoAjmQ>3i?-WsQxf|YrKf{s7S?z^|) zN*8h9uKuYot6scd_<O|M+qM6WvyPm818j6v?+Sm!p9E}K3GzzNx0#yJU@A7I1bPW8 zehpU)1JvvhN)J9pbRAD2TQ=k|Xcq)^n+IE<Hl}>L9;4zZ1Hp*{Wlr;&3PtrWy{*|q zlOdpWZV8Sh1s9_a20%j*kbIJld=HKXnpozayZ{)j8Np+WsXPR|XRcG^mO=9d^1kvZ ztQ!oO3-G+F;qK&w^<my$-`x7#m09Y2__!iHCWyE-k@r>~=t(@s>H8jZvs`hUxmw`^ zjtyG?&ZARP#DGqkhR}O$?#~blh}cxnf>@x5C(*7FvUcUc7p@n~FwaujWvCUZ%C-OP zo&K^jnb-=K>H>nKkq0Y{1&;u&Vnykr;gnGGY9qw=<V-ShY-5KG)VJm3<ypOp31w5{ z;TE^@b-CRzbalXPsXrAZcgOOankm2mn+?rU5>o`m;FeWP<Z|Gc<>2un@0AT$CAQm; z14xrPCim((=<wUOY2zmsf^@(y>STvd3dgB-ZiX!!fNoCq_zQZ&S`x)d+ICKN-aURx z!my(uC_3_G0yFv~U$~D=NL}V&K{lPgY6r8yrDOS<4NEo+qKauTxw@QC#rl-7$e1vf zR1^7sAyI@h$O$>$Z7SodK<g)aSd$Mmd+GkCI(N#{$3OC#Q?x_)#)irt{lwU=Jp1t} zGXO#t+>c^{{7libKg2;-hG8=5j1X3|m@D8@-UJQ#qliiYGPwwMTdrl`{IvO;l5ce? zO9O~aRlF{!ZU^Q-_vl4!O92VJ(m9yXHR*Nu5&F^EOj{7#_rCrsO~!ebFSTAC^Sd*j zS)PspAD;qGOkyr)m7o<&0;R>0KS>g(az2ZiNj(HP0N4X}i`LVGK&ON~lfVY~DwzQL zTz5n3Srv>vuz8wn_qWCb4FrjPJ40(Yf$1?#PJs%?-Ousu1cri(c0lLxAk;RDY+rfY z_*x^O7;k0Af|N^99o<m$XtesPyP)Hvsp|`8-ay`3j8+8#O@okQ)4QC?sClNA^Szf6 z9NtbTUAFGKFz;~gqQ--YcmacNfRbtrPQA~54S#^x<6fWAi|aj6#ltZ}YjJ8He2&wv z?DemHd$lZ^_-2}YUZtRIX3aYNcR7))4NllKis#|wryvOf9=2kbJ(mD}?rK_+pqW3P zVdbY#L7PV0M*1;@F<5A@pwfAyKta{qc@I!>O-*c3qBWu-R!#re@DV(m9f}TkR0B(= zd5&DuT97ZA+&{)|Zze)|qL_-NV1?owIeKf|708rbpt!pbx2?Hmt#iBFc64Z^)7+F9 zJIdZ4c73ejmkL#uMk(`?NHSx~_a57>ZDzO1ZEmGs{>VP2`(-)uQ&`CTV&Z7w25i<` zpaI(B{^rRRAPU*LP)NWt)f2?=;CT)6_bT-Z7}4@kpHJxHEWB*CtTRD{!}hf^-@sq& z=XYDgC!{!Dd}ga;g-s7`1D?)H)Fb72GM{u2EANTa%F(i9Z<-Snj^sHd`sn!w(_*#9 z1DQFG8k;pHZNAq6Y3R!jy&O9(ZL*Kj=ivNzTvJ4xr2q*dF4?nZywK(~81K8Cz4nVu zk$G|hCKVLYaG-%=4vZ8uyLK*37V76)*ETn1N9HG8Jc}JxbQk5QbjO)KYkNHvGloG? zMTaOXyf4~L6d+pWv?FeP_0<$~EWD}|^g*AyfM%7Cudv@ARA#;}gM;Uf>!g?J+;>gd zJwIXN%p_>$ut<9{K9>mfj5C>_u9>0kkn@w*<1QDYq5=ifIwII7&Tw^;Ehi^3U1s%^ zT5Dy~e5#(0L>{dSv1XfUN^(x<0p`a<#mflBuSIF`{CdK9whvAc`Ttz~;Cux5h3tat zz{3#aP-3!JEEa&i?0SN>p$}oaV`|o|F)Y_!MvnO<QpuA{E_Wl>)#n4tKn4c72yU)} zX8ZF_W@a#hymLEDKrxu;+*RWtbfv;g8DhUs*XdB|M_?Z>1{*Uz6TMT)L^(vRj*Mjp zSP(Y%+U9NCUr{wr<DDyH9WfqQd1GG7hpdGk((vA#Xn0qTMFs@2k)JR(gX(6^gxQN1 ze<SGG0lPQ7lQs)VsDjGV;#`{H)5vX_N%G{z5V#*&OucJ0M6bLY?2D(gbRLC>rs)&h zO^?9}^J-;4Z7FG*WblPbwBlG?uVu~#AQuhs%X}aJm{ZBEcjDW$cQzmB`MZz&IMcuC z_fRay@%JQ6ga>r4kctYpeR8f4kE#Pcfp&K9HxnoYVIOEaz%Dn7hnQ=wzZh)q&_-e& z+(8Gnd=fgrx~{xN1}Fh`!X3%30{h$>Kn{YUs2TwQ!4{|u1-;{}k#<`$toi=(c}fL2 z4m`63(<{(GD4h5i?2b#KHSB5X8`Na%XvC1>p@E@;QkHYxp?oUfUSghi1Xq>Avy)8n zfzC=fpa3bdY;)01hKg6hI74m*86=bC1m~V%9#Y&<oLhMS4AP*wxx?jf&y7OBjMQ|N z2N>ZU-bOW|o-4>#@XJX*LtI%3+JqD9K!3&?pW~yTknja)PX)D*8)1<MT@H89G~kjr z4=7jfK-_+rB#`3!FcWl7^HW)(JWz~wDwwyBN6yNeZXsywkcL~*p6NfRmc3B$2oT{f z!c9Iel_mWM;tKd}e0v7!>0?JnB3(JTSSM+|AA?F=&zV5C&ZW_s$f}6gXCFB9=V6pV zvgqwIV-ipOlKhG&u3(<P(Xjny1nAFxms+WiBt55ZPRhv)I>X$v*%^O57qSSVyqVMw z>q%Q-xSpMQ`C-CqW&u7-zW$q=llcXPRgT#NrO|R8P3(I^V4LBTEl%}wN2jhZsAVUE z)}wXeEE5#$NtB<b9qdM@%Etp8;%<*#5_0}$^|9<~DW<++i7Ar=N>v+iRT#lJ`>7<v ziaVPj>%NxcuS@gdO5^1D4a&@1c3>COlx+;?st`))E{wafsHB|!N-KQ{qbEj#x;kk_ zGdHu&%0y93q6~|*Pq386#_T5W8=cQfn(itKbSQ8<a_n*#wMRCxu!#p5z6!aDYEYs# zH+UR$CW2o^Kev0~lIOAIM&-mdf@R0+{t2mmES|edl=d~lNlS>|qO$LC#XhKK8%dZX zj6Qq0^{<#98w5qbOq5<F^jPki;8;`Vme}>g+TOaE5k}J&+Z`|MfltO{1L%B*DrP7i zAsK^G7XHcE%@L;_CHV`n%|yCJ)y|>av5VUvYaawa?pE|Av{g8D_X;yX8A}g^Y#lIL zGzr?2G4|tOF?)n?PIUDbXy9We&^_mRQ@04fG91tqgcj+Y=9Z^;fNVKy2Ha=xhkdTl z=@GLk9zxM52{dZc&FloqCj&Qu>yh|!5nyRFbxyCpyyp(+gq1Nqz3y2*qsI!DS?dlg zz0>kHUOsuYTL8F?&okw3J>J%s{Viepf)>Cd);voMPR_mvTJn|2HS<8Bjs;tA3>(|Y zzKfPbLbjHM1|;-X4pbcHUdanyef#l_&w~!Vy%8;6@wX5)p9gSHpP%L5rqm_-%~m6e zXAV#_>hQ4g(@U69#X;kO^N&&a5<L_9s}x7o*hhD}d6S{00s$RM*Y|%k75p17P(*A~ zw5EI1yiEJ;jr{A;g2$->9ge53Uw{6aW9NT<FfG)16HZo8{ePh04?ck~GnDQZj^7-~ z|2mtWzG(f32Ur@lc@O`>3jX=xmMlaj@ASW|chXVOq=hi4^<3rDS3L~^#1NLEP?WFz zo9}7$z=OYRn9|kx=^h>N7;NA%@pxGuxoX$<n}i>m=$GGcIYGgU*}z8>GCFLYKHY!c zc3-kD?aQo0-DxGB59;&zdMVH<$i9l;m3P0+^G*1p|I^d=|Bt-<H5zOI)nDTu#v7PF zj1t}OPOezUt$@-AKLC6-Wa$C|Dc?b6s<e^o{dYqrXq3Aj7(a~t)2}MOyDtO|Obd1c zfc|P5X3uH!a&P14;WJ`U1N<|F6<YvVypg5rhjS)^Y<TCrd5u=0xu5DO#1+F2HBt~M z|54^Y{o|j%fs7b!2HnU<8cv&HTKuT8b86p)#=Op!&r0$9C<d$0l~X%gTTXH^m&dh7 ziSO;*>+k%}TvmKG8l61E3BFj8V4+{sjmcnB^>2LWuSq4G0&a9Atzmy+Ni=w{x=T_R zV+?>_Fa*{tMNU1&^wO5akH%^{jyyh}>)wwW7xex-qZCh5a@vHK#}*^w(iZ=Zww1p= z7`!;*@ZEk&HqYts!;b$pfFD|q@Hje+W)-=Q>0fGR4<0Aw1%mIXf=Xi}F37L+zZ+00 zoH38E9J19!ZtB-3=+{*%oTF{t)NnnA)49kE?e92<Ul54&Uq4r$`7#e!azoIEUy3r~ zfPSvu={EBhW9Y4|c@Qx8h3%E=X=UhN3s9DZ@{_484KtP=RG8q$+qjd!Pp21hGR2;O z>(ynuf&ZKDgF~I^ZvV!8W6pz>tfQc2{oBaGfE}tMLH^HC>w^&1+Y8)(v=Wtb7CB5S z(+in5{Xh2JGAzpVdmC0n97Lo9M5IMJ3`)8|l<rQE5(McI7+O+NN|5gEp#>zRyGwEi z8Dfa{8r=K$_xFF^=ga%~J&t|sW9y!{=f2l<U2C1|JkKRuWe2$KoCYmWpT3lM5<Qo7 zT2fvI%W0LCH^2u(I+H@sqn;nA38Z(%?*4UcUOlw(#UK6NKaH(6?`A@G3lMDVVLDe8 zL|qPL9_FvU$9Z8NH&98X*Ta|pVsMB5!Qk9miM>n#BoyI+a<4%E6Dlzjd<FEcRzMYR z#_9qJ;7X74)9UWjJ^&-|OLIchv4~ke)$!5xxS|7coH59koQsxFk&5biKtEFS9Cml! zElB6}+DVeFoYSrO@y^OqyEe7}O&l;50**AEusu_pySlt@C^89sDdW}px8?Z@UITYR z1_@w3&?s?xUxAvKRS8H{VuKDF!#|RNMF$EdBms_RU~uvinjqQA9+XiPPz8{3B^YB3 z_3=sT|N5DV($-WX8vyGbfKckw>(TQ6tPn-f`7c8WlXXYBZ$}uTWM5Y@zjk$s$1m(1 zOPOI-;AJ(N`Ds<8SKwysy1ppxjpQt|%?J{&G!y@y1!nuy%bTZW@1Im&XcQL=S@j3C zb3e%VOaL<&cxKh|D4+=Hs$Ye!i`tl>vOM59(T99{yt~le^Z{VV+bA^yieBjV`Tq;H zRss^d2>_#M*OX@f%?nVrVI}|%27vxpj{+Hk#dvWlYPKK(_{ogV!d$n3y#uEhU42@o z>#&041OVsEfR3^XWj_FNE(3sPK*_)?wNaR>qZ(1N1n5CmSrD9G0Q4lWLkXzew(`sR zY~A(gQqe(*^sYS2A(la@9pz`WVHa<7who-lu*vzxZxgdx+IV+>kx`Zu9>=K*FyB~B zfckE4<P|wst!xWyWWmcTM0{_D%7B<7hz_M20lEtl)5P}@>F$B}=z5v5N#>A{;^tqZ z<SGF9<UB?3WUF*M#ei`9Xx6o;Zq*2E=bnu#{VB&f^l%m@02Fj|rCG^S=Gy=31@LF% zaQ@U}KpUhv^uk{&Lgc2ES<7RsV#aE&Jl$pm^?Uh6GvzY{Tm?!$AXZ$SCoWUP_WmlY zT7#j5_SM@{ms!194ShryW->&)ZG{2_IngXC!(YY<45Ro>ni*po<(ttQlqr8lG3oTg z&{|g3FpW-JP_mgQBKl@reYO*}j!#u)5II<CQ(r=~3Z%DRs%9E1B&;@A%OHMHJ{-x> z9^If&=&Rfsw;CcU2rU=%EI#ODG$}AYQH&`zOX$@s9d&@utaa6uzoxO!MA}T1xXS&U zWh@NiJ=&_U@NNiiIEjcZc)Q@uX*T;3ssHPdR{0Ca0N=_-f7h8@lLBQ*&0ft&eTarX z#^y7kq7uT*O0h}Jt#Fa+L;Kgu6ou;?YAQ?YY~^QX-H}OgW7%)SrwG~OV3q|-1V8fs zsKBoF*-m}1uRXnA9CWpHOiRs!xN=N`7~)X3181=}&{!lO{1<>heh3t<4y5xNwV^+~ zaDA^q>7l!eHzPnRp$3i;0iZyJKw1bVz|Oy-#*H_e?aR1=33~Y;$>%ifdkEMOUziS1 zoP1qUFt0X&i8zdoFCE441%RGSS`QHKSkvKBsVanViIGjd2cFsEpbkoO5}))u-_(=6 zq8KLWt9+Bdj-}{-Ou>m$@~fnS{2BE5B*_0W)JqIy1JdeI!^UL=PK-s{M59ExTa|La zI&HuVjDaYEne~-lI4mYnN)>cYd}ScsslbcCdJ|x8BYrIMGtDDzP_X|yalQSfsw*(O z+3utX`+)XkjvO`(7FnB?<<ZWJY}~gwepkc?w1=}Q5TB=b0gsz1e%3i!SDk=Vyuv7y zr@erH`~Xyq4vjaA+CRM?!)STBHUO-jLY#Zq`&NK+#`Jk;HTLO0J=`_O^wi#?y0n>r zz|-@UU-1rod-er3l=RpSIa*y1q-H8z(WQ>?_4z^A*>`o`24NMtN50Px8<)W|xK5N* zvIb$=6YVT)9*YE1gaQ0;^b;m>)fTIzerOHTR^M2I{bBt?0c<MNNvZS~)jM}d%F$PP z<&SY|8SCK9Na0b}U2a!o-S|Od3^v~v0hf8hR?@Di3(BDtenC6Kfdt2jDhw*Q?C)Nk zAC`iBwgx$|3%W^eUEuJiHsiIg9q7Fom&VQ$pL9K<rK_c`J44#lmFf`i!ZfV%RMy#D z=L=FDO#NdV48t7`5IU-ixWDQTk!HF4mlJP!)7;FEdQ}Gnit&*iYQ_^wJ}Fy+l_5z^ zgcJAkrw<z8R>yj1>P~f||8vYz(m)=06mZa(%g6s&@-?B?yz!Fpz<hBBYUyV0TeFT$ zu3+c@6t9io4o(^d_5<#cHK5$%ScOgk$4IC&K%SHQadef)UVN~*G46yJff1GkqP5Ni z5DU509$&E&`BLxSlk5~`-}j?*0Hcgwuraemp16Ai5))gsY(n0D!Zqosf^y;e%}XHH z<;HO%0Xl7h64Q<3D0Kkv!34nXj>&QYWFiw_B;7)nWOf>PeNtqpV#Z4zcn**%)xFr0 zY6Xp!HL*INeyKe~5tnPyq=;7s)5L?N>V8NfQToM>n+EK&Km7pr$Nykd#7*pj7_(2! zD^R!0*SEReUcgKpBGpxbq=VLCl|Q*lXJ8ia#>|`Qt!S|pie^+vyx&tn_oqM9nSj2l zz476t(b$O~8a%z<Bl%q(mt}<k!P->VXQJxu?a&;OY3tQ8r7)g(jj;J=T)QzX-I%0L zXq|Y>w=CBbINr45CvaQ)PW7ei*~Lr|dyQ9c>>9h|cIU`$X_UQBAb?fECyjd1iqd7R zNW}-syy-a|R-aa3htak%@I`Q1O|7(SBzcO!#MWE&a6{_35BGKjx7Kok6V=A*o0K*S zgXL@%hbxonbP|4<9tQbOZj*&pnOJbuc_<NCW%Meo7TrcKkB(SeXhmRaIn+87)7Xr@ zG!9UT3U(xNXbwCqut`O8ct?q#k}a63pGn@~9ejJk@0u^f-;@w>eq6)3eB|7>WHG(9 zMbR?Fq3QXbyv+6{iZ{8)o=bp=q;P%+`|c;M2(Gqt09_9UszOIvWdg0BO$QPI{MJrb zRIeg12G+k=6kaK~3c=vdwWRM3E$2@tL$l<VMY&%}NBx0s7q+7!Q2?;-6c(166I;p5 z6rSWmyghG2Qg_2*0S<6w9m8P4>RQVU;Hq_L-*f*=GHP=$BN*#D2%#|^YsP9PnmH7J zLagz@i6iCl=u;}HW@nf$e<p;5p1>;|a*siAnS$!fZ4yZ6`*D?c{C6u`0Ajz~rVcgo zpzCD&&qIf>_*43f<UOcAzE?kQ*Xr3&`s7*63%tN>=r0=OIWtd8<;I(f1K!c3<11Tn zl+Wk84z;$^$Wz86ITE%iiaZYLw!U9)oK$j`;NHtM2)V&Vxgag>)I{h-59KIyc6!9m z1jmUtu4>@p#wW5lk0BeqC}}`!s2S<JsE>%d!5CvTeR|Zb<|KH2)?rw;7=OK)zu@Kq z^6s?bDwZ)VG>ul6UO4|ft|~lF&y;5%1WtoC5WtCZSFDN{4FI-9=;wyKRJfm?wpATa zY+HoYAAOTitd}y#BekJTr>cAou?R3#ZE3%8l-_*<V}bpnO)>%WsIFMDF(6>&=|<R9 zUV4RH7_)<?Omav4`=9EQdY(VWEd_HxlA9kr8bILVz3a<ICnmN&!%oUiB=HXv@m6>8 ziW+RGZ=>ByZ8OyPKx&wQxpugSM^43{0Tjyw&Yls;rS}7lR{6i49r<W@0L3C}{Q`=A ze!NgZSc%12-SoZ&C|YOSlx+|a0pe{<K#B1L|I1If%sXj{T{o)X6t2}@k%3LkxVs`8 zV>B&){DeSMreXd*HI7>7g=Y1Cr=u`QIjWxatxmWPoij?N-O5!8tMucz3ni7P)~N9a zhMn}no2QkKN$SIgiEo4(Wcz3sYTX)^_@Sov{F=n>H@#@qmRH}S_MINQjIa3J)cw+9 zmTA@AFqv^Rf1haDyS+RGt%!|+s7TXykhN_dd8G5!AKlJErAU2pg@I^T@|*?j2_(31 z&Wf*7u*|2D=G0d_zv-k0_mF+H`oT%cW`6sE|BC_3&SPgzqaP2DAC{jVkx^}iQfkj< zh3OLERopFQ==uw|0OTt#MwRNQD=v*#6M@jrrUV8aBSAZ+g$(G}0O*@X$|S#~&{cH8 zKy__VAU9W5FA$6+t=%*@Zvg47lnY;|qEV|qPS~TY*8xh<L(yXq{g=6VD0my?Xm(Oe zuiu}{j{xWDIH0N~3sNaMB{B^#=TP($h|msZri%JY0IZv-dOpM!Ocdb`1Iw(nbpw^6 zrjG2Y2dh2I)~TyJ7(4|hwzdMqk>GJ#vT5^JMh41vYOIVnfG4)b?;nbi^XF>|XML{e zVX%X9u_>5i3gPXRi=-p9`>=kWldNLZklear2Pdub=O;qH8o3%s;PsgpA@M7N^JXKf zzaG4sxn%eqOJBhVajkOgzuxb@u{nG&)R~2xYIU=%dbCWo%0GnHzsND!KmB^FaW?~t zO-f)j(OkYDkww?N=>QXtLHm*eCLpI=Pdtckb*JG`1%KkZRy}fUsw|hP1RM9?DZ2qv z4qGMGo(V=r4STTHdiCv?O0d(g(r&cJ#m%_CH8BqKfBa_`6r(JI-0R5?QvS1Mgm$QH z06lXG*d?2Qw50^-jp*O3#eKuP9#CTrIS@atcH&E<N2&Tb^_#AVayNfA1!dbP&{e77 zq{3?*;qR{atWN(2pOv~F9DLiL)cj=pO%F;4zJmfAC!_cY7lAvfVwpLUFAqE|s$LAT zDOD~~S_5QN`00;&xgMQEaC+Cc0NsZP6#KUU7T(zD5gfkSw69GLPDU~N$QaJ2DawEl zk_3#bg+H-@&VFSm8E>saQ<94Xy1~8pp_h-*2GAjaJixI=tJF9U)Q3NGe4G#&#?bjQ zP#<l9wQF<G{XT@M?H@ut0FcnrBiOV}zh$w#*A>*Ngjbek1ifIRl$vMx{_wSKBFPJb zWCG3IYc9y0yR375l;{-6$~V28752!fA5oyawjni^({nYaykk{9b}Ouk0ZWaiC}T7v zZz{!0a=6`!ce{=9&Riq%(oo6gBx$g<&sw9uHhE~;1ADbalMG7sTcYkUI=MjwBiS2C zjAX4UJ)3$g$<BxBbD;@F6zA-;5Tv6%Yscps5!)+MeI+MMqf-_>?K}ga7lI$0EfN}S zVeZ@?O4&GfR!Zy{d2l$|s-zFpCL6BFgF?Y-VFTOYEpFkio=$(c!VnQD6&h?CYm)iT zk%7Wmyn0YewM;6H{0dJoK}WG>c=y@}tN`BIClhp%)p8&`pu-o8I=o1{aS!^QzndQK z4O?#Yq{?Ua|ICG+4|pau&Q>U@3!Q9%E^P8;G~)_JiA<~jF14@l4vN|Xly}sJN)pVe zcNEsa<my9}>J^|VTi#!29>`XpQEQO10lK&;z($&`S8y_a;(sqKf~$ov8F=Tun`J<N zY>kb&w!(5^&^h>|oEhaJ&bu5g+LCZlGMo9D)Q7^G*yk`Gr07$?NNf$g7-hQIu;}Xm zh|w=*ld+ifgJ*!qwU6MF{UoYR<{k)!m)z;EL>VoX1~&}EfK>8<H{p5KYgAG%4=QX6 zkTV*W33k+|f{J3b)1gqXkJcJhN2BU};XF{;?wlcz<tWM_fS|O{gYL1u&AQ-dyvILx z4<dO(^0gzbI>i&`)TDv>P^5rUk7X6Jhm--6QfW37#91`p^!=b4SJp_J5T%G4bs|Ly z4w}N+f}>~g>?QHEnkpj!Ls&g@TBbnUmHy<6Hkiy%r8~A%X6pHVf~74bq!-eH-iNc= zo5sRIs%%egAkZ9;6FkkhaD82F;NvZFBUdyph=GOE&&y{%7iyr`b#FK}$?Sh{RH{E8 z?Wcg4V7c(1T8<nI$v16`U`?F!r33y>(I0|Ut?r0bX5{~~AW)kHr4nQrOC%2+e*d4n zWB<YRme{SSs(wgVN4@BYPn8^=kZsw(7!VKg;^d&xU~{!wSFH;2IAdPz_iKGgI^2!B zmA|z+>U`xr2mBnB0o?wLYZDk*X`x+k1+#mdsqXD1`;q`g&kn=4O$C&Ub0S4Z;%vvp za}adpHwRBjw{R$PeWCcP9+BY%({lTyGYGE+g&adq+C=Tv2ZVQ0gXG=pym6fpsxG%{ z&QlWlD=S}{bBBGq8+H_YPch4uB#+GPHu_@szP<<jYUpIenvjzKU+AtZBLNT`6Fzso zV4Na=&UI6~>Qvs`y`lT6&KnNyMe$898|V??!7~H9n4&Tk;d3WmJWiX|Q8L!oIYMqN zNK9*%u3(cW&kwypsx{gSbgV3xVr4wtqcuNW1o){{&MCJjDh;>aaNUX`t~bZ9%JUTC z`DQglTu?G{9cOYh|D6dFMGsEJy90-W=ho3G3~EmmrsCxCKKyK`X!d}<IGy8ud#jyK zSC9X_FTvt0#fu;B8P#&*W<b4Ib(wj2x0FTrSKAlh$^EPR`C9@5$O0{aSG|P3SP|2V z-IGQGv9tM!xUhd50+%p5eHfQW^8N)ni`8dU^f6syjnOkf4{fqyOcxoJ7H=VgqOkH^ zhvpP>M-RK~XP`Wggk&G%5~ZuJIW}1zbSF+X=362`!uUz9e8%aWorOYC5W$!6v9%6{ zz{nmfk@>wqlb)L#Z&n5QKO%0Wo*S-+exOFz8^<l|Iey44_ADjy9P@B{FHdf-j#{QZ zLg3OwA`*=VGxo8iZHiRp&#o3B_9X(&NzQkwhH{8smAzPE6~zOdbECFi#VXZ5y<+?K zZ>_OXokQUM3mFxBxaq3-Q-)<|Y;1pdF&Ptr#7{$9_wXMJf*05MSmSVle;USHK{=N` zPqZg^La#@GzD=846PD6|%*$QsXuWp5Tt)EuWid2es3FODs-TCb?3R{;)iZK=w_*yP zT}O!E#P>L?;9Z{qzba*ivWkRCtxG)5@#rkh5(`=D2WGQ~B-ebkO9k1)Aj@GewB}zv ztuY?zYS48@{<#`~>lhIz&h`mmo&*Y|6>SPugcjWPJab@sbz%~_9`}IpioBO5&Om|q z!N#CWJtCa?`svVR1G%+cNW2Nw4Y|ztiJm&swH+Aeeo@W0$Sonx$-S13dfT7zhP02H z&%KT)QqfGAWsA4#5XRqBa~b~B%i!P6@u+r(+izg6_CN5tml!&3@>wEdPhJb1W;V4C zdal^`Z*g>67O!HV6>$bZoaB@&XrD~_%SI*r!TRWCHyNg(q9#6F{M57K&cCt=UR3*# zEG%g9(O;b3@O5<Dq<SIo6(%mrvb9^G6%1IT)za{1FyUMP&r)jP>652CAe5Q1TH`7+ zvQYaJpa@X|t+J6+MWg@uXh6?}c%AX2Cz)sd&wT|q*qGkyt=C2}mnY<Lf*$RAM$w!+ z8@x^)bVx*{{)mL@E)37>BW%W5tt;W_+C#w#<^KV6fnz3$N`D?2sQF)4D~^8O@^L;z zH{oX08wDoi0#rZdaj`300BN@0A_b8TRGv6_n`8B#8;aVeQ1^7p?ZYtV-}m$tRnxU+ z6oPZgnaa5@!7s68_UfH-l;q0>U5fG6Y`?#|6vj_b5#n}D`M+#j5LENNjM&_!DMo2A z;3{YVW&Ul7$FtH+1;x6*Z%yel@a~C|U)le4Rq+x+H+tgzGzkNR3MuDrGM+mu2eszN z{wFF?ckeptYp?03{0YoI|I1ho&7+COwNkbK<)8b%{_&a?1>KAto|uimzn(*rFn;*0 zHeqk2zi+_5@8p(3yNUBOrSyMwNte;kZelH0!H|fo8oG5A*)OD#erWqE&zQ7}zn+tv zO~Fj{f@ldlQ|8<nkGAD_TkkO`ds~V(xoV%%hIDsGM|D^&Hx_m+p%1%X^@4=h7+1<^ zG7+c+{1|QjYu9T@CHFtNjX%GE`z@MB_yikHEf{xS(!r56Ze28OT$Sjl{Y8_1zC;$W zDWkIu#gI(TNzCulUii7lxw=wV$Y#$ND_z3FmFS)?Gk4T1qxdTC|AliMh$8azh|c}} zOvETh(8*!B1u$1I=X<St<4#5}F(#itkGV46^PSALjm=crAZ|J8n40GOTk<dO@jluq zyvM3exl{h~N(S<Gcv0JY{3vp^{_4M;h1YZ3Y@M7>_S_|21TJ63@(f9<cFLW*$0nZG zGirF9omehTM?1Kk=gRKh=P^me${H({xS6L|7_~iH*Z=q?lFM>tK~o;o)E4rvdaK)A zUlSi!;8cP5ylIjzb<eNJZGCa{`FN}#z2`zMHmB)CtrQL;Ko#j5kEwj88`guz)GKcL zYo0Xm1~^1BXbitSNYp>ywx%1;&#>6;kjB!!IF*dD+fF2nQe#tR(<m=y(X1F)Ez*V~ z=tjnp&n0S~dL~pb4~7~FpNE*MmX`{<dopWUb>nkNBFJ2gO=xf*SXq!b>1<yf$R+Su zXKY$LQW(BX{c}J#1rX<rn8vJ2me4Yxj}vS4qYD7A{{^F7hFGxeLcMy@9mljtyE5IP zJLV(pdeu!6C#DDGWzI8Q!g@F*D;AgUzRmTQTIQrVC|BGTKI1GS2_~?dS>0Zk(fq^0 z`uiRO6)1l8U9>Nye=nJUYv>y)ET-@|&s2h}<BK;{h<7__F^&ypmo+Drba9mABL$i< zGo!gvQ-}?+H6GzME64?9Up*m2+}e$Q)?D=kvmyo(i}=NSypNRqO4*IXkNaDPSyS=7 zo5x%4CIA?#)}BOMS<Y(u@bg=}BS$}t10menbbC>{=OcV)?5(1|0>k{Y>M|>~mfJ_L zudnUlc$B*GCL0GxPTjbkr5+(tnE2J%?;3~uz?VnJ(_hh6*zlZ?DTm3ADOtDDlvI## zmNl_SIbl(c6jPkWBcJWL%Pg4N6p!D>3bQHJj(~Glw30whH$e|py-R~A96igaz8Swb z|AEnUnNjuNT9s)>rv`vQBW=cw$NK4btIF&`i#8E^{w_N^=Sd;S4Q(%P>M8<rvec2= z)pRCm<-C*c_mB&F#wiPkk)pD*$NzZU{k>4`dV}C5Lw|1aKa16?UQ8bpb(LVC&xdoA zvyvKR+YR##?~#ZGw<j){*bhFdR|_Rh*0>h2ydF26a@;OSdCXRPlZi_`g(8c)pS~>( zV3BnAcDR|hiF&NdVjkW1hKSrwyJz>v`MtUJe1VwzX4O`4gc7kvp2P^v;_!46@9pat z2AgC0>)1HiZq1D&q?MCju&1b79?ZTn5KT<m(Q!r8K8NUeVq8XUSO_elW3=n>MdGgg zx^bR_@5F3Sj@(yzP-lO6D~wJ(yinfj%wa(q`>fD77N8Scr(pxCZ4C7(p#QTXmUEyr zYKLSMILQv+u6TPWvF0q!&o=!*mGTo|NvPEWaqz;@U)JNel<=D6M^%{cVo<2@l0$iZ zqiJx%{({2)rA{oO>}vk?!2A=Z%RFehaa{qSmn8ITpfTASkoK(LRm&#!nTcNoL<DId zcSy1jvmgj9sXJ-(NgBhMY6MjQ%iT77k!yumZM1h%Gi6tv0-$33@CQATc~`<^E%`3% zc8Tz*hu~{_aw#anLit-7*3ekaS{7^ij9JI1g9fIc<LjdSORCCZ0^w~x;)ZfFFRptI z&UJ0x5mWci;`uzIb&k%69p245|5lDwN)iHwaVZRl=rbrLv*K}+QF~I6`=(em*N!<{ zEPd50eE6s%r{Mt-7*aUF6GXS#?GmPX*D4_ORgB^Y+N%9guEr^(D4j;*Ew+-=kuKim zZSRg#jVz&StyuXEO_7|q2pm!L&EsJ@*5L(Wepbgtjc=59s3|NpDBsyb_CH^2*Rk15 z9ou~<2*Sg|k>eJ*o%|5u6%Zs~{isCs@5ub~--_bkz{|B^_|xvbO6ita&`8$Tp~ulf zH*=l({8EMA@`?-^I0+qkE-S9VJ}c_7Q7<_A#znK?X6&}Pcr?A;bQr+wv-_2+lrSz{ z5L%j``_Pz!k$fZQk$X8^co9~__t?#<@0zSwT}`XET0*%*w!RyUT$<l9Gi7^iqd|nR zGQZMxrfzUxrBS;o<UUKll=yh`bW4AhnVAZAY2#KmiB}bI>iMraF0u5D=4q|_=gkDz z2I06qfIjbgQe6yCg1WN??W!lo1Uua$SsZ%_GlTv@ugVql{?A{#h|;OOQ~u`=3Mat4 z17=JB=G8mY^dMQwhDm0$nlIPLm1}x$6Ef?&qOoNZQ!zTz01?1SvFpVVj6htse#Nqp zcffXO^o9X$Yg|D3(M0DuCm)2ssdv3&+(bCw#j5QK8eo%QI71YB8L;nP%kIkSUF<wu z!4OB>rB%)1p_NZdE~S2WJA<Z<q0w^PFaln3+SNC*StT*ZK1WC$#TJI^W?<CE$XsFC z5<260_uhe8J6SWIa>*xoKS>of>lN_D4iMP@rSTZDIvppmQ8PMZ{0(MHi014&53^#c zX_uy@5G$xczSc_9w4p#q%zquWS6rDrf}anS_sSIip*}HFvI9@Qsp17V*Rj$R6beNL z$|w!<GTN76ouJ@~f^5ygraaCM)uzhm5JJu`PwcubP-DqZ989rZltthS(1Ju*f#yOv z42&&~fP1U}ja3EA^^(Zq43P*Pj+tvZ794$H0b;r)IxX&SR#D0V+9f*Uxn47lW=xkH zg|xbYG`iKJ7w{GWOGkFSNMduu_8h!EfIb}@XNVPo*s044xEtyIG>5EPVBW5L8iw$A zJq|_nc&(%Pb|tm#6G<gL_aq|d^Xc;KkGS8pmEp5f&0okgCZeA?v=7R&kTiDjY2QD0 zzHA8II^^whoWt9A+^=Oeba~reodtKX!4m-p><GIVk4saKTJ#+R!Nar%+FzjC8P7P$ z+PNZ5hiInUHBlS9qNF|$LIIaeE})TC?)fy7C09iXd^wYWY#|Q$jq3u~QX+~x&%05G zA!=;vp6BPkJyt1QQS>)hSePbYJAsNN`Pz*;pl96m^e#|cl>jGCy6z3N?-Rk-7Q0YJ zs7lXu>KqE(!MLFIr!*ng>vEJXlUwO%HiJ|gQbl|%d*YseDRYbJbu?4BejOpC#3#uK zYHu(WR^nPA7RqI5SSD)oY-~xtJi<<m-p~8mHCbe<u*c$2t-2jI7H27c5V%Zw{yq3! zWtrwfv!s6R_JSqa--qK9oR%$o$ki$yR<o1A@7vX<Dh2XhXkLzr=I5X94!1v)=?M`} zl5>0BV)ZGj2!M#C<P;aiS~qYqY`r>Eh9+;VdOhH<dY^WZb$2-Oy(i|$5or4&wySFj zBioxxc<Nta5<lLH5A&>qzMk3|iWvIj+{PY9*po8X`)q|1-4kR|)?v5Yg|FpnHbmK* zPmNEKDKX(c_?b1N2r8;WbRcM7xJbFrV{6>g0~B9C9hEr&tVs-aaID>c0o*ol@F<}c z4;p94N;C}61FnP>EIMCm(wwSaqtYOV$a!C~6^hM)ymOzO5-$?SekBp#Yx^2cH<(Z) z0D_eP;;YKQYg$r>>cV#JiAor1D*-T(<#hD`YNi~<U66MIo16kbt3(NMCP_>a4fy1D zzcy<X0nw8K4l&TO!$|7|fgAWXAR1H|e!mM10u#H(tXiO$67eW6S1?FLt3b12TBsFt zM)ScCt#?h=aYBHtBk2tipdQS?nvrzrVpLic;?4yorzAf2fU9;nsH?S3_E(gay{@60 zu22FrpBibz6eeBb{OtI5<OaZ=xiF+qqBSG^WP$E|*6XXUM82AjY^3O3;m1G)Hh3G| zTc{i~a{H~0x_2+sr^fqhq#*Ub_Ho_0tBgpT_ix?U8d%-@$|o>j7THCtb9YYK73jTc ztA;4RydTe~m4gpk;{)JA*9y%%3y|(LRyF*)LA4tb*WV@6w`^0XT49Ow&5R(mm~bD4 z(R%h4{l46q!K{C$baHD~CGg%$zo<LD>1o1LB*9Nro~DaLVLW(*t;ir6FY2fG@)4d{ zr19u0DQfBiWhe&bNXq32>!{h>n5!Qck2F?ube7z|#t(Nz=(=JzRv>0A_#4-pV;tt5 z+PoX$4=qX$Igeo_-(8Hi=$p9J89_&c6y-NSbVNIn@1EZtNV<V!iufkmSdA}#d7siF zT)}$$u)6d&^#M+}To~D|`Kjs5nzXZV?6*Efy%#Iq`}u%2vl{1K>1F3Q>>l6new22l z+zVFhBDzI(20Q2;$hxeYc0RhSZ(6n+>}O>&)pN6oH~sjvb~jf`Ca?SL)amCr9X;K; z?vk57IF1O`=n-FQ_g60?s^Gl8qxP%45PFw35SZTO!fLYvQ)9}R{l{^O@w2^{I`c@; z21nhKQ<BTPOL!ryAoHZZiGQqx#ADyWG^XhMn9JmcZ;Ivx$H$=+u33Sf$^IgT%^!kc za*S*w<4c?GZ#eB|e{uZy+^tKfu8176AQ|qtrfWMRl-+dGLNKQTUg+Lwvv{kqwsg_w zQ!u(0CA&SuvU1|hia48#f(8(nWmWG2xj>;^;lPfxf7{{&G70XM#dq>Uu8>><>_U3( zms>!8x>DSFH-Y-{i~!xc>63U9%ni(U97Wbv86WXdpE&os&fd%FQA-dW1?x!=*Y7BG zw_fSd#)*GKob!HKFsml~GI{8P3j)3#7yU6k8ddh=w;k!4!j#}|0zX|dK~1C5{y~9$ z_ofThl<zRludhB`;6%}x1>>4xeTg))8E>oiVPZ>^$ST+XS!Ilz+af_ld}lTo9-76s zE-l9h5N{_HcFJ!8yIwfMuy4?tTIM+!T|iKv#R@ckF53VlR|_oq7A8;&p>t@ueoMJ1 z1|a7J^^1f>*;Gc%@}Ytk$NQzRFiUlApsLy_1zpcrFk!3G&u0QmQ_5>G{!XaI47_=r zX)}N$SP>QBUhA9W&t-SeL~e0(_XDM5W923d#felrV9Rs?0jOFaQ?Tih1JFt3uHo?i z{`t~I(~Y!MYHAIP=342s_OPQ>2aL707w<yc)BAyQwC+yh<%Rj{t{a#n<(<^Q_l$8e z65i9Zjb;m;ugi7k=^p03%$@~TvI1s^FhX>ehh+3l2lr3M8XL|Qi5s(10Lcix65sFk zW{>3(kPRCkI)T~^JGGlZyU-{on8Gy>urz(%xZlMTn{s)!wgR|txyv6KWiuZNNm$Sf zI;#?k-BQeCYJ_Dr9?{t@=U?B?!raf=w*S!YjuRDp;bg(9(wJniM)vF6GpOyx<@8ys z=dj!ncVxayRE1p#)a<g#nq0K8Hmz~3`Rx=Vvp!bI*uK?V%clKGVI7=o8Yjqf96?$* z%&+6=c`PHyx^@RwT&L!A)IT8C;Z;2Bn5ToFD=TF@FHfsqqTPOo`fK=G81+`F+#?Vk zIg(8eLl*jh{k6Kl=|I@%5iJ}2K^20P^mSp&W?{vs<{>`=Y_negxn&E4Wy+$MeiGX- zzAtBykHMS$adF?w@Kss7HGXF<V5YM=#UtU?<|6<0wMCwTCD`Lw1^ge{N+q=lL>-8F zMhsKmcxc!2WTw@p(GfVIzI<i>gP|?@vez`)^zID$fQg5t?95<=-N{|FKY<%81j!AY z;>yv$g`f%Rw@_1-kAVi9I{kWGu(zr~s){ah(jReR^C?olVnj8sE#i`E!uaz`Mvfxv z<$I~ey1=uvJGSv`<x~((hlPvvbrtiwYtUeVVRHTYYwO%L;tc-CCc`!l3?gyJbt+v6 ze5-MNA8hld$?EqG`ASrE>__&aviLGaQ=<hHb$J9gsdqsnRELV+X2W`8I3TO4Zs2R4 z6Uc03T(AUu66Ks%nDjK@v0&C&hRZ6IO31lU7=Ps~0b~TYI9K7nqB#BO&-i1R{9C%{ z#civ>9l{lAn5w2(#>?D3aBG7Y%6d7qD)`)|re;+!+3el=?2?rN>6WJ4Ta@r7x{<qJ zv9bVuqczG3m@$IcbBwYTx9l6<qjCgws|&1N8?GysPgPb?GA82j+~iU3ve-PYU}L@Z zrOh~u6)l#(UQhW*-QyP6oDQhxXGABfj*MusoaUb0AqjCZb>L4BJZ{EO?RQMSCtky2 z2+19wjDIdXPlbM8dC!}e=VM$eY=y--N5ao>_9Wb~<d6idTQjgZ=49h!EkzG*3WyLK z`Iqg~)CO)B2Ps9dwT``kfj>7t;YV*baISH7l<)8@KnXC$+&z%&Z?!E;zHd~VfNf3) zJXHc>FI;7UDr?0uuy1)cLB)jvFrcpmZC_^KiRvt*8Z=Wse_%#rC2~5!)P%MeDZ`rc z((d+Ap?70K*xY_Ca5ZB5vEu1mvkIjAdBH@p>b-{j&M#fo{0O#rfa=47%qeOb5LHK* zOsXwx-|bU<ggzNv1wLd9%+gfNgH!4|bRw4|o9!8{?Qw+O&@qB;rBpUNjd~pCr+a** zyQ^lM$bPiO8H=tM9223jFZMv0oO47Lsj8c=#<GJ~FXwqW6nwD3X6>APBjR!>8Bu<U z^ks81fHg|U$nS;ToBTY&WSE~qA55GETZRg5X*MBbQjEd`&?J)`-k)5sUCI}_a{r$F zra<GWe(3Uz|G}YDJP7<Ab#x~YJn|#H5Z^5e@@~<Q<y(Ts!iS8j6?1L8@nd^DYl%uY z&Nvd_2HxjKyMtEH0ZyBQ7p5>^*0k|3?g>?xo1Oe7-7>DV`+=;TfJ6|4%C!`gO#8kk zj&w5r&KK(#T|pz4qx(efjax=?GU;m9r|-Dx)VTCx4{U%VCmi<t5=08>d4L=ZeFS|g zN|^zybxQUDyyCa|6`WDOU6g<rQ1}Q@)p(8<yNgls3-3$6w}iUi0^)W!ao9boYpyF* zjb!8g%LaK34xuJ<Qq-?fVfi3$Yc%ZlMosTcm$4Oqe0ty|(Ip?pQ8Mn3LYW2;{}S#t zNZAa<yw^7fqxzJ5K0}Z0ho9`ttQH{?Qm=?H`08YP$klx;O?z@-XLHu#+*<CMYQe^f zD9UCJL|KXob*Q+Nu_4WF_uL$J2~*tUO>o8C)J;x45MLRWqx76xyq@7oB2rjn?Qgwz z+tbvKcKCoCb5kHANoM~U_<ahL`h8~Bx<}(cY^N3yGWqcCLbrO?gWv@M?=E+L%EjyJ zL!Uq<8RGj@#DOY4T<#pgxRyT?MU$Um+Oc@UpwwBHI$P{Pz}hhVix<*=q8r`o((L79 zDPP49)a?|)jXQ=w4)jYXKj?j4s86Q9zoj-r8>ZO_iFrpvKtx#oqK|v&Q;f;^o74`1 z^uT&2Bm1z5dZ%|9U&omfb~Q<4-?L(4@vU#=_#`e4v|wdm_7k3z-T8!meL3QZ(ODUF zlBP%&)p&~<YxTVMh!%W>&C^-qO}vSDwg6IU!l-KzsRMUWJN$?rR1{e3ZN>MX4n4xR z+P&98S4s5J9+o$0f8L<gu)`k|kU75@TRHcn>-MZtJ*EHWs)oaYkw_wkh(A99f_9EO zzb!NQu!x}snQ@qWwxQOj`GeuM9bDX1b8m~Vl7z>^dVolxR*#&A2>fbKbg1H5^DrMC z2~H)CwO}jL039^4(oaOH0(X41Ye=-GLz<>nGw!FVYMv2NaPDgBr(`d|3n1BS+esN_ zy$U@ly!q7TR?#~^h`WoP`nGE9mEeS7FiUQWdtO0h?r1Th!N7UV#Z@-&NvL{h(Fnc_ z^Am9*J`u~Wy=7e<oJFoPn~c{FLmlhC@g3Fl7ZABd{T2zpRCp{%YSk_2A##CDN5tL9 zkgP2TPQWe|H64`$t1-S!jsD!WXqYF|d}%#eTu#(<-<@=gXtVuM<n6#m`4F7U$~ltK z_J&u8m!vP9m=wNDShuzhv=@J`f8V=5r2gCwPx9UeYo}IHjIv1G&d+n_JB}kRBkumw zB4}mGgti%YYCgo+z=?p2xgUsFBzJss2oHsyV!?Q#ASEqR8(<nXDWi1gKP&N(WK&&_ zM~L1@m)b@hynINO6dw;m{7&Wr9{WLQIu&c2v8UYT#$(|m%VJ<#6{Y?-zjD35>6cpL zsS3x_2chg>W4_duUIfQ^-p;L#ydQ2ckdzBB!mX_D8J;v>QI9i;5>-sX0HIG)Wmfb_ zk?ZvIuyu#zQs797)iVTs^tJaf{PO-=tBDXa@O)m~M;DQQ9aktNeii1=h|!ppS+p;} z2x8^PY+nQ6W%)(N?}i3os&oM~;-*irAqzhiKh~{|ZC{@c8;rHUNCx?U{Aa@p5e~{$ zU=tEss~3&!wzB=@G4FP{5_WX^Gb|o)VFQI{iIn9|IvS8|kQ#INxs>6H=_|}1w29>U zCO)|PL*p{>qKeDUx9a_L%g)|4vFUw7YL*Wv=dsf`e0$7Y5n2J7hN6x}u^H9AE;OcO z#Iv0(vvFF+5#ks}Uu~0)FS<k-F$>aUMc#JFz@X{|3g%n2dh{5~8xeZwKk|0!3+eHl zUQ7GDH76?KSito>^_?%56jqyjGdg3mSy=aOFA!{qS8Mv0|3~?s#5x}oXmjogp6!}D zJ)f@c)($DbxDi1h$5+y@cAp4!o9^?X-NB5Im^&S<!gy99LCR`83kW6JYq@u_p<`l< z90tbYA>mX}wVl^jzk$-sR7N$V?Ec&B+Reg45*v_s-AT3!u^FR@P+o0WZQQ52LnbPZ z-4aJ}wOTNPn~X5-;a|Giy&5;qH2h};%|g_<<!!KfJ6?oDlb9g#83DQQ{RwK%4p>z{ zC=E(_HyMk59HYXI9b2&Ro=?)H(v0Gr#Ll03mWOAZtk%lF>TjXcXa^D778`Yb%xD^t z6uKSzyyNPTuY}~WDphJAPYyMj<31XEG#yk=mRU8N<3^;H9;znve&|HFI)oD4ASVG6 zoGsjO*xM=jK1RqQzAl8gfeEx~mcaMM7w=Yvy%IE`-wI5SoOyIY1`eG2cs6>^$e-Ub z*7i-@Pb5h4Ui)lML*30I;dLidn?}35=3YzC0tJqw?kiZk_Z>*@rPKM*Z5rkS_I|&@ z&Y@{JvirUhvFaouovt3)6gA*M<wnFlUFOi-W8P!tygc9=lSq+5C6geAJy9|2`AJFS zD!CM){uu@P?E7`mYXtH9mjgtOI8~ooSih922|2K+^Q&t?jJ|bMfm^$_Bys8bj|7Y7 zgUK3H*%CgggCGvrVR#VXL)?}j@QHANmlszLV1OFe+q_(gR_E&T&+w!I8uvP$^I%+s z4LDha0xF<RaUaP(GxD25K8PCKRSP6SSl7d{)oVE|#umEzYyRDC|2)sDU;~$~KZ-h( z^CybTRQ~*ut3YhW_L5Kx(enF2kJ>K(eJ!f|`}2pm-;hUNH_|E4uK&;9UEPO&U+};F z@QldINxoOTUP<$>FY#`A<=rHQm@#~uW0p&TDpVz!Jb-};s_Ol(uVi;XUlitW*s?YG z``xI7@4tV`zt_@q9~UCbf$`H;`v3Zp|9W%NIJn{e|L6Z-Zx*;eaaLQgt6l&7Sa8uZ zxzKJsv=OQSEZJ@VO6a};!=%?0r>#8>67~;^JYkmQ0}>{nm~s^(L0J~?02BJ|XDKH= z`#Ey%8+dCSn@y<N`>L4F<bvhomk++=m;ytZ>fFG{0ya?8NoweO-RuGtybdatDg92Q z6&2g?J7Y=Z_q~&8kXWs_&LMSc7W_!f6SzRRwZCO5=o<9A_1q5Z3dDy%laivYdsI6X z4Jr%I>SZ1-4D<{5<wcP;7?xz>OQ?Fkbp%Jp7L1*UMrnIiH2Pge;|@A~|94b<A_LJI zLRO~@g7oje$>c=?0|Zr1*5y1kfvME$y6PweIJWjT^)72YP6_u>2ckAOkyZfLcgNA? zRR<VQREsKmqfqs~&lqaBb&<UgUpRp0tMCnpwQYn?z<V_>_G25B2c>j8_k#8A=yD|s z0!HK6eq|M`;0$~fW07;Oh57j`NC0BNTr4}~?`}tRb1ZO|u{z)~lBgKUvl>?ltbJpF zV}_^lSf6>|#a@`F@*+Xz5(8uk%t^|3TjQOJH#{qU3Z7YmcM~-Z->%S}=g|Qec{FO* zh@63Uq3T@Q{U3BVnMHK_bpKiQ|13BXZy~<yH;^6%RKfqBn9zSCJU@4N;dlb*nM$k4 zu7x>;`*RnFs{Lg;!5Y5RCt>TZENLPapng4~>AM8TO3tGm6yigEdE9}Md^tJRpt=Km zlp4tS0=|I?q=0V$Q||t&x$`HA?wXTe<U%=f)wHciAZ^TB|BWi!I{Wy=<<?8exbn4< zux)E(rp{H>+@+NK^!o~52JQ_oOhWd1&kvTW>C$|_?KSy98=G&2X9)2FPEbW>^S1=E zJLWsOEpjqqaxbd{rEb};vt%V5g`^9)G*_o^UjlF@Gtw|Gzw{;TO*|+lHQXma>DLWJ ztAfiF`^bSX4`l=ZkvCQj1LfS(T-?F*^Ec7cn!x1=NysBZ;lp8Fn#I3uwlpfcv<?tx z*3KeeI^|}wRgQ*2xNO0|8&$S?V%RV73Y^AWU$*k0LnMo}vkVy=NB~@5YvD;dRI|?i zNs<4J$TtrG7Wd}iD8p3+_3tLBk4Cc_R(GiZJ~_x149bp))@x`{##5$Cv=LDWI@lE+ ztw&T8vB1G%F}J7!t)UiCOojIVGKoe-pbF0g_%-EzM51WhK*=WV#Jl!|vc_rK5-i+k zr<2jD1{ER=;|P%))<^MkEuB=^x*$H)6vd@@M1;ex)dDF<H{U^z((JAu*F9Y!(ZG6! zJ>PH0@eTo1T)mXDWx6~t963ji9tP}^3S5L{Ts8|#`gqoui(E$Xx@38`mC28)J4R|L z9foyg1A^8Bj%rqJP#g<6FJS4ZcP|=<&5JmZQ>EhCikxBQ(dAPOgsK4)a0P&#roEe_ zbH@_cdq>Gf^;wje0+%QKu@oSfqRWNezyKel$jX6*jXo7~Oxvz^gXJ4}{hQN3c|U*{ zNoqK+L~pKxv1gTuAUQG#;TX+!J_D&t!O8Esn2tWw7BeZ>LfP_Kss$h<c@Prr0rYn| z)D=gbOOd}Lb6Cj2IITAE<Jj39!pmXaiQ=p^nM_jRM#s`}E{aDs+iJJM^V^Hxi$fis zlZPvHv({Pik6uuU_`cZ+Dv{JZ-%uO7*mWHcCq7gWeM4<JasnWPoTC+|NVAG?FF~*v z^=sBMwJ_S(W=wXRR~ds@OLxPe@9G}^Q_KA4sXwIzDZ$g<wv+e&-j>)Op;gTwVr?hj zm+}{9Yf~5jDc`$JHw*ZIjYhivkUR+```s76zU~ia2~_ymA;I8f-G-B1>zFJ6U77%= zw!$EXE@xN1Jw*{!Z2&h%hfe^vt!`<$BxP-*{tU3M6uIo~;)~esZp;f06QVbx%A3}0 z*p>+!Q%e*k7|cz&4iuV23;kQJ<%dE}HK-66Sz0FPcaos(t97oJ+kdpJrQ<swT1t7H zwSKoHrraY>P!aoy2^+or@dA#gI)BmwyvIdg>{>1}SScen?nwK86_uwVbt}g{@%bop zr(&N>a+IZV+>ns%5vKP#PrtKl4RAcn%El7G5~kmNoM5Rajglo7U0g=S)~B!LSS}O5 za~BYiwP3Qi1qFvSd$MN0b8<C7<V3$YZzlcOg6EdeBXnwSe3D9lOGW{yat-2!90hbm zED{*emEwC@6jZ403Aa&g<NBN~PR(67pi)8eXfT{;;lVy`3H1K3Y{w^~<)|kZLqJ|! z;in^}NcECy+NM>wpJD0y@rSz;IVrybaou;Rq|}^AZlS>Mnv2uTP5wv2X-J`QF(Y+B z*7BbsVU$_RUWp=#_TqE6MkD0!+NH;qaHTu!y7*U~&7zN-A6?cZdbHP=Ag<>Vsq0_Z zjzo{$nP!WPRV#wE3-Pc1Qsrp$`TKbCZb}#Z>iIBK`j+T}hyN8K@woE?HZ%5IF%-$R z5+^G~tn~d(ry?fbxGd#$f48j3RSe#LFB~o&1xM8;=W`9xItxi+dwq66lo_4aT+{N6 zcpRN*U7jMCbB8u4AY|F+z6H4yOQR|UH1>3tk{WinZhRP!(s(*jwDDwCPY;0J-Ts1S z3k-v2;AqQV#@~O*Gb!QHJwM?qgwGk)NqhorGk@gu)XD15Z&g$R^Sgu-wRCH6u9~JR zszfD%-g_t=t1Rla7bVR3BP)fHt^s`VsKBpeN!dLjkzzi$bN^;?Zlkk%v$|_I6JkJQ zbnoFoNeW@9Ep;Gn5MPWF6wm0Vx+p%?4RFRbza-iV5*0H8zP}7<Yggd@ql}evy56VV z%u4(TpA68I2~r6TY5Qr<y`PIXQ60>G)7zGQOflHCfNknVO6o!L4i2hmVVvxkM(am8 zyB;FX95S5c-9gGyWTXITmuRT?uo29@g3Uc^yC5DL<(phN-*jKYPT!4{cm793`?Y~e z`I`9_|6;Y-nH#eSS9^Suv3S$7IadQd!CBtkUnZrCUmUI~^*2PQ%(v{f^2Xn(hxDf= zaL{Y)Jly?-dwZ)S%w1b06Gw9P&P~EFU*t}m=k9N}gI+BnJ-2}eoI6K1bd~EJpj29x zCE^%T5hoZ!*hj4b(qf&wDUbOCYX>{AUpk98i)>jeztB~a!Z*Gy7ZKC&c;g@|3Eo>Y za!Yz~D7{Kx+X?*CYtGGBy5QO4=$M&M-g}TU?^fj9IHJHUf~KYWyjL`bJkd`uN)AkD zq3+3&wsv)Xg3a;f;<!Ul6<;=>g=jXc<<;rj*(%ov65Dwk(Qa<CJIZrB@597^!9*?< zaJMbYdMzAE@OrrS;uS)-7T93rN>Z?86McbyXY+VZ>k6Ht0dnoBd#~T74*>Mx%temc z-${vQXX-+~VTwC4rTi2M#1q*e?`Ks|hyYEO*Eu*I+BXiN5PLYO;JH|Uz^qaW7bB@g zaF4AZjY~ua@EtTi>{_hw)h86O)fAhJ)p7VP1S8km#89%|Av5wkTdFWA<7)5-N{exC ze!5b<)X0k~`}>q3bS(vy^q|UJ{~FWd&j(S5|9S!Zru<z0%%yc$meXx$_Uc7FA3@h4 zJ~dXc<LZy-qD{sr`2D8!q6@Dqlo$q}s{5%AjRszu(f=MTzs+QsFpDf+4!z2%D1`<> z=W+Xrobh>P5kC6~zg-~wAIgV!4MjE-R%tltPk=wh`RN@Cvr~7R=#*2+nsD0QgziI_ z>)G$_GBScyY#uKg{Kz6a$aeix2u=bDcH6e0CBV2OIUaz7?Ud}Dh1?MmqSV;3{_c}2 z%_h)ml$QkefCF@7Wr^a_>2O*2YZ7n`UMWjCw|u?m>FP8wmaDeq4}~lk_<dL+xoXSF zG3u%iXgu+|FD}2wd<q^5->-tq*9e@YW<PZ?iI%TS?YD#<;N6yhYf}scbA&N@w^7}T z06lKo!)#G)%sNNVu#{5><(srGczA-P6S%w)g!EhCFDh8A@eNS4)^%gar?F;RQS@{0 zjg2d}(st~B4WDc81szI0q2!t8u;71+V@&^#M;*T@vz{x@t{QI7JX?5>avR{asFPBh z5?ux3swf9VItLmN-aVn-Q_tLIPRD5EH&}iTs~`M=g{H~ROp0_QKY)YGcr)`bssK@l z8)^=$e`u{$hl~hUuq=k_G26e$6=I?BaXFFS?_XL8c^aXh<9S|@ix%JVB`wvN=~G3Y z$k~id>+6-HSUsMv_Zv$19M?0tK(p}a?v~S6{JXE82z)t<phh_3o4*5DY<Al@5d7)F zcr>dU7WNl<g?RwM0qBcxtP;NLyB@3-P)8-dU;$pf9DK>{KDe*HsWctLiJU^5P4zMg zP2={<CuTK7PO0ug{X_?;aKf>_;fY<&IL_(tcZ5@&w;Y8$rr1^)qd5O1IdZ>QSF}Dk z+)d<0sKl`7Nqr{tD**<s@b?>*+&<{%n@L~YjE8~8g6ffVsotR2<1BqcW(fb=EoZiM z$whvXGb(b|BV;b->Dj<qXOCSUPZlbjj-Fqd7z@Z3h`o0NvGl#LSYSYAZ1TUcd@AtX z{ov;k&j>{NkQ=#GX2Ji7$>1_wE!4x%c*sJV2DX;{`x{~U1QrHgs=hDxfu|r&uIq)p zb<KySA#>kYm=n9jC0j|`qREJgYJSJ3I$UL+-Q^Bk2zv|u?IBmaaRuZx7g^`k*XVl! z+>ZKk?O|@qG)uZ<@MjB3a|g*spIm2u><);3EttquW65;97|NUdan;6Vk4HfQ@h-ep z*k~Y`enp9{&O`xH!6jMwL(aYIZ=ny$cPnk)5DKb#=W@YI&g4?Nzwn}usQ*lG8{37< zF9^M#-3$@Ml%eVuwc)1SEl-mWetjZ-osa2<5d|{tx}wRzY0Y+JV^lXr3-Ww*Q3m5e zFQ3nK{&*NyEWxt$hfsE*MG!0i0UnTWoZsZ;TlVHwLHhj&#d|gaufsPHYw?;TT;auz zf}m9Eo^^%uJDp?+9Og97(VWk-K(n9pZ6)|lZ{Vj|6xO_%02y?!X+FEdYgD5KVb^9o zs|H~w=S%1MG#^01m-ull%CQUBd@2ioUNnyG8@b$p+c#s_?fFa?)JWtYm|T&Nxenen z7~I{OHXT|xWLg|g0ws=S4`<3RZu#oVGq~3Cte?4VtF)V@WdwU96DV`){Q5<WIiD(J ziy4o|d*h1sdF+2qdH9@>gwg7#x|BY58(y&zqcvI_9H2lkSYI8U31PqOzT{)dA*^}( zMDl*}TS3J>r*+yw^E9)wgTWO&by>lsY1_&5wV0c$Db`I&`+c@^A5|{%#&nGy*!8XO zo#P^VTi@jeu(R5*{cbSr_%ipqwvTVri6hJkL!*6H49`!0)^|vB2b7PJPO`FLwvSzt z`Ch?r+Ltsscb8D<XZTaY`&QLj2Sf)Um3pR|pHWTrz7nUg{THTg#egz!SKuJSuHa{J zuSKO!0{m*Hz>OP+@V#mB-f9li`TnO*01%E_Xi@KpDwrEtY+2Chr6g$vt*aOOR)Y1; z3@f5c<E>LEm+y)r^7PI(YMpEA>8nuHv+7D%?-EPyHnJET#$(|k%+(C&wYU3bU&x1h zfUYjd_~t@si>A(Tp2X7<N`9ap+@SWodHld4Um;o*k@i);vN|=tLMk$J<vHyrs(Hlx zL0j&mi{SfvgGBn*m^jgFZVOl{(oAfrr44%_*2Da=ep=N@HZ7PVE(v4Tt#7MNAx^n} z{}jz@QRjD8&nl{%G>7%}UJC2uUN@S%f7W9v@XRS6*~&i+Z?Ni^I(l1Va6U&%rENM* zt-=6z@g4EBb}`eevBIG^arl0ab)<ge);PBvzoI+*CMBo$n_k0qT<yi7wI_vBjP{eS z`gN80XZwU0^<hM2S(1k=cgWdfoT-u~J;V{w`+TYFYb(vjD3L@(LWZT98)c65OJp36 z$eEnaWots~g%i2MxOX2C_T3@xl<qpttQJ*vS$(cRu_9IXD=qkLUa>;vUgj$^Op|Y> z-_~Ay#}6a4*L7LX(84<;$-UDSx>ja)dXr%n0MG@CA8|hh)(5N^Z1UcIjKp`opl%*+ z?ciX)7ZhTu8v95^&J2oJx-M28L5G`ffQDRU$<$uqI@`F(@98k>ymp#wqn<2M6RJ9S zA=$~0-t#uv=3B3)OD4eu#Q8=Z;4!!_avR-tx0r7J9yd7a(Isf4+(^nb*fqo(I~K`a z*WU2tI-UEb?x<-C7OTMg`catY*|!E#--V%$Lb5K>evS?@M{TlOa4?2*bKHWvrcv7( zF!P%0bot8_G`b$I-bToO3wH<j)7+8s<o@<K=juFN(E?w#_EFOfoV!t;-9n^rR=fUZ zY8oFRe6yS!9;E0AuC}3Y@k63#3zuq+?nR9~I12+i@O2Gm69uuUx}w7a^{$~XRK|z$ zVZ=xwG5TRDp<^_=!?Q&aaEEK{c~&CCdmLahjXG;1OF9%(yeRxj&fvq7S(8VN{||d_ z8CB)mw)+YqOhRd-Bo#^NP$rFlNQZPcNC+Yg(w)*EjevAZcb7Dh(g@NeAh50*{lCxi zynFBUt})iv{c#Q^bKdigE6(G09H+uv+$ylrqD#p$=<tmk2T?g{>n!t&JCp899~aMt zk$MbWt-<=t+eP@<<V!g<1Gew_567~|g;wX-iE(Din=e<1Xd2Eeo1R)RF#Myxxx?DM z&3~6j$=p;jUIf4QEtQju&Sre<0IF|7FAdS}7*2o~6xA4oXwm3b5}zRS=O-9>+UR{~ zJ>G$Iip_>n;MG<!%7@bp(0#cF-)kmz?{!zjYYr$YlGE?;wte7a)FP7b{Dl#v7i}hw zfu}g-BpzOLXX|Z+Zb|EOuVms-xuDXG99=#@#aeu%H3Zd|!_TUI<MjCjY;&i^MABLx zjF+e=9^zxtd8M%-CyC#Cgq2Mn)j4I2Zc2vOX-_TUIJ~FpxNV`M!DmkE7*Tn0M|f6& z>SDo7WM67H;CmY0-UV0yxhjjLIxYpS0_%9;1p}qSoJu_cT?w6WsEPL7lcIE%G#|0f zFAKEvbJx)UJG@9<_2cMje36DJHS5H%w&RS0dZSp<+==L{Y17RYr8}bx4SH?gDHtE@ z&+coAqM;_4q|z>)>H08IvFrw|zfj4tFstjj81G_Nxwh{pPpW>!yl<8K_QeqaVv)-> z7#(?i5%WHdUTd+6X(ZKkfd%fjrP20_mYl%Tm%H{2W?7tr5p<XJir6~TsG6Phn-VR2 z>}X4Q<lk1leII4G>{NQW>@+6v?Op$2dXm8NbXnZpH{>JmwBI{n2-l}Urv(n>>sbq0 zZ#?Y#-VX8{|G+<uebX?e@bWl?c=Fom^^>Y8k!{k+5R-%ch`=>FjEMSb_-*XtHQ4}b zKRK=2G{~~u;wg3~AtDO<+8if8Fa5H_Ba(TsjKd-$8e<mZmID=LdB@nNE@JejNhdC1 zGN#L;faJMVsB)TiF%s9P)Rrh2zBg~4U$_|`7pt(~g8wF{eKosFu*WTn)bG`NI0o8S z*RNx%_nxjF?LMwQ@Y1ZqzN*I{qBG4oCpxUZm$WChzd!H009Z3_LT$X7-OE9nR(3VF z3%)K5?Rq(E?SYxE`w(@r6oMggk_sZ6k5djCPiK$AzCYd4-o<z8cp2N3SyScYNKF@! zD4fCeMNrOBh9Q%$Efn?8<{?)`?E@9RQbgHfq1U`!hxWPdJB2D&<U|OU%Z;0l*Agxz zOb=tZ$n762O*wMiACpz2mUwJIJG7AwQ?-*2Lk`Im!<BI|@0FeYJ2{oYe9{t29djyf z_7RMMw=4|F^|AHRO|LP@#G?xdei1Ng`C@nE7(`>Wq4x2jle9<HGxGZmm!)OD#_<ZW zO;;<>SUCvT#Gh2BmG7)%V{%@#j(qt;Oz8FE6WPUnpXq6EYV!}Y-0?6n<@LFIi+qW* z`BvfRZ;vadG6l`-HwsOzFcI$}q!8lOL_hD8Q}Iy|p(lO&RVXIHe4Vy>{^%3;IP2?r zg+%I_h>B<_NF)D@BN0GxI$Q^|YDxM-Q>?22&el4@x|1RKC(rSR5Koa-3E%7<@T6gg zlzj1zsO@E~!q$)0htQ_aUOjyMQL$xcPQiF~cYVLv^p;H&5nUF3EG!(Yd)@m|lHgJ( z;hRsHFXFrU4!dtWKhQe#9>V%x!zi|MXhIB{PVCnoT@J1T8|kft08+yW(Z$P}A-5vu zMC!D9Swf+=9d)-`3}j4FxwCMD10DQo@WU06Voc~-Z>RhA3wa$Mma+Lc8cj_Gbn!)z z$$uuDOdLX;F&~udw|DyHBH--LI{)46h2HLECzdxW&ItaG6|Lakr%dpLqT9$SMbD== z*gD7*qE8_$z=8xzy4@w=F_SlT`(0`zmrBa{S}(!FBKzODo)P)IF>$WZCXMgmc1#6f zJWByBCvOk;Nz~Rp&f_1NcLiFX!903ZLr@BA=GLmuOBmJ~O2nU_HUuf@oBDMxalYp7 zr|7J2pVcJ)(R2!ybH@*|i$Yj`TMuH+5SXhv$|AoBanKBI-ZCK_DU@{&CqqDffsuR^ zV^h7BDJmhoQurp#`Y7`(t#rL{IlEW4nY3h5!ssYlAbNyUq5{K>PiaH<^b$bKn$#K; z_7{=HiW*iUfAN7#Z?LHqM>&lqhRRCu*;pkTRW^7_Lsat_iJWw$JeAF#UaJ~3+bXEm zxyN3KAW&&yWk1ayqQOIeK)vr&4NR&ZcaN1!Cyy>-xqn!FVYEKZWYkUIt#m5qSy5|6 zQ@)C(J$UVSlrJ83$I~4qmn?seBF`D$0*^PE?Xo?CY=2X`!jb!m_6$oDPnJL08m2BB zm_{1gAD|s{M^Yq1Q&ige0j<|;+(}o4&nA6kv@F89$Z*a*Y1*d|l>9qPr`@6tbJg8U z#<(9bWYdI8Pbo%K$vG`+`D^dy?+*%`-E18{AtNATwZj7+BVj7obuPB^mJB><Fq!5( zm_-<(L&6#Hrr@3~uOwo#Kg|AWg)B1va=V&i-i7yPNgJN_!|3C7&7pY}t=%VGL?j#| zZ$H{k<RR0*=<S4dU#t)t&}w%fnYE?8gl&q&R$=82vWpV+@P0TT>sdFr3VkoE+B11U z9=kVfni-15Y@TAqBvr-MNmXBi<<*@-V)Z56IpG*bslJLZhb1dAc8^8GmVzrF01+ug zg4u_h)t}46Q{ZR+cBJ0ggLYOwg0;;x9EmU8zbJLJO|-p`#vWrt6zn_h5?Sx96Llr& zsGepb2gol^st;WD38F5}e7p|Le%Hw;^1yD|%5>36dq*UTE>n1`|F6#7p9~E{PcN7% zZ>UOuZm15FURAId^_UJ*B}?L>6A*l84Iy<}i5wqM>JA%5^Yy$F7D3lQc6T6X%&W=w z6V5xMiq@qMwymu}R2d8eErUIEJ*Ef7mw83P$m(($vue5kBv8eUR}cOg+vvs+_o((F zSIzT6`?p@Pc$1SPYK(ygN-s5~SM6d|ty52Ul-GC_i`&ivf{I>>k#n92hB+3dfcQ_Z zH>J6WuGgKW@9J?7u}UO?x@f#6EM7(ay~{O)N<A;}{um~zPoIq~K>lS*$?u9_rbvcR zo?|Putr}egO__P=E)6r{kz3P=Q8jdmw_b6wdOR<SfN+;6&b2-X7CYnKBV$_5F>Q-X zRK9O(O}**ur`oH>Na)&1T1zl@%N@o`)pmFjwoH+@c0A@$(1BAF;A9s_RWSY7>a85b zQCa)tJ`Irk-c>i^WX)M~62sE$yoY17?^%Np{#1J|a$o4ykIV(1bzJ@^A>7vC>rlbx zv_U+J@s&6uIPxJBVuX|xepE4H8ZQq;k+voqPbzCWe|`+^?P4YKgP)IO>m&}x#=ZR` z8trXR?nw-^WU9nP|1AQuQz8;Pf`_Vxs7nM9Suf7}*wdO(YWiH1r^Ust8fes4A2lp6 zQqwguMI`FC9`|Oor`<|pydTy7ru5t&$LQUucBzWrol?j1qQ{MNl%zQ<CEZcQWlq5% z4++NM3XD^9Tw`?%n_o%zvt9T>LHa&IR)I@^J!`gNU23hF*r7%@{wenJd+7G<3Wu8d z($Z(TO(CCj(*(^k?(Ha#2xC%~sRk+5qGpa2OwMqMxak1w_Bi?kMm}mCo|IlRu>W^D zti&oAq8yUf#tCuxsW$DC@y(@p;F45a|L)@u3P+E(9T$DG7Up+q#_>C)PPED#q8r}$ zbZ^J3xy`ze?h6k;AtejP)qcJfhXJoB=Kg73*I0dT+wruHH;1E((_^)zAJ$j5K*qP- z77!G7B!_5cH(zw5Z#6$Jy?k9H^s?^NgY#qGGcQ}heAN4oNz)tGe@uva&{fZzYEiQu z;^?6-n(ed-4xUr9@x$JR28KMg<Fd%y`6c$13)A`X8z<H4_0CK#iN_DiE2rg7Zx6X; zC7P0nWD|wgJ`Df+>)fHI%zcVx{bsVy61>&Z);r8ECmf{uu!_ZnpoAcK@Y{l)N+e$b zBN^5!P?NeJ$Sx3F!f^?7O;zq*_lubYZN3s!Nrkr>dx}_72IAeQ>5rUG88+4|nn(%U zHqCZ#p);}eb#UKz{%W1B<U>Gt!krdil2CoztgXc8Dz5$uh-}5V+KL3TMVY^LwY>>- zS?S3H^qFvw{6v}?j24-tKDkYW2zfDPf2E8zX4LS<4WbWrxG1lYQKdS)`$l%p$}ru0 z7fmvtXq+o*s!>V!mZS()iE!OirigZfWNu>a5P6V<B?JWI<5&W*e)j{t{~v8#myP1R z<~~`PE|<wl%Z!gngu(V@=d$0a!UwTu_Nc_jxH%u+O{Wb<9%1<V^pZ%@jt-30o*lhp zASY8`!qX{6P-wE4E;ZI{{g7}P4)0f~)ZnFENP63o`tJ1?>qAfD_9chI-wG-|_&B+! z%SDR^_Z#CVgBpBb)D_xGC}wYW1ZkhQ=AxUKFnwhR(Or3j!SiMg?B|xtKsjXMda(vT z2g>23XYq<0tSFvpbp$=#qn}^2;i4K#zo*zD?y7uyMn-~|A%F$s{f(8y0q;Vm#-#9r zPx_|q6hr*FqTS+Tt^=c=$&xz-y0w;Hf2sK-myVIzZ$|y+S!Fq-WXV?h+OKjw#`8y7 zC%c2BI=T&z2>TX&`60wtuN{N6(Pby1M|i{+-9TH^abLPtKL>1~dx169i!+toTa%=V zR6aXtS>NyI504V?3roQ$(=pJMgSF6US8-p};N5CRJcp_mce$tF+^T>vb&OQqlbngh zJTb@a)2YED#3K)2)z%ORJgMfQ{yru?mq_(I7eDx&i>bXx3r37in5-32NFAo@_uI<* z`tZs(!AMq3lw$>PzLRgsDKck0qV<^SG4m}Arc$sv8wPp;`8Xr0qwRK{OTs2O)j*?+ zP1S5cb=T(G!BgB`%J~)%Wq1UwEsn?(VQLbJ#F5;fqTx-MM2nSJ9dl7Nm&2)dbyEum zQkHP@yik2)e~XWoG1f5X)7sIH1a02Uf3<(lAsGxijdWN9c!m19C8X7JVw9ccoqeiU z)4>RzPA(<?G9NQ<(kk!5TvL_mSnR%ImzuA)ip67DG{tPW%X%oaf<5Hg9`ZDekBBHO zKF8df#R;xbFHZC(M66zRK%Ph*`%rb8VtVNp1i371?XmfDVv30#<L){l)2=;O>z~de zuhn;NwnNS9%tzfH>)rjtF0Q9aQ$X4J!c=JYH^B*U%35E*v-Ep)eyr}r00P0k&$D$= z<t~S8K;mXGxZ@lzZ3*kL(mHgJM1oik$rHl-3E|H7mEp(Z2q>g-7m=(V_*~}%EIrr_ zX%)t5rJb9IM2L3J16aqv_GcpQYjPQ~;#F67@9*I+B$6Ra%U{nqaG<3b43V82F`P(_ z7K6OoY0W~>{O=TyDcI~4)scPYcCe)6s#U?Iydi7R3&<%W?!zNbj=mL03-54dI`gUi zPK1w&DD*uNMv+Cg(z(ewo}#wHK7>r(+pv#=q**R}Dy1~&xF(=|EX5CQVJQqG_y@uP z$5(P;3S-X3A*(fuXNSiIGK|1&`mNn`R%uLMJ@uoCwv&;vA$26yJvc?8c-Yg=hj_CR z=$-tqf+~{_PK2`e>~*`dFbSn7>K*60bK-P=OmYmlp2^j+fB%lKq`KSqzFwq=9OfDP zU1){2tGcxLI~tuK9E(gR0Drx*%}H;Ib_UyGz~+T|J5I(6m*fvkWms}ls2p$j6aqX0 z&s)$4SoBFdB|cl|E<JP1%XvoSBGxL>c%Uf5{xFg|+^XHzp=Qq&ZcJFoQfuBx(<>}$ z-$NtD+AS`|2<!F>uibYP@<LtwBt1e`9(YaEYMNOxe;}rmN8QGA*)E7;Oiff*2|wh6 zBc9*>)OpK0$GCrm{#1<`X^v#4nx<8W3+Ef*<4(I`lZ?{2yOgva-Cw7uU6ET04ZhoY zrgXJ~efpV|zM-=8#z_N){!an`_xL2xNk<8d1}v1=EU2jxNHM;SyGuS%Idv?F5`riB z#n1c4RL5kpPO_c|={i#jCUj)f=D$u#WSe0RUIJ|27)4wKbZs!fwGo!%%c@8r>ULYq z!Y0uYx`nz6Pe4Mg1|9a`89f0E7Z!IP!|3(gK-;*f#i&(Htay5)h?<n_(U(}pYoXLH zV4owgde3g=q$82<9yFMv#UU&INXxpSNQs<315h7JcqJ4z;v!Wk8Q@S;%o_az2{mVW zzIT&!5`SyN<}40-z<5Mv<f=j%j^rtR8$opc2#iFhp?=BE9Md1!{>a$hJ-{q@PEK%! z|L0czGe-V{KLBTgK5R;dPQe`3TPpV0=A)ZGAS~h7f)w9OD!HRND`F|7bhxutD%Rq* z{(PS9IVAul&h?U#|5GOamuAi~O08>61(;4kYb3{Kl@0x!yt^y+|9m?xx#!Pc-1`@_ zoEV7z{Yb#Y`PX6ndC|=13-(BApLs{){~v$**BAclzoc9tfb=)N<lX<TgZtNe!8fqH zgnmox<{$^;oBE%>0USMW#x#X1wEfTT1;4Ie0a}1$*RqF#r~e<U^8f9y|Nhu^ad4xx z?`Dp%{2v`nIUa;D<?Tor{F(Frhi_onhxp9@>r=0W?Fq?O^;=rI^g4iH5+ARJOog8y zpPj$dH7MeL2D`U=t6u0&Hj>tW$oSdmC$Ras4TVp(K(4EaW#AYh>OY89l%a#FxqWL% z*4q3>>6kG9!z=$(1C|KLqaml^0GcQw1=;qindFzIPeCQV5728I^UohPy%GHmZ1UH= zz<$1E*1HdEMhxeCe+TOSI?c`hxx0q_*98y@Z3dyv@)7KrkEDwl&o>jVfDFDKVWbI) z;>s=8p!isCod}VIoZ%4Kw0l-c`n!$%N)D<l*aCX~uJ#pxSE@iVf>^~dr0NPq07}Y( z0U%QXy}RzGb%|@g4~NL>t>7LUh<ji%y&(<Jmh_V>tLOj_$lO&P{~|7~@dEf5wL9w; ztU!w&+bKQ&7)Unl;MvAsM)!P9=J?(7**vL5Dhj!4NeX*WL?e)U4|LC+sXYGswT`ER z^>c|xzM%ZCpMG<P>Ecib5{0eAgT%vL1G2;T>7^Su6EKXfmq)^a@-i(~kdf|G>GB$! zM~eiYi6I|u#=!#F$Br*YstrJXs67OD^(nk$8oxJgeeBeVo5G@>APYn*f2l)o<?5mk z4uQsn=L9K$cZe!_Xp+X*l4n67uut8hP&pQ;42dUT)n{<24eVvT+)ZZ#=NBM0fVtTH zI3Hzn%=@;7SgUNUm?Va8<jD?j+xq5Aq3ir=h1ff#GU0|3ki%{Zx)4P_=HCx2>~@vC z12q${hO&A4AYWJB7xQ0PfL8P91rd~5fiKD4b?T{L6@yXuwbN+Qypr}&#{C%JUabK_ zkIn`SowZY+MlYlUy#l+TC9(?uM96n7gV~zzc`fAd{f`H;`3Okf<3}CbHGhgVfB)FO z1WN{u=2q=eFEk%%K_)>-xdGt)G6IhLVlp0hG#2R%k=Mn4QX13=?(T&$(4{OEqPJGT zs;3C;H$+lGK=1MI)T^VML;^K-pzp>3j`J*BFw&$q@NtSNB*=Zv5<lNNCn~(D0o3_M zT|+|S@vCV-`UcCnguBcx_k#83lDOe9_(O5jZFmTl34|HlZSW770jQb97r|{oMoOG9 zjR5|YQTK~&6`w=ut>Py4N7aB9tk{&#ez5D<#oHUiP^9`Mat#<wX^R~@7<z%Lt)(@1 z3-kwd|7KOU9rPR9bI+TbxfC>cEJ<0u6veUz`lc}CU_w*q-@Sd0CoN^`vMm_d(<_;( zmFjcOvrTTKKFFp!-)DS&9qAG(IvziN9r}_DaHW&GCpp;`D|82ysKt*ihhGvu4L9VV z2}vrVfSG`Y;~?uXU!KdCi7o^r#*ESUhfsfs2Zx>8WqnUH!Yc(JFqKuT&g&sHZ14_& zYTA`Hz>l}8T`WeWxeM*ZlBo(iKS<^KV*GXjUTKtia%&=r@tyxteEJN?lXPkBrn>&e z<&@Hfri=MT*}i|9E?DT1Xg|`$bt%%CIQ{5H6V{V$1P{21@6$&-Q3e3brn_Mu-OpD0 zZU}8}^51DU)^fl-zq(<wF+F~@d3CEB#VGfJ{sgLgj%xshD+3<USnqq!aw&2&huVGs zpdkg3-i70V`>(~A_(fFT+%w3rMF3#9GSD1XD)L>fM+7{}4c*=^S(tz#)@N!f2+LK1 zW~EI7xK)U4F-v_&g$bHlRG)6<W^NvPob~CL2MB%v4)N4nOEcAdrQvr*l?NXWNu1u_ za@kZ&RWEe{c08?y#IbBG>u_4fR%5X3VUlPCOO#ATfJb<1zhbEr$Ci3PE{UZFw@fSm z7LirRtkxhi=bM)_-u~-1gckEnIu=vjIu<CVHU!-OkREo9&CH)vNiw=ElPu)AZBBu^ zTcH6lRKV>mXv6wS_MyS8(rUn!-;3hw9EY5l&-f$Ux|J5md^aq9)iSRb^^-ttZrz;D zM^m*UDpT-JbX_{xQ{;;P8&URE7@f~6SwUq5FX}S`oG@_TFJdWS((Q!eM+gKReRl6m zN~^uT@`xK9;;HWE7hGW~Y5u+XnW2~nrsm}21R9!Qj2VPkDIfCw=WHtV3`xI=^G7ZG z?q5qYG?zDTV5iNl(k;5c1?m|SP1-gr*h>`^KA}JIi#IO=4_2%<CcooXUKBlHM;UB0 zC&U{v_WE#1ur(QknH+m$p)cJk9gj)9{AqHmBZ}thaY$MVte>?#pEez4Zf}AK#O4e* zl~wtoYKiuc6uDEB;Zcr+k@IYH7u)Q|J+kg)Db_BU`?MBhyrB3ga*VZwa|h=z;G5%e z=$3sjW0{1s_xCM)LzG4QLkP#jQR`+B)y2K0eud@PyYsj{2crKa(cTSFSAx9X2}#m} z*2Hl`2-YThd2&r9@yyNp;S#IwTTz1ja}iO_dXj{I4X4AT1x*n(NsD^P+YE+}5YZ9F zMdP3A9Y=u1n?pD$N<*$|>=xwv(O{#sh1})FAf78_pyMdk<QrBYu6Fp|{On>PuJwY_ zwQeMZ9ljS~EBut}pfFoehfMw4wSKiV_z4|4pJj`u%i96Z(%PTR@mdD&O*L{gZ5BnQ z7<PB+{O1|0>bE}p{%_;1s4xYY5^f&1LfpSCv7}g#Xk&BY<P;9g<CT5xqdww(?)*W_ zO78uk*HWP0o(0;$J9h{MiqiyjE_+$}^sn9M+IwE-b0gy($X62Lv~zBWQo&vymr^Ti zyhLIGMGwtd+p-xzfWzTt6O4v!-ax{=@FQrLtICvlY1TD!4e2h(FG}APxKVTP1DYfb zASZ4t$&~s?@^-+Dt0K!nc^^BxJdrS`zVm0pTQCGE4?SJ3_FWSZrh*td_;l@v1hs+h zeNsl>bGupYA+7~WsUBH%gH<2}6fCE5N0+wNZ36FY@i&LQVUXyuOp-r|yQJ`RyK!Tp z!`g>?HxFXCD_>{Pvc060o`1#c@~!W4&Vyn`Z4GD*(T7a(`fJhvn7kJdWJ>`Xt)HeH zUTp83_w3^BYPd&z)$5baNe9drBb^edr#ruP?>QoC3v}%N_i2uX1gs!wG{SQlZWa$O z{N7(mt9o$n`nV6|%x2H(A3sR=0+Y)?BkI)1NX;U@NM|bzue7nmt&7bp))FX_&Mnu* z77i`@crbhQ>}0+)98U;qj}aRYTg}U6k#7X=7ZY=@+d5#3gNaiL9_-F_<vbuC;2t76 z7NVl)uQl}CiV3W^k%C1kD&Z~-X=4t~K?jaJl;=M8Ag?{UYI4bYE$k;nsT61q(`Gpb z--g_)_!T3FB!a<e!Nta!!VulnM0qj6FYVyxZ?JIF<V&s?CzFNTBpvuY0T}pI#SEP+ ztYN5dYz6)-2dTX;R1&01^8&zyj$X{y9#i51$=7(R-I-dGy^)|x*O1POqQv1g4@WP` zdM8WHAtupi=R-EpM(la*-s8dDASbVi&R-z}r|0^?eB}kTy+Q1?8_|DvHvcTY$n24D zmUiWLy_Ej0$NfYEH)tihOVNbAM=W^KeYTHp5k7Gn3}r?<?@FPf4va7seslNHk1mBL zO}`JYyDsE@g`WHZCWCofpz=sZ&XTdUwsM{U;6xGJ5kr+8C`}NfrKDiI*ZlBO=mj$) zxlqJZ*ALL*rr;X=qd3vfZC{u;)PZ)A<G8uagIL~Tmk!M-g}y%V)2iA8{F4veZ)oY+ zw;kJq?nhzk*iSKzMGEMCY3^?&O(dRgL8s|4x6DNU!IJyOPrq$?X$omuRP*JD)u|8* zqp{u+*M2%(3fvFlZUsNfkHF$Q7qU2b`$(qJ_aFI3u-3Q1y(2RQ>;?}BSq)Q5Cv>Pe z30iz8*pO$c`NsTkhZyGlgs(YUExsIWC%*}jvvb2uQS25?RcSnkIo^YoBQLnJ=w*5B zP?ukMobIr%^0SfE8k+RE<nDe$-dVnn;V29ynL}h@M}CiH>g_vj0xy}4f7<?dpQEhu zyQv)~IIggIx}e^^Pr7e2zri(vaQjnINK?~MHnXzVTMkR{T=Wl{b5sQz6#?r74VN@Q zj)RG9GR$vurd+IOvDYfM=y;WCOG!^dO4l`T7x|zdl1cY56baj*$nF*4_lwOo2DTig z@t96c;(rD%-8EsbQ0yPq$+Lu<U%Dfdx=pa4-0p(l<{vq!+NTeR@_bKtzk!{PxFlEJ zP%3arDE@3=#~}=O^a~T8D}Uh_PUy%tRc_3aeq?pQbT`hbEJbAF+phn5mnRCDYN{RH zX7n)<cDFZ>X<H|>`LxmlbO1^J`Tn@J%eL~(z6pZ-odxYjr3ZE$8n(3TuPODuLax`% zype`RCmG65SP{HCUkv8R^C#=_U8HxdU5K#_%i)ksX#Qd5`8Bk`dZhFOuxhoF<Iu{L zxYn`)DMr|_gp$$6TSUezRn8{!k&&44FltKf_O36X<-Bz3j{F|9GFydY>0EW)1y;lR z#YU94ZsCTG@3Gipe=5HND}b=iq=C`CQ@~!^$Vs>vr4nNk&)?0qbQLui|DDpe`_~$G zlNx~VJ*S68_7a6{KW_niYag~GnP?Uh_vE@2!MeREdQ|4rwejuu1ecv=w~KWUSJP;! zUY_!(Se%DDd?b=MAX-1UY`bcPU!S}tvS^#nI^=DGSOW>Uv|fb`Fo#H2(-WSyRhIfL zk%prsJFO**Q-4`C(rMn|YXW%l`00ZTY=lrbG4<y(WQg$UIyY`@PQ$M@UxiTae%sY* z9jVjET{!tMs5g*z@99cJ!Go@RgDBaX>x@jf7w_qR=FOg4fcH;s1`J`*p4M3EAnB2l zqD<(g#DZ69Dhl`13FQbI4nOV|pfM#)X#7G$uK-(=G3i|<F;EdFS7GoV*n&JolIU(7 z>I+nwDbX(rCVZFEE6Nu6j3}Qo`95Lz0qq~`i&1-#eyon;1)Vqon!k~aFe8Yn7jaE7 z^?WR1;2bytG-Gh;34Z!g_Q$v}R|K}k`Cg-dWT2KU*=IkpY*%AcCK_HMW4?3e8QP3# z%|c~HO=?zre+ilA=CKNzVo<}^-1HBBftGyfPrg<h&+WQ9C`-+(xIsG`Ck4_zomzsc z+?dhEaZlm*OOE>;_lqTWKLunJWbXOld$saE#EbM9nG!p#$5x$GB;I(un4(&#Kw8R@ zLux%w00=(oxu!eX?Ne+7x>nQ|(7u5lZHRZb{uxb$McZBO0yJUEG!`H45?x?88^lX* zGxx*1UL0;-dIu)uT=A8zB{dSKqz&%Hdg9nQi^qM|l#7lCM<1%HWgI;4&=BT%PZo(J zf5xm#({!d^wEY_C>SYh3&33xLB2%g-JYrTTo!g3*1$$|m?cG@Njsw#yzVZ;KA^KD+ z4Y3bhHf9yW?89I$EB`cepvlRcxGj2VQ}TsyEQpO!SLx-KRB@3<WfzNHecF8Sg0@n7 z_pZUrVXIvTn@&oKy)*(dCfc|d5>Jt<*VMtRjrCsGkH>h@MJnXSROcjSZJ8bAJ=T}i zD^V}+8K*z!Rq|+8J3Kk)7w5_IcYe0}Krf^o_|^(0+dgeSZ4d647fxAaDN(_SYO8y1 ztI(h^pTaltcK^eD&6utExGJYk$HvGi2l>mK!>&5aywyv=dOIwu57NX=%T5b-`_><% z>4dyohBcmd#v88A3$NMl+g@*Q?@F1inqh44F1K8!TZghPck=ml8~ZHrtv<~d3KcgP zt(+^JXX@jGKMh>~p2JJ;Wffw#P3Pr2J{L#XJby0w{081_ja4nLG#5a(2}q3C_YrSa z@1qDfQSLN!!P(FGxIwj|#q+?L$aMMNyjDY->Agw0T{)}Yz7<Qaxu+z}vs3p#iBvz? ztHFvgEc$Kx;k<HZNW|C9RVWC{(V1U;iO5Jwn)ywWGuJ6eaqpOWN+ZY|+~-hk;mcqi zKvC}=-*FY?9Y7u6o~gHWu69c#=ICKQky%$;ui@2R`lwf^`=GR!J|9k{G4B&XMi_;K zl#q*N*|?=;;Qj(0S143?pC3f(-1GZb_*necvbw<#`&`50>sOtyxV5)`Y`ap_h@;k> z?4kI5tAFNmmN(cXxs^8A9QaY*8B;zfa${xhX8_`}wbY@%KqdTzmJH#9Q;(>}pn0Cs zCj*^TZx?SR*o`^@LxM60G5B7PxJwx9#ge)tYLGb69iuP4cke`Zpi{vDTU>50wo<u2 zT*SU{q~bh<5nBotsU|DVTgcA9$>iHc+-Xa{ZdP9Tz6AFgmFw}iO7V7PgattzTmeh1 zl|E0P&mQSk>wtbrS%fmhNUweY-PHNGcND=Jlxu5`iy7a?>eRW88oA^~1zhrkIKBMA z&x|a1JD69=NRPjLO0rVl!XQ6ZxPPWdY$2{fi=q*5x3}941@7YLN3qSwc3kd0yc<0p zofb_YLN~Hn7~;pU`p^i+8Y6`oPC+Z6Zkl7IMbl=DMzIpnQCV8K`8j{WxQ=-{&ztmX zcyw;({X0yps!dp@Si*>B98q7cfmE>?^mM5V`$NMdkqGP_5+MlRA{Y`*rNMJ&Lek<z z#!M~R2p5}u8(zJDcO2SpTfi;bHM<oWz3+i5YJ+>4zpkJ%>k(i)6jellGeJl(k|c+B zidG!$E}8WtaFuv_tC0P5#FEyV>kAGc!z1m<Br$a-N|y6T!iLG}`Wfz3MQWv)(w<+^ zdb8oLg;~yyBzNO~rf}ci;6|=J+tNs-3HZGBVCqr6OPA5hg~kRKT8W16-#chHpEW+& ztzq&v=(|#TkYG={xYu6+k6Y-tNtnvJawUFYJ1Vq><+<um4y#Z+cX{HhJg3x}&^KFi zeiArQALIu?cSUtnH!<cgc6CUy>lGuhR4TWfw?o4ICaT>zJo1ux?%p_-K}dc-_xygC z!<bXx(?z)q#(5dM)6Rn=K!Qm+N?M17{KhMjdA2O=MyP^qCwpjcSZ8c#FrQttRt{Bj z)XcJDHh=fS<#?3EZqGl0Jk6Uq#vFTHq_9^ZNYQ2~@L71|X~O9%>a-(-WUbw~xiuRm z4>7tEYxe7rds7J_i41HUipGauIK){d1=*6eE?$xMLJ=f~;}`P01Cy7<mgl4FUDXu< zl0)wfiS1PNR0quJU5<j+o6ZcW%g2Y@?IZ#vJdnP_Nf-6q*PrsM6VYFe#Tv}kpj-?v z%=!;<+bYfxN>gOdXjW_JEF+p(&Mmpyq>BDsJ1tRz^83=My!nmyGTsJ8p};6XcN!tt z0F_H*gubg%6aetro|68?kchuziQt_@LGUbk3!WI@TkeaTt)O^ykWyx2rI$gAh^0d? zR*=SIh|P$Xi6;Xu5u=V)gAtYirv8<}-BM$0sk7|6Q1r{^$y;SFNV@1H2(y%mZO50A zM$#j7qPqqx^5}NP1`u5zngzohDX_3)qXnYzPmVLNOoQ4#apY`#5HNz7p$W$;W}ugf zX9>OgrHT|L<`Xiaf+YXEM@Vh7U?VhhqARlp^A$lp44=om5BTK;5?`A1aFhscQaLcq z)_D;=r`iEIG0F)Bn#}xya;TW%H9lFw$Zc=Tk<5apgqKbfO$l9g=nT0YDUnz!DvFJS zVIuB~YG+%={UT0Ph<b??Ukalj${D9kkLyk>Ws)#kGYyCu;F>AGA+6tTScrV!^Z20w z;UWAGCW^I;w@8fraNcDtdW|XIg&zUzJ`$fd4YE)tOd+}y11Fb3qIljU(<$(LFGc_B z=<emjfz39g{RXmAzKm4b^e<ucUwY#>_Wp6B6Q+Jj3zl%udW}P6MM!49H>7M4+lKq| zzOi&kWoJpt5-&32Z6lM%=ufC5v078MQ7AgAso@Cm!*To)8-Ks`RUHvCZEzf8Mqq$# znlwh|(d{-mQ5@F@SqXNZ*ry3+uuRs|SSRFgXFu)wf{*MA268lf%V>v~ekuXkT;$KE zdg7Y<em7$41C@AqEeomyKH?q_(fx+ev+4WcCnnCAdM<WZx0INu@aaM9WX_t`p7;(& zCa1v&PgRw7&ROG|G>;I5Q|#eg_*{S;29lFGiS_xEYE-Plhbw#LM3;(&yV=#q^7qA* zcht5XSP0F_%;n-jF5<Pw0F}<r2@L7k`x7Dc`i0?8PT9N9?$nDBDr?n1RD4f!eWTsb zFhU#Y*OOWLH`7L7@cX;3BT+BA=_+?BMF|d2oSJJRRc++_4rfc#N`IA18Q(G6AE_@j zUrG@;C^P*OL2+Pvx3x=u-iz?*xM+95TKZVn@x_kvMD0E7=Zq_izp<18=z~v-?l?C6 zb`H-o!PU!F?J9dx`ToE%vdEIas?c)8BKRGr*XR2)u_mV)YK#HnF$!%|k*Ys6j(Ee< zHiGO3oEy5b<%_k2!*E*m-A61fco$l$e(AW;y4LQmXw(k7w~3P5zrerND3N)U{)<R5 zvJ)*y*x%Q@4wKFyl-Z!hw<VGICsuX0tRx(*%3av31o;0|woH2StUQiEe%dGsLT}v- z+@_mBDd^en=qYqh$c81>Y^i=-<#02L$HYfe$dYUm0K^j*n*EWk{UWr@PA-W$RJLLa zYtaGsBzIzW<t7uu70z8yoWl=p>0@Q}8?P7)nqEl|T2e$}A#}6a5g=<88M(IKelb&f zIQ5FlfJyWo>*RAr*v03M0kFl&nR2qo_gI95ETU}w2aPlmnN|X@AATIKFDVSkcaNXc ztOKuX{0y7E@V&j>M<pDxKhO$DI@fBLEV)B#3Jx5Hu(jVv^c!<L!gRqoS(_U$VEZjb zLCI98*542^P*ufx%7*#Ynj%ItE<zg&$FzDYnHL@QNW(sOOL`mH-?L2%aJQ(J2c4fM zz$BO3E(0j4Vg;X&WOgrct;bbgsMJ6<LtX8i$#+d--k8^Vaz-JP#&yeTAD<)Ggw}p3 zc5Y~Jda2H!s+hP7WynE0Nqy>w$H)I3wv~pVo6Q}4MBl^2!_@4%wS_Nww@*4<%IBbj zf*@9pHuAp3l=}sST5dI#&9?I^*G%jnuOf;{#tBsG!c1gF-ECf@Qo}c#$*QoEsMn0j zNhO0uPC?%zi>peo#<^mH85LZ7*}OxHBaMdrj&PrRZT*T^-eGLrPHg?Ti0VBXlIL)- zjvA>$4A$o2Il-%!E^3NgKdLGploLLX6$(4q+7jywHBl=U)((9?GE|`4^^z9uvuH+8 zb$O7TY_~udmr2xgc@Qt(6|%ZxA{LWmd-EedU?cRdTJb3C22_QU!TUe_WSzutpe<|Y z(wtnQ(3<_J>@Bs}V>qvOZ;F?E>r?8)LiEoy0gTYZTm!`wUO$+r{`_kF)A6O-lCFmg zVq|OG@H8yA$bdoZnWJpN5T^(^PeLXYb^u$J(EH=T9u2M91-!F4_xGjeoWnAmX7B`w zE&s*oyoFE7{cgvV_6V}P89%w=js?8)dSql;TCPGu=CDK<ioWPSV%BgpdRTH*(y1S@ zc6)NIl*a91PC_ONSHGkXAK1r8I>u_ase(=5tTNN;!K{gI0`}f6P(~3_OUf4Hs7p)` z%un$=+OE4|-|LDul<T-%F!>APsh`htb9E6aUl&yRv*WdI2ZIiOm!NP+lc?u^5qfiq zaLEwRA1o57a#rm<Yg5ZrQ<|X;xTC3&rK+TusPVoesG>QYXFYEW-z-9W;I_DSy*H`F zg+WEVDzZAGqEx`HwY=z?`8kcWB!|=L2;Wu>Imf*f94oIFnsmkzta57{hSn;_E$xL% zOHT=+1s3_#CuRmMp}OfldT;0p0-q;Wq5gQx=x;-iRauyHEzzXcW?QoThC<8(7hPmq zK1|LnYaEyI6siF|dCjz$sNY5vW&h+3wlAhE!<Q;KpXvNiX-26WG2P*pSYdA)8jTUA zON3u(0qJBs!!FCh?#crux5=R}!Y92yDtz^udHib=Ev{NvdD??8*NplZko-!XZb<lS zJ^4mH2ikrjPQ?Y^z6IYKbDrqZ7x|Q{JVR-b7~Waj+<NiU9OX_iXOc<l6~AkPtR6<z zOjZP(n|brW{hd+n9m~XMU-p{~s6;9Td`>sab<I)<zsohH%Thlh=Y(PJn&tkzp@ZF@ zTe>*jKXP$%(q+K(deZ-3b(k~y{;VnN%Wy1rdCqc&p$_|(eZ&d^ijWBaEk@46<m?)0 zv|5K)?S$6-sjh0>Li=Bzj?3Q`b7+;+;Lg2GR7AQSDV35sXa8|IC)K^S_<Wl`Cj4^E zQKRZO^bjP$eyggo4KZcLEKA?%^H*54{(B4HLAOA3iUi-yEx?YANWexAtlvMQ^lj-Y zRkJqxWxKxD^9L{aABOn)-3i@d;@S51Q5DAF)c>^F_Bs3@X*?C{-cka!2rY%G3soiK zPs_B|LJtMf`B$i$hIg3tJgF-%yn<qAp9`TIWjr}S!Ag{kkBubYB?#!om2_Hs{F-*a z;xj5~gkm@Mmx{e7jcSYvw<r+w3>Pt%^RV^w+Y|4*-{Hc$Z^>$gotyf4mPr(COKYO( zTyQD@GLlxNjwL;RGW2Bsr&G@UdvDAGnQnpYhbM%;KvsrwAt{r@>LmP~n4-1YYXRg% znA1!JD9~v2IV+r<OX*PGzfVr_^l`pwyvLTt!e>fSIy|fl%c0^$7S9BWZKg$Hv?mva zQlS*@Bm0>crJ5}0C>%B9m!y^6SpT!6?4)d-YA5xNM7>R8N9FfYx}Rvfusi=FD+W=o zjlVdo;~Dc^J1okz+D@S&?k;n-WY)W_oyqO4m2}fH_H)*Ua>sg_MkyP7ts7mlN*gti zKJpPIzTM==a?}IN{=Jwo@UDu6?KTcPnahK(m>6;D0*<K;4P)EXhT3^WOs{865B(nr z3C7z=g*GE~cB6IbF%=KT@^KmspqULUKsEtRTvjqCWlE>H+dIr(?mg~gwe5T6X%cf( zzu~tf&?&Q{qkT-prs^Fkwqi-vGn&%%3Ku!Ta!6~jr!c$!GSDTi3vX%c_re!bgEprj z1i#3EFT<t(WT(A`ZknH0FSh@T8w3b0Lln5}Y}HuRJT##GxBPvnQkm?j*ZUIH(&kbd zvmZ>KB3Z*Uc+>*k;m^Tf?ROtNvqd7R0$PF+^W#POmA}b<$75x;L}W_wUZ+1+Pn@?- z5j+^a7tEk72FogHt#z_6JCzV7l3m0kF}%CV_gq}jcCXzwtb=k(ZToSrh>ZNLTokX* zzC=m_BnH*0mu=%MUi~yP0S}R)pOY3Ojvz*wuv^)ebXyxWL)?gY!#zFIH`4`=>G5zs z{*wg|!^C&zD^xbP$QT#85-y$+2o~-{B<h)zc&aBfmdU_XZWa6Sg#JCVMVH@mZp#bH zf{G6Mf{54BfnHf&#c$Y%?(A3;ly>TlCPnpC^D#`f&hd>Y-`cn@i5^6~Tt%0H%)WV; zsRJ7%IM05RleU46#*-TOr1RD3eCo!r^yQ!Dj{$K_2X7SqrXiI!<Nj_0A%@}4@HW9t z&7t~0|4yiIEza?6whQie8eOB4gi_^$VS)AFfQ>vuZugkf%xvI!*1kL5vrudq0eLcS zCNciUDUSL~sd~d?E<af_PWc}_yG?b-Nxu8wuoQ%EziYQ}*;?Wo3g}H9`K?Z9Y|k!B z92#IFn2t$e$8LvsIqZYd;Qm$ChJY#zCDA$jVSu<}>(^QJYpGC)AxFt}1WR@S&f=Z* z0Zz`d!637NZv#Esp2kJ8{kIpxH!A%~$V%pkUd$$iTod9_xh@VySkkhlzAa`EwbfDc z4tW)wos7<0Z^I(_+(DM!QqZuH)5}F8z|mlAI`etG>1v?99^dyAz?$7Crv08E;E?7% z<{+uEG}B);431sGQuWnD&0mytKQ*S!uwua3g|)(Q5rHF0)kgzq8-PHZd3RELHHu62 zUMK0DrjYDjZySuamRHsvQ+IUt(+51&)@W$$3p&*_?4*AG-EvXmllYH-(qRb~W6EWC zzH8?Pi70{WyB$d;R9-wc%nu<N!Vty~`q0Cn;C*+RyUIJFygM~N9t@{^+>1{%Dc_19 z$LsCJ9MVyJch?q6Wlaljb%f<D)fxtdrur0{6HKVUns$>2rREd1Jp8jJwMQpMD<Yeu zetSzmkQaHWh<dzfCo{G0JFfc%ESWpeYXi5s>g9RW&(>x~%x(*B0m-O1<$E^^Wq%m| z`9>m&exR3*Rx++L@!-Io_@(pVgmKF5^dhmg?72Se56j}(Efl|(0Tf8lZ|2;@*&hlw zw<r;Rd68pXs|P|tCCUgo1XJoK$0Fa5SQBR5{#p65rruQD?U=IoNv9f;Rqyj;%H!y5 z=hbGieS9Yv0#eaMTBw1zUO`i+2eQ_h{SL|UM+d4|C+g#%MkAXwXTmLOw;#@ic*7_= zk0)L35qh5^CA8-bH0Y8Nwe8HjD?W)esz3a#A23n(gq=%k;ZgBrc&<YDPPs4=`f26H zgMlw4)dlHS-29=OjvNa8we)`pt5Jx78zo<kz9H%2BVh49vNT@3`U9<1DvY_)jj9dn zzpa<G_Gjr39WN^`3mB&v$6S0B((2?k`2<p~HD0S%*!wDUFWDK#1is(u51Kpr%$=>q zjQvd8NS>eb`Lcvll?g!yf>FTG7_E@_2Z2XY)Z27Q(L^_E01RJ2>ReiOH=0aGD;abl zPIg`6D-*JB_?Hbpk+R2>9^VB*ZNs2Il1k9&Knn^v6y+JwDKf}+IxGHjn_kCHi8|71 zS>F8shN$R$OF^-lpUl=ECiqEhZd5iCV*A+2G8u*tCuhK;KVr^rDDJ>rl_uxrhL`dc zR6OA_`dP3e#5pmjhu<q1UTHiT^tRw^wU&Z~o$7s7#(Pp(p<8Dmucp~8oUxTQhw%yn zbdciN{($M}SbLgBq#~~zjitoQh6YNV<pwa~<r6J*RQi*W{N+x6nR?8~DtDWw(A0Yo zK43)_^80pb0{1~7Vvg0u9(16Ujh(MJ6M#t(Km&bjiVQD!=;8w)#4w;C>e-Fm%J>$d z^fwYObL96QsleD3Z;S*T39iyWaF9dn!k-{C0VFKE6ztIC#DerRn%hF-#n)ZSQ$SGF zI7QdTYe`z**Z2^#L5d0gAdVG(^Hu21HCzxv!D0!M8stG5^;0YQH*x}e%N=Y%$ul_) zMJ0|qM~qWr98j#9ndo~@Oj~ofNT`fKjP02ekd_OfX!V4Gi9D-6%bc5Wq!S7oUk*00 zMMwNcL4^+d1@;DxlCVQ1CZ^|!kY?lw-v=(vaqz9W(XfhjVd`S+$$HJ{u4~FXF;wHI zo1cC&RNs6A88|=3x1v1$jp+gX7nl*HQSW-5kUaH`FehIZmJ_1HK{9qjf}_-u`zW1` z4i214Wc|0yLfzjGF?khF)AesG0+MF}9zw72NIjM7DfK5|xq++)$>u1Yd7^22xWw4w zyDs$QQV0L>e(-`!3<Rk7{S8q0GkywUZBTs0`>Lhi`{N1S_~l#;hX8avJFrZVVvH*n z8Wze`Ka3{-=LfO0K{sSunvBrDohv}6<05KhNH!!XI2)UbYyvl7^DnB1_2yqo3A6t? zE8vr8xS=YA!*$N_fBZW&1(xp-?AGev8u&kl2lk+lg3U^?H^r*?;pKmP(*Nc~b3Am? zj5loc{_QIN@7}Kp{U(AjTj~G9_y7N&{~rwVe}D0Rcm8#wsP_O5oAVQ7bFBihHpxaJ z_d{(S^-Ve_kZp?I<gG(v#bG0`#ryZ~0uIzg8VaMtNT7L4=7vP(y4PY0SdADEo7rS- zbOlI*PvjR=AH4tLj{CP4gyi694aE%Wd2}<x<YA@FUPHJo6sl=v&h4dJzY4`+7A8H5 zVg{7kDkz&5HbsiBe{|5k<ck%!KJ~a(IlKag!Mn0r_<L~#!|9Do2s&aWkqRJo9G(Ic zxfgK5W7SefIjluP)FRY2K)Qs2IhjQscPISwcqw`|Lve++6KW=*n?X&0_cMY>Kahy# z(u*xl%KF*DPx385D&iDno*LzjhEMN<mM5Q*T@QMwW39t3(lOm~;}<X<t>vysScc6e zK_`j<%FW(gd~>!?uljB7Y#-uZ4?Hnl(_DYGk%PuFVA3(w?3JWpe~bwDV}U*p)4(eo z!|lL5_-D4DV6lVX^tH|6u|K14AB9aHQ#D@j&JQN>2lh&80Clopg_78EW5`D9w0k_x zDVpmnIV3*=l{*Kp#0zvUpVX`z<#j*oIR;@a%usGYu7(T9(THXr<S`ig@!>CKPIDg- zL)`CBX*XlhZOG0YL`g6~2|1@@O4nS>+hWLj?nyA)t-|V9$P?85nZg~y^IAaS{F7g! zsaHy&c33W#qFL{ul)r_%JpNAwP^!B3B&)F=;n;a>%M`@4aseCeL2Pw>Hi#~3qPq#) z9$oKh7j1TgACD<^HP}L0c%Kl;1Eq+p%N3pL^U3de1|K60FDi10aG+30Ca7o08GwA? z@%#dRh7;W-YL=PyV*Nkr0q9%t00C_ig2ExliV;BSCQirsI$HDKD<{nlOMdM*G-=!) zxS=<JY|;x5D!F$6=q7gF1uU$%6BKiMkN?+q$|N(^qnKjXZ2DFxo3IST1C6_CQs5=| z!kF`*AWN{FAXZ#C1Soa=gzs~@e9d4&qbE?RDkPOpf}UH8s{nDQI~)@5aB3r&mjiul zRL0>xKQ3DDH_Aa_jcgF|3#uCqLG}I@H#tH4t>}%vI+%+l8aDSpIBl&ffHj$9U8YAj zSEG>_#m5f;`gB5F_L`s+ilcP``K$^<sZgvK)P-U|+yzSVBj8cI5?Cf0qJ?OJUhte~ z(Go)+N<feY9#980fJOB}4P_2_K!*hj7YI(CJh23UyUH*20?;r>zko1B3nB;va++Nx zQ+cIk6mwAI(2x&>&gS)afFp|8b=!5Zmp_A|XkC9Akms*LzS28F65sX#{N7l<ZE4K_ znE7|gG8{u($59Ie8n5LKN5huGc#D35$JtwXzp1JoiWI#p*oNrB{6{;uDSJK#K`Qkb z^~Z(Qg=nO|)Y~@=?8nzHee53vZ$WP|O7|t8xB0{)-?;x}LfzuHj<L%bi{;(otSkh{ zA53-0n4v%4m+&+u75!(HkwQnTXMz%o$Dhtstc<#BgV0#b(A<6#lSgU*MgRO}@O8Pg z2j^F)X-9wNKy?qejgRPhCme>{cI;3>yZd86<Q?~*q|H#2WoZ#>6S*ua%5^7qqx`zx z1X9C6pUzd;;29LT;vAIzp;A1_K>Z?q6xX61vNPCgows1RmlO$X2LAr*`alhBK1xlH z+E~l6{WI{fkijVYCO|>>!0Uc}8U-sOg*G5MUf~#nMtVhA0dDDx=2(&hI0RU&c~E+b z2>qAw0Wu-LVOnUlQ<>3LuR3j{`@f1>0?9T7l$|~gOR>bF?S1cjgvWxGYLeQeVNi;q z4i<@UGDUC7`B+XYSpJrmoXmn08}rLp0B;kM?STm1;vY<FOetav0-){HCYhK7^~1Xv z5)ZH)0~ma;BEueiFHboxXjDUI^-tSUN1?Jvj48I^fH4s6qY3l0#F?U(LFkFnrC28; zXl-Ex_>w09tmt2$XwznVWRbwDN?p;7()X9(W>Gs-1^LbS9r?ENXM+wCC!e>dK)Jam z18QhBp7HIe9xp^lPfvgWDm%(DfYEIaikTp2fRsBbNrAT=t>ed{I#+<7&CMc*FJ`#f zr_V;9l#PBdN1wFP-sV0K)zZi%T1Lfw3=cD4Z>=jHH!}Whj9@8+d&>W_2TB7Ax()_* zfCI>!66Mw{?DG>!Vs&JV62o|Q|L;}m3BHwyEB0ibeEw0xVkXpD$voP?>buqu%)jMB z4Fy%tZ2v`v%PgtH6i*jXbNuq&SIWVp)cULAVsa!6?KPhe=R^t_&<QWxTx$7&(Y^Na z%+&ao30w7RoW*odgfMHhs%7Q)XCbU*Ix!+ktJV^~co!B%1r<By6rCii+8??nYXM#4 z9<CpmlT?yW*wW0G<~}!o_)`(5`NI?y{KJ8bylkS)nOS)^qLt>a*EX!x#z;o)Q}}MJ z0m1uWwZOezTxj{h4<XLhi61q;3Ixa~m&uW>#nor_xAn_c%IkpA968<EwlKkY{Ai0K z)S)9C)oB=ZCSFv#`T5!X57kc(Ktm&~nXTkA+BO<HPC^UJ+g06rup@TTO>Mn`yGC!v zq$k}mW8BUA_AzWQPpEVHxj%AiC#j;a5^LIzE6=32Sa;e<SQxaHw>A9Pu7N&h;mxmc zn}YKGE(WFEB7s27{Us5`6}nrDs!U`lM_G@@S<ngcv@j`CxWWL!jd)y}ezn(F`d&=9 z8~sc_oyzBStG5Gg#!@!3o7n(jf*$J}L(wXcf#+y%R&#{FE@L~CWT>73CecZ_nmtuG zW5A3TDv{SO!qC^Cf0KQwRf~+L9;LP3JzPnQMJdJ%)%b%6vw4Zkp1LID`RJ$J0<ooq zMcvO96&<OVO51UcaU^de2`LJi?m}pr)jKy2#gK|SDejqA=>=)D=TOpb3~Mw&79C8L zOOoN*YDQH{8{}2vABttQ#7802aHxA)lgL86?u|jItQCy`!#SanpG?~QJjR|T8-^)> z*aRu;nKiBopAvvS=kt21dnT=^FrBBAXvhH?o)~r&9G4CwA~#z4+?ofm6!^OTtW)Cc zu~}5`K7|iQIsAf52If9X+^my=NA)1Lq|gp?egPxsC$F#OQb!%+#c|+nquz}Ny}7;+ zbM6;#I~cO~y0Xd&tJ~lCG5#`uGHR^r!tx<CJ(@FRk2~P+UwJ>a10dYVSK-?Dmx&+D z<5+y=LqlBq6P#R=EOM!t-P(y1kUhPXa8uOdg(kVEX^_IIsO_~6qT-aOUh-eAHO#%M zT3F+Sl~tkON6C_m1tLUoIry@ow$U$O6n$^mO2$U>W*1XfE8n!+sac<>*#X1ofuuyB zlrGsu{nIa1^fPb-wN+;^!)}^OnrSaKAk-H3heJ8rLA%%04&*lPl#G_UQt>1x@8C${ zsBcg-1i~cl<74MhQAiwy2PoaaHp@`J!_$tYl8&HK(8+edLi{!2f{uVgf%*t^dmX#} zeJ^=nF3E+v?%UkYxw(ZiS1yO$*#vfzM)vX=U_D#kOWED(?{nt`AlRt$S<2khEv+9_ z_7w{~^cgvRq!Fv0LSZ7#@b6z1r%`oI?o3j_zlhfWv+w9r!R8Nc6@XXxw49oP%yV+U z)989S)WEVwgh_PZ7Pfl;59mDWs(*Xkb!8y1-|)ZKd&{`0w(Wf!wi_i>Kw1zGR74u2 zTLhHuE@1;A-JKpp8l)Rhx)G2Lg$+ozbZlvmlCJ+;o_p{29KGkh`M>?WfDf?Qd(Ac1 zm~)P2jAuL}eC+}Du6^<#F)YesW^vpX<%>$)eOG6bY}ei5cy-jGdaFJP6+3%p^ghMA zO#jU|crnkt-971*rSl>m81{Vyci82e7uIQCX)p*C(x<TSe#{1{)*PY?qm$5hIsAk5 z{5arLTnsfcAT(-a#a(GL*NeePa$IfG{7IacWRTDb?OPdW(Y2_*beMR;+dK8B1kG_! zDD~z7%))Aoxn5&2SA_X}mBD8p9E;<HrHmk)3gGFQgjq7B+@8@exXG<o)wJ~L+QwoQ zwtU_Vc*fRyi|cr$I^SRT_g3XtgKV7^Gh_AFyX}%_G*<##26(QtO05~{!AxAIjyT3! zLo+Cn4f%Z8{US1b!vutjGbcLTnIG?V-<;l6v2Mt1KFK1EHNItETbxwW5XLUdO`C_2 zu#Ai{^512fnM_ZTw2~{iIO@uP=Ao||qsq5SBLeYR0aFccy~DrP6)kX6j<5km;q>*{ z$_WfNBVwcZg8t|&VZ-Rw=Zlp|v?X_Z-!}rpW_gI~7h4yEGsfh*c&bG~n>k1B_!pbo z7ql0+O3U{mLg=u$e;hS@zQoF_Arbc#;f9w!-+aI36YBPLY_3d7fz!{<L^T#!5ux%2 z9YbS7Rwo*-0?ILk@NF_!M~D*S2^)+C{kaqF3%DSi`TPt8NMo0>J*y?r#$_V{H@#)r zd@j~@8*U#)N}p3U9aNvXo`<Nz;yk>+RT&85IehaaIknq*GaE3))~iJ8^Vo#HnNH{E zd(UTQLdFiKrOBp<tAdNBLJjUw-E9?kOE{g1m=Ey@X+B4IHnAl)n%i60c;Qo+r05Km z=<`sGslyGhm<dkjU5xpfHCGo;jq8v2{A+mhrHgTtE(Lk>Ok+{oTiM)tgJanM7_<ZI zjPjQaSN5*$E=*HYQChB6M~<TM!BnR=)e*3YaBddpMnMyQ8>5QVK<2L1O`FKhC|7}} z2{<I{4!0$#U(xAfAz9BAjBuK-Fe69<UMF47^mkNVKEHkC4@?+mWrT05IJxeYZK;kH zX3(}KWmiIPq7t{f^G-CqKiUlv$;qwR81lOUEA6cUnop`X%ofYMpI`Fd|Mm!tm4x|b zwa*ewWH6_dTgi2+>k2Ny<y8s=DmU$$k^Z-*sBip{AuW_Fb?HSNUA($p$z20YJv*fO zibHHR6XIiOJ#SUQ(ldAI+Wq$3h2Er-FKp7!^a&W>Jv7$O#yHJR6}c`_s_)7-^3$%; zMXJ$eP*POa=Pp79t|+)fyzVk@Kq*v3c7MLkDB1MBE}~T0gwL0#fq%!_^~gDB$5?CL z^SnV)x8UQCXY}k(?P7^1K8NlCJNIgEj-D=H*_+)RsL@C@5UIY>oR!?%!yZZxe|JA~ zjX|FzjU!B+`7q9lB%6O-2lL6c7<ERq{{~_vChTczjeSyXV=1mC=SQXuW7mD*Q3CiY zkg$9?H2B!7D%>2_L+h8KBfs^TH@b0`-TPed;7POXE8)>+(G(9CYT11mk=~g$p^=Ro z_5yf6x~Ad?o@9_<EoQSKt%cOvhcdpcC7&kVBfcmpUitp!Dl6p<0~5TheQ{n?nDWhg z>5d&VqP>_=O|5`NhIFvlhGIoV$6tgMDvF?E5I(nt>EuM1J-&y_eOyg1LPA;njqYA` z#GTjTC9je&x}*&Z<w(kOcm|2!Q^_{AQqNpRIxuia<aBIo36fVPlXKKG=+=7uak#7; z`oy0$1okj+--z$&#;qxNr#I65RWg*R{N=*o+w07;b|SCo^jEyXajJL)&z>p-`^fY> znxiQ!zcm(@1k)*4uwupZ!oOoUVP_L;nG>6-Vp*G$#%xZi>}x>i%gwB1|LkHmt?jiT zpXD9%5W2e^C0{UtJ!t>P_P3v-mreb4=PR<6bM0L|K6Z0%-G=M=E4{I{bz$b$<l0rP zEpB7i$9v?(+7yk}92>?ks!C%nB~oY~eNFb1%f1iIh=T+Ac`vgk-fI9YYL8MjT@ci4 z5=6q2uNNznY=XWwxEKU&5`=8G;9fMw5ubba`fp;(p2<bWF?lcW8=2*Dh2i?<?l|sv z8+zp!$x(U~qZU1KB{P$DGc9xX`PVX{kK-nGd39N1i^2n9>~52e-t<3{qoys6Q?KMO z%`ELXO{w7=nbBLj6CB7~e3aU=cd1zcd+J+%D;0W@hn$UNjP#M1n-0sC>&oY6u6laa zi|zhK!fEPp#JH#1Xp|@St~?{x!ga($Wa#SXM-vyF+^<fOUhObK=inj-J4(>DC%Zmw zW?-u@!aGuQ(e{nFhbnmTFSMJk=8aDaSIPk^$Z<vY6ZkRO%cB4fkqEu1dQeV>j#YC` zt<fxgeM-s#)S#^x`uY%&$UE#cDSQ8TtDoDqcSYWMU{qjA8feEK+=h~1HCWB0l0Rm8 zsk`8XH@`?^n7;vR3z{&{0nkBIEQ>^UmW`B4^oEto*3dnpTU!Wf`HgL|scbxf4l;$9 zaZSEZ9PU&V1TS_o`FK1IrNtHBI;knt!jX${J-nRsrEl=Vn$dQ7njK!<Qap{@Xvo1= z9;sL2p?2<rJR%-FUh|9B<fjIhq>OOZXgY&!uT=FJ*V=jS42kL=2o!cy-k_jGYd<c{ znp)>iZErRBkP%Gj7ac;^w2vo1ODZ1W$H;_z;&ZIY{E=7KGQlMNvoMd1=og`$Hq{Dp z@k~`)3O3?PQ(pj!iKHuY_wa-fJ&eQ3DdKLM(6^_P1HMb9-I^EN`}8MgAcG{Yd!xT1 zQeJeFdnX0jU^U@~C-PgjO^qWw6%+4@l>`<|wc~x6*>owPzv3X3a_Ie<d<|i?#ml`a z&C#RT@B^Kk@<yH-=Jb{~dGq_&tDkI)QmFe-;lim%w2XR0<I*~=z;}ik&TqAZGoDo) zJuii-r3D+P`ZI6NEZJ?nO_Z##>>ONC3f(|>BIb8fQUbE==1vGFdUzf?40eZ}Q&io* zrtl5amyTUo5DnOI&8s(U9K6Lfv(fSW?bfZdP5aOzIrYNnFrgIGADbFb6}-|%XA72- zn9UU(YuoEKUbdF~3bzefwp%aRBGlM~HN7YZhOtrlw&w#C{PlNLR>j{Alnr$|;!hpL zm~?H=(xMU+t17=GQ}amAO)ezgHt4)$NzukT`(=qDTYy3%ajwlF7&??hHn2(4^QJtF zItdj-d=rUg&3G@HEzT$4sMSQ$cKQcX`;qA|a^R-f(k3=rS8Gtej;ytsn~$Z&AXB%m z>02<lB#&`pb{>n5Io3{{@Ty;@|FyMQGeKsJWobd-?qdk!7fldYh1oxocYcW=RfOO= zIOQsF<!A7R+EJJ`Z`-2Y6~v*DPbuQ1cTDN3jEf5RzrHrnVW(jumT_u=y_PL#KkhUl zntt^XbKi3+^ycJeEwcVlly7Qs?op_LLc^2K{-w=T2H##`o-jDid=fV>V%fnOC{5d% z%R(n9;@$NRA%*elRN1iw$zC_We?1P=#ousGbd-wTe)2SF%yjZ}7RJuscQ4gvk;96y z^xC>K1$`aemYNo+1^>tFA1;XM7bJ7#NoUa~OG_DXp51O^>g(oVSj=TiA8=;NH1Tb^ z?g|@sMpb8C(v4zM=PN=(H??|WLyLbhU|?R<sSeyr5#OHMB|zLElYG!a_!~M=!&3A# zeCal6!{7!8=g?nDlDS6da@$2w?~u9qnhT}P+y#wQ%hINOSLb1}z_OUGfKAJ_y`8Q| z9lDubDXNSI7t@hT=Bo@BRAq%8#WbYi<VQk}lIT5zYe0Pn%IDJcCo{B1da5<o5K-Hn zNdYeog<6~`x=59Ca{V`T9VVPWznk~u=T))i-rWbeAgIJF$4H4u%kXNm!sDPNe6~3m zduC!xuEu|npXxl6$-_C_y(UVIj~+wntGvgB&}QB4gD}nEuWtOu9v&npzSp*+b|h}= zl3}K>dXFog*$!^@M_gH2yc?(Uh7#|aI~(r3Z8ZIgPn@Kq_Z>QV&gV}Yz(z4I`WVUG zse3h+Dwtx;;)?(7D^zSFna-f?Ed?#iW4rEwXrm$rS8sLbpo~9&=?0PWr5(gQ+#KDw zNu&V&IIiI1gHLh{k8ybr$#NcgO`}}mLr34-d{ud0YO<y>Up=vxX<gxtl~z@U0uw<& zdH19YwTnHH%yh^&9Pb;-FTYNKYOm61u0x!8`3nw7=uu$nPVe|<_Ymo{^d8H_EUdP= z%rneyjhe~0r<St;2D##3APVUl@T#%ygQt{)b0>Ga-zDvQOjy8tWGj|Ht=tnmXX3`} zVLgxJ<NlIBCoJ&k5|6-ER4voH>oA^E@8(dqvUH7mS27NTn%GY-n#G<VXtuYm<L={K zoxkkeGnA2UusScA=rJhpk*;yTiBe*I?$+viyq0GPr)XDo4<p&qYI#gR0b^CETy28h zu^_Irz;k!K%c#ksIstUFSXzbF{e{X|F@+4Jx!WwUC~y>qKPML?*oq+NEE7BurCm*D zcue{AcDiIA^%blyAER9LUFQ4=AGYI4^)sOF;!hfmDKW4cKDY0Iqne5K_04?Vc#5PD zmi_o3dgL~6^*jn*75j-zn=KL*fJ#D9Nm6Q|>gHUQG`{f|Uc`~?3zB&-_6i{ycbZ5$ z2|_aPs^-6%x`yfQ^R{8PVVy*ubzU-}Firk=q{F07(snmNA0Zp#?A<d1k7W_$a_My> z*tmbDEm{)0n|S4L=kx1@wY>e*MsghzR5Ndjqu(g@aCtHW*~$xi(DP#V%DH|5Hq38H z^%XbL=V7rp!vmjMIY^W$G#*sM1;-E2>2^+Z`xDB0+dVrQF81PtD$Z&&my!NB%{!m= zmy$3S(ki~WTcxXDN7(kaDYtA?lvkL$JLb1KEj4OR^30lG3h&NO=7{4=yoY?YAQAgZ zDivk7u2rC%8&7m=R`mIBxl1~>a$7%rmi1_4VS-<2Hz~WXkPp)dw(*Q{*NIPZ8t}Y_ z{xx}QCYtZ60;hPVE3jGLSRz)D;j+|`Ea+CqeLX&WRD-E(TrMKJb{F;HYss^fT;!yx z9!H+NA_iZK$a#{nPoDCI6So?07<AG(;5mznZ{Jr=S|Um#x|OtCa$Yi$g6&&{m{mk| ztTp#1xWEJ8f+bov0PN}tFJT^7OIeSuD?|o1wdO<Co1=<uRn@N=LZ(tt6JQYsd@nBF z9=!Bbi<6-Z)pQPU2&{&<Pg$yo_-f(XZ24=A5mbsnMh`7P1%ogcd~mmy!qn;VzyI{} z@6fj#P4r7DoVDf_@z9}L0}GoPsA(Aa39=y<@28*lpKrq$R~1x0ZWBPya1b*-w9m|` zf;{iHe}m2?Sxj&)1x^{zLK|o${{3q*35vs9CruR((nU~ksS7<$E374@{|w{Lfr8OP zQ_|_)R!I-8zAMs{)Ub;-rV2hU7_4XY%R}0K3`+g$uKx4h=gPj{Eo+?Ae-64Y3wC5; zJz6AG+?U1wDTX1vi2~!$y>%w<)Y&`?hv((5w}d@Z4h%DKT96BJ=$?D}dJM*KcE_{5 z+f!e@361?8Hfi(=n)nYtF~EOj0?gHQxCf%)*7}{K9LOeOMH*I;IC6H(%?o?oAdAVu z{?@2Gm@O|)rotPXm%GQ)`1_?}eZcdq5Vi;fFR}Jw*j*m(O5k`&-gFdT@xUuyuA_Lj z&bLSb9fL0v%{%=5(WcTzt0|fbht28wqToikOY^TD{PK+Ye8CfPoK0EFg61z2zkLjA z63$#tpZrppmo-M8TseCex&?b$g`4SLyu;h$ADngUcFCSGzx(YWR?r&w<T>s8GeLM~ zT*imI;V8?xfj;??(n7K2$P@JfAJ{Fu^dFme<VhEl+lk(M0)FJsO#Eev(naX-!LoVk zRGyRzUU_&Y!Wug&Gvbm`m;T1VtJNJ2$TqDoc4lZ|dmG~#dn~7zvw!&nA6Ug*FpkRo zfS<T)T*ZgH`Se?pN(0+uR;b+qcnoG3r{qIs&h_NK*lZsb9885@%KANMl4OatvTT%F zllA|zDE?zUkm)7T^i|Mv@E8Am_`i*%n~3#gUbP={@o%sEylq+Hcs3&mnN)%5j!w>U zG$V$C<^Fe8GJ~%c_n=z^>j2tCD$k2_|Jx{h<><D?Ow(Hbz#>>hida4M$yLslm}&6T zE|XgOxlo>Cpw}LnW2oe-{B7+2UJkyiFnEqhPqL=xD-(}LQ^54BC9X05T%D{eU@p3G zj7Q)8Ht-FlS)f4`2!xf&bStMM7!*2Tg+$3;CML)Cmi7++eD?tewk=Ng+y!R+_kpJ) zF#x49%%sBRaBGgu>-4a?$fzrxZ5s&Ickk^m=b*vDg^r(p2>ZOB?g9#-k)Re_NLv{f z+R|<Fpi=8Y5J;wUm{Zr%h_xU7GosZ1hFVd4W^DfZ)gob_f=o@vwv{L}xz^Fd9Z1~F zgZi=;DPIaJ#IOWTw?1zJ8Lgg5S>-I5KuGgw_!4U}i=}4)sPV4#6%#WaFE_IVDixd$ zgVUh(fn84E`+ehm3YYTVZwuTdUqlm>8axD&L}bN{=Wah%2I;N?O%e^zrFnk+LvI)$ zDRMCb$(ZsAP-i%!wBJ&_lu8~heD1;sg7>AM7^wxcAcz;D;<ZDZg7&4Mqk8U4^%p?h z=H|ub#aZL5$qAIBb-6e@FalrU4W1`RsNdl1;yzHzA^rU7TCmkrO{+<gC9(TPg}Rm# zGK7piU3`Q{)EA0nD;j+R+474(kZ0rqz>^5#D?*(+Wi9JKx@i6jL$M5~gs0v+1C6g` zHqRt|?R<f+$`2)Gb~@OA#zPwxU2;U&=ngKKX&@@z=%e}Qaqruu-Y;=;f=i+Y-}kIR zCU!n}8)!<YCJM^F>#Sqetr<G0bEuCQQ9pLA$H=c610qZ)(2O*Ub3}voOgHD@1n8cz zQ3d+q8G%yfkX91?x&cNxWyoTl)4}#G=w8r;Rwn#ydw`6w&kF-;#Bm6Er$t#I2R%o> zmKqs>#@n*oZBS}=C`R+TMrjPBg5+_!-3B$9Y&A{ujD^X=KX8p9q6l4%K^6E7sHoZF za4x_W{7)OiYtXRo=0t%EupTxZTbN1%nRhb=Neh@IJg8IOK<Gu3ybv!jU=1AhI5!Z0 z9$)S?+x4K83sQ=qFdFt8c*#8!Z%+<3(<+Ut7h<Kys0xgr_EH<}$1B-JAXyAaZ}7Vv zd>3r1Nq)PFg@*v$1*MJVTLPO)#hPN%SAbktOj(v)g#E#kv-}d)Be?U*K-jJ!XcPM+ zL7gHXfYR-`Og!uDB9KT=*Yi_@I{?Z>3j74<gwfu*fG1tPN{R;&Cm5^0y|D#KD{Y_v zICAm!*ILlksSW6*r1^b@a$<OOG-wqdjEw{uRk5pC*P`yp26>$wXHt)W`G^SH1^2~| zk&5NC{n@pd9Uix&g2`hmG}r_6Gn`+qciWTNXaE)2^S~%ln4YWI-lqF`oD97eIg?~~ zQ5MK0_4~4TgEl4&wJ=-<+zyZ?l5PRYVYeoAvTabO=`XKK4IWzTeCx=aVDpohTs{Yl z6{6WA+nX{<CL!KOw5NDPF!`Fi!1iNop=~nmWh@gW(5f)^J5Yn5gPN^t0I?_~Pi@Nz z)o(T50ZCQ^WR#3R>HCwlx3@y+3!)Y@uK3b}uyn`x>evTU8?h9whl`gzjYgIPZb|!~ zPG8f8Jt21ln?lx1g2Y_>z4-BWlHt+AaUjBHqlfqS?&0H)K8(FCrts``=6Q`f8qx-@ z(FQ?5LZY80V&|4k6T0nuARQ8jpvJDgm195Q3F9Tn4Ym(@WZ=9t+iVL2LEfjy3mx4_ z2}c;<GiF&L=x?adtOZh&j0M1}0ZFKq=Xm*@GSJE-rWlKa=Yb^j!q6+J3k%TR#EgBZ z;7<&4h8-_D>~)aB^b;KYWj{^V#f~^?4n26`&lsvB5kea2b=UoYGm8YCIgqH59jwNe zyVnZZxhDFFA{;E#946FrZ7!ve?}6dFeR*L>xq6cw@gy;&x4J(SNAzx4{-O#*9h#Nk z6{RoJ$E38mG?O7>gt3eaf22?$Fc?N{Dzq=XMmzDk7qAmbqgx+mQR=SN1MNckuhB0b zDQC;cHs`+;3&^rysOi=Lo9;kwlkX+v7<iLLgU1;>r@g@qZ0CNngk;(XqB5)4Zc&XM zQ<!S9d~{}<9-kU0bpF9VWd&FyFINtbr=PhXDd{ImoC&cpl__R`_934P-cO&SW|oR9 z=yd&gfQ_p)p{Y(B*E&H5<zMZNF9l6BZ5!35K4pa*>hQN}zi*oAYVyV9%b@FBOrSzX zmq|V(N$HAMEeo;D&WlM_6yL|>Uhc#plXFmx#Yv!cs2x$beSZ&Vxd}mXAkj>Zki@z; zT7>cBzFBas__(xz((L6|;Z%N-yhh<g$L%>85KDvJM|^~OiLmWKf_!y!aa!plbIo!F z;d>f936UT)#=E^q6On7PF(Q`C@W#ZOC3mBO(?=kB#i*cZ5liEZJG4<j%y{-BsYe|8 zKaa8T03Y4citsZ8!>^~>GAqnMb|1*r4B=c>t@W)3-HNi3HYRiK5!@kR&s;VHH$@s8 zBtqPrd2!Ns(fQ%MOtdWuIXtC6$MI4I7n%5ldn_TL-~qPLQHekTO|&GHXZbYWU`v_z zwCBOpPzp8om)taq2jej~qOir%`+X5;=)|xOyf)HV1CxZSngB;C$N7Lh0ME9>?h%0W zh!@~gD2@6!By?z4hP1`v_`a{3K9yQjp$rdN|3vYvyHmy8m?F=k;my<&ZeLj@gyIx9 z2F#N4Uv%E^prwrxN&J_YV*xWi-%nst``fbwut67xwV@k?<tT-Z`@@wKp09r`HM^P& z;tgf<PW|;W5WCI6-V>;Jhey&%A^~QbdZ<R2pa2~JSD9*9P!c>wDhrRA0z<;Za0MSa zK1Ie0gaq0TDN442LV`%E$wr`wRN5~=p4oK+xi<HKiWs$xM@n18`MfV(N4Is9b5w^T zlx+`CT^>3{N+5|6ZdJ2#4MRegfFtCE-*s}f=`HO2Eg!ZA$DGsy`F#4S$H+m@MeP=C z5Hm9wcc=(sbE4uqiB=$sp=n*c!yO{+*h-}S-Zp*NF1(1LgY}Mr8=%Crf>df0d-5`6 zl#vk0$OTZ85CqKlcSE5ww*x5N^x(5cw-3zgymfDURkPIPXiJ&wIHE}(Z2n`pe?_M^ zjdP#q5=<dZ-^+Dad^t8^cMlXx=ktYA{dBE|ibUe(&0h8L2NX_mjkEu{TnKa6(2+H7 z8Q9A1EMteWIoQSNhnhX$?&&C-z3kEGb!G@;ilnD}@DVgd@9Ijzz(shca<cQ;tg=1` zu@|R$?vKT@K6_M?&~we4J!7Xz37&A6Z0k9q>pZ2x)LBAll^kVR2Gk|quM-K~;aCH; z-ST?__h6S0p<Bv@5tg6W5yg0aWK0h*k4%HUp+L8dd!S07lktO0#f#+W4h$Y7FBMN1 z>F2<Z2Vv$gnd*qhwrzQZIHN>+pRW6`TnbaTq-H9kNDoVoGOPk2sfbBo%UDLS^yK?7 z%cwkB&~Z+{EVDl<iScfa^5RnRk_UB!xC!By^iT{3E|vRw>5nl$XN%Codho%*_3d=B zvFf>|bX_)sBIBaUp?1p*{QMQ0aC6mw6~R(@UD{7T*HsVDU-d`(r@zi4Um+AZ*tizP z7#64JW>#qul_Fjl1FTz!BppZAPd#%?GsXh*d5lwlrdjHu3~js`U#f0J4Zz1ywl$Dn za}2Zh3Q6Can1xW}UpF-Ht8XH4x;7_rm!1V-rU5WeEE-v0D3(AZ`bhkd$?)XiO#6Ea z8JoOqPQGjik%*XMg5`8GZv;Y7f5TT-NR}<gRBm}V*SKPr2cm&J#(~@0VNlZ9GnC0h zfm7|v5p=a!5&&BkWD6C48OFbUU8EMtA`m8qX27?HzOTaGs#3e~mn;4K*FH6X2*#zR z_kP8nkW>Ai0j8*cEuC&^+p6*}fBe6f|Mk=V`>cOY+W(ucf7{7F+C<+|46x0Y0`Bm+ zLX@^QpqjP;ppiVzWjo(e1q3R!3Q}-|Pi;;Cd-O%=alw;+8~pQL$Y6J;KWzMJf8}Dn z0JZTz<Rz1eQ&2Y(3fzk<O-B_i7jQJO*?nvO(Z4nK83iN{0_l~r-X8!?oJGlWH4~NR z55+oA|8HOGqV*j}_k;iv4Ojkk61DW(zGNIG@a7?T;j{9$W2Z7d2jOdiLz@1A>n+iL zmdC$G(o{!W1r99~z*?5W!;l!W?MB5Y5~Re^M(ly&4dndy=dD@f>~uuYwOyR{UbFx- zN}kx=OZYq*ZAl^1XAOi5=D~p!2o5IBywvKH6_8*Fz5t?D_O(@=Kas8jn(y~p2IQ0Q zU-vn}=WQ^E?FwXu1x5D<fHE)%aDUtjKz|yuU`*`D?rnfK+5l7WhWlo{a~<fLw+(1p z95qfGiGC^oW4o@Gwo$5LK;C8*=(9X<?O<3<n+akNld>9!BwlpTrG)_8#X6N^I#obR zQdYMdv<0puTP!cQrxKwmPU3Tg!bZfRr1|p7Wq!-sHWk1Lg*4wtgIO9}^5#KX+c3bf zXEBzASZQVxc2mQ8ZK33GBL_e`7736bF(d$Ux-2OiWHy-93dWM8=h|BtH8uRfwD*N7 zudeT9jO89X;6tZarUGo#3Mh|+Q#FoB8ytS`WO|D;IaCsnONi5LO$hXg37!2I><6e} z;K8bwX##|K>w6oci(bmG^t>EUGSm7G|417kTGO1u%CVcjP3STl_VV(zAjmzz2*7*- z=$yv%B6}?a^6*W0-i2sV;HXE~vbk){Qhx|cnm9W-kZ&%4q<r&kOrfO$KVTblOy<Fq z(*>w_8)$5E_3)rV(mMsMTC9O!vMtca#xOD}74myT2z$)?8373TSTGg%CqP=P*RW~E zFlu>?zYREh%uol0^3%OheJZGDqz;e?HX9?57hr?RkA}_x)@6nW>>A)I`IRxa$3IpG z@(aqOuv_{os3+unHh{pc8l+gB>owln?e$Xmn$qzzB6L_b)NtYW2T;70X`}ER2C)jB zW#k(JW`F8+!(gUZucbOyK;JbyJ=`t@z%)yQNmSi0lh>eY2|*4;idIPPX*dAqF54B0 zM{yLanq)oAO%OCwno3rOy92e|HEQ=Y04=4L_&RNRz5{8!<|BLHPi6L!=sNUMCv5@T z{uKS0U)NCUv1aP7DPWHmc6!J#Y*YO_y%Gs?F5*RHx%wr38vS3FnusLv;rM7ntkr|4 z;TG8!R_XGIph8Q)HY$l)5d_(cKwC&z-v{ghm_0wfPw`_^xD={keg`USe5I|#+Hmel zi0DksA4onHF0k|D%Xey?3P5RmKTE(p!w}<p=}J}?zMmmN6JP+3?LINw*1or5MztH2 z(vF)TF0^uwcT8{6!L)!0W)07E0)-(%=TeSwa<p4NfWRELB^^4N-?K>{Q@5UD!?Vl; zz0A&&TA2NfSq-}22)l2Ql1NZ|q3CQ8sR${pGa9chl#a%SZ|7i60>W(83aKz?`>He> zxEpn~-8feB9)>%>+SXa?66`5F*1V$-=;4|BgJ7VV-EmbVFBqsV-)H&&sFCmYtbuBS z8DAT(BmVLk2*jn9QBrxIZX58j=kcU1yG8ggElmTfit$rD?WW#+vjIGP=XoGqF28pa z4(-$;mN@aEsuL$|Bfrje-&>5TNLeJD`|ZlT@N~ii0tYimg8=feI32sEUp&Tv5Vx|E zL}pQA-fcxX?&6NgbOmlrN`%hV2OxW&WuUB=iZ%=)r@IrE^*h&0OknEORxm>xrg8<{ zTky;6TxK~o_E0l988Sn}Ydkaq-e4HhU6GG2t~#9T=)5NOa~yt+F+FTGMIa!E`?85% z)DYVj;rAH9^=7VRTZ%P!{V_Xj!U04%@ErlcG#+EYGKw{W`hv!XO<fLUS)@rp)a;^q zFx`Trs|6lH_$@RO!Mh2M446#mZai@Z8}gvT#ZL}UjwMK)RMdN0KzxONAL2iMx~1jw zy#*o^52;c%-$r`UyrYkU)NM<_-q;E>lu02KdgaQ;Vkp^#g&hV>NuaT3{H36MaECz` z(`&2w%8{kp0@BS0$FaD6e>}IdX~+0Gh+!HC(8DYd{t7ph4|20p6Rplcfk>kq_cs<m zJ%4zv=6cqko_-hp03#!BxU=pwI_%^zcRXRum992kaQ|{4s^X)G2t|CG8gSYukH%cX z(6K*w2{kWxSs)G@alMsk$z*wHE!(_HhjjFT>5B!khCky$Spd5ZFM5@#{&JVt4%p~r zq3y2>CP}TH&j7h~#|c4j4o62ehi-y}AP}l7cA!US<+HT?c9l41s}rg%8j7Jp4Ssv{ z>dIZyhinbk{C#d{k_}58@#QA56}`fx();+N$Q|qt^4uK(*T`dqjI@{YtmQCpt$L!E zKJoBp>c%XTR^I$DWv>;U=4|DgEGqu$hUSyH9@*PbLA!ov{h+cV-V2I9JPb8TFiH)% zkF-Hi(4ocP_})R5XV`pKY=8eg6$;&^T;Ww_@ch~&jNo`vFMiuSD1`Z6d<w{>Pfps2 ze|2s9o?$@cI}o*hu!<YOfgj(IKnjJop{-T4B;b1kh}z({QP|6rQNOm|>7dI#K(K9q zy^JWdebEI3@r*!=101VldxE5-Z4!MC+X4{$Gm}XHx}^^wjm05VGTn1k26BrMQ7FPq zf4^0OKcsCJ)GTFhdwioocR@pAS$X<cROLCXZmjLQ)8n;b`Ki#-@1PdzF61;kw7TwF z#Y=>oKLUqFtlx{tuI%pWK4WUfQxJ5PLT$26%NbeEF7bJ&qWS98yR||g%9`Fg9D(1r zmoG<I(D~&#OdWujG(!q)^1ET|PA^b9^>oVN#<DT5Uug)xIO`FZTugSN-Re>x=05^X z?o@=rfH*b!H_%^~@75+L{gKWKD4oQ#i+swN{b?o)?41l}8?&cb<_iCwS_gV1J>kuQ ziv5WfIKKu$6w)Q&m_Jy(2zAY56WH&DnkkQCsEc*K&*w)Pe$n-`wLb>UgP)=Xp}M0L zXQ6jOeh))Bhdx@*5I)Y(uGhi5To0Tv`sYz?X&q@XjY?M%h$iFdqFx@`xvpf!ts>vi z%!-}lgp+T;TS;eLJ<7r&Q}dAH-*w@ce4L#!`NvY0duk86gJyfE8*=`c3}smw<||c( z0u(slo(Ofd?T6jsue9>G#a@mX#6~4rL(!G5mNrO~b5G<ISm0&3Jkz{0nBSwF+&hj$ z4m>G7Qj8{VGJb5Q34Y(zOwo7u(u;5Hk+~<rJ-R&@*knq{?+}u)VY)FBEv7?lro3Vi zwnaRfb|l_iovxinPa<M>Q}@}aEE|E}Gsw`av-s?+x~MMol^$>0a!^za*qVh(>TsH0 z#UA{bRH`Ncnd1W|=HI|!HqmoApS;Zes%M^a{v<tW8+>a81R$(DXfZh9_6ej8V%gQd zOq7B{w-ux|6okeO0BrSX0wq~-e$wE$)4gP`deM%i>PRjO?RQ$*0M41?X#bYSyrqyH z3sXVZL}DrFwVzX?GDfh;Xc0-#apz|z*<H~)D-G%*AUTDgfAf~pVYzRWgL5koJ@2y3 zDde6%HwK$%;Z=*h-!_-WzFOD{j*s;}K1Ih^3<WUV6}7GfVN@xYE`zK?;;)<TFCS0{ z<qazkh3fyt0KcJd=!NtQ@WDZha{oQ0_V2eoXMzTK*S!9hYy9#n5tJTB*k=6Ck%^dN z0U*GnxdyQb!R`FRx19T6_%y);zb%u$y+KPFdL|uO|2uIhA`XU6q?!C{diJki9Xxt1 zfRVJMN1*KWKMV?b;Q>TAYoCAoKgJH8(Z~&u>C`G4$^ZK`{&q?NqJttBzBuupd56Cr zp?{g$@>uYUM&4BD{qIW#f#E+W<N1dm$G>Jey#h)v#uohV$OX0vA)p~dwg&!X6#r#- z|36I(Op*&gPxGLNMa*1vroatUrtMdOw43rR0y?=6Q0bPhxfjC>c`<EJo0Ng4AI`jh zcZ~#&825w&-B4^3aGm|mGz%f{_Py-|kKCVGg;^Z%yeYAN8$7E#21NXH0gXzNDtbU= zFn21bk~JAtG@C0mYD2b1(hf>~4!{iuMWb|CG6`>{g+Z*o*=?!P0~Gy2sa3A3Lr{51 z1;*+0a`*7r8dk{#XvovSTQs}fMimYUZQrkYP<d?mo|NYGBn!I$80)v&`)69W6e1?9 zpRN7wE8fOvf9M7-pzSyT^`xl+z{Ln0m-1`XAln53h||x99kpC1uzw~zp+sL;C?uIp z1|ZCLiY5D3)dZwm78+ZFK*wa~Tl5Ccvrm5@ndd!z-aRLEU;X8A1A^bySvmoZ4oDG- z#yv+AGlHY56l93oK*OGx$C%jtF*h~Ep>7lFAj>Bj+Yh?Z^e&HAm}4tJb)o=bx~mY? zfirL(D98puv0#ugB8CQbm6VmbTfVXj92)WL?=-mA+Wi?>YH04@HLoel3&xc3EyK0| z!S6ND+@d}Q35l#qyeciwT?hqA7@>rzfa*3VNX)jHZco%Q47@u~xllvymLlZowu&85 zgy+7$PBwGC|IrBGxeyStzui912cG5{aW>8)FFC=zp&GNy#z|ls^t8)4@51tuWYoSw zO{SoFW$Y?laGhK|69e)bstMqIu$_bGKpQAlely+xA{s4F-gET`6!TJmiLi#cKy~ba z-c_%~Np#DtZe=$1S<W|tB0o|=H;1c~0z6Q*?kgfnc7V}>A=Lsnu<I`e<%I=n99G`M zzCBxaUp<HNx%<7e;Q}|H)+R4b0F+Bw1!!VV$<racYU>kD8zgr;`p0KnVF3_fXe{3x z8$CPTlb$&Fgv0WF&k}&AQV>r-0%t9@(s{8ffu7$Q<dtPQhgDT}aC{3uyn$a1;F^aq zXMX5yUjg1)3-f&=ep-PAOYWt(6oY*dKo!=n)Bfd~bvtmc66lV8av1<?2dw{>DTv=T z*5&s9gY8uR9k%yvkf2{@PfGPVURj=L^u{)U3iVW7moIMtpok570MEwEfvU7aL1j7Z zvfbwUD7m0euJQX2ae(m7GfyZ~k+%sNaOSTKgwI|@e_)kNa8>g+&@Lbv1@StejFZ7n z$d2Lg`~s|S5_KJ0aYm47R-H%`PVa^^`LOx$L*917>z|W=v<??M9`sIkGcN$Z!?k}* zujBr0RuwHw_%lgfu#S~Q7C_*}9?0Ku*`m@6ZgWB9=ks*JM^CYlC4vQ1)-`;f`1~Rs z<_LxBv9V){-u-a)^M$|u>g1;ix8s_2K@s{;Yakn-;9BCou;pD=(UR9qL?^~jR$G_$ zh6^y7xHmY>oa3!*k7k3==7BAz?VAD0l9W0X*tYa!0OFP<=eE+pwgMH@GdTP7&ApHW zL9Spqy)$`-X}$YFk-Gc}Ig;-4Yj!{;K~w+*fvk;mS#@1URlaGdxa|WZRx*IkY>ul# z4yix8?P$OD>~a-72qN5{gW!b=l)hq(GE1JI5C-d%(VFScZGagZrby?A?w@pozZ`Gr z?{GXe%=M*{c#M!CUxA`E3Q8iQW5909(2_n{ypHap)6PiaqmZ~AEzIC~*Zl=(z8%O^ z`ISa?8W^V1Wg=g4KVgI+kk|$lj7rph%s$Fwx0!9C-V!ySD~=*Zi3M9EfTAL1rZR|J z09rP@fjt4_0=bA`(OFAS(k-<?SM_LrG#PuBfO<~i1oFwP+J!+U+ij@EA49PH0gXEr z$?E$vdu<S*iGnfl5WqXf^dY?m5<#~gn01&M_*bdXB)Nt`v?oPPQjKKH-2MUYY{1?q zSgz5TKR{S0(~_1TaJ@)}F2RJb(iwETl}eDUqZ4`h%&TkrE#40roG?#OpFB1UW%lj+ z@MEBTTNBMBffj`ddUIgw#u4CMLQ~b|wLF}!j-3&qXq>>0&OVKaxB+KmO8x*hJvwQs z?yQ#eS!K{alENm9+GsQVGm)?l(Z|l#8MJ?;2Z{s`qz7}u;0W<PSxQlQ7};Q!th8tf z6qW!&4R4~wACFuWjeMc&t@`P$T+Mi=Zi6DXkyI!d$Gx*Yaf;?#o%X)_y*yulj~_eQ zy)+cFmZi<-CtDqXH589V)EQ$%+sq47Bt!}wujyah6h589eQ8_u+`1?0%UZ%9!{ur` z5nA^kpHYY-5`9ggFTj#k>^X=cb$`e@`&7B`Y5!r?B*<FP4+dM(B?aw8-G0d-iV2fj zFa`uCdiQ(}z73lDidvXFZ1r07Q+kU)9YA%}#Mm4EeJ7ckBh|w>5}D_hz!*zhL7ZS$ zTR(}q>1Yhtbv(QA7Ype~Me&IEqWdd)QIBTh&z`6miD_DYP+j~PllA2y0Upz0ZPVpn z9gRL$3{vu-?|sV;!VPdxLNO+ATQN6KxEutI999gIb``Vdb-8v=VKgDq_8?dk>m6Ma z@UFIY;L%6#P^KZ-Mck>N7!o9120t&%a?&FEVWm~gdj_VuY<GU_DSY;O#OQ+TPe8F? zz<{RdNs0)G<$Wd~-tcV7MPsOwM+)JwaFwuz1~GwI!<waBp)?(%mwD9ga64UMGyqYC zk9iD^ku;OLeIh5zG{pi&fd-!elZ;(E#`9!9g(<#er#eY;mG&?Or!fxnLwNFKmvbq` z(MXD#@d`0HsBio*-BV?8T?9XZX05m!aWY``uj<YT*ar!Mf(@r}zTaHFWgi$KjrA42 zCKFr$iYV3;-l=_+)CYH2ma=+zjq5cyk28C#6=g}B?H?c}@b1uGJN5vi9kbHp{+2@p zLYUMw$8NO-xmA-cnlewj4#&YMisr~?pI>E$e<iNTFqe62E`l`9h;V#-Vt3#O5Tt=K zsOis=DV!8EtZ*ZN$P&8IwbJf@4K(N?=Xx%X!u(^ID;(`cGjV08)uGfxSC!U+sIQKE zh59~zGxPqf1U82$kVdB|YqSE+gFr5GyhO<xS9_b#SzKXAUt~OOodFvi32jy*8b+Z% zQa4%|Ol9%Eb~R>`EpFj9XCW!nGly*`@b7d^iS4*gduQ$*xvydM-MZVx-i9N5RAp7q zsrBJ!I8GYM65a?J`JLove^*4JukhpaO^E%ZRN{*!*24q2Tqsa8F4atiOe146d`tl} zLCgdlB%S{iyNGcTS0Bf#!SMK3>_U3V58vQ6ngdXd$u?*MzE2`jM9ZprK}qBl^F<z! zA0vVUKRP2{F!nB<EeK&{bKMZg$md1A$Vd_x@%%!c-7>7Mp8_+7&)-zW?17r^gf+he z|An9Y1*KCeplJ*-nxGbPjtOGJtGYl^Ls<}>_KH|{h3%ERS)31~e6q?OYH<%4N7E-( z5=6zG5(Wgg%b5_&AVy~15xSm*Bu1vu#3S7>zp|wgp<EX}RcSSXwEi2~F&#ML%785( z+Q}PP0k2e#J}TH?EWtFDYyxOttd4I$Wfz(Th{@8>5M7C9X{^^tC!`O8*4GC17WUNK zGwTt1w>*FJcVw`QxjAsRebqt)+Mb3`@Umm*<`;fm8OFe5j_i<>pz`01{!X`~!lQ@f za}L_ZJ#Ef~;)@VZjhAV0>E}^o$=H{9Xvdn5n&Ywx$^VrFB;vb&TO>VT`yD19tJ+oW z0P=}e;;FPqvgkHen%clwOwk*#JEuJ$YH+AHS#VF}5niB0G6;P{;y<1Z@KF%+=OZO} zU2v<cB8P<p=}g1=$mXqnqgO72&?+s?%k-~#`9+B)cL@TnGK|af?;a{KO7mkWu<5C! z_B?_sv>!u0r(s{ZC_R6`MvfZkL7?9fNW#Rg(io_|kd7S$Br{^DUTxK|L`&C|Z}&qe z{74OuwQ5Q|F)!a}y6w{@bcb54fw?Sq=TIH~g_J7zQS6P0{`l`Z?RJLR@o`u0`^mxy z-S*cLRx>6fMnu&;)};&X!x^?vhfPK0mg~~&DLHheahd)>-d}~+aj~1FPgfpAc*<?P zM!Uba@MuEAROlX07Ek5!e2G@m8^;pe%(ca;%t8u&ifj)#g}wn7^z$N{o|xD=+#TD` z=cvu=OAafpz1yD~7AY31o?Fb-Eoz{W-&y(PoPv})0J2*80DP{I*Z#(d=Svo`hp8}y zin7iDUo^Q;3n>6X_9-Sw(<21!k7=ZH>Y%=W_7uuN#t?z83dCtpz*m0an-5Y)ZGgh7 ztEc;g^aKc?uul9KiEpaXfO~)Gg!+9-V3dA|%lAKki<|>A(>p>4iv@n{iN#<_pAf)D z6}@LB`9uooMu0oNN_x^?_!m#*CnPsW#U4`f30kKrWB7uTK*)>AKK)SXA&*qZG`LQN zKpd+uK&tSQAX7&l9Q^$o#M*esFh;eYN$1hzB83p|4*s-XqPyU~9=D$u`Y87Ln94$? ze45Z6d&w8!1J4r(vp4L=6{?E(hC$I2qYe3w62F83d|hc2q(LmEteLaqhMx_9i}DGI znYu&6B7+uwunmaCRXgR#r2{CmJ^;2~FCm!vE$6scfrkFTOR6nBan#br6D$i6Y0NF> zF18%4M+1D|+4yE*@yzQF)+KBIa`Aut$`>IL$E-WxVs%t;$ucns0+@ee@&9$&e8&lA zC5nEslKzZp_*MfFHs?pX|3Wo?+GG%O#qU4S8xdvjOgL4$j(!V>P-A_)6$|~R104M# z*71+}WiD_N?jUF|OnHz9sxbaOZV=hr3Dy0O^8yj@^(qK?y%AZNDLHkIdSGJ$oo~L? z#9&0D4$QyCXGE5W+PUpqH^zr2a8eGQ*mM#-zknTWYM#v8_y}F%xjxM6rG@@U=g6<Y zY6WE&Jo|9&axrw{pjMf;-6|rleuH-c#A9xWf@dW8HQ4I6S_n((2<v61wGpPmDVaR3 zuUJJ&Ao8Z=)2PW|(uH~cYN658UN-^f=d~VcrgskIDw}e-(v$pky8nLTe;O?_MosU6 z9Wzuq^Q&+3?|6_U<CbRR%bivJD5HUBvTK!p$TX+c6F;{}J$)8_L=#KN%CX4p7xC1? z5(6E#SWTot>NmgOKZDRxHux${fI1khCt+z2<js;zvzIjUbaxCEkJYd5mtEDnidWwC ziNmNd)TCuxx~KYFLVZ01+vBzYiT8gAnf!Zz*yXgogT<aK%yp=<__05#6qPTjB)pT} z?vz{WdVPt@ibss0cQYRrN_5{a{ig%`Unb(`Bg2J#6g;;*-P_N?$WHvA+tO6znPD!l z_2BITkj0_{i*A9j5ClAb?ohvf^Hn2=XSXy-wrS-rRPz=iO0(Dh7|&P#miJT!S~Qnc z|9R0shQ@{O;`;5|;Z{^^@Qp&gJBACQd)&sS-(FwQ3p}*YI$NQV4{|}BF_+F8$}X#y zco8)yr>BBN>_*Y>GvW20IsWUw(z!5F-9Nm(QK6t&CEr5j9J;LbHm#!hjE31Au}@Ub zheR7*e;}8j?TZ~SJ*l=}_m4L4GXjaaSE;i<l;O#6CHwh_;TeN9`j{#)hL#jCS?Q-* zKhuu?U`7w6X3NcIg42>u)TZis!{Vc-XU-1~Ys|Wj7KB-3p6qSE$dv_Qv5IPai<o~l z#KL<e&-+95wPPjq5=or}*ceDToleVtcpWbHYQ5K_ok@GMii-Kvu4$?x%oo;xK*%Hu z(8{iLUDOG`l|J1cv9cW;v?RIrqL$NnQE;>J*P5aKSkwJJ3D}Gd)BLjK`11wJ@^O6e z*|j?DHsl^|c(8lw`TI~UMgIKyGk@morhMJ`$tyL;a;~6J$KqSpwg1#-`0tZYc(*TG zvSm(N+@eycg&#$8nMhMbm*IWsmZl_wG!whGhv`cUqpmh(RDM2VUq4rI$Ha$@9S&3} zK8I1oZH{;D{zmB?L_Mt_kh%!#7XRy0{`-#hTpni5G|KOF@$z+RQ2J0|uXwV(b;}JL z@dAOIbG48(LN*JRGqYQBx*v;l=R?lomNAnCXeLUAd=hL&iUzgc7gZOwpbbxcsZRdq zCt=CRTB3iz<Cu2WDA0Fz)Vw3fD66HPq>+dqXgk(xXG0tnv2msKeJ(!T42A7XXIk&^ zcs!<;R&AYr2n*+FeQ(CnsjgAXT{oo1RBe}S43%s=WpO<RZ+Gp^8^L!=9>aqkS#n8a zETPF1QCVHDjj!yz_Q#2mTKJI5VT9~T=+A#H>Ds)Of}1U|NvUg?dDo3-Eq_{K(evP4 zZt0WK)P>6=W@h5grlx8f0*@LstX6*{uoWJzD3;g04ken{(d>_z?$W6KdagrCvKIQu z_(zplsYq|p%7>#)i{~7fl8P*ijfea1du4;%Fl!XEO3tk1<;H9nn5Q|utUcj~ITI^X z&LSdn5GUGoWH>2t;jiXVd(}8|H;ZKI0>5i@#(dv3kw0@s?}b(2Kh+}rTxNyLTcM68 zZEEIwX_kTvEMp9m?#3b(ALK3$cceV$b4P_k2RAovy=&{`GS8PKJ=rej`M&vXAYNWv z=Y9;vi9@iF^DQ066u5R+y@kq6h9ETDOy}^T(hDw}Hu*|jhe~EFmWJK4!`;R<<e|K9 z?`4|Vox;77wpB6H@SOFd0PgwRxin<(QsK?1T2IQ!>a)OY+r?||l+l>D^W=+*Y!97D zg6k_u<LNR-O(kW5^mT<E=((8NP5n>}njI^4BByXaJrDhAvmj(U7AZDpnyr7Lr{gwy zh2DJa4ZrZ~rRikCVBBPu@B9_Z`la`|1=*Q<YRqKn&d#HMq<SB-^f7srcBX%IeMeKV z5nMK5_8ArRbP)AALy%5qTP`H&@W_d|dh677x>>q42R94J78e$TD@30mD^Aw;QTx<u z=I*?C{@z)}t1m1@!Yem~tKMr{luvf?cui;~sK5)Ey{gP7PjyBKn+(ll5;p0QWW)X4 z)QhaGvTmj)l5@uWkNxs8yuB}1&8reM8{Kcef6+h^H@WR~Rl}*`#fQp62lkIn7iU|f zY;IBoH7do2$9!i&=?X1py>hSLF_USs1qVv#D8ZB4K^^>O3?u*Bf~a~L<(1<A;h+x} z&N2~!jsuiptK(8WOUd5hSTHGfOJ3I4`+i)AJ5#I{I+G_|bdI~KC;sVUp{;cY)ibB! zR-@Kd_xF2ebI1L*JF1&VJ8`ZN3H{Y5VsGQ2Z`4iVS%l~%EX7qKGWTJU7j8dLJX^^h z2L!}n!xjsp;)3vTE)6qZ>YT@OXB8Jm_l;#!^x#pkw;p;f*TyhFu#lgCuLcN?2v zeEs^JmgOdyzJ9HKL8U`6>HfeUE?Y-f+bH2iA~<?((tZe|pRT&_;WG-i<_TMGe9X1c z+D9*jESQoxeJyfP7sE`c9<|bpwOd_Z9a?EF6}+Yq+*XTo*{WdPUXA~5yMK^Xp}`e{ zo~OBg{?C4fNC5t_o&(9p8BJ?2qaiGQJX3}VUR0ds6E#<+#)dbgO0@jFYuC;QlgG0# zWm5JoVhh&7zDv$%-0`yCtKI%sE1Xlc{EeOiwL^nrc1AP%rgK{RTF5Q$6E_{li-6K4 zlS@YaEU>3bGkjdf#GsKvX=f{YaQBPRq9jH_1Z8(Fp2G29cr0U0X;MO2`OfJ};zSlF zUSpTZgLOJb^t{2KkQ{m8Bz!tz^fEy%@(9yV&q_U>{j<T>E<Y9m9S09HnT-nCgKFlN zI$I2Jdejei$F!Gj)j6!@u{gJVTx72wtUO)zo@VrONqcPO^TH5+o%ZGWa*8k&tHn$) zZisctme!Z!W0Ocx=Y3!4k>PF@bz-^CdWjl{UZP83oNp)3AB_?wYk99E*bX=i27B%w zec~@5vTZfeMU_d`ATvMLAm3^eMivm?2U$Y2{s;ejI^=Nr9tDZCW6kIbTtD^Mj>&3y z$?}jzq@qU&hd7Cc0dJ^pe|m3diA+X#!c0Ne=0UIgfh#;|xu>|!qSR!@t(jhkirt`L zXlk0un&OtTpkM>00@E8mo{-)0gHhr<5}+wm7E;MnmR#iRLSaqL7_#xOVtMX+M+VO0 zviN(%qB&1nas3U*{L%WwSY$$)#rd6P9Mo)rdNEng9BRdb(T2$tZ~H#jKRN!i=cmjl z_N<E@8GXE&Pk`DeRaQ0`xdLq7*e)_tRd0XNL(TbRh+xG?S-q0ai`r|e&YM->XJwzD z?eave?_MjrOowx?T3xh^16^mdoh5WG5TjL_F-5jpCLg?~haA}&0k>Syp6s8zIZzxf zlK$j8SF4D=#{Hz{G7j=uTOlc(E-$;4$NnzblVJ?4txK>wf=in>#Yj>F)5UFGeLs9f zGPNBO7ZbOvDMVkdzY@H%>4opofgT@2TrA*S;r4~0v1nOn>p*<eEoAO-E%EB0V3s%A zzG|xTkE&ey&LHNC2ac$Zrv~huK}t8?eyKH1Fiep0-_Gqh8jU}!BIVDQFP+8+-dkk* z_@G<frl9=C1LQ&m<7BZ{yy-d3tb|!k(L*tR?`iUjqcX88izB^>f#1pEG@hH({m_de z)xX+2e8Wg_*!rlz@hIt^&vxvgs;0BvuyAK#t%sLMrUqhS6<b{%n@;@z8~oB&o`c!9 zw&Oz5tuJuBD6-Es1H_Si>*%isjJ4;Tk^VQipJ}ZU7ax!`M-RBQ$ubVaK8OwvGJZg` znt}H?qtEzu<_kg9Re2oGZQQAyTlOnC8lKOKs}4)vZf9l+;W~NhFxE~#V;Sj|;`Sp% ze$G?b`SIpZrN3=v$$tNo#z3WJaw9xEeC8ZArD1(EZ9AVTMssB>$297l9&<{?_X8TU zJiQL<&Pyh)ZuJS|M_KaW3ESs?FmK!9``qNo4`{8)6iywwi?QrBEIhO-WWCB_{8UR; zck*`#`F{>odLexJepv(;-_DW7vy1GtGYh*RoNc-OikV<*`Jm0@A5xR*A!2(kWslny zgvls^_pHw*iTqd)&Qpi&>r?A&$N?}xN||<TQ7Gj&x6CxQ)WOitLdB+ML_*=o3c?Fn zl5Ip|vYGaht9+ZW7hXEvhW^gD0tZiTGOWJN=xhcWU6tw*MEHqs%AU+se2SplKCVq` zrEUExx3Ca&BE*;$jZ*#~Yx>Ev)s0@5rAD}`nSQ#F{l$I=d)CLt32G)Pxjl}t#{zjy zl5E7PuC7ihaV{UJbse|5md74}w7oEP=f_WgSn_|a?=L^~8N%Q;H&+KNJ^Di@Z!d+v z_N>&UxqgQ9shWG;ihAAI)}oew5at-0J0m__7059^ba6(l=jtr=VZ80D^o83xif1A5 zz)%98;%LO}EW@4c-iW8T&FZ)O=|Zi8c-uk4#t#xLY_-?Jh=SAcG{wCeTrC8Y5d8g? zGg<iuvYkcsI-6e&GBJWm)9w*Z?5j~!o*9aN^xXxe)`P|5Dafe2nl~&$8tF?*35uVC z(g)SmSE9;ZB0U6{ytK=!>nKV;8`}1z%>-S#I5nXt-=Ha#D?P_*{i<@I4WG4QV$V=A zLmc1GJyxXjGJ908E1n)&gd<<;w7-`{mUPsc!r~OlvAKG4qJWR~`b37?`xi@&CM~+H zb#cPuoSGKZJ6+5DmL>w*PH{X3=T>Gqd7cego<~_+gJ`P%T*?mNJg0jicx!dF$W{(( zPh!(kgZ`>-P0js|`;QaKRc9_<H1e#}93)lvGY}hzojq&3JHIR~L4?w;kMgqf*Df04 zmIz6B!~SNc{Pat_W_Ue2o74H!nyZqVZY62w3d<Fy7{5D5FNG;f5ENU&*2r7(A@ahm z$B#T~T6@S@2uIJC-U;N+ul0~K5qdWsyyUqUDYX@2BPK$L;LnbmclvIR^GB^=oK<S& zv(nd~XlM6NXwYJDP!=gAC$l`?cbugH(xnnKT~l{Pr?|=SMui26mi=sHbUZI4`-`1N zU5tK26CTpI=f5>Da@7rWz3{-ty_2+2O@ov7_R&YL#wjniWDn_&Ro~`{T6+ts-ATj( zZ`F7I(6DS@(p38(lyEWw3gPQhq<;;V{GU<w6~QUJjFr}1kU3Rbk}nO9M8${RKFWP) zrQ|=h$g`rowioUgEb}fYi1FQMaFcv7kcQ}Z;b|01BO*@Xk%^LxWD-v|4K;Rad+L5Q zko=V=VQ(WR@8a6@-QjJ>IX-RO%=9lhC^}gvYmS!-Cl)R2P&R3i5|16ePR>kd1T-k~ ziH)QRYflTBquW>A{=e1#xuRt7z0$T@?}qKa(m$UH&o;|1{r2_sUERK$sR22AvgRu& zm{mCZ-S=kS{+A8l=Hfdc`_A&Np5={ycO9RW{lzy|#lf{LLN7=8>-6gfpP$ybru?t= z(5H{*l^VWXyP@gm@b-H3x9+c9@3`4T95+4X>W=w#w<@9L!^t;~OLO;@?Uyhr_$Ohs z;GbR0(i_i`_nYrn@%po#z{=<C@iPUxzjfY7m>GF+=|0=^WBz8d1)G1LpLJ}Hww{@> z-k*b8Djr;2_pwN@eR1}Ih0IE3(V1>KH@YpO)|Je(D$V-4b$iU+YoJ3~aFq?ZDh2O! zlOLavPD_1nvh<eS-d)G0%yXUcsC(1BO}3A_n%kdj{~EWx{>@~IXRkJXUH0+Wg?t?e z`&*0d=Ule_-IC}UURyoaPzhLzI|!z%&bf87S1Y%ED$72v%~rlR2Uvi^mQ4=c<;vFu zeWY%+wa3j6VE_Act%Ui;I<w0yp2l4Z9?saJA(=ew8262%@sHQe!8|zt)-Gx^6aKL% zeV16IeX>xf_Eo#=lV8K5%XR(QU-c*zzr86q`O(Jd>c^hBey?p7pSAu)Resc+&tKGm zWzXfL?Tdcz{~A8$>f8j~JomL*PcnqAeJgky^N0>u$T_e!K4m*EHG9RO<G!=LT(S;s znm@Juiu~b>N9o3o`qI_I)@0vwecgXDq;MIZ#l(qA^=xZ0E*yOX8f=hm?_GWS)KT_x z(~q6ImAtvJ^zxsjg-m^pS1r^rPiKLL+5%rzw|Wy(GrLz$cV;>NlnB{5Dekjy-OSKs zVzxIzU;leQFIl|*=&$nGrp4-ia?>XIea+h_f2`ih_Sg4!V$JL&=N80zzo|ODAdA!W zHP%5TaP7EYDyx|GuBpF&-TE6<q6_S$_gtEvb#Ud{u-A8AHU}Rl*L+mz3><wp<^9FP z;_4aYiwvR0jIqFhXIKoNu^KB?KfJbWKhm)8vsriMLe^c!K3eOUtT(&(wL}OwFf=#C zeK+Ru1h8`9ZG1w){&$6E^`~`zo%Y_=-z;rzYSodc?EGDgwa;<`a^~gC(asEJ1bQjB z4ss9;OeZXozzN;qGHaShvf|ypSAJAv{a8}*@vW!f&KIlJFTAu^B0H<9KaTfo(D%sm zN%unA&d6u$+*CG;-x^-B*4`)dZq2_%4#mL5E2i$}Q!xgl5v>UzYnBdhEYnx57|s7^ z+{S0XS%$2>d8cs~g&;4OL;{E2CZCK!u>m857gz$vjAku<z6r&*7<t<lIM97H#fZR& zaYi3-%<<WaoojFx4M1xgCWA)jXP&_o-B9n&0<A-^tkT235b;6^Fa?YT86+%6gA9>y d2PT#Mss9<hw)g4QcRLw?z|+;wWt~$(696OqKyCm4 literal 152264 zcmeFZcRba9{|AhS$f!t>P|3=uj1W$agfg=^M)sEN;0PhfUfEmrcI=f<WbaM3V{`0r zzmK}E-}n3d-PiTk{kZ@7{o!MO&U?JxujhEZKF3#9`UNo|6(JTD7O{l5s5}<dMNTX% zoKk{|;3o!(U%bI5Y#aF(B3OAHx0b*+qWUTl22xU3EZ}PbENmZREL_Z=fDbD0frWJ; z5gY3Q_>7JDSt8EAetVHK@xs5p#wo@8;k1{uHWn5HOG5OSf+P0IIDRbo^O2TKpIDm? zzK@c!&pzGYe23ln{$OY4)51a4f|H@N;S-zY@4na+7v^JwGU)g`XJd7K><`pMP&xYy z>tA=!v0qR|ct<VC!qBTxrC;LnvhKw2TAsFx6VScG!ubyu2;n7isiY!Va$GV97WRL* z)Dw}_PkH|5n_%HEGeWTL&PiXw6Zwxf!NSJ5;d1f6yb9eME`fIH7;_TjKa3SK2?&;F z=YO0G_(f_g7WStw0S0n{|1=peKmzTJoBw&XSngrh=-vfee|e8X|6k^eeOc(je;H_y zH4ZMP{92eS-G5kA%tFz<YcTvT3x+E%{SHg4HSQ|m`~Na$T+aQ=|80j`FOk)YSG*Q+ z|1WF*4(npVe_1dxaXzqn%np)FWdA9UzyLvzJpL~W_J2Y0zryAJg5-b2_5Wp(f1c(4 z3zGi}l6P4DU%(9$3HG1#JsVh$G#_0ln?yVod_k+0?j!Hmk#IGL6^CHuBP96F^9QGL zB}Q_7LM8G4K%SsF0Bc)=kz-dd0NSHKhs%t#7+?0Jgwqlmk(G=0l3wg*C&M{JG~;tB zY%K06HC*<%f%nT+Ui_~x$W#yRLb&lGW$`>EX0npuTqo52Oi{QXbkcN@B+exJF;BWh z67x+Qf_vmlTIs1YWm>PRauyKmMuluhV!(~?IR1ua?k-mVWOL-`eZ<5{PzMg7=6fGF zZ0E?J8hr%U;188`z$GlHA3?{g<kH?(eK?5v)p~8Ov*%h0METR#yMIG1X7>7f6U+z? zrrVgsf;5nS*sb4pnf>XZdP&kB3r7`q2R7iKE||UZ>K|n1yA}Y+1Juj4^GO*qk*&HW z-M&%j90S%6PfNRfcinnF;MzB){e>{9zaDak3E)@atJ~0}^EnX~K#XP|)GH=}#UW!P zs~yDU_@(XW_qRhZ>j`L%3xwe%W>wvHt`iW)$|nXtt`R2ctF<D0zy4%${i_oqlj5&v zof-iCr;m>^3>Sm+i9wg%i*<-7v1NJw?at=|Te%KqQsoupdH!9hAC`mOm$s<%`2P)H zlQ>P=M_99g=l6i{6Q-Kbr5FX@QA#pn9;J%Xs21IPgLG;euzf1kchg;i=zY9m_rjeu z=jWKE+kFqo(zIN;L=@nQg%gFN5xF4&CiC?^1S_Q=PHy>pTm>z7BDx|*Q)4rDAIYbV z*H%}vLaT=QoZ41CRZWz<bY8Qhq#5k4r9R1q4K5UakEj;?&8OTIC_dCR6Aa#FvD~rC zib$}ge+QW$_=eBAqv>{G=T;rNWq>$4m`?o~CEdHiqjtVKzn9ASRiegHh-v^VOYbeK zQb|UCj=WHt^~9g;f-GNpU;q5LSdt2da+(h<DdS59q07fhe)f^9M0_W9u!TVwEUmT! zAzA%U+{i7Wb4ulY3%50lMdzq2%MgV1NJuy;#|CwX{6W0RWxed8Uc}N^S(0f<(Hd4H z*L!`)W6tyq9|fD*H?@I$3n`RBVJV7tcyWoyyuXsT5Z#VaEOw0<us*OTl4tnX6oG0o z6qYI`jzJE|gf1M+<x&q6M2EKxKXRzvEWUoEkB>ChrZO-Y`}thxjD5|u*;|Uo@P`R% zS<`a3vRzEdL0=6y5Lsw_(8B|77KuR(g#I~Hbe6axU2kHjFFraXXoF7OdAiUp_X7_b zS6-D4moxd9U-H^~>LPTGbTrKx#zc)dad9BFR`gT?&f}oo;(CT$W{#ls@Y~aj7#_>g zkWo+Ko7B9cu}#@Iik{1bR|R)=wNZQhMzktjLWGarr_wdg1-dO>AQ7x8DH`oS8AKo5 zk>hX3T^~2Mq<v7aQMW#F@S?0tch}Tn@>9I=pwM<^xZSgG#{A_ahni*IK(no}w8BSu z4(@@E^6-6nn%mXQ4v#4YkaEOlnrBb9rwLHo-7<xH)qhC8JB(6R`wlL9*h`~=%Y5D! zC2?*%dvAzKSO?jkc#(kSKd$+}&T&lDM~00{m<=ZO6>gA8d7cd1ugh9#fB(j3KP2Su zO7^V5?}tr<8XIq4DE!GS2M7^u{ga~)t}YuQHFOg<xf<}uOw_8HxmObmZ@pO<7p~7+ z>u<v6;Hg6Qj#pDI>jX3DUz@b@zw3+a&_MRj9kg>i&Q(9UpJ({uEp7E@A-4)vt()0O zg`a4u+=y^)3~v`+{2foJczri+Qr#=<-N9pBnK<<{Pp;yj!$_595Ntn^c9UU$!&`c# zERkqGKZ>@I3j$_skHO$&WpO`V5A%?h{+)<>B&K}#d`7rs+<w8iAMEwVPgAkLC$}Te zC%-7qYW;~snaT@fdPh!OH{U!rM<FN8nnuv4u5E|?ITrnd>_I^XjdR@&-b1QqPNPCp zJWctXes1wc`;1k)!!qVM)M}CvjcRfBhHkyqY0af9M^k=ojlzGjM?o9VRfTpaCED-h zYZV-qG*^o53*3=)#M>!*Gh5<iKl4)SNK<XOl;RXYKB4ydF)kU?3eHYF(~9Be!*fAK zF79r;{pbQ^8w`>hmEDj!{L)1**+$FgnP)V`iS<cJQlf}F1X{x_5?x{C<#sc^acd>s zPsL!+uPCiZ`jBQ^DC})h^v}c}sjCj|>?*rQ$G7;<Qy=D=On<Ko*>_dC%d}|%Io!P0 zFM$>RF0CC+J)+1=RZq|;p<hPY2A~h57l1cehTb5rfRIlueK#NW;XW~QI8&yfSTVn% z>$*?f(|v?lsI|W2NVFZb?s~tj?)Ue613glUaj)e$NWiMF9xb@W=<jZ9SpGU4Cev#6 z_iejTMs0ZxtRSsW;!Lj@3uZqInbx*;Z%HReErf761~*?;paD_o4x&=T>S`v=c~l+} zUXFP(7_c_<bGdvv`F7PWM`~eH-%@jxaf2#}x_q~_$1!ELrTy8O-FZ(6i{o5pg_N4w zWrANH+BwS*6QAvL<ksXGgj@5OckusNf*~oKZb-8Q|2>~)SnfFN^^^WM2pnc190Et| z`F~phkdFlKCrEui7Wa?8y(u+{+zadaHts4+t3Nshi)vq1D!oQ(rr!?Z@GGU}soJz? zUt1Uc-WLOf@-aJJ@lGUc>4{VA-r3w>Mp_-H)rr?|_Vv5;@5bL^fj+UYP1xWU;-GPJ ze%N^b=^uEmXD7(G5`y6)vto3(9AAZwX)av_zl1!y##H3AZIJh#a6~nw`aH^*Srch5 zMr*$gl#1aQZuX~MUBMTA8)|APp7oPZ$Y|GB)lYdOy<OdP-M1)Bvb->Fa9A?(g%dBA zg8AU+o9&2P9@FktmH3hLQtJCz3chcUj!pbAwRAQl#OAW4A~#KE;R;4KvW&MQR6|D; z&DszBg=FP2HH@=WD`M5lhUeK;SGQSVMdhUyvg12X8_<hPGh2Bo$S~v6Pi*RC2lUw= zud}_efvpFisd?4MO(=2z<RH!LyxAPKb;4L-UzZiK7cV0ZT;F)j;^E+FBmxlKofE7v zZ;N14N*2Aus##r5+v@c&jcDIDZJ!{u98!+7svAEkef}eaVYR?*=jEpS>!-M6L%leY z6As8TspPtwl?KdeB^h;m#xjw9GnfUfpwK4B9Q#-(h>0L9oCBsrEGU;TL57i96(W>W zL^N{A&YS4or&xYrM4?-LqQ`A|DgRr#0EF^<o)1j5UZh;y*FXGPP?6g)WaOu$x7*tF z)yPV8ec{FZ)qx|syuBALf+ey4B99f6Q+Z2cF@^ZQUyOkKHnw*V%hQFB=s&=E4jY(@ zEE6u*aT+}Sv^#aeW?4#dqy{IvEz-WmyDcXEOq^v2PKkOp!i|jwY1AFG*5<&VZ6{z) zL)#1QuKx30LAem4cb7YdEmS@zJ+)nWyF2blIeZp3Vi#$eM)$qNAwgI8sY@`;c;PVn zLSsM$<-YPdH14D#eE}v#6Fpc+OMBqwdQzXTeeZK=_8ilLqos9xOg>=xfFZBHR8xNb zNobf1aQ@o&=o2CJRb^=DH*I|*dNHPEidZ7sRtzz>YmObMtx!>_Jjz1PVPX{4!7>q- zLtJdah=Qsej#TZBvDre$?z-`qPS3x7&38Itb9T%J5t>tLY2Qq@)^ZqmR(RKJ9NGS{ z!iie4Qj;q>#{Ya_gW_?HY3T$z1xm&KZXz+w;;fF-toW>t4h?P%ov05L_21-qv-MOU z8Ty)4Gbh7U0G@8Q-Z#clo)ismsvG|@iCJ$wh&pX`q(yN;`p@E<L`wT7+~l&9WfnhL z?GT6u<1}^6?V;R8$7W|a{+RG(Ln)W-wwoL!HoPiZCy4afk|#@&YNSFc&qO1{zeEu! z4|QF#8Qbm8LHJ7|*z>(hS=6^H6;~ISw^vu!n@9U9+E!3n2KzG(7O=@I1*Vz#B{glD zm_f9|tV}}P7-B*Qe+a>b8liXQEixZPJnpw!%CgHl-d@dgZ_E`-v)(-!(sC6#eBnPw zqt;i*k|(We$X>Kr$NrEzf|X|VX_%OFoZ<KgFIqoR^|)FOk+OPb^dYM_aIA%DAV&|s zB+rmA+9;r)vO{jEEx6ZJsGlXG^hCYirsc5RTPju;wr64#?fhyxlx7I&9%JPcL;SXl zlKsqe?O}LnXm$+Mrs0#~hmWrx@>>YoMlc>EIQP}o-r~o%zQJwoJ}I_fI*=TWm?)8E zTRuGKwmqeO;+)%S1&e-c-c_!e&Nmn~!kwv)&Q{)OF<b3``Ah1LKQ(M~jn7I6*+q5b z1aR9dNNs2N+qU$+y_yEd-tK}rRD_u}PQaCiJcAJ7T&0^eHsc0cX{U8{$j~<%n(Z+3 z?vzhR86eJ%L5`L?WuJ}x)U0mJ&t7XS(`tivAWA#SU^8m9ud+htjqd(N&{u%p<84>V znf%H3e~1w_ZV`pi0uElMmW{mGi6G@|{TP_;+XdEy(wI)6F_v&veLtm~QZ>caBlC%q zx5<J>d)HhWt;`tre)(IrjGUa{ABer3OTu!mxM;|IkCnNzcYVduM&s^QuX2L+QPss+ zBlvFPmEExx;nCa$yW(q=B_H#OP)9EF)SJ#UefM9gTEGujQQZ}3%%79D#!p*$?Uybc z#Zc8l13w0J-(A04*xgGx@;Glr(&U>mAH|JDINIhk;M6+pG4;YEpj&%E<ue|4-^>jP zdBVu%qYZ^h+traHaSOE53mQYSR4pks9An+<>du`v86-Q);n~k%OW!W2ANk;je7QB& z%<&om@n3Y~PtAob!^JX4C{OnUwWQ4pe$Xgm6Q=dEGubv=SRcwKQa*(Ap13Wop=OmU z-N-LjY<h9%Vn-Hebe;*JI8hbjD%iAwnr8+%C%-%hAE{Q@dxo>YzS5#nbY8naFY z1f#ty_l5T+uz8%;<OR?{H5xFr0~?L6c-10Q{BQGMr$hKcH@f#|zo=whRgH<LJS(;w z;@ZurZ{>Dt<-heAhnsQiI1A>~gKa-><!Il0E~BL-&*g%TG&0-SZnI7J%&C$zEc5pG zUfbnIUO(4SXP)RY``A+JhR3<evZ8{#NH<Zbg`$P_lQ++T3TQje6BizIYVYg<#iuQK z$$!QJ*^qBN;h;*czzS5JY`RGXL1KAQ>~Z0xhKyJ6nzSSLe%-<N6KWyjJZ7ei_FY$* zm7bASvHJ~5?;sAfXH!(O{ie@|M=Nz}0lg@kYTDC9pr83M=ixWCG=4es-Y2V;JzXb_ z*XyNx;NX8)tUD*C%40F{W=13MgVRf;mWY-**{NBd!eSTQ>H(PbF#<U-o^%!`kRIZ3 zAq({~!GC8x<xGJ^d1TEBn{cjh2z~DWu3)fEf`0$R+4%x|NHf%p)J7jxXkVj6-by?0 zB0=j2{)wY1;$+c-p8xd7ld*YMu=4f%F}2R^03CL$0v9QRK%CX$uV|Mbzt%kZ;tt_T zPty3Y?S&K!rB^vb2(>z!W@NFOFPoOpgtS&^A5hh~{90kCy#>|ahz#oU6LSxdu!*Q_ zx!QXWoQ5MnN_t~Om}ogF1@e+>=@x6^qaSmbsrBORt#ilKcjz5Aza2HMT%fet|B6Q? zV(Dvi`|y_08Kn@7aVKIYG)86Q_}=6){f-|IgxQS&y&tT#fBbw~*6Kbkhf8Oas^7`7 zTP)%Ow{?w!h&;_B9)pYidRdS#I92d(6CoWiL=UG4ChkAj^lxw+CN%n<(m6hUC~5Kl zap*Z+JN=~6ld9SIxGLdfE@|)N4RLs?_k45S!}77+M6b0WOO2zwW*u|KJ=4kIei_7y z4^fXZdbeu>y6m51D_iAlVU+xFcb&4Xgzu%&flf+^hCfRA>1pt~+}jbF6J7sPwaCJ^ z#c|6KaSmq!JR`)RVK8}1-|U3Lq1%o&L6f3$y|dr6{C{2+%kcTIoF%rg--nd*SF!Z2 zt9qJeBM1?>Q0J}jF`d*~x~T2;NxkM7JVz@hDZl7t!U<RVfaTaPWmdYxnQV90sh}T- zD5|BHstRVVpCLW<^r6Q#`!5>r!IlHk>b*m}`%RXRq=FDha#jOCD13=MQ<LJZrgg&j z=GodWYk#tVa%SFIKDZ*qTeA}$XV<B|yR5A1Lbu>V*(Wb^i+DXPo=9@j4!tnn!MozU zP`82VFV@Ky<2DZ_!tt_go?dm?nC2N&zb~h@;PFbvmGi4)mA1&Wy#skmN(P#j4PS1u zC#G?=6Mspwb}JPupQW@oGfYU2LJw?cEL3&+b_9ADu>`^wM0@MT4A(8!9%s?{hX|$I z!yHC;4`$hF?dvh}e>bVXxvi(YvTw1IUnqvMW+&U2Z#VpQzg=@3uBR87UM{d7o@~Qy z^f^9eyi0~R-suB%d{)VN_}f$zo0S)}NrrpO3wkr!`REOzJ7=%#o#weZMTcyE>{gI{ zt;Sc&bGi{Cp(9Obo_%mHOeE0D#Nzb5k-Ssb^~&ZGnACb@Jn;fe|3v#k`Bvg}+l)@J zMu|)ZcR1(!RHx@*3XJVuNvkMx-d<}w<z(y#Jyf>qOmAe$BTqFoL=<%dDtU(gK<aCk z_U0(6#)D9eHs>qP1(;0quEnX}j0Wkg_Q%Q7@d0*?0&z3mi63Rk;z!#9hJ|)Q;YaVM zULD)>)eMe3kR&W;`XNv1I+3OLU}nK_lXXn^^%$9o<l!eIAl!BHw13tOLi+!H0wgXi zlGsUc(Ik9@ZK&l<J8`)Lhs;CDe~dT8!_;P|{KNZ-??zv&n7|jbTsB;mOLU^)+UWvB z1gSd8sA{41<)fw9fY7pjVg<8E&+d=Znm)g;iW&aSB*q=TCVgUi$dq+dQVN8gc1}(R zJX_~(DBdzg!LKqI-}quA-&h_3cbL8ZJdPr$OLS2($>$y1lxgUil+Nj8Dd}7;=S@lB zA9h3YdCGOg7K1gjw2b3h(Si%!+9RqTNscJSdEgx~D<dQMJ))C7T6=GD@WpMNYe=qd zw)G#)4b*ClMmf|i`H=S>DzU4`PNHjl(>ce&B5GE=zw*yFpH)oUi>mEj-KqT4_PC0? zBLPQ_za{!z^_$@ygbi`jb*ZGEb*gI}T3n=>=b@JBjU~t_Kl4<U@Sm8lrJy~%dq5Vp zG+Gur?Y%lY??WnS8^q}nGyrq5HWW^kO<pZhPZ!t_t~|OWY#UMs1)OCQ&dU`xuPfUV zw`DnLot~>vHWA&QX+kB&QYHa?xb#GkC2X^*!w#x%9RIOP0P@TiyDWam=Q@A86#H!{ zT?6)=?Z*lZHEbAdOIt!9NK<Q9BX=quQab;+e1BisB6;IF;;W@pqF_Dx>rh?)`n8xA zQra|K&FTAvLaPNeInw<<Z(pQBm^6Q#EA(x*w5m}HFq-_vRR(RjZnp}Y#GO!AMi$E_ z3(*eHXLs-z5%G_NyVH>_X!xW}vQB&J?&4g_(FFM=-k%23d@t5e3vIHeb9Wn<;<k<C ztt8zU(x4;UMUA`0u?&uBb419!ti@$`;!fR?ZOpPaqUYX3_f9xUF!_LwORM$BA$HF5 z24RQsS{S`WUf}$w&*I0m#&hez-Gc*IpHm4?lXFE8^b3c3EKpDCv$zPz0&KF?PvRnp zc5kNc5Tqu&yKfrLY3hs8m%Tgigx$-i;7*3oZIA6Lhk`?k#XC|xIliCKvbt``tEF1D zPnZA~voq3U-1a(hNT*JhxF%p~ltDQ@+rHpnx$bk=Z6!=4X5?w=*ulQO62WT2t<Ac` zj%Y7VN`;$*EDl((`z*@Jb-N6h53S6<-5*=4*kDTVfiq`#HmOerZe!!mrL3kjQk&aB z85u$+4&Ek@4<&jhY*c#@6@{@!4UcUBTgx0sWQ0nF7G>@ZcKrVFM+!D70paMb!?aGZ z18dmv#*t7#SE@Zlujq_qbf5_F?r<8ZkJRQhrEC(G7U1<3b1S`j4i#8(Sxkbwwq*w* zx_Fm7INUpguz?^BikB9!*u|w3dpa4geJvH=VJX+P=B|+S+%h1N3HYL@^h%vfh1!B~ z!@KEf`FZBAYWPbuLUVlV=(m$B0)kp5ZMMB)tsrIudHpx3r34koxq8RgHjPocPJ+K8 zw{K%Cx5Oy|^5JSH8|yP(_9u49slV0U%0q18#|8Z-L%q7a=~BqIGh(dDYkLm^_EZ|4 zZ~~Jesy>2EJxA2{s#3M%Th{seN^DovR<~9N^f2P>n7yD~N<IfgxHmekr5^S`wTGl` zx_^>)=m+a~Y5oKWRkYzmNIz1qpPx3Yi|nb1N&v}R3N?G5V~()tYmEywQ6UV+$5*!_ z^+~!F%G3rb9&k~5QWf+E)c_lzF1uEBoW)`><4wA61ZAE|sQzbW?&U#;#?vtC7CGJ8 zfLxu_J{$VkD_JQn;dMwkKCQ~yNLp_R|20cD;R%*7wk4{u$maW=0|*9<+V(L{#Wa}q zojyfDXy50$9(0c^7F6OsBH7x(EFAa&lRmUPRxes#KqZ+~5(jl^3ByxdqH>_OGUc@V zS0zic!fdb;C6TS%S*G$P+`HL6Em(snQGMB&DvxWDR0hUVG=@imltTOQqxLbZEn+cq zt=AIBMNMYm5=JWb!j&_v4}MP9CXce)2(t7oa>(Eb>hZfe^NDnUBN}W%0h`F1cFR1{ zF#66K&fCbBsr>TzpuaFI@YuE%Oe}vjf;l5O>FYpwC99%UW3aLKqj1&Q!&jMKUMLRQ zh(Yy?Z#;^NnaXi3sqwz~T86$|F8L`mKMZeeyF_Y;ed%$^Di`_S&*!Xfpw`R<SCNB; zN-?Z5;m>PCxVl~V(=68oMs3@FTPw>r`tYE0u)YsYaAMrU*7I^rP!FaD<Zws!3GS9C z=;Vm!47mg<TFe_SF5Hl~eSePE?;<B)L0z|**BJzNi$OJ`uCXxR<=0*6rwIFqIg?|z z<*fLD414{_BasH*P)k>~>koV{a(0|{juz@5i}XU;V=Rt%3h_Av?R`q4om2B;bUog` z!?d^XVG1dC>dEB2=3dE@{xg9SW<ppl<8e*-Y^KvE{d&EabQPATlLS=h93`{k=6Yo9 zCp?Z4E7ZWx3EXbi5LZE$t*64IV#m8wTYkSC9f%I-kdYheU_w9pyYql4D~;`JDO*_h zeY7Y~FLll_ph}hq)C=*J=U+c{I1ZA2JkP-^rAH$bZF@ZCjIYAXo1>Jhlaf5zTsKgl z77g|I^8);!n?&5F_!Z3`JM`Z#14@TPk@?($gpxfj#4`r$t%c<?hHM>g1zG?6W&NjN z=Y8^j)7{@^^{?MT{(ozT;q>MGS67X^sP^`JyL}Ud@{pxPPs^8hc&lU>Qz7(6Uga`N z43ByAxJ{?vKoZo4X5a<o&v?O6P52T+%u}Z##cZYaN;{N64IEu`=lMrb-kJZ!=t21< z1Q_JvKYB%y&dGm|qW0QY1&?m?W%V)(n1~0sN7QX~q?tsy(1TmN7O^n+QkoLdOttD@ zK4vu|C7@_;!nxC;Y86><sgr=5(EZb=%g&2QJ}aRzLd@joq^ti}!#ZHN?T>pX|4D;# z*ywV{mBN;lD8u+d$#9mY)*|f&9BOWpuv}Ob&(g#-aQA$eZTEBg6ZD|^c%_|r{X1;? z9tp<bjp;`7??Lp1)lTk^XOu%o^O!S>9L*a3r7WiUy{|+ZLpiF&Arp+e)OnKy4LlZO zVKK0w>*qC)e_!a_v7q7%5S=T(Wsb9mHfkW(e!^+t0P1#nu%J}y;)Lq`5?FJ*)rL^@ zBBaPsDSRWqHu8~z)ol8!mpvHvp?SZ$?p$klI(-&=cg0xvWG9ryamrnw-G`V=+|Het zT{dw-GE&3ZH=IS0MM;BAS%v`*2Mv?8D$uNfBTkC++suXvba?ER70v`zN{oX0vlLm8 zmYUT!1niT;Ig~p_kmga8!@(Hqv%nKFqgFS$SkNeW{ofJkB@QwJJ%5w}sILL2vAVRl zwo&VPbSOz<+w}~IIDu31S<gzd^0^+`PSUA&a3``DpZd99z&{*Z9xp7O{&MVn><Pgp zyCICIu0ao|*QT<mBTI-ls=Mk2syXuOPAkI!xbT>_u3UOM8~kFV`vvW4-D^Kej@{9d zb+@zaPKR;3ND7V){lb<hK%7B?mutRY5+p2C<j%YL_-kF&aEuH|<RsvHub}h9uMhit zl(K}MZa!|7SsYJ%cENed9e>4_F}`5AKYKw%8INPFe1_x*rFB->Xus^f*?>>0(h@-9 zpwfbaOPCC)vR{35ZPak^ai&~~*lwWPaU=d_-?q3!O{_>D5pi+)$t6wlZ^bfEe?9kf zG`Qvc4`@0b*_~H+nSyYrb|o_3&NQF$Rclt-8n3wSczI9`YS{S0z-;V6=pHJLC^aq^ zeUAkl4x_sh&XxkRLD1x?O)7UB)<m5YE-nSo<ZyK$>Gc<BrBV|`VbY&Ng}PFWCCmgW z#RgKnU2>pq(9W|T%n2>C`uX`1(rnn8c1Lz9)u=mJ;MUoos?Et-<BLy{pWCtVZ3~d* zH#Ax3Nr?VBWGwd&K!6im<oNwVaRzMeYL@oT5AQ1FL_Ica)@-ROU#~q{*=pkm#N!Y; z*?H}}^@Gth#XOGRZso(>fP%-JPah+AC+^A`;fZu!#=Du!Ts;|{L}4<RXH3BYF!j?_ zp%1}K?+T4J<#}gEFPe^|>g*IC-mE)qQ;uv*ryQp^tZOQ@65E^?+Ru~1?~C{Y(5P8R z^z!$xhGuY9N6Ypc96DooJK3vN9%<c{g2cjlRL-LDAxmu>btNxuJAJb#pS}oAmAZXZ z!7X<jwnX1b$_FY_3wGUl6QTE|imtP%t&~X5wMFiYUZ&yiThG>%?v9t{)0Ztauq%_% zpDdPu$}o#xoxGse{fmK5`d6-#(P0gLeS7a_9?a_WCLc|J-QN-nM2$$VhK4PdIpgV{ zL#;$tdqn{{qw%(hLg>Ro_>NJpm8<~u>5?BuZ2|U$i$hRS!C7aG6|*Bjb=`n~dfIDU zPaksB9T#<qx(n3|XmD&!rtPN~88H(Jqo;jnN0hZ(^-Tx!{3q{eO|ovhT~2@>>gH$` zI|s()Q{1)r8(7i>;(aWqb*h_t8?WbcZu3J%2#v(4{EPE_;G$+@<=w5}tdS)x(cGrT z-^M9e6h3f&UGA_(SIa_lN0H_hM$zbWf$xo+Pv~v9n@w(CW@vYQyV*o}v``Qa>di6l z;E$NJuSn^)hHXxU5>xZ+(|N(g7ppSXrI&irbYqsQGH>5f%u@J)-V<%<cX&{B`^HSO z46;aHvWky~swp6Hv8m1VNIhnNEyrddz*njGGB}(YIEP1RD8iGP-pS$+i^YmKJd-3S zfX|&O(ZL6YF-fM^PwYROoxHmW7FU)G_l8IoT`WWE2h8MxcyI_czA@rKM94(_3r(I# zg~4}!R;LJb^GDFj-oV?@)d<{ArCrc(i|}U~Al=(fy?rD4r+~10RgD@$-0BtuYv@D- z@!wB@?KMzlvK5%=qx_$gt&fW|n+SQNpG5cfeb2%)s+K+$ar#TVo*UEOFSzS8daDNB z7F?NI-NtJ&<TLKMC$Lh`xUy2*8K70#=uG@#dqCZCm?2W*4P$~!5zOrb&7<@6Jq=R# zUmZ_$L6MlwCHc_mf8JgE3I_0mCp$+<O|L~T{bWe3;I@xgtKODAnhlk4+4xo1a=X}| zJ$hL9bd!|&spCe6y*{X#nNd1Udr@K%--eBiyT|$Z#nuOSUSuqzRX=yx|DEE&G$DjU zwu@a2@rXm?Y=9d%VbnZk1)DQ1G4uUBccXT;JB3F{g^#r_;FFX*(r+DdUav9Kaz%&7 zfo5>~N!PuDy;l$7KiwNmtpXuqK3>_s6Z=Z7K-=AQf7)jtU5Z*@f66m-*vlNu&0T~M zaL}$ed6wT)>O5-CFYksUwGhUnf;&Mpc71a8Ei?{8Aq+29T3Pc;_-y7K<JC${7@D|D z`j`Yj1_zF(0Fz2m3pg+qCx__b3Y!Hr&x^z%t$zMw;xDk#_VS#+KI;Z-PR5ZvRp8V; zJwCu-?Q0okyc+=e^%!18lu)oL4Sjy7Yj(J^q?D`1eO8kzm*O4H4&$e}lnFW#QVT(b z<Pti-6tw@kCv>j3noe^RlLTrN*7^dwL%ORmmbDUDTOe1Lp6pEuBUdFD<MiN0i<#!5 z$b*Z+Lz0@n3?soY9mpvJo8QC1A(#B#Sez%#4mEHvM`*<KIjOHe2U-Ov!0OR@T^T*p zdtblNhm=>4y?R5$bhs!@s~OXq0I4M4#22fKHC_hoNPmsYpaGnjX8&!p@ENE-S-Ks? zBz$l-qze>2Ew8(#A;|eF)H}Fmd<wnX@2Az|j7#=`Kp|7UDX(gcf3oUM(UaYxH%%Yy z8;N-_C}_UBG7P}v5o)5QipG9O2SJT@E5Bw}&9o;~!i*No0}E&A4)CpP`Fi`V{bN~j z@s#p3mQeZhCSkT;9Hb>0{0enjMjA<l%>aAZj*$k4wO0<}fOG{!Q`x9xUEJ*(eDp;m z?yES_eqvB4gXFSe65R{1ndY<KgN2MTbW-}%B_*DT5YwKcM2{RGBK+}o%b)%+eR~`e zGFZ7)lCgLOJFIfQ5M2!Y44A3w-nhd+nWYwOb=Uq0NA-pWG06UPmi<}b%=O)Xxvdmw z^I_Bu+59&qH7*o{S*OC=<h=g0!~#GF*7+3ukGiEet9wVB!07(w%<92H!k!>2;$SY) z43#h8W7kp!*JJ|nzxn;8Yb))%lO=$68C21-g8J_Z>~_k>Z-0rt=3v6RD;9V=uFpy~ zdQ6>pr?u<pO?<$j0`Rqg?4pzXfLG*gPxSVACe`1z7qjN~WK+e1AM~$|SC!FN)ng+; zI{`T91?a`@#y$vD9c;*W^H<YAzLv1_Qd;E7LV_ETHLu)b>UsS%=xQTatlBw5<&T2H zbgVZH7j!#4Hmh@<7RXFWTkgx8xo{hEsy}`Dq;V@;3S>w3uk^CtVCBb3PqIYVeh2>0 zHcs8iZp@ina#f1$mwwQ&psOpke$XR_1KLlBu*btS{*?WVjeNSk2aQ&1t&L7*DdxUm zjO`LEt11HNC^h)q+Q5LFmj_8Dvg^j-kJIsPJKs|SW0h!5a{onJ%JNfhX2+!J@MIJk z0XX<>GqvTnfily<j!OI0EJeWahVa}sU_@2k>#-3if!y`X+Tz0wA3L2<ARZ2;lJbN@ zq^6JZ>uw&_vYzeJXN9!;tzwdmATtn|&hiPm|FoxrWN=K#rTV6B-oH4YGea#2mE*GQ zdrk=>pV$KN<t9s4wXSAcQCr--Hys3+H6e!+CK!68-_fV`tcAVS`CCf(xBA1tfxH%o z)8&M_lINK9@8bL4vh4^4N~&H<d;JZK{&t|mT|o^r(=C9B{-4qCKWE<<q|&>q(tH&E z2-JU<OF^Fw8V@|Ra>|$d{(t`MpI@b7y5mX&<`iyVMvzE%>3Db45^3C<u0i3{=uHer z{-MU|wYtK9D!^&?o2q5#-2sUons1MJogqqot_%LM0`AqA-lMYkS?}|63W+EDbX#zw zL+EHFb!)8BE*qmH?GKl}jNUYi)v=lXDPdA4N-Y(~-w#JGhZ`v-sqQYO1djZSdhC!X z1ZYqxz?#7Ua9&>?F&6g%+VqB_W=9?wQwzj|{UFRize)(vBqMyH$2(@_3A5{0+?|iH zj27ZJuTK1RMdek&zOW?FwEh_vJMR5gpS3;lNs)#Lt^*T@BXiTP#Aocg9ZtP6LI>ZP zKiv%77PH93!7;hTL0}AIlf>Sm;8h=5#Et9$(41@r5^B08*+F>U1+kXzemhHF5=L^% zCYDj^Rrcnn(XxEkvy(liU^~g#huZa6y?l56fw|=DV1K<(F7nivP;wWcOPo%)FBPr# zGU9=R3N`UM7e*cfgo!`{_pX@VZds)}`MEBX$awT%dtr3;M`$q@(o`jD|9CK0y$l-9 z{|>2$1#R$s?st9eNoqguq{~cO-fG`|-VCZVB;bqKeAi-rQl3Jf)AsxUdYTq(A**UT z#{4?{p4qp-E{UvOu)wbxKpCa>8l&{5xoq=DHuZU4xqR}uOxt15qyWZnVv6^;Bq1Q% zC50!e5g_%_-fNgb?bck|Xuq<SIXEL*M?P-XAE*>SJ0mmPca`Hx%?yp#Yxa;}zj@mX z_!qL&EpVvsihU|*p>-Q05!{h=-e|yIojf}&vs>zE5;|N=dEi7j%X|2$$&JK1E3l&h z;6y_2eK(`=tbWrmL*^OMxrUB^#I8Zpvp>P^-go5&zio!#M*Rh)9F>Q{fzN?$QA93{ z{SMHDMqp;>+`M_y9%#Xl(m_qr$_ua>_C5l)Hny^%w=Fb=U`W+4>mLlYI=r(Ey;8iY zKnJ?$9@m|sIjEmlX+JpIn{=DRrww!C%ItOqgaP@ciSTHDCUDh*h<&5Q-y&tO^(87? z!8?FPV8n}3)5z^~J0aI$eWKRIWZw-iYIC5$YaiACo`H1Sd}G>|5$vXwDt=|s6WT)5 zD8Q`URcfkyv><%8w2hbxS3WK*SqBSyQhRpL>2_Rc81K}~`%@V>E%>?$lfWB@9#{vH zsP*|6fZk{%JxU78t2>3G`Z7b;OOvO(a9$KC)^1g8wX#Y<xm}M|%P<Bn?bs6_F^~EC zv$g6F7)?o=8vF%^A?;-(Qa(-cU^=dkNDQ0Y+!+wI(Zpw-IcCE}r#JX_!Ks~Ti(5<p zLVaY%5h&N=Wgt)bHJw+vvt^S!ggd38xi;-ymRQ;j3#?bqbOJ!sS`$`Q`-1ghi+NGP zod_?6Jl6MODA&^nA!TmUft`dD>$%p0srcn=?eN+cgb3!T)NL3rkDjIh%#IFsXfYc_ z>c`K&H2B*_Ln<)|v+S|7>v_VISAqzV+;(1h2xMOj%w@Bw7F%=s!TVJ24KRpaX`ur> z;TA8dH~oGPD0UotIkQ&h7{fV$SiHCLtBe#X!AzEfCe)t2Kkhi=Z{Pi#a@c7h&d`U( zUIked@A%8N_L++Rj7hArd{lTJ5yTxI?^@XIxPz86Ak;a)K@uWMaT00{q@`sY&5%o3 z0r_TE5O2OC&NNaJo*4&xo%F;eYRhUJAnvPH!KIcFy6B%+>5A@G-u-q>W<Sx}TU);C zSpyl`#R$+l^!nr^uga0gx04hx^LD=^%?HA#`zZ-Bvw$n@+I+;gZF`lnd|~8MAMUq5 zPnx(z$deI3)%+65!>n>GWWLQ2EP5_jRUws>t$Ff#f}<r>!HeWT;>``|2BNW<@O(WC zZAUlMpa|n~CiKwaSVeK1-GJ)A7a3aGso+wfmw19d6tJoA9#%T6uU&v;g$iBcj|AkD z8?Wg)yT&3apKc(C9_m6TG0MF7h0bUG6a7C@S!z5mxzZ;1l0?rp&6p)o%$oR0U$LQ# z8-5)Xs=x70s+QYH|D<5vMP;<MtfhMwga+yBrnDjAzY2)%o|B37nqY9B<85;@Wtq#| zv#jNbKeE6X(djPA)Xb`)N>IcX1e{~Rr$zp52@ZDjIu!cQOJKcJ6Z<;4KvtfE0R8lm zM9nkXGFSUd*Q4FSi<Wro3KzL|)*oapc;j3agzs$V%SH9m<%!v#aR?;bnb8AXWLi{T zjaP;Wb^4_f6nW8OvKt}?WhVWt<KvS&qbKBj@>3H2=;epWoe|YQ-@qnciY-6|WeDN& zSSue{^S;~HQo4F`8CS$NR)i&WD1taV;rF1#J9!N`_$#C*auRi2Na0L?EuVvqY$9%7 ziim$N8Z{UgUIjE`;ULwT7^>fjHpE*}KJl(xj|R!|l|)T4s*jQf3t?O<(ulPEM<$C5 z?b%6l?a|!Zjrz|6bM?DZwM9SAK%g2+c}EyUvBxBPp_FQdJF@xoXq|SPtqryRNKbWX z;ypxMWupA8ZZFNLz{}<FB*;f^TSAEjoH$mzhdXM_YK+8>DVDG8{#a67kWL_)yBQ)x zO=tpWcy7{d7DDgL%gg@skK=Tuit^%_mxB0h7pJl_6SZuw!ifbHi}ZfL?%a6zi&A|B z?($t08{_>N@Nu--{s{TWr|cbgBYfiqNDU=WlC@YXn!j65*tiHv@j$Koy1~dl9&KvQ zyS4ku&~mCY@I>%h+fDOCrB0k&;e}Y6SN<r0mjK;MEEPy?UKl+|;fyM!((3=5%lEkN zb6%?VT5L!_+$+fvSjjZZhBU(+*2r!ge>ofq<#`?oXV!~U&_vTcIoatwxkVoRcosdV z#ml{D`gIE?MJOs7iX+CNB|eOIOGH}~K~Io8X#JrhH|TZT*M~*UN}a?NKUj8Hx^L0T z4Ho3zXHgC$LO<z70?^;CVJDxG%l~A1N%Q;tKE>VcPW?M&Q)R^qO1aS$oocYjm=_1E z>-)#v#MJuKV`K)Z^YvC*3H}zJ%YjC%a^f>MYUv1Qg8z*`(v9O4S<;9*++6<sqzZUK zLH0tmH=F!SEmh}>z}u^gZ%LZE;NxETkZ)nkuU$F`(M8|cHxdPY_LpZ>aNF)3P-?kc zDf&oUk>XoM@vSTN+UB$OL(OYm-i}m!)~S{d<-2fuiBV%CR^sfiaeJK`jJbpM(f8D$ zh76%4f$+qPpC&;AqJ2rvv;;}GhLHoNr$pSpeBMbta>_>NXjNo12>+Bzf*S{1rs1vC zjHWw$cY$QX25!WDk$5<bkCW?X=zQ;Yztr3JmnBl1MD^0(CMubt5(!t@PZDplQ;kRp zDstI|c?d;+Nhx5!i`Y>m2-I8t(&<01)V(0OU}snpn(PEHyCF+4o61=sU$Y%At4PSC zFUP=Kt?c`uQSaB0^{Pnp%G;7Sw~3|h2TtHAr@x{@kUyZWX4)#hbz%M5^{(+T3>mb1 zGMGB-FzH%G17A!+tX&9y?%*^D$Ve?VY&6ccN1~Pz`dL=($Y+9lq!vIm0^tjsk72j7 zBQ1f|lHNC{{zb$OhRA)1PcnRS<j%{PUslRz0=BosjI{9ZTEm!AB88Yq@t*A5B7XlK zJ*~RU#sqmgA7yyBmHo4o5$;n-HOO5Od_Q>L_=3p?;rY+HZ?<1EZ6wpDBuk*>qsX7i z-aSn?-C;b#DB@$>$=0((Pm&^G0Qf?ViPoAn?c4~GkNcJHT@>@Id}<>y%brixy1LTz zPvxIbaLMy;eZPC6H}j}Z6h(O1*iDf21eoP}p)ROu<D$2C{(ajFeFBxaNad(ssEoO8 za=`>bv&^RnuDemBqTe9~zFS=nI|cVNXsvouCle5dnGSNDabF|I-<Pi<M>Q<Hqb9&S z;x`rhoO}_KdN*+l5tW%Y{`Fn}Bam&a#hTslKpf+$$4j@+LdB87vk|v&JgSOc{duD3 zU#wgFx%-_pi`v;{Pw}Rn*Y|%%y!<POgL`%`jFkHgio_C+$U3G(E4g_oC~#}=$tj=t zH6*MK;ToYWs&YF%rBU2V-#1>dtRNSD;Tt3ORiBHlG_Q%jCt(XC)N7Ov!VODw_`2<V zBYwO%5~I#c8O@9>`mwa%y}Dj^h7eZv^59Pj=tfW5iHS9nU`G{5cV>mkb8-HnoZSc% zV%(Gn7@jLE?iBm}(w&X?SvuV-Tc&Jadv0$Bz3()$cxoGuuIT5J=VUpx;n82d%=)@A z47H@d(PD<twr<kS2~O4lqlH(2CRB$Aw(p#|p42Iyb;>3RpRP;8iR7Gd<z*m~iZD_X zoI5|Hb`O}6Qimg|Ed$(srv~p)JFtqiAK6=>q#%+DvT=U87iL?p{BdxF2v;6(CW*Zk z43Vfj68;hfBcnsmo*2n%Qbmh5YBVvTpFUa6NICu$NAsFme-J{OV41upuq}a<_TB0* z);clz$vlUY?)@UOSA+Fy`zheVs~8(!Yh`jhXHAE(JthgC+1dU0@XBP-^DU@drrh~6 z3mAFo^#bDVcf34aVZW-@TkV8VP;_yaH$CVbPS5*&;%437c}Mr8aHa{`F`5F`@i<7u z>qkiCtUMj*`p=(p!Na%CB_!FUj4uIHWvt*-e=t$x%)Sbroqw?ewakGnHN?`+(aV5a zYdZixt9ea!{>E?Cz)<jos<D@lFOW5x?*W(FMNBU{hTHFcst2OW2q=jOcG}~Lh4|tt zcg0q=PBUv~Kt*R2NL5}zMoB6jd7B{Spx{@8+u|^*20TPSDd4vEi>XIfJnBI)$gCrl zPhf>l=PRx-SFF;{1mVea>A1>9o)HIts{#)UF+OaNG_YWMmdsu&V_w;P{C*;xnBxl4 z(>f7$y$fbG_5<1GVq9@|a=ql~ssbq0Fk1nSlKg`;YTcx08*h<h&v~uF&<D;i>R8tp zAi?g4;r$cUP7)Sz!Z8e{VZGg7q+$%t_T0`E7FzkI-dzCx{M+51k2_~eUM9izdS!%% ztJZ5{^3kuY)@qN|wgvT)@s~%-EX{_2muG~L0`~hZu0S*KIPb13T2%irB(TIr;;dQz z#}otMwCPS%!-yeiRZs}=V6kDRje`ltt3xZ@=1+yecVCQP#Gb<#E1PQ3HyQREfrA(R zR3JXtw%fQR%I6KJ1nkXL@~m>Z^u7^MvhOr_0h#!js%|C}2lU=~Z|vX3X?6JZ&6fvp z>^NGW<2kAL3=5B5AtJ%;bhwi;@gM;s?dpW?-fhh91<SiN`vY-gH8$PobEKQ8S!n~B zny<-}00HeSb-WEkj;rg}w~eh$ew0T=IT{r`=LVSz-pFoor_kf^EBP}lq=Ly3EtmY; z;RAfVaeMq?)qcC7{u*ETKFm{`RccgNr%zl3#ht+1o*+5?mSxvqv!3zev(vr0lc$8h zvMxxlK_&aK7Xh-xpctSR_*xd(OZ=cBuJPO%PjDaWD+Kn&K%Lv!EeB&j#%p$ZUP|C^ zS^xYL4#E;be^s00lZfr3OhOFg)W=gMKD6mfxFGr4)`93;9V#&{Hm!GPaNi8gv0Vxo zNZUq8D9R8o1_~W!Sl)93yLBQID7gDMbF<W>KPz3JmQ^7`n^My;X%+1CZe-nY6N_Tj ztPh>M?n#`(gfY<aNKk+~O!C86bJPod6s+^DawBUsdz#s>DkQ1LqMbh#_whq=CZ|8F zpT}`SyXx%p$hFqw=lW1#it!Mz&Z@hCZDs;?q{33X4j3ioQ}yoYn<x3Thb9SM)}#mR z!Xwz!O1>`-<eFjt(l{eU$n|hvU{H~Rdj-{DH$IK{cIAaiXS|?m0d$n5E6JL*E3x_P zwKQK-<mP4z?Vb~Bfh@4h6Abe;YpiccZvi)X3wp4F8teq}NFSJ*LBuyW>otMmQQ?pt zXUnH+0s6}_5@sJ|w>CBmY>rteim~$3L(~a^<r_v^L}e@ITWkpdFs$+C(DraE@!xV; zEgh`R#SvciO1|hgH=ZgHitD^uE<R6qdFj@o3oCO_strq<tt8R)2O9~(t^p|$3B0bn z<SOz(8NlOsXo&Z7=cZPvN%)!2qD|B*tW?0Fgq|dIde$oY%15%p%z)Rk3&fdPnZ@{3 z^RJIExsDBEmCYG{={ZkG2h3z1H{c}s+uM$_fN@l5y<6W~<6ZbbkQ!4zQi?MBDvEae zY;0#TSkg!$*fs8|H6R)BAd37saLiVtP4fz4EGmDHmw!mNtUYM%+n)qyZs-l300@G) zNmjZI;F&a0sr5S|fZ#rYJOkd2EA$wc43=LK5S6Yw-7ji4PqMP}wvO`D%Q|@9XYYC9 zP%CS^^`f!)`4ABYw|So`aLR4zg+t&QLgmZ-vs>;3&D@0>Wn<QUmepsYlcxr5Cn&Ae z%rEgHNt*Ntzz*u&lXL{Gn-od3=~Tkm@fWbVnggI0pe_m?`aKO4yLoIEWsg9~-E<+| z*#ha`P5N}>UFH?FX9V0v+3f4p+X1Aa@8j<RAy>*_$>al1XR1$%zfM^B^k6nLojwMb z&z7z00BFkA#;cC7TGJvmmp!RLJ;QBCaMW-vo9>ebL|M}*%^cJu7a~_lEWB{kmhqA= z+V-m^5aF4FOuhh9<i&f~!_55Q%LLbQe{!dSxMkf5ay>ky{=Hehvq%ClS`-dEwG#s^ z#6j9wtm#BB83ExDBV0*yA<iM5bdC8&1hC+><L32x_rw}%^|qvJA4FiXpqCVIZ3#zj zrU{*IEHgbB=J99-!sqm0(`9h?H5V@3jRJ?A2M6>W*g0sQ8POtkyfVugeHm}f;NZr= z@_k!}SAvh4Fb+Y)l$SLSi%<b(&ZHTWj8r3eXq5+}iQ_7;UuX}-f%9i+N%$edupam{ zZyYvRA&CNq&<&AMF;5Q0I9qvS1Ce?5%=@Y?MV|4vyy?^s3942}cPu=PFs_m?97?s@ zJrmCBtJGU)1aRE9Yi{(7-WyJ>1P@UFf<NsL9O;2eSpGhB@X*a0DF|v$t};a29;QVG z+@G=ofKH7oQ=og%;H4J=f0d!^+u;lMRLD{3CgGb6GILN2^g!iRbxb(U5DQ@FV~~bF zH7^oC%MgCn?yw>4B$Q$FGU3w4*D`|KJZ7pc6#cAFYzQ6=*ZU|Bu}8gD>XL-Fm=}Z1 zf}RNm?ZD*f#Rct(UaIA5C*f$Fd#&!Tu;JR6N8~ZM4GPmcQ0~L;Gb=wx0E8z(cB*m* z&k4m{-5S@eAIivP^ylww3bihLF#?9Q?NNfAq$#OY#oRlc0Q&Snd&42rCrh>1AmW7k zRxtdo(a<eo%WJ|~o^aS=-bqj&UH(N?2IAq=W3Jc`s_!ySrg0~~XHPp7p<qcTzuFRk zM4s}&VW#Ic>Z-?={CX4{->;oNaj9D&O_E|V^zH*cl8RJ_$8v_)@>uFjfI!Dya#w-U zvTIV+Joh~Xal!}h$vv2<Ld55KyJW0MC2IJ&#uOhh$I?c<CwHZZ@G|87jEaRhua?#} zoc!|R*loCuw(gdd&k|tH#`KRIqpQ8ediSJj40fXWOc~<pU=qtek|sC^zw0mL9cXaL z_|EfAtLZ9-4da7HWn+MN`D!ngiD828Ad&=&E#8PQQ8&jgq76*Apb=9C8{}u%{l-sv z?;uHJpLs3aT{q|UYT4Ukcnj6IP0PL8VMkH0vDGqj6whFr_D43A@}Y56tse9(BYi~{ z<sIzH+_5G@$&%p+OLCcu4{@oiN0gv!#<drTjZ;&nQ~P4*?wz!^Ev?6UKktDG-s_{w zt0v!&C4<f>y`w9Wu(_PkUH&TS5kk3Lkjy-_6Ck*=W=p_*?twC+?mI}Ps^*!Yi^J6) zZYw|Y<uM=GpYnp|8Ql&xlD8xR7PI{Nb%y?D?pNd5K>Bz4;(n{{^_XyUqo~BSFWGw^ zLhfsKvKyDP$I;@w4eLvpYogRD0rh0YQL&wsEy>8a>BrP(6{PESBo1@@S~iVFi|kSZ zaWFE`HV!KrWc9{ZB2^rpr8hEyn3|QN`<T}AZwvLHzIh&iL(d?>79v>C{1jn(hoR4S zpu9#0-WVf5h)^_%`5x$g&3@-WshF*Rye9KAc7~pVWS~GtaIm~)IQ><e#oZSHZ)dh6 zi<Q`7D#R9+5$t&55(#GV9Qf^ZoNvAnOa|pmdtYV1yTo;+1dea?nSr~R*S>M?UTEKw zJh6kW6cOSomX!Iyu1zjwulY+|r9s}GTP<*AL|fqCn4ORb5sGC{HmDlL&GGgYa<zDS zYskxd+=m+*rD2*`_CCmV{Q^`Fjs2ce`FXPLs#(<OX|{vc{mBUbiR@tY8qRp9`I~h| z?)bMqGf<<&yEp9?YVYqVjdM?WL@<9(t`DBS5}e>Y)?@SevfxXxx0ZdyX@J|MR|xgd z)f%)@3Exr}Gbk)$iJUj<5}hVYHCnquoRp?h-NUz3l>`Y9DyHgrnV=pw7#q@&mbXd4 z*;CPX%t@8}fL8(<Xng7q3h{bX>Nj>@CGZj-{VvO5$}0Q`uFL1|tq{b4GwmZop#9#H z>>B}i`dM}Zcc*5+L2XhOJcC`kfR}$i3>2BRB(<0Oe)8Rsev;&@seiNWi{6i`0~YxM z14t>>7(SZ_|C<601EiDMY|*^d{!_VQlS#4Es!%bL#lbNmhY6=IXVkl(o#H@jaQ{cN zU0E3%mhli)L)iCN8&f!@=I+T3ei~g;M`az(^$dBRM(IMq+J<sU`Fu>*<PX5QM)5iO z9zR>B_%3_5cAoe{-BC3#yH&ld<e{}xpSd#&1MC3&j{aawSP9Hb^qSx7swOcJRZ4_3 zYI(tp$3bD&g$(LW(!T_T;4dYgXAbQoNk}?+p+7lHgRXJj+jVF{IRYfFGyY7Ehew_& zmtyM@*C+5x>+CQxflO`GM1_ulJIpkBhcVvqt3~aB0qxVCG5isps?;<5rKgLk5~04r zJ6%wF;1(b8aY_rUa`n#k`ktPp>eTd+<t6!rk$>+#CfRhSt$XBu+6`J7XrsI&`unS% zCzO#f_3^tldt^tTV(WnYfBHD=mDMxs>_v^6ttim1xO2_JXNJi!ZALUy$dZbmz0%TF zFduVzY_Bl=VkdZnpZ6+~>NQ52fgEn{`HqSY-4#eO-cR95f>O9#b054%$?~O)x6eqq z$)D4jeD6IfI1LOto~u2{Ehq8@?+cjeb}z<k&;Qibx3<F`Ux`k(9(PAjfv~fxYCl@f zd8ud4zTv=d7M0X!_wD$A$dxWdbDZB|D0$LHL~?$r^=?$1dZp&D>Rm+g%#!7&UE;>I zZ<Z<O3O<=iff|_vAyCVo94eLnf7p5ps3^O4{U1ge>6BKa8wI3G=|(ywrMo1DPC*($ zIz(#d?h+6Xq@|_1JN_HrbI$ku{m)rz7R%)thG(9A&)#=j*JrYC;~2`eC`fMq3?yuL zOGpHl$=>iG3dX-B5)?~Ei=ki4G4v<-CcZV26Jn5WsGwk~q%V`@0~)jgxZhE?mq}}H z74|aHjxc|3Xo-7R#5!^ffdLv%L-?czb0!4`+QzDe3_hHkGqZP%^E|<G)Je7_r_}eJ ziFqv|7oMN4Xz~I*Xt3`VVl*xZ#=JJ5%1XmztAD4jQWjAAES$Zu2~R!yt>*O3ZgY2q z&3+)Q9+eYWm^>h#sPx&{#?hCYEMSzs;K#e`2{cdOx#CkBP^<?C2P!X~Y9TM8(-h3I z%HM3liDg=GwQ;Wd#gSZ=Z!19)b!YEL(Fdh4#=Igbu@SfFC&x;L-odkCEYrSSr<1ha z{Zu)RxDwCrI)cxfHGEzcng<1Ys-R_XaXl^y35BqHMy4id3f(K3<V|?m;<H7Qg>>*< zMKKKYjyW6X&-e<Oj7jT>_=I^AI2u^W?vwqBk6-wG+Tp!7t~T6%i;FU8yQF0r(V~!7 zp_15ygK}>-r8@b_Lp7plAP7!kUMm*w;pl>c@S|*WhzoO`6h}m3x1o?aE<JhfE<sg| z&=DQHQK=syX_;_#KDuEibCSjHl(Sz=<Ll;gzO2@chqBOqvHml&V6~BH^SYXD)V6pz z{cF1L+MYo4VS*Q^p#Biic$M+;zASqKG|G6GxA;PFsBS~=mVmY-ty5c_00ADuG@sXW zOq`xAu7!xik|m{0PoE;G=`2m8&MZQI;7wAY$<l2)6OH5$6ZGJ|Wy8sx{3Fi25Hs7( zFtEyBKgsv``vyGas6IGkO@^_u;<5ZTMqFzHfFr!n`@3L*k=1uvjDp*C;S`pdYMo)} zozyqYsKbSCZTtO2Dj-*w5|ozDF?o;!C7R#fr_<_8I?tDa(e(uAK*ZB-j29)PHr;kv zlg1%ql5GeVG3cS9C9y%SNOO7Bj`;j=Y{UDL#NsUa(E_&{>;((VS<ok)mUvB>MA~Bs zQ9%6h(Rr=Ac;}clk`OC4z%evEg^$D+;>E}K+i9^!2}J+&y1LIoFMC%D3>g{?GBdpt zJENyB00;<cZjS9c4$gOe=tVGzcS}N*z}26YOfS1*h5Uonx7Z|>Vn3Nb31zguX56f1 zE*O^lAg%OU4<}TAa&v}t<n+r?)cyT(DOrTKia6DculW6agpl(`acprKjNf?@g>H%r zD26)}<{$rR%lt&N_21ji;D{KWqXtqoSpJ-AGA){$*+(XQ=`*y)1SctGh=qdBq}|23 zJ<_MZpX;(?Yks?-2x>`BzYOtb5B2m)j$i4fm}2_7I3msaeL6q|*xs%65}?&82=+tj zD%NeOI^CKX{b;?=<%{WT6ITjV1_Fu0`ds|Ki}%luoeDr9$)aqa#LSR6FiPT@E~i4Z zo;ynwJRKQ!y~?t=v9~~6D!uhzk=6P;r*Ul+IcZQ3ja*VCoQh)em9>kQ^JP5Sz%ggj zvH`X(*GZn%X`E~B@Y8;!tkGSGsBF&@IeYv6N;3Xt8sA^Q-+muAo-LC-Vpil7qZ&s% z=@fcghC|}5()=SH>u(banuc(4U-|Qqaa*P|0-Iw8<I48D>$(9vx;Mp1y;SdOIBN1? zK9~Q9IOv@rSxf4|wl&s+X+)Vn)nd_}#sr95V6MPWi~h-PfDU@;-lCyYr^U=0O8+A0 z2PJgXisvFy9K2KjF%S~2SHAhLmfc_B$qqO4fSN~Ozvht>6@rQsmDgRT6B<EO_CKnW zm@1Krd(HPSg%6V4%xRF)UvDntHh9VLoD6gSXchcx<{qR@rRO_^KZ7UJ9g8b<PI)H% zwEVBMT?C4Q0;0CQ4L{9)EkfjiEO6b6R|?Hs2J1hu`nNEEgU+JlZbyHfB`#<AXWRHI z^K{nht=1ELr5exC3X1TRTK3C-33g(lAvdr=N!^P7xkIiwaH0`&p?V@%2_G|X04w06 zQ>Of1gEth&2qotx{?Au+der<CfGVNfq?!5s)JeK_ABQzM;LI|4+k5&c*qY9%uF|w= za$o*;2#M?=j^54$!%6H3zu1BPXU-rZgSKONknOPBub!h)A78BM8uU#qFHO+3`|zxd zrgy4+Hx^w8pTUUGV6yYf#^~O~L%{V7R*`<8wQI;g+$!KVoc6M5j}Zj^kLb~a8oP9} z!-+f9R7<zwHOKW96#eE;TMb4<@gEEb;zLp;D&!geFYO^zm>y>LYvv5laCT=@8}HiF zT=(~6)lH{<hB?{v&zf?ZAAZZloX_&mGngz=<Ylk94b+OTIZDerJ082NalOr-I=XQ` zyhsqdIb=#?NuZpLqx-J~z<&mvMPPfo`)se3adqILmvZxqb|^}r%u^hCeW@)`u75)A zzY4n~h|4#1SnKK5^7%|JBIljc$jI60*C*UgOK6Q7bqd^flif9Dw-Wr>-m0mUCJBOf z^X&YER#yC(YJv~^85ZsOp%&8PBJaCjFMn5=7LhO1=aDZ5yO3~Ol<v;uCNkV>MX1jp zi_=X9YRTR>U`{uFqAV>mz1<Sp2Sf|4d%NDNMN#02Eb%Nbo2c;NdH_m9rMLV9a3}M| z&7IC0cI7f(!Ja!WIb<dP=9@d{AgZyPL%RQ24yMX&tsf{YQ|Gpq;?}3jueoYj01aod z^+y#{oK~xOivY0O_^&yg-=}L$vPmk`PP1Md7BS_V{cbW%H85zj^x$7ztZBjA=CO5X zkMcNMbNh44{XjH3j<($opfHt9f;E$jpO{{Bte!^kt7qp@5ShFD?$ze`x~H+=b++_C z(6O1S>b86(nXt5p6@2Z|+_-DQN2Hy<*k68KdoavZ6knU~@@?u{HR;Z!qEF2O<Yd={ zLP5}(%}T56vyDrf_nm-gOY@RIt<5!yva;qsLMAwf1#RZ`=c_%w_YsZU#GuBnu^nid zXHd(oE0o-Bz(}>Z?HQb?vQ^XBEiG}zz?E;<v)r2?U{fDUY}h8!Gv1hC>fF_+_p<P9 z=JK5;X^r@BlE|PotKP7k033(672gQ@H9J2i6zB5KCqF^IJym?^n@|Q!r!9{gYE;Ab z%C`F~2?pw{M#k?xGc~Z4{SpVE`ytKT@?R=dpniS8;PJgI`;)ZYYrOky(5A@h#9-CO zp5hM#?n7X1o5ZvV&CdPZ*!V5nV473*7o9?0`tXMG6#VB(kGyYu^k&9t_pZ4rbL=*( zu4{|UqxF5fzK;r1j@4v&FP_;f6n_+S-z-<}xP66LD80)#v7VE$^Yx>A2>=&8&}(kK z*_3AKuRdPAw%;%ruorIXyarb4Am*K)-Xy<+2X%^zNM%Hu<>ODpHL(z-g|00uty`}b z$V^OS5@GA5ynV<5Vzdvm8hqXQmSJ-tdprY4n*x!}CvMFas_QK1jos;_^^~jkM4L;a zCEj?gdxQHum&Qd;m$-=1lwliey>3Tt3O<}h-|nAgY-o}YX0OZNdMT}^v}U}IvQqm< zUX)6TD+{0b`|e!c`pJKTBdG)t)9ssu8zt5*Rg{)K0hXDkutHUH>O_Um9-o+Kz_UGV z))VY6Er#{CtL^8vN5EWrz~i@}&GtEe*ua(&BX!v>Q29V?l19e6ly`)remj<Kp3;oX zhi}y2KFy^|=uTUCo2S95VzPx|+cx~kR@p9v<D}1ZBdPK7uee7cjhqUwf_qngE;k;F zz+9`A-};xqq+AfG&jR;%+f?$5a$Nt~Zbhh67lRZfW<nW`Z%8qEorjw3e*dEU_`Rdj z`t*Zm``qDu3p!`9X5;*x$F1iBf^9cfNB>y-mBpVpEXz1k%4U!2>%%ku>!okGOOMB_ za^9>UZ}{p8X$YT|-=6PM+LUkiIh=jEzF6$eCa~K5Tp(QDsDC>|;pz63K@%r-@4|EP zcG1VA4ST>sGblrsEzon}q8+5r`);>!+wxf=-=%ou;zt(`E4}ruz2d7&wI?fOWhtAK z_A$s?7c_FJr|^m2|H=&ZCBOSLH&^Cuo~ldry3q6aB3{i%<%g=-Js;~3=SySCi$6?$ zS#OKqD^CvOg}FG2;%YH4e8rO=Za6x>=XSc5S(Ulg=a6)<UJD>{tY29=Z%#SeT>8+l zQ7ZG`Wq8PNa%<a6c*gQeLxh}~O?~z1Mv)m<`D${|HE;H^x6u&UoCgcWiWSs+17tR1 zyLXT9upR_*!n3C^j7?>?sCasUh}qEW(>OD>Q$bc|>K{`n5jUq{rI*e>I%hGSq3K(@ zPU<!&pikP6%p6B#6if@2n#25w&|o+0wu$?^*{N?8_8R`Um}ghOiVsli)pXp4Xt@4m zkfhRppeL4<b8T}ro?CtQWB(Bstb?{`z~=LgdNxK*h9tkxwi<0BPoDHXKt<R(!Lm!< zr=)QkU*xCKBO+(JebNo9`lm5HKXf-9;Wk9<OYqG8>YA3_$*M)ZrW~;$HAO-mlPY^x zh?`gIOT2$P-r#6^k-sy#y%2fW$;&VdSZuok#f^_9tuy`@<rO)7E!xA4q{To5Sc=nJ z_se7DJIU+KkecIWg)>XtUxW>CvQml-jp$qm6NkuECxTj*jeKTFYc`bHqT6)!lxrj; zqSB%Sr+cp&RGoz7k`ft0UwDlQOy<!1dfhCW?gFJj<oi%>_~}F2n9KUtL{cFcY4Nvn zzK0y8k`imT7Bi*5pj^&(6?FkRbYN0hi&|{ZI)CzgAeVn-Ac4soxCed=SoamhpuZ25 z!AL305_IvNsB<;-&5^h{9rj(g8aYSu-cEes1(#E~En0NhE;c-+F^54Or8hkFNPF_! zD1h$AS*Ofy<bE8E>a5E!uCPFUDVy5I*zSnSwl@L0lc^DNF2gVO_#`K_kn884k<>W1 zA62)wl^$g@I#*+m@DJ#n$DcRLjeA~v5yf+LeLq3;>_JVsVWL9tuiW%Vn~LxGs7nF4 z30)ok!Wfg-vFgSi@8AG-hI2?p&B(=fu%y<7KZ0F=@!2hCZ4L}EY-YW174J$4zIbh0 zsn1}{<yLuEnb`$j2%PHUxzfdn6-2514tUYGgIB{)El6K!CcYLp?^E|}_X#5vphQrF z3v*tc^9Rsg!S%qGY-{!Ic6xYk1e=7O37|I1zZ@HDh)UIkqpnPnK%pv>t0XLoBxIRj zdOjfb55RP#Q3TZUo1Z8xc4w;9L914HR?%lgF+E6D<XED~v9r)N^e4F;ER+&g<~W35 zFuAqEAcw$>NBoC_)4Q)4fom}LjnO|h7<e;g0A)Chx%8HA^wC?qFyZy!_|aMYLuvSW z<vnc`X=oIHH&|d;zCGGUj!Lz`nA^q{7#XBlLc+6A65Q)~(u#MFZ~1ULuTE5W|8+YZ z34eAC%bZ%iJ;CF!%<g%Q)(*#lE=)ntbn!cmavCtCi059OX^X=@mzgn$Gd*v)W)VI- z5mpeMS_smp)qZmx;89=g==47AXI{0puvwy-W1N_)tJ|f;#kX17(}v_$>uQisUk}-f zzhbbMf1HOjJ*Kwp<MMlJPdLGal83tr!eUy3%$42DR%MfXqEqIUm>p+nMbC0tp}Dcg zI;Qt&GQ%eZ3n{4n&C3?2mlk(e<I=A0LKzShC+ZxExz2<A$w`>5=q4{RDL6g3N=<*I z(V;?t%5Qo!PZk(oBn+*Il3$pAe6Vvds^2shOb^-PzkX{>iV8JBs9D1fRW!R#tC?Pd zOar5CIWA4beo*qSyJA^3=r3KYQS7FlN{L%p9>1nTXkKg9FuvFzY=(-J2|p3)#yGAo z!y@@g*F_|(7>!Yu;(@pcK_eKr+UC_0S9cMOi@|g|jtN=}DqRn*fBN;R&Z9@{st=>P z9-sv#<7(3^TG&s=#<><jMp&O}Aak`%il{9_Av8W%dw5-~oV>xm(&@AW7`e(9!yH`y z1=syMfY5<Q#QZUsmx**;MtM=0LAmT}U^aA(-TLb>Phrjn-LKnsSXlQoKBo!`ZkAe; zcRu}4pW;71i$vgKK>~Ue?1jkw68`johH<PyeOrpaj=4}<zKIjtqo=My^#|p=cnSUO zB;~9<f}I!tL>c=1iQBQt268Jcv+w1VYKM_<8Z?+~W105ne8Tg_m~<CBGsZ9O14Z0! zeU_?iVo{G|a?F`eDDLD}G5}7N(6fMYkGf#!_>a{6W%9>-er7Jz0*GXTjxwH=<<5It zNbAi}#Oda*-mA0SRBmD{p^MC2poW+L&Bj2N7GPiA1xB!%oM<7wrK=6Gx!t=lRmEvA zRlWHs2qbhL$vt<<N95h3+7u9hsNEQh+H1l1-E7+RV6lCoP?e5J?OXhVpA^`4EPz_r zAkhX4;cYNTUc!JN%S>yC6d@KTbY4ki;q?8h3h!Sgt^*Z=05@~Ck6h17@9dqGUd=U& zorpgBGx=CgL|mH3P{2V=v1k!OJd#d6@<+p=`PIt|iI>&I26M=4W1S};Il6vYI_6nB zbYJO4c%V#XN9hYgNLr+roeSs3XR;~JezSF3n`fu@Ue+ROPmF*;>HUb9gPWThYWo)v z2&(rw&%2L<tE~0UlU7#F542qE+{|3p8a<OzJk~tYGp#M3_H)^I=;)tfkg78>CY8=% zYc_Eg>*`7r5?l2Ue61FsxMqcCWcNCst}uNr0{PDan+^Uk@sd-WOc(^WP(7-{6n_@c zFb1u>wCmdJN_$rV?vVn*N$_>fwc6rVoEtJMIa0C(d$n;21u3~co~v8Ul*P|*&i)Z1 z6MS9xjQ3i&I+bqShfczS#uPL&49ebvUrigO%kZXc-thhGj!Z`%(H?s!bbCt`%ree# z7o1Yq_<6!VcFrP8F6ZN;I_sk0&&_t!QPW~z$9C7LRYNSUs#Zhnlpv+JHfj*~U7xO= z|9Un&wj@LW)nCm>DT*MRwpqDDgu|b^{aZ&0)f(cmx4>vqcsLDiW(k|^e98H8iKI1J zWQx^Z342vy5MP_)BPfe+T75g=d#6S7UnhZZ>F+)=LmgGB&7l=rnK6E?xb%7rRV%|8 z!hM6SuDhR`fEOQ^goN=yQb8u{quX+S=UJ#)@Noq=qWV@V;fASTUYCx*3LYu|g#3N# zS)ljTU#iz=(iMusfsgaT>_-e5V?I7UG1xvnfw^8Eh);xl7|x0fa8^Wmt&yBR$EJj5 zZgMZylW$&xhc;#@g}zN~mX$MK72$Y?j~f-g3`e>WhFQH@vOv`TS&+_|5}P&Cvgi#X zc4aceJC_AnvGA@Rqx$EwN`YB=ZK&I^dhTGwxMoiWXKuk3<r7iL;z29pm0e}@)sS_5 zX`wuJ4s^kop7E>Hqq=h+$Xi4A`xhqYQho^kc~FfYWQMxmT~C)Exsh@+Ow@1m-9F(M zidKe}M&0BU6T!4r!`O`TLl#WTk5aXjLk9KJZ?-6}RcF4al;OnLte4!y;E0d~n0Z2t z)_fOkt$ek2em5L%Xn9<1r<9K_b(I>M8|U4B*dl31DpW0n#Vd)jmiYHU5K_qsAcjUS zAki<sx}E1IoH9J#TDOU`;f1P&J`zr~t>~Vj{<%up$`b1Eky5Jd34C4pbhBq|nxLmT z7&+5|VNW&9T)k64`m1geR@&Vn^%6#pV+rI~$!9Cw&v*Lb=&I3a>tOBbIT9EE8dDk1 zq@ke0K*e%%zdv0mS;pFHE@uLKW*Q1#_-H(iRz?VM)sy7vTu(NX`{Ehm=3@$g)%3&o zhu5zIGi^afe&Q0l>lG`5K}*xhkCb1D2rli6t_W{S^_v@Zy}XbgB!_G4)>G`wj(5PJ zJzAu}rUjgOCmSQwEjvwnGze&f%*l(NeL$XjrAMzddOE%Xj3lu@|1PfYzJyqC9>CQD zB=#%7SDECzIm#=)z7^Dbjk&e2f9aTa>ee^zCAZ#;0K0fp-UE3{7QWk`jTb@p0rOsG zE0HOCA*k9@tg7)Rq`rdDYIs9ry6l!@E(E2K^m^NE9ILYf4Pk=fXMQlgvMo<^ktXp* z?_zC}c(daND6+2R(6qhCm5;!iy&|QzIstpC5pRc>l9Wu*)<2Q=ljAc>cowyg=sG>? zA>ML+@k~Xg2=U2w0)L@0n{e(sHs$jG{=%J<M|r-#NwnKXsw`oS<kbcZkH63-j6aJS z4GO3_MJ{%#<=gn<v9D@8sP|L^F_<YnIrv|p_csi6sr;aB_II9f1>YfV=)@PlWv?4d zO*QWmYkuXd+Yr8h8uIr&!nLP{0&SJmDk7~7a20D58nm|9h@BRdwZsC&37XMsL&S?o z17DVCfuqp$uid%hz#&0xK9q(d*JV2e6YY)<i#^-@ZH0(Ldl`aB{w;yxD{H^VmG6C& zI&nwTgVPTYuSF?S#N!AUZMPDEl3LMUZ4GAa=f85Y`D?VsMn`WV2%X3T93`<VI@~4k z7hoWcz?!|N(wkxksk5DHn6ZRh8UVj+z2j>5&?EG4KR-BgEt~bMHc{^kFv<Mge;yNq zU4np$iCL5P2kM45)#}?C7!o22@E67}5%$syO#{p^d5o0SL>*jDx72v;7yX2g-%yl_ zzFX_(M`S{yXV2UTa2)!yC<N<zNMM|Irbd)w5xy|R2xnN&G|79fpUDOtnZ{R3YK?#V zfyx*V)*Rhdu`6l(_G)8ufU#xL^fxcF*ObFb<ek@xWd-J>IG92=(x$5$6cHas$%v}w zO=d;EU)wiA2u+`E-gj8|sgD$o%{axjDQ`Bj#-n&do4dyLZgDn!)l$AP8QxV1{0U-g zJh#WU&$@=%Bn}P0)^f35X+9wR@2#cH9L4YrB~o9g9=t(+A<eMQi-A?0BHnkqgy?$& zcY3u362pz=gZ^TRv1qn1+gUw=O~-aQDTo3})74f{EQhg#HvwLrru0YY4^|?Jz^1+Z z6818g{hhzMp~%yB%NF<yDz5?DDW3o}6m=>5WPiaR-RnsD3w}Qo_?&bzbw#Lb<R)5x z(rpyD19tN_flMeCeBL+tGJRkNBF#^g3`IoYS3{YOz!+0jo9juiK;0y8pPz2IntLp9 zqn)+~a>sKkjmf2Q%R7AlHe1ASN_uVj7E!nfi4ZKxiG8U;l|1XH&pdYNX~Mqxt;k9$ zZ4i`w=6S5HN<WcL@Oen_j-~YMG3EfYa`Y!!*fN6RSg^~3S_$oJds6YBR1`Id%|OVB zLHRn3w^H^O?J14Gaw3_4{cE$E7a9y$5nr#95;Ao;2zJ97;9pz{Ku7xfYixE^_*|!m z6z3xDAGsykGkwN~>I?}JT95C2{ZRXraf-@bkI!OL!Bm>`bNq73WG{*mbjcVie()(g zF4cb?zR&##KAg95OcZ^_oJ5&QL)Cp@m=ojIh|)GGq|5bAj1Uc>POSmx{A{xE;R6S| zEP=JTnhSx}CaRH64kiX0PMbbWn5|>OC*pVA`FSobV(c~ai8_S!dPpyidiL#-zCDfU ztU{K8(rXc=1@REw=tF;LvtrkfBZz;+@@H!wAaZ?4sTtJfO}OR%p(7T-wh$Zd5gJao z9kyQ{R{UF7IE)Bkb`O}IYBc>_aOXYfYp}5p%b7u5NGg74p0O}uUS}PU&<)&y-6=;{ ziIlJw;umI-H586-6~u;3hZEHpUR!?M7bD=cKlsY5T_xsCS0SAjz6#96K#?S~aho#l ziAwf1k+?*SIUK1U@vX#a;#Q3c9~r-=R=t0C&7zd$fW*)Y6}sAN>1R{4%~!_nmTFB4 zDlmETm^ta68`6NCECDI{{|WVf!oCd|Rpi~FFA%?KTlh(j>DC+dSc=A#l%^C5T{yIe z1|S{HSd~pLn^0|lWZ@&iA!B6Qn_&R>C^pulLPDICd?I=Wk_j~0P=NNJ0!H;XWJ)h3 zG<^C@y=#$o@NXnEHLHqn<*1VAl{-wL-J-oFUQyH;C@IBsdf6KU)sfqW1id0xQWu%7 zw4LL#7|jiPO!D&kJE8Owc?f`8j9>&TqoHv(^}_1>Vlj-WwMXf6Z^}H+_patFr(jvC zrkcP?XacMs6+l2yV4+(-H(}#maK5>3(NMMdJW8cSlp*9Sjn75gW-lesHIG$V9*>xq z3OqkPmL@wuimqB<&Fu@E?(0Ey_3S<xWN|h$ZZy=cH*F4f)TLxi6939U|0f?^R6{Tu zN-Lxj2dTd-ITi6<{7$!~_Ebi%xu!0anFLT?SD}+_Bd{_vXHs!Ml2j!UnYFS5+@i_( z)fM47ZKBoMp^i9`i&-HQDneIGQ_TE^s48ETo;Gih+q&RVE9p~-)Zuh>h(uyYLbkDI ze<55+2*dz$@8;r)8Ru_hq4Z;UNY7}`9sj!_@lQ)~P$D86dQpHMVrad;Yy5Rn*V_ht zR6S6Y+ofBmQr{HMM7q1o*idS*auF8CIPpX1mb~~YGrLR@+JuZ4J({4r?fhd6+s4v? zuo$J)t?guHgBEo=`FNe;SeiWsF~O4gVl31cziU+Rk@U%D{`CJp2SG+A5DusNt1aUm zfQOuc1gBOiw2fR9FdeEBARlplkcK169X#`C0|#Ce(>GEcTa@MZ#O>bH&z?CS*wPCE zxoPfk@-{tsBH>i0Ab$ThVAM&U4T_+w`wjI+D5uMOUhlG<Xn5MdGzuVkmq1W%3gpe& zIPf$dUs%jk6=GII`u#yM!VE&Ejg`N_Fu!yMpAy|Bcjd;Ho%}&?r?94SZ3<q?Cy;*e zCvdf@N{;RQbXg9{dyV@-TJ?^3u7ztG6t9rG5l5d=Ah#fg;Zz|m@NUqa?F%zspHZq1 zYEI|be%X@Y(3JAV!c(>EUlnaT6!7qmA6MhB7`+fOy~WLQXI7Sp<YLrU2z_ZaL$%7- z$^QusHJ1^TF)9SYb_)MT0QHH(#g(9NKDL-^sQ%nF%l6>%sB!dTB1QPaorrHg7<eLq z%>+qAPVN$RKgd)kYja!%SOe`PI2uHMC%3&>t#sczk4s=DTLt?wAw4rT%o7Nb8@>Vt zN8ckX0V*Jo8pCS^aGptZ0$7uu*z#DRs&*FCk>is9070!X=BGahv}T&|x1fFc^puNt zsI2+RxCl>pY_l`lL?W>eo`*y*YR0sUJ}T$gL4<GcJl)DmAP;qeTYVf)WN-fFP#)qw z8R^N{r6sD1-bAW2)~*8aKd0P}SGE@M7%A1`=L&1l^^IQCXBHAABlKb`_TR^xm&S8K zI^@{-(@!;zv}ctusjZ;f3p1Rm@lFb)M-N`^4ws2oi>eZ%DiuigVgZ*qnkCKzDwaBC zRhh`S%QM+-G*iL){$f%PjHxKO%H-I?m3U67e>5MX#=!mO;m!yhF{YLNz{N3Apg8$l z4ab&pahL?pHu<LW>@Xgq!sPn!dBVVt=Zo?PgwY#?-oK11Nb!!6PXbK+ny-o6YAkL7 z3uiE7?<GC!DyK9}Q}%h{kuQ95qWY#wH3^jHf-%V%L5ZGpXE{2K@=v)mEOh-NP3C|? z9TV0daw)NR4X{|kNe`-g)$%hX8N*7V?XJpOE)C&MZG^ZP3Djjvp?qq1aX9GyAq7p6 zNS_gYw8NZnYB&_S5GB)}@YXdiEszr_mF@c$7iognS<K1y??Lk!lk|wq$#(ga%}K%g zV_aTrl53vfm8JPw)Rp0sH?&PN(mc4{aP%sNdJ3B@B9<!oh!U2g>&^eyUf+pIMc55m z3{}?*2wW2O+rX194a$(%x8NHEh<JfOb}|vud^mlaH3w!S$SP|82as60WJZA>b$5nw zA_yVPuaVIjA6JSQo}MUH6}t2dH`{VNoV(lB==XBrCCOM>2>~&aMk!ubS0-4P3+{(< z{`#`Q<v+Fj|LmhN&mqA6`O|@A(Fd)_ABQOuP+ATfoWl3>f&Tp`Yc96iGLRm}GHI|v zk05&`%eZw}9THFB6`#Y^Dk&MZUA2FK3~<(^aPAe)YSr*0s@2(x@)plZD?^u}6r){e zp@BG=5bAeL$)Ep^P3tCH1mILw0T{s5GqpUH%mEpuEY+5TlKhIv9(jfJkj{;xl)Xs1 z+CNReqdy^6P8{-laTVcf+rbg?_pP{pMO=)ZAQXuJO*U)x-2ZUKVBP$`Qx@n7ok*Ve z5ywylTN&%k)hT=5XD+^t4@YxRG~oAhX&*L-IH7&{|7U~f6UlTLjP)UyVtayJA;m`R zM|Fn(&kNpD+n>(3WM~-P@YMwXT3pR5B=|bJ6Lab9;VARp|Hn%IcS_q7Cz4#z_Fs#k zZFq5ZY`XnWM^lL+6bosW^rA8bhCTdx8wNt;0Ai(^_$Oxnf8DUQUX<DTKP|7Qg@S`Y zLYDDR5Dg2+a0fm-CsqOu4ZSk!c}^Q_fo_-e$KN+Igi350<PvRM$vfP~^uL$AMamED zv4Ph&YrKb#?emznFZ^!Km^)c8c27yPC<Ma6m51M1<b;<DkEpWvg~pxJ#crX?8jt$F z-(yoE909TZ^@gUy!#%Rcg3rnI8-<Yi8-6x+!f@;02>N@Caem4Q#HMdRW>|I9u@m)- zns>Xc;(x!GKnQrT^kZgCyoVQ)B7jIpLj`Fu1})7QnN?OD4)Vce5ke$BK^Lg$)eoO| z-Y6*lryT+A-{QosPT<3p|9J?LL*yT8;2ek%(M5<ng5debbn8Tazs6ISF?oBkUUzgv z^6=(!5ui=HoC8?*R&<B~6)GN|aN9hv{yTo)aSxtBCd-06lx?)saH*hO*o#NiT}s9j z4^KFF3NbT%ab}>PqqrJ`C8)z4gy02jt7qa_srAsYIrR8Rd!w&BE4c_fJQe1{6a~8C zVqzwM-s9iQ<iGB8bK$`2upIb{Q;#9U;y-VKN(f>;tQX3LS_T5toflr)(Eaj}$?3zb zqGCW`?+e6mU|Tf48$CV9#qVu;Sfv<d1k51)3i&`)58z4x4wi2_v-PTg7C{a2IO$?i zAWnV*PWb2GFUJ9FCF6w4cG!54#sH{vitkGowGa^yzHgVcvVwH1lJ-w|26mmppI~4c zdIMSy8+0sYFaB93l~@tLhg#X0K4$Qcjc%O;wtc1o#f(HiW0HF4nvS0X6Iu*7@CHDi zmGQyA?K1b_*|TS2`SPjx*I}Tel>iLCG62L>BJC~*VG#2pBxdkW;rUx%4AU6K6Q|*y z%$j$7{^Zw+7ph{rcR-5h=C;N&u#i$$c?(`Q2?>Kl%HG~SHav)+7mz1cfzvH+^H;&Z zu<$+eT%%hOsKpF0$zH|eR-{bxqsk?-i?-ZdS@F8<r43+&Mn=X1!C8Hp5Eov>e*EVX z54(pY#4gltuIRD9c75(JO9QiC64R<M2_xfo{qZzTJOtAMu?HM9<oY~xY<dm331q-Y z69Z75G9Yc%&-F)S!~e8BSvCL&SubUeq#jyi&xMWWp%3vckO)Ty5j-1#8G#jYMY!;! zaonD;nXdNCAWzBl{Sost;4MftgA)coMs`9)fcFzN>hwk;iiC!o&p8G#Fr)!NV-;9T zKl$F@Y5)KwQ;uY`YaUAeAqOP+plxdiEKmIyXWfg=aOEbRzNbq|IQ@E`uj4J0Y7mf+ zXeHIOX#XC^e&`5j1V74DS#;}u1dZK&S^-p&5xi|slT~sN-);c&+6HhdzqGJk|HIb? z2_)gN{0<x?w18n4d%QkuC9A9Xn^i|*z6X(s@Su+I`fNAu$qTa$^Ce4){0LeRA{8&Z ze*(8IJ7xdxcI*xh1;o<LzDXH^eGI8NWgB`XaLm!>$t1)scSj5WD-|7}KbZSR%!4L| z0Kjq8c-iwNFsRakvpTZr_Uv~J@MB^@G;hP)2=|!SN3ik;O@Q;~p>u+Yg{5IDJR}3U zp?N@#%xBgQ<}xlBCP28Vy{QaB^H!lDf>`(6&YYVP!%lx)krabgMe^@{BhiNs3FwQ{ z*)Moko9xcW_uGtWF(^?Pbf8P+fwkWG^ri7kdRUUe*$M-M*mGDZF+i-w(<_T*+WT?s zfR73d075m`5iVe49f-70`rath1<6X?-1aP-B2&1FfT;ijm<~jh5ofgMgH`na#v$j7 zo*5<0NML7FKb8<CMh~JgY%m=l6s1It@RsAV(x>3316#Ngcazw|r3uNy`HDQ9N;S@~ zWha#cyVp3v1%Co(G*(=H9G&6>&o-c1>3f_{n`c-U^gE2hp<%CdcU64?EU%4D&|;Qp z@tS{;Ww<r$J&LmUMdT&|Faj(m@p`b%!Onvi9ynX?v@M8q{NSrBpwn^PoiT0P1Q?d* zcJocPYKBv2Zk_ElHX|-2S~=fHWsGtDxm{s2N-eq;&27eeO*Es$DUM-UP4A5&j>5dm zyrKo~kg!O(f8;m$jW3SmNdB>*D`qh)gm$yUFl$x3KhFgIJi@y8Be%&+m<agyM>EwT zb(T#~lnVtLA)^QU^o3r_bv=3G+W^37M*uG>rKy>$5Mu6c&H)@&w<-7CihiuQ%jRA9 z|6IyHKPkl8_~?&g7`t^aiiO;&QX)T=^713QDQK1xESU8xY}|na+wuC$rrFUNc=`Ca zCA`{6IFvEa(Jx+u4ufQ*j!`BOq6DZ@jndYU7wFi5E3i<jGQTs}Y&cy{-|O(rZY*T~ z1hk6sKnh<&br?Eu1k76egZnTg7u;5?LvNn!XE|g(lwZ8pi`VTyz2<`P=@2i!Ke2>A zPkTJv(v)TrfzOjdK=ENk8Qv^rA^(<M>OeHv93AKU@Z-5n)F+kmvz6<e`DPt9T0a7~ zVyp6YMru~k1&mw1I>c%;!a_qa3f354b~I^TaqCTB(ntgw>Xbzz&H<U|X!}6jZ%%a2 zm_p#v8wDtwf=iF5-0){LMlY70{5^|EA;cTksqyqNvf2~$44xk|;?x>H(luP3_7i>j zMsqw6Ya_Y3*oPj*8uA3}=el%@7_C~8(djXH1L}>lU!}M__-$|SlYUVzU7(i#N|pZo z^{Z5#UugV%a|5lV5kV<D6+ArrhfWUK)GvKtpm9n?#MJjqqpUQp{UybnpJLjpr$Bl9 zt3Lw76(2a=Ze!roX*=@b%cr1LXejZB*nezgeC-cgV`7xFYP_QQQx)Wib0=l$-t#P+ zdwEN~nH$NYIpJUbidLe{o%rkx8gE0F(?82z2$Hd)d`5-NHz}w45GYr0?e{d^2;;Zo z%o9+5N?)RKSgvXT_sp|r5@JL`ZLtuQ3KQwwQJmh;D2J8rIAlGz^lXL%sE9!h=;0p> zpHW0$<jbXGv!LI2ACar)!erW?kxPzdzd_#>t2S)+=W|6FZ9{uByaf6~Gab{Q%y&`% ziPE~Y``;|)#@}y~ipJRprrAQK!fc>0?RXF$7$m9a?(qmlF~}$jW)U<e9Zz|@uK$|_ zz_odC_A2R{u7Ixs!)KllORKMz+csa;yIC=Etv}7;7UMs&yKVWI=a?J{az8gzu&t}* z%SUt5NHP_@Eu^B6#aG3v()yy%V-#fgfs1PAS8p|e=44sOCcMWaD@OwS#ceR;(IYu} zD%d+*9uAdE5%@0{dzpqv27s`oRcrg@S2p%KT+#Q)Bcq#(!w)V7z`|U8c>|1cSsD}k zEPg~cv3`|s**%Ic=Y>&dZFSYmL{fg{c$$~Ei}NO1w|f_#cbq#P#;W-zH2h6~rBERk z*N=TK!V+@V6nDIvxeU?;L`MsaNmF>OS|(pUwP{G+53%uLy_cT3AC;Nm=P0AgeP@Ov z^ZxzU8kMevt{3J*uUM8r(`wA2F!E^mXO{R(2VvZv{k>+HzTgvp;b=?1@8*U7l_6?? zu<%Z16!bejIR`WUJyCCB+jN>g%Y1PR%9{-BtI*JT;U4j0&Rzs<y^odjJfuN)^=Wge z%pj+w(Mmw;N}HZl1ZqUBY^rviNqfFHYf@(*2&We5#gh~#PB+_=t$GmH&-;(sRlm0( z;_FJ3XqJmT`2NNdA8T_g7yA&KbcV2X(X#>85i0rOh!#cqxi>^ffGQD9-Ae4C@09RP z)0;R6go&i$Nr_ga1pBn(?hKa)@Q?oK@349ZT~JtQ&V5|$(Nx}5XwO{*$KNVAu(<Cp z!Wbx7eZe=dF#`OHw47_}z$4ivYRT;Tvnre4x@aHlmF)1k8f{X|IMU;^lKorr%-)5o zJ)xv_5TNW&WGT9KyzsmNofDZ--FgI${4`V}jcVIDZ37|Dr5JjYhq#>8&Voz3!jPT7 z+tYv;{so-zbtk0$ne*=X8<bCfez3QPfjLy1lpYm0fY4)-|CSI^ixki*%kduLT`TF` zilEcJcegs<$6+WQmjxb2uR~^37+z%<I^JhV5ahmXr}DU5_lT9g4DreJAYf2tPip(r zX`6SDT>hb~Se-R(w2(kLN8dxrmLZ95`}|A%najYp@z`gw30C>#=r#R8MLh9&l9-!w z6`#kL^^_`1G2c$$X_#JpYd#wO+#E|SD{*PC{$b{e>fTODwQ2WPk5rdAq^c5zfg18p z5Yg#e<y9k2Nd`7U52(PKV~NJsn>qb9s*P3F{9f8JL};VG%U>j|R`wN{`hNHD$o94= zROXv`({%tXS&`AKYs#GocQw;kT^UYzvw-fh_xoGJ%Tg8HNjKl`h-$6gGVKmZ29%=( zDe(+xI*E3|j4a=hVrD^YaMes_+GMmUk47~|d<V{FLu$Wvns_2u)y9#%oI!idYYHDY z;TB>gL`1~R&zMg*Ujv6G|8%2U8A1`1U>U~{k_VvW<=Xz^hXA)6`%vslNrj#vdjYR* zuS_rA-5WSO78EkHAOvnNMZ>2E?Iz(V^j&BQ+vat~4=gHxCl_5*{|4p{cZjS(IuWm) z1LEjs;(?+%+h}tz4f1`$GsLw$Ue~|Og?sQEk}Q?>$|1W6nA&Yi2;;9nA3;q$(c5}e zjH3}yF>gIlhy=mtxkgXC*dMT<Hl2W=rTmNCL~)8fmHpL;#U>z|?h0TT;Ux?E76zvC zQAd$XsFBHbDJ+JVADp{BOe8>aWuPMny_)mUtx(;yGcC%`sJl5pJ<DTZ!48}e>Pe|= zx^twsod?u`?X`|CjJgF6ChkLS%EK0reb5Ns90b&0gN&YyfcQ`)LIDI~L}qg2-+Gto zvxuR{2aj)mno$wy8K{zDuvlYM8H>Wa<xWV$>IfLdWeI=cU8B@P!+bPFsDfXoPWIBr z_1`;F<c1^!d}=BA);AdXo6~UuNlo9XP*b3+C6M!I^~W<$#k8b)(qDbwiTI@JvpwXv zQTr36D}dkSgK2m~gW(JRrb{Q&@pZ_H*JTt8$^1IS&Pst^*Vf234)A%ApHyVp;oAkV zWgnT6u67<{jVDR!NM8F&es1EekO~Oze(pW<QrkgAg~4uT`&X8}76Wm-8c-o1RVab% zxGAQs;|-H@iK>_f4l!}2o+`KuKyDz-kt&9H0-nBcS`o;YBZt?-TYYX3;+U}Iw2e7? zk_WfrZid-V4TETD<;YNJ#Uc%t$=a7o{1eirV#PVle$Xc{CCGlv7OasgUJ>-VfayC# zB&;2@VkFstDktIg`g|LexQ_UtIje4Bgp0JE1$)4izg3#;_)tynUt@&053<73F7+by z5$|TF^`SmcrJV#a``2_Xxas;|Co-r?u#39xOmP$fh@BzlVBM4`xiW>(My5WXT#ps` zDATHA80Rt41}XOfu$2@53s(uBfue8Q`D^8PHL7}Rj=+VB<Si`rix}h#VfNO|3Y<NT zU`9?Z-X?dmd<<}T4>jWC{vpVxvwZKviP%aPY%WH77qq=5VcDdtWKS<JF-cxZu`&C_ zQVYp)U)Nj?tQ+@=R~==090#j3Y2uW<=f08;t1b>Lg2EEp?A)`&MvSfKGY(0k7u331 z+w7jtOG>texbGkEM=cEATpnA|)M`0nPYT}dlC<<*{5I{n!RTDjV7`FoM<Fy_)FLj_ zuKuRq1#OkT@RY6zmb>v}WdBbNN(fP6Jh?fryF4zjz1qPuxTQvpuWqkS#Yueo3@>Rf z#wJ8z;IK03)b(oAWjd3Y8C!9A@_xHG;jw%XLJ`%}IV6-Et(o3HL617Rx(GxuLHtDj z8$5jCo_=_B3`#jo+RFrp@nm_WO1Y+f>e2GHg;m0M4^ClTJeB?SSgGw39q*cNALR7Q zWzWck+0J!_e&c=(pf_E^7(k<cLSdyL>u5flTg-eUlMzijP&b)#`wQ#JtAR|&g+X2C zUBYOI1C8En|CipCN#4|zguSR-l|!$YBZNds32Zi#i@;TtH;8b)xmpA^bMQf^%<}Z$ z{F;|sJlU*NQR{A$LTyKot*^*aSypFVc+`)nkY5)WfvTDU7w-o~LvpLyxjVZ6uVI%W z<lO+^(^A(<J>esOK(o=uK+glaB1>dbA`#^{0N-1%DgBn72}q|{4njU|D_OVEU_x4r zIxx^4*AYPxB`=RwPXl)VnTQo2?<Vm~hP1=3bX&Z%u-9`zW&ELnkV!=ua|IwfJ^`Zb zCMQQ&u(ZB)-MT*_x(Oh)YnMZ%U&);q5iqNl7;{~NvdCoYt1_qSj^-DNqB)#M!f;GE zNRHqGFk$SQ+JM%n`+NY3NPEyZ!Y~P>h*^^@+3m?bB%R|9b1B6LtKBoqjkKSu?maZN z_-)}v>lgb=|MB5urNGl97YI>Y<3o#<P<o9Vx=OqkwvU8w2}28bh7U1?=+b9n+KVC< zp&A#~Id7_10J=@2+BV3YXPUFMu>H;n_F3_XX$5CrKb?TnJ$QnMv==0;P(|ucaKS_L z+GqfmV1eFgO-?_jNd%oygSD)7sziF`$qnsq*)UuhgjAfOglOIn!R62Ia=PT<O6y?L z=sqDo>~Kn-yb0zazoU4U^E?tX&`|$$kNuN9hl^--v5<yr^VnI`%GBU(!G(t_(w0<x z`H<=3;Q@Q+0c~Wci{ym3DXEKkq17e$GttqrJDNpNP!&%($gP%T2AD;ApT5(|ibp`9 z&{t+ap{jkB6W>_KVhMW&IagF~uP5?N!z=nY@$!|B&sn(ZexPGkn;-t$(gOSW(43lO z?eZJm=T1G3`KIMoxh=1kUib^*6T@bdjBQhQUOB4km}KhGv)i*sCW<h!TL-#>s1t`1 zt$sRQw4eiB6|6Rw2c^ml6t0-ikS1vAr8+d|aWTW<d{13Whsk5w%fawP;B}Vl?G&AP z7<M+2mG?Y{qCdWn@dYR{=aB{9`)1efN5b0<sI-ntLkNj{$?OmF<EjMYA-B!ZH+J8n z)i#o)Is+@UHp2xTP%xMiAHyujI#02fx!9*Mi1=YcZMi(^jmBKX<@5tdY#FXlQ`&+* z->A#-gy1y?ABOwA#vNN`^t6j-NO+f_agPv@=HWGo0is5MsR;a^1^CL7uL*{lO9Gx} z)*gHH>nGt(^wTg1NjP#7rTv2cIe9oH{bVMYUkBFyGg|j7s(@#R6G2LvnLGD@R>p@_ z?6YWzv)a!29t`r10ICwTI5hL1&7;VWt4Rwd`nawjr7N%k@mxfx3J<ax#x)Puuk#I` z`terDVb{fe|G3qaQ!i$TF(`LIg}Ct0Gu{`Ft@)eq2?UFLzbvY0XzL#1_fADE#>e~y zH#LyJX|#CDWiwfV+`Gq!-jVQ|q3H3wQ$5++i6^(e$6^Hf)ztp<cdu4Ul31Z*<%&-e zdl^<IH0xqThiZUy?8%rPF>aQT193S;s?*_a){0+S5W#ctD`&>NUO@~bW)-S4n=!ge zN-#Xqz?t%0gq4<Yke&zjr-n%?ensDYNSUt?fQX`?gb_B=2*waIQ7XFC9hQ!AkBvtO zMWsuaq)RT@>%+s0HO+4TS@sH79rj1)5H%jn%!rUFD9gRAi-nm+i4`AP$=Xnb2(NF7 zRP;kyfT1Hvs|P)nf5Krhb`P2>J^Nxl8eUJnPv}!Pblh+^?6%6D;~=o))|mqAGVpbn zoxy!xnlHV;(R@|k`57L9_{MjY8~LF|Y|a3BjUnUZmrs(+-RTa5#4h2O(CHNnQxFi5 zn4=DOC<sYmEf+v(dU6ga_ojkHJ{Vhtf|ntXNp|e`Rk_6%l>5~9^zQdKV?^qSp&XAU zBVo@Pz!$_kM#rqn?hrI2H=R}CWm;Gm+Mg|#<at6!+(NrEc{zh;>WM4shZfltYb^A) z);EUKCUggUN@S#RnUI5b)MOwglYUBI3_(NsJ{8ozvoN&P@fq1RjjXRTigC+t##=a@ z*+6JczrQG%sQY*|zBOrgtS^h%y<GN@R>Ns1=0ud?B5J}j#;@moHA*oi<)%ThMZ`8G z$|^cRWCBkrOP;QmT6Rks2A_<U$-7ABEbBWrZ>wz8RiM-xD;K{mOs0G&4i~8GSNjD` zZ7ge19_haL&UHOjinp%_VUTb0!YaOwFAXS|!-{Ltw7{H{vnLO_zys}77fpG&lQP|U zm1~(^8Rw$qHlatfx*REJH2w~q0nN&+Qw6m?5){-E3rw22k0}H+6<3}mA~Ms!D&`r1 zG_}(EwZ7bySeOx;=9qujMw7>J&sR#?EQi4l2G>nDJ5LZYU-^;JX!42FBL<BDBXltn zG7SMUO(wJ7G8$_d>`8fp0p}r0COdoo<J=b$Sg(RB+Udy-K8i}iK^=|Pexzup_+2kH z_j*S{I!C-S$3*79l`bodVB_Lumk5F`FzuRm@G43?p}TOFbLX{1)T)0&+bIeDi?{lI z5^}uu?AoXV$HnKqoUN*6`?oAc=u%XNU?w3Yz`yqVK~B?3W51@7Twxjdvosos!A*7w z8@=<>4mxic-9c8D`~AoUfzrp(ZkN4H1(&hr>^bQaXZzDCppBd^@b{n&b=xOYI}P53 zO-MxwoG*IUSfk*!D0a_=zGZ@crv^_Gg}M=?Nvs|g*+AVoH2-|qRUIm+X76Y%;iJCJ z@V5|dtBaA@op@)s{T;$mz1@BNFl+#`EQO9ON4dKWa{QY;QiBa85)oL37eI?^L&3B! zMmmmG8kCPh+(kd5bW*`sVN=>vZVM!d$_3I}z9?Ri3HzEsm~QGynQem#MhLAD_I&{# z8jF0w3XzYWN5RpaEOA=^$lT1c4ow7k(49w4k^F&jb1VMSXnR4_c*(e#pY|^6!Vh;? zzZkD;jd+4Qv=uTyL;vf5Tr@K2VlTi`TpBq72SK3*jX7<x2Q5)~f*66Gbf16bk%rp) z0_CRU8~WjI&K&FY(X=r<irC6Aeu{YPt@393zoJ}zzG7r26Io(-`20{oFHoCqe(Bnj z`@xN^mj?E2MogN_rDN}sShT8W6Z3lV%FSQ6K%H$=q<h1rym!*bluC0+)EH?)6b(k( zD{-9psl@qseQEe&PM1`POsCIsa9t<Kf92-!=as6UnPC3N91ZNl%&Q}AG%RYFe6jE& zRx)AyQ9Los4@GUSsD@mK#Up_Rv0vn;L(vYek3t4kGj?-Dziy-bX}+}(F(dHs$9$0- z`u^2J$9jT@t+1xUTTQ7(&QX1i65u}91F5KZW+0a~duF_Okc8S2HSMEsRDZx{^m~<> zr^(<R-WA_jQdtOkF&`CC>D<rLHU~}jAAHMXpo7(RjQW~kHLoD771L5+mlr1Vd=ZS4 zMk0ubG&yYjiHw7IiV6Mw{Y?P7bF{)#R&W~Y4KgzYc!Jt~vNadlV@(aiSQnuDnE8SQ zv3o#pfCg#nd!kqNy#eC~O2nXl!L2;lyTVKxf+Gv(BC!LxmYxm7kE|nq5LcAq`Ntcp z-2y649;i1^8G<cTKf&Q^p|nNyd3Kev`=39COd6w{VY-<gN`p~Vbu1<tQhbEpnS00= z)cH4>5{ABOKc19GiBdUeAjpW&!)4{Roj>-6TMoVTKPO8hx)3soZd<s(T;@lnp}^;+ z{aIU2G!wRXrX-?5hWGt53twpCpQ3peLT}!)^``BVJZGERL-H&Lb>0H!eDp)<=@r<P z|0v6UkTGZ7uH2`JoNdZW3Z`Xxbfi}kU3Sa2;2IeabuE5srtmSXS`@|`D?4e|uc12G z)qqf|02_rRb?acFb9<ul`o7V>rZE$gBSE0)H6x&B-Z4FExb+|WbaS)cLtK#cL&V+z z?O`}mmkNj6yhq!A)D+|=jJfg0lRNoqkQf}^xe{8NcYKPHH~69o6Tk+XaT#PPYswCI zC%$wDbgG-gxZ=T&ak{GgL<-^06+n9j|6;$li`fWO1jpa6U&%Ui7RXh5wP;o<kvMx^ zzobok*9T8C0KRGIE1f;Zr{Bd|FUTw5Y%{4edF@=3gZd2WK3AaOGbwe6EDE8+w*abr zK3&`hQrF8&cOrOAjzw~qHf7uGD9`}76a%%EtR*@s!f0^Y75si&vq%_X5W+l*Chk)> z_Xn-fYQQ+-qjP_L26{ehd<q#s>(D;v`DC59zY5k~HW{iBjOyS9B;fhRCYgJo7VxHz zO^(+#91w~FBO#Ak4eGFFYnSGD{M}!I5mA9Fn<;)c5WSzHAke!xw$R@+u0<#&*vLGF zzU;T7`QktqOm+<JVvJuBUYq4J=lP{p;yc}uEW5ia1U5Uhj-q>+bBWPP4+5KNj>TUV zsBC_`V2xwHi1a~tS8LmMPZ_1;^xvt#$LSXeDhqq}=&r_Hg`fCVNoEsAQoN8JEvf<P zT`uLzl9V0aU*(p()t8#Umy0W93$Z`<$7sdb__gTPp@FblaW?%^Lh;UrAAL;^d?6o4 z+>e$c>nTj!&<MDAW}p`yZEyG^Lo~@%m*&5Wuvdl4xIx<H*nh*Cy>C*ifvcTJS0L&8 z%_yj%-!U(kPUD5B%Zt`)+Ij5d45gb?xOvo27v>ek*YBZAii)W=G=F87p>GV!92tV# ziF${0!(5{19wu;YsVK>6AJPTNH{}JiH1??tTOQ48I4ykR@MkejXl!ol@JD;>$#}Cf zfMAG-fS!~49jMddV!wDaC;MHd_V|1u5`N92KG%e7w%?Q8oK4Tj-n7h79{W!T(f7u1 zZN}R_>hGkgMFftC$=hPJo=pI+=BX+8tKDWDbf$a#jjx{l1SwKGkcQx5N7p1SA0O&M z*6g0#)ugoArR(TSFz2CM95;#}O2{;uHUTx;ztkJg@!&C?<4~C+P8lJ@Q`blRua5=K zzlC)4$AUxYF}%T@_X+WL+foz)Vq2uG?(TM)w9WO4KW-^#kJ)@Yv|Rpf>3?qx*xT6= zeyq?kvoF$3S`!~6V^}!IJ%zWUF+|#3^X{FOJGeM%o3A1r9{jLVGW_Y37Dx<uA#3NH zt9#%1X%hTA%q|+un60LLWf|4>2cys7_n~a(PRpKrZw<R7Lnr^4gFoEwhg*)0qKVv? z-=N-&IF!;}Hl6A`8|TM^-Nui}vCnsA=7{WBnc_VElU8GE!)n(dZ}6{pg#vQ({}J{T zU{!TnyRg|vcOwnbjdX{SA|Xgh35YZZNJ)1$NS8>5C@tLx2uL^5CEal6*6*D2edoXT z{?D`A58z&F&7Nb9@s9VsvBT;fV?-RnyiZ@2o0D_ghX1LXhF~;_=W6UD?f&Kq$l6tC z)8^>nMe4UkyuGGkm-xqsfi5Bp<FUVA`{(7}&}C335i@VUR;+tp%%tJTHoC%MP(+g9 z=B<NI$ZNz;7q=MdUVpfeXAegF)6{Pt!e2F8Z;Tqz%rJ5&c@6G})^nAlDMAMp-d>qU zt=kNyJY*->kPZQ`iR_@>4}b5UbAEW9+EzotZZj3j(<~FwQ(GOYCVt!s%-L_1uKVB2 zZLN}6oK8<p>)O0wKn6Vq!@E?YyQ!1dWbV(%iz!Atp8VTw_+!0k{8wW|4Ew2XKpidS zW++pK<eO8^62Q6SOq6Fl`JeTpGrT8YHsoWSR{Qq5B1-bv%uZ7^3A@I9>uQ^8<p%$V z5V@9p6fH0QYl=W3NX4zE-(g$uiLLj^q~7|xFp5@Y%?*$_a{0n;@%aOU*5W!j^&gKH ziS>4Z)ugAdN(~HiWt7D$%egfApNO!*RDs>He~-Rt3aLWkU_|<ezlD+IT&d|;l0IkJ zWBmItFycD;+gbn2j(>bc$3i(njIIq+<xAol#rGe9NUlEgSE>;{aT@fb%zVA%i$~;O z&#%UEyevrjL?-79@Fj!5G*!h;oEVDSw>;Rxq8*^v716&Z+pR*2l8g=mZDGf+i5j0> zdSJFBhuCb}KEAF?{*4Y2iG!hKF7&im{xJt&CJsFAFqD(TBA!@9&rl859l&?o>Aq0l z!46;hxSR^8mT2E>5l_$AI8o6pNhx4hD(@PA)M}r}Al_DlmFgeYq6-u((S#P0Ibg(6 z#Km_hMD(FGyR%IiiZcM<2ABi!gm(Nv5vb_mUXqg@xW8~<p#C1empp&XmVXUf@T*6X zx2j=sh=P)ml)X_r;i>z=gVscV(jkUC_VF1SU%2OJbxJRK27CWv1PsN~RnR2_E8st` zb8>hdZIo3+d_pr@3E~HV7XzZ84z|GHL-~-f_DNMQd1y`Oe}BpYcpfeb4Na}68(h@; z06CR~LL3k<g@*=v-8lq?n_FV4!uWe*%*#t4PUXQ$BVmlJ#lTqF9l{jm`k#8XsH5ba zjD=Rd`1?(Ci`&q}+koHQ`p>^7!^tW|*8O7rNB!u8eco(Nl0S9sX@vjBe?)sv;4TLD zT2hj;{06la$}WOvY!y&UfrT5|6<V;409@-OK%&Az;XxK93^BKht$tO2if{@bF0wp+ zn;z%f@GIqFoK!7Isl8ud0I9!U60yjf_a4Xo;^O(;1`IyHozVxx$k;B9)+a(y-BDFl zRSyAVZ)?<gx;h4(gnN>q(o@Xqwh?GYK6BomX9G08K-ZXG5hx(8f+Wm12qNm_$N_B0 z{Dds?_;DX7aQ@5Q*jQ0_=b@rBqOrBb?A-c9@a-et>8j9wv<_@O2*FNG<a>=Qu;RSs z^#OW~ihy@FALw$+zXlv?(yl%z!@%A6>Jd^2r{NUW%O30tP(1(Jr8xiO6nUyC<QARR zFu3x;B%m=%+QTCxq+cIQj{|-~1w+FuMOP2r??oEho}VqOi2m6Uz($LJ)0eBmcz{L& zn^JewcBebqb#D)H$OIia#$T0m1Zs4F)-?rAzU986WuOxFsy_^n)=2>ve38B!jENeT zjEt2*IW3x8*m<&V9dxF*IgWS!GvKhy2WWEk=jb-8k0Z&Lx;$h1N$_GgS$6^z*>`YN z-^6~}S@2@)HLZaA@2UL@2~yqiE2v<A4{VPBhl>L9k+LwM60x%a%K9|_z`#BbU$9JN z)oY&roX`ogLE<t2tm!*%hYTY=RjJPBkunPqrl$u$8b`-nZ89*B)ljS!zUq6)s$zmf z0vB5qA!8Pu>W`YrYdta2Kv;?HJhENKWTH&}a$M!*q8_aEbP}{Ko@R(VupGA;QNZn3 zWYYWSJyvcY3xT9HRE25Cac3Z7h|(5MSjDU5`>qb_^Q-l~6(;;A&JuL>izfgD_TuJT z%N175U+55k+aKve(^6K-5YYw-%K2|u2q`God!7R+Al+#I`;kA}n|q-CK?(98_~bns z4i=bqYUyySjEk74q2T~5Gra`_vq(H`fH^u{gnHlrz#XOKv}S=Z!NJI>ZKG+9-M1t8 zELCcCX0HKsd~^JB-0{Y|HiYM1-ywnJoT^7`pTyPrfHvz95o>}-onM}PuA4k_RLVcL ze%Mf^L>`8;Q)Y0_$iY_1UZoZ#Lq4lX6;uLdIv6dm$I&-_Wd_FVMws->=i-kbf1~pw zIsL`$_0dxlRMc32^604T!UDHuNWvwm!r;t+54*=GfWq}BPT{k{SP!5kiwj&0qreQ6 z{d#k%TjzFCgbpa9jlR|@0~LlRx*9Kgq9q$XN_(U|v>55=sj@h7E__y*_Om}pHZzE& z!Oh9C?;J(_<$75YKu?VmZ^m816H-K*bmz{z>XR;QqqXThu{3g6+Ytnem1%W!7+VvG z;LJBAcJ#Nk`ma^3MG!26X`hw|{)|N;lu4xNt~?rg%x^z4Jh{pn4?{Dq{c#a20HBBo z#<7bz*#vywy(v5eRD}2FnPDD>d09AAIpmT;o7q|;ONnRCp5=U<s5sYZa`OW*oOn>l z?FH0p=Sdb$c7r-*)BgDCIV>bOJQ9)zAXy>Iem<QNq;C+I+e=Cc=9@(@_Z5|>q;0<a zpNSAuFhsBM;UdHDlKRMCbCzWQihXJrd=RWjXeF#5n8vw8OG!wYtR*87G2i6QLV0qM z4}cekAgI1oOZ4o8Ku)(K-QpY+0)ZU6P&6Z`=t;H0o0@z0E`(m~+h((Is@yvisA`$~ z>RIEThMoX)u4Y0TU3v5X5+kp_o%|VDINXe@3z<?T*YnTouro!FaHt6hXoLT{oWa6Y zfzTH9=g%k%-c(I1-BC&4pQS03o{&rR?e;iZP=FCP?#yS)i9Dc6<%W9%1k^%5zn?ZT z%K%;^IVXsUCM-#D0>PdWEUOHsdy8ZmxP8jk$}I_FAjq3%yYN*F=qt<0<2jXiTyS%5 zFCZ4#=z_J=SV10_J+;OvsV||gLEkmzBP#cADDXeG0$-2>7DJ_{r1ZP&a1fC08UwP7 z6e7t4A4Ypz9QFd?89Fc<zb6vGfQ!Iq+Y5xPjh~Q8*~9yctbiiHQt?QHommrz-lN{p z!tYZ>gJr+;EoWa)ON)fQeMjf3;Vd7p8$9wV1K~G^g*O~;T>wVQs;?g?@-i!i7~5Fe zNl4tYSSZV{I-I7poUo3S$d?0)SZq8p`_}kX1?PXSk5oSK)X|SG816VsZ8{tN)aNZO z{CRxPeWH#+?|lCQmP}kH|7~KEbf1u?j9jo_7acYcJfp}#13?m6VeKJ9_vgI&Xi`zL z*q@kv`S|tLvAJ%nasRO&Ju=`f)d^VQ6Y8BT&pmXfByfK{hpovI3`5Q^Lq&oa*L%So z;Pd|&V*m5g?lD#AC$v9EvHuzr|MhF(BjEQPqZzt_t@Z!kO8}Nyrv9+;e+;w#dLmu4 z4s1hZJ8b0mU!EB4tqys2zvBvIG&!OM5P`MeI!pq9MX!rnt=Rr{ulIAj#kb?dK<o>+ zd!@WrX7O7GQbA$!;NY9p4U;1?rgTY!h0L1<O+bSzP%oD7tnW1LSEsT4J+ttaCWQEt z5NVB&(0Zx$OIXqbu58Pc*7(##$6P=iY#pLnMLExhw7<DjVi<atc^Kv60-FKykPiq! zO`lfcOR!+}_TOr6kHcv)F6^=gxQo`(Zp6wQ-bR3Rn;#|Fo=wM`d>v@+?h4Mk&GDmD zXn@<kDz)t66L0)V!5|m?v_zd6naLq;_XXTRRWFT%`N1SenViqV3@OSM`R_Gn0PoP; z`KC3_$UQ(jz9U*VUji&gi9VQx&GV(x{F+azyMalUb{;&)8#*fudq+%6O#LVk0fFiE zb;@AIR09&5B4~(T&mfQOjqnL43lx)-Z9noP5NBNe)Z+Nh5c(w!Aub^8MC__OHPPmY z<aNKJ?H~lB&D)z~ofPrj>FJ7IUN&rq06YGdFyg&;CHy<$Y)5>Qv6lR{t}{o*o}f)< zl_UgXVnwESdZjV?<?Co%kG-*LIMc=W7a}|VVF!BmL$l(++2AE=Sa5uZqDyb<up;is z0(nxukrXJ?9ZmELCJttTA(pw+XU{OAs(3S2^zNflfcL+}f%W>pyq(HpC7s<zQNbF( zZ2^E|NBopAwi!0G8VWz7mUP%3?0s|p$AI>x1@=FDF`ANy*wu}mpu=TVZl1{R^AQ(v z$uxNm;jh3VdmCNr&VU8%-$v|PTKMLx6H;EU27WPy@f6TgDJZj{;jssb&eNK;DXqrb z3yGcoI5$Y7LBp>YkDnGc2ICQMfEhK3GwHB_-d*dgbPl$XmMi4*bjZrU>h}CuycQU& zKKRtYN3Rt=s2@5T{|Bf3@BTo74)~JpWdF{ufgJ>r7qG7*7n6S*`16lp{d`?|`sI22 z$pfEwT0?TW53~BNe>SCmc`EFbTBgNUJ914Pi+}?cwmAIue$a`)ZJLrKY#0|lg*~G% zDvcLr7rlg#(YYOt8qNK+A;T<?JLKfs!n@CDY`}|QhXj9g-}rQoG0qg$s1gdeAnE3T z#nC^{Ab%#uA`LvxQn2W6KqIbV%XK0hpZF21^Ce#6%4NRi|7XUMNG9C9CNN}eN?(E8 z4LWO`vV41%XM`Xnb5R}ovHDkGcW>9f`;jgdoJT{T-Bz#(rPxxU%yk89lXDxBDQ;N9 z1qVsIeOv1v5b!{8xEt)aDEK6QUn4=Tjv;>Tq+?p@b)zdRWO;@S4y2-FqDAqcokx8p zyRZ9ukDmWL>Mh38uUY${*dvX>(gRpKUS1Z7hOjg6@(`l;(Q`OiQ$4qp>A6}-{9vZ> z_BY5M)`AL<-uy;5^!RkJ{gnS~Q~143E8ud*MKZY#jnz+}Va+i-K>ZnOux=HbE;~eD zM4AHO>1ptM&!pJ=@Nmh0)!_lFi0Ue*`Ur}la<-%2p~GPtuj}?%KnQd65RdAl@k{Qo zBRe3jP5kN{;1z*)XxK(PGU!>I%sbb5b^STlP}-Dk{h}8|Sr3Z|S(|j8#l2y#H~Xl= zU0>RHv|jyr{dU?EVB3~QKB{re2-*sNRISgd{-~-pJ;u%kPg2`9I+H>9*TJ010U#w_ zwqqMijknr3JfmS|W)=)JO@Xa_i#*WSL*eUJsiY&h+NR|u2U+ib*{JbqF%u50JIo<f zmr~EA&Rbf3P18OmuF&|VrdIk4KB?c{ybXPGv{#*cTMqCi;61ZiVeUK;k%?p_!HXXf zv)3_wbPF(mI<AIZY!AfOhY~c35?QHMLx0*|e91T$(JvFh`?EXMri1Rcr}Av{WNRhV zqblGoZAcm>%az8CXNxoB^~QO_9s2Vdd#xFP$HRiEm*~+}DF~%W*4-osBZ@v*CBB1^ zO@@%Kb{RXq4<9R~oQFF&ntr2m9H)$?yw&Egz5XhZvp4%){)x~Si}`qXCH+z6j*4sz z0V;ajY0}jF)palaz70g(Z@X5e*?7J`SWk@)?|r<?WncT`DI}Zu-Ap$9p(V*jcf&yU z-I_$dM#CgAeH~AOpSoXef<1&iOFbUi2h7%!i^?1KA)x)V|1jBdv7?+3ck)#POfT2~ zvW2*eEldMd-yR?eF^dX`y8@V(@@pWQX~Q;wADB!C)7$`gyR&JbE?!4#Pe{Z(YIgv{ z?eR3wi|qm0ELQ7ZFSl5<n}j|PFrHrnRnjjHMZkl>B_{?+W(|BGT|=K>65h*6$h|@x zPRW(Q>uZnCI?1(GMHI*Il?xvqDYEMgBZtfBKrFv3;ml2`Q>zxI%c+tZ+4bN?Ck*nY zUB4S#7RZ~PTlr7~8x|HE$+v%`I|cm2i8x;DN#!5PVw~Kij2|*set-*ds-9;kvo{ZK z+k4k?PP9{EqR2>-CGo15aFpa7eYuhK5bEZO&3U<~Z;qz@#4MSgxIQsW)RzMm7R{_T z_2qiu4kb>NUPvnMvS+8rBK@9-vBp9vt6O6X%UTlb-z0{U<h`0Ft6UQkS#lM6O*Hgp zbIGHC@8)SOd`=lvcjSJfBWGgj33qYbdzBE9E_e5|09Dhk1&Yg_V3_W$JP9Un&*#*d zp9wY?h+ZYsMCEhwQ`=|#L@xRQ-^jl|bs5*(7h*rtU}d%#YrdggPY5f}sIvF^sOjc0 z+?@Zy)Hf0iAM1#pe1tv`Ap2r){B#so7q9E%>|`~}u5)&)oQF^@ZtEhePKGV&O6dh( zCo!=WyHF-Q=vy7-!5T|Idv4ov9f6eZ(qGgUp(ZWKfY}%2A^2(QF#9L5s8`tH*AtC& zDg)6u<(kj?-Eluq6PXVsZXDE#RH7RXk3_7$9hjBVj})27_a-u_*!V9bKGMbNM_Nhh z-R)t#urp+_cwP{0C5FvRF!nknT;aRj>7kQnl)R$L)*<;#kn*TqLd}Z{n))Ni(Tg$5 z616mmZ0_BrjOm|e9aAij;^dx>!c|5K@~$pB#)4j}frDo@3u`*AMr?Nq#IujtzNc$5 za{LleX*Mcq3R2dOXZ3-<be(H-(&ceCAE23YenZpRV3y(=D|xZn^~s-mz1(zg#;}Rw zFHVB%FgSdS<VLUU(wf=nUjRkb2Qnf|ffUde2iv*&2e2en;L7NMAsA`jbzGion*ueT zSbp0VK>s-b3h=KUMC^LefbgUbxQp@uyNOzXGPx(vPC7mWs#ZNPsu~cUf<+f+Jk!Xt zN@XL-zPkcdBLqnjY(@qtsl6xI<YFFLnB+oqFrFLWXxVt!6Xy75pYZwlz?*BdAgbm& zKa)0RlGWvs1+O!D40SG1pKsJvvHkKB?XN2zMJBU+)0#=?cjwQgzdl=Oxt9>S#YNeb zDjb>ieJ|Lh=mz1Wzu*1leSd2l(Xo_BI0ILpPVGfSV?o!;Xvy8zOs4V=c*h5F#53#O z=m&;tv)=zvTlze#Xv9F<?`Lm}wn6(1lBd{{B$R!4JVM(Er`EO>pUfw5{BC^TO&a<q z+E0kB4hj$wfJQvuj(A~rBje9sn_=ANL4vWe5#8dhH1(x`Bxl@OKfi0Xy^HO~D%I{~ z6Lr;Dhil=761aJ_m8sa*9%zpSzK<rYjy7xdk@A*xNwuc5yY)NqmUV04Sa8uVRB${C zysgw4)I*h4t%TxTWQxpd7BR1>yzribL6t{F$PXhOj1YZj5QYr<Lg%=RbJU6$$BDh9 zalDUbuvo^u%GIpv^U4WSoqUu$YYJp$BjYh`BjSGP#vHbKYcd<)ps0Acm(L?7*`w9; z+B))YSD)S)S&4e6uz1#+rAS@gI`Wf6FRWQ5HZN>u&%EP2_N^{aRj8o+wfXSky6_57 z0jmNid5TYY{EGJ|A%yrMWh@*iP=8rJ7ZeTbGVZkGr+vBhzUfj_l0t;PHk(hOGTQO^ z>JNkUndeWK3+sH(D6HA@Q6HbFbC!FX^SwN#DO6##EfO2jN?1jKt(R2rQB;dsrh7OV zigOD1Dhdd+$#mlOd!afPUPH`~Q1mw~6{zs!#fq<E@Asiy$2^ur_Nu<BE}`F$(a!gA z==K-i>v;||ST-l>>%Y$G*17v?KM-Qv05qNQlJ%MQTnOLnWKFi@i5zCuzkO2B>h&W* z-YUH+z}kt6s3eh80Lj$5kf*PWIbo#e9pVpEG+KZln6tJ#_J<Cd*IOPOsMXxlaYa}~ z6ndEQBNU}%O@d*Vd4q}?YYUU!u00@uZ1AQ3mR7cU!5blm>mAdk_a?vEPd-mo^djU# zgqE?#$jQYRX{q*)tv?9YE(T(Li8%=Sk|I5q0_CUOU~SbwDBv!RbO>@Y<u%c}yYBts zU=Tnv&G9lgl-4&vqFj7L%VkaJ-JX2Q0*YRfn+D9ah=fHE4>Bb69)}ZC1L<@er7}{W z-CYXvP{CXtef}tT(72C}?I>KE&zI3i_^gtFp0aKQsR!_x9s+)Yevsq<%UqzZ`^slI z&UyiMt`ko#K?RTlP8&V`s3xLp><WYvb>zPTBzkZ9)e8ei-#rf(DQW4G1t#@zkRN6W z&@>|-RcUWT0WVr(-EW7%LN-VS-7;Z(6pqiXrv>O)ikq9whw9hNML@2dugAHv5MISA zfJxWdUSee%`eVk|CP`F~o|&QtpW@o-vfT=m5&9aXSwL6rv-Y)XZG@8c8{>+4x_u62 z-x4Qxq!FP}d%7s@?DZt>(LR@R$N6A*cEuz{Suoed-Lr0B&DfuhJ@_2VrgX^ssEdi< z2yPsSqd4FlaZnEC<Oq}Et%}n(WPCDW-JIF}L@k2T742}>>}L`};p-K0SSETV*|wI& zq_Vn*t6B34x8;5mcgA|b2dpA&9tX!aUqase^l`cuPlU}#%*no^Ql56Zv(d~R!2-*z zIL_Da9^C45)|y4q+|+p2^F)JE1YwN)?2%_BBi4Z^=UVsMcUi^}ZrRF@IoE=g>HOUI z+V545+2kCYog|a;n0Q=Ut-C3}tB%k`Rd&<Juy*-*3+`cwJ+`B)oq#BEHsjdq>ORR5 z`<V2Cs&M*8jT0}ZezswY9@1fJUrx>YBX6Y84}GgdtcG?NeKd@Phid~R3qHh%AF<5G zXu5M;9X2|H<<L4cwsrE~=&D`0PERCc{&9Ya_(>caJRABLCi`O<M%Gr0rSz22!^QVY zJST$&<x?^BVmhI(qRQoFQ#qOpA|l66UDfNXFZVK?zF-=oeTK9$BaIa$jF(3wa=FZL z&pprnm@&(d$l>Nh)0bXQLQnC|Hphd<x)i@ZN!|MU1X$i=-Zx)2h#b#na+{pIu&k_- zNttja5mMEC(@|@9mOb&Scf|61;gVH|{6r&YC&hN}iA2kLi1j1)oqX5N8(&!G9kfW% zZy$9PCvanzR7q$*9wym7Xf-&zKKpdS^u{Xfg1nQNfYZBV-bqR<BTw_K|BJEA?V=x) znisOAd#?n}pEr>ruit-;GET0Pye0K6rAfZhpgiheVc;{@obDw1tZ2)T<)K&e<{+su zuc`um?P-y!P(4EZt9~47XY_phj;~^ubim;y{s0^JuR)?~lqTOxpl}M*|MKT%S@rA3 z9s}^hH#Okbw)jBL#c%U$Z{u;)7k%9dLmy2me2y1-%+JeM#cz(|L;$52EPWhgD%WQy zkps3OHbC~~RnA}zQp9p*C-M^jDn$S3;xz6rZzvgd3!QigaS22*1n@s>pxl6DlU|PI zYZ{=Hmb&Q43qd4_e?9qY?@6ZE+=nz_SGCfjXQosO06bT{>f2l6b@$Hm76_gVpS4^7 zhk1&yOWC{bY>!F6o+r-^gu8G(h*ZS%SeD*ZsCipWSIfViC?f~)m!qd*7kS4!Q+PpK z(1l9ixKjWzpgeHG^L2XxSYTK%vu9y>EQ?nNARAOUyz!g@mS51&8fxF#i^Rx$b-bBd zDx{nqI%gokr}YN#ld0P6@6P02p(%&1So~S>`SFtTyCf^%ybXPbyIeSKiH~Y1@wz?5 z-_s0v+!rMz<9;3U=FTwoI!}+E?b(VbvIu4iZ>+}R`<f}m=9#Vr;y6idBV!IJ*Mlxw zw7l&ryw#r<#r5bvyP<Aj&mR{z=Ek3Nz7h4Y?dybISvIo|n^>}vy`k@~p-i|Oy31)o zr+R|$`6Gr&M|0Bth;}67D$4X_)ggr;M+K|50|YXJx;uX@-PUGnVJZcbI*sWvn{1jN zs;wyV(2s}h8t2uXwTAz&H(QM~8S$K?BjI~jSoLP|rK8VhNp0_}7lugil;KHBWh5q+ za&bkSpSf2A`$eE#n>|RT678Yio%9My9*L=%ta)x-NNzDJqRB#v3E#q$H+>xDH3+#h zC9fzhesQ>}|3HF-CC<~*_j44zU~!?CSmzwCArfKv)jo@u7vhFAqBX0yQipYG^o9A# zHmG&9QlfghBIK~d?d;cAqwiGEGlkvtLYB6>KQ0E5$d)G4Q;O%jLuJEatG6iW5L(WZ z-2zR97NJ(=(?ldYPk+oFzSUEC9a&vGL&QGx9|uJR@hBV5S});PIEO<9UWJrbdR%eo zKh%?)Leta8&c#k@d5DLKk36f`dXvC)5WzxOW)y&=St`NDM5JohTkU*?vRSIxpY=_0 zD(9PzJ$bQ>9c6I>@~pgIZ0ze*bXI06WRb{k$eM>*h-H;FMG4d!-WmV_NRn`fK>zg> z|A^RVVWf^IemVk++u|h?yHAc>Dl$s|N*~%Y7Dq!alX$M(?L<}hiN48D#+T12XAmi( zy(#hD{)~~$16fe-TR<|(=b<Y;>zr@rFxI{MDIhby4^SjnU4{Drmv^5umT2CPq`i;z z#&GtfV}^+9Pau>v+Fdc*BE#izVq#1Pxx2E<9R(pqkiZ-RyjgFfzSzt$gNcBvG$Nf{ z>9YUgX1-+_E^c3?LNc4ndivq61CxM&*3(N`c4)lC+svi+D3Z^H(gbM%w`1-@>*;4K z^Vlo!3c~U5J_NY4oG?&%^Cv)aFcAuk2iR|hk{B2P<n9{Es$_^7P=ww+MA^$6nZ2Qf zBFccE-<!I!Ya~;|tuWCo_*Skh3?k)o%)w+X>4r3imrQB^s&qsCX7xqzMGRnexw#22 zK8)a>w@b#@%Quuf1frDNwIrB$2Xw!kof1XZ=NeBc+Ku6Sxu|DJ6Ik9)@DaATc8F9* zxeIuWO0IrolwuQV$eX2H|6x)!S40;6of&C;ln|{#$Gd9DiI?j|nOrr&(qk};Oayyy zR+)R5iPzawR=XH<$B0Qa(Jd3CvLdQ>T8st4)%9`Iu^8DFt56(NA`pzM;ll`uSv8!3 z9zkYb{b1A|Hd``!ViI|$(HD7@U=BC7Do;?+km>OGp+_5ctE;Rp7q3>52A9G>E#77p zT$Q=?VeUIdN=QB~A8i2JJpO>-^RtEGPOmHJoOL9_i(e^+GKRB4Dcm~*S{2J$IkR#m z-)Uz3TZ`dEGz>EkhCa*q=uO8$5~)?7O$CHT(~8oo2@v+I2t_W(x!V_Ojk%r<qEBVd zmIZ&WP(EV}i*GdrPqtUJdFAjLgn~y6p<dOQsy4C1@U4_K9SY|v7X=T~(c>`Pc?v1> zZx?kDE15Ar4kGvl))Z>!q?&xqQ?g!i96=u7;?Q>yVX`falDBOhB2IphYA$tQxaBOL zg09=SW!CFPK`!uy@LM0L-luym?Yy*K_(-jN>lO{MCUhSgJ~GCrFym!;{N8<azJX{k zO1&)S#rAit)Xf~)fMgo+;$#BOIVbv!w~`?UmE&_dlp=WNHxGS(D1!5qPcn2M)CS0p zRKE%*m_>da-fIF98!%DD4!KfZ)4u|yqXi2(UP(m<CoIpn&O`80*xX}H*Y7Sv%u@%% zlg(lspF%KEpioAB>^>TJRAfd@LsQkyuQjYY{anx!(N&B=e!I<kLsy&<d}8dz0+r}| z^*tiPbU45a5&=XwRds4KS+L{d+4Xh0y(QiukF2<RpLqbPic7NjBR~{jv5K+>{|Hio zi(LQ#I7C8gavu{$obbh~Sf<gYmZG)BPo98ApbSlquk{dKK|J24KAX&g@}LO-3&Ps7 z<^XYpk{$LTA)C&tM>O%Gi<`hlx9jWM!zfIizw%cX{-pMv42y)8<%WyQfBh2wyv%2D zeghDP!bzqz@Hb6x@N60~!JqYFZxf@gD0Y-dl!V_}TOu0^JXB>5Sj<7Lq@k`G(;81{ zc~Zp!nRt#}3l})6wj#<Z$K!iY%fodN{LH3`^TVSX$9au+GE)({PZyjfti0w`r-I85 zqN{9LARWp@H+K2qm78fNNLIa17Kj)!o=G+>DUhy=+ZM>W>v?ZKkTsq*Nk{NDe)U;L z?$ys~HJT2F!3wPfpF1X(XDTmR0`Rvq<U1Ft+1Gf^1PWNKR9xhK&fQ`~mNVsRK3&~} zw^zCRQdE{;yql1^HpRRb*d$WC>?GytGfA4eW*s9LN{&x?YCLW0MUfe|?J89NZ^w-o zEC4Km@aEO8?)$gg4MpN@FqHC>*T%CkhWXwXE2KFk@YuzzjL2m9E^qb_39wnDoURQC zqNNcb#pScit=tHS6psT>Y_k#EO$d5U+Y3z3=CnxG+&tVF8NRxGNSFEOOrnURrO?v+ zK*;MA(sbw#B9#s;#6GxW652&VA#*#l6A8aVAryR!544uwR{FR!tqt21@ZacQ|0J8m zk?_3Jw~RUO<0>mPgfu*3k{pH)Z2r;F^PMN@%{yp_-@>p{k#r~~snFsK+W{}GI^R*W zHwP|ftLyGepvEdpuoqJdJ&9inB@%$<Tm1_)cEnRHlO?)Z_JNc$ktJzuSx&Ts2NYmn z3+DLe042*b8{RxEGDNxk2OdO!eIP~s>0Ud*dmKiZUwhh!3cMZfIB|)It(`3Jxh*<t z{>24AO#g}x|DIhoRI(AZ!&!1RcxUR9WhYrlLO66mBRP4<%%H+h(z+79GmOP|e;JhO zfeN#P1>A(TKu~?_A-HSlgEhd7)Hj`)wh2Mcl!6!C1r1x^fV%M0mw@p?`ID6D@mi|w zYc!mKkhi~c=H*&Sp@tT4Oc~-q?^Vh^l+G_@bjKuXMIjGF*y}S8%(TTY-ZV=45Fi)} zv#ZB#ix+9!P-0r;kER^3c9nlCN{l9Ic&L(i9pjeMJeO)ho=7m!8+2bYo|OdQSPN$p z+Z}i1w4y-)J)8k2h&#RNSEl2HXDpL#w|+5N_!0IjsVnDR0I?!|+_<*zH>Yh1lNGDJ zur}sZ2d3hp`>fJ-cXwmW+b)^##`-jaNL^zUmqCU;R9&UK{T<gc_dhh!6O#;o`QY4i zvS05hG)`~)1kgWEJul+oIpkMML|1>l%hhYL`$StsdFd8=+gH-^-VtU?{XNs?>XlD$ zY3x4z_-doAU3rx39C6~j|3Rq1e#W$~Ee+bpDKS`dPEj{D8}tK%Xs}@IsN)8PPXJej zETDQ|7=orJmiEaItd*<K8-6+?v8ZZ$%0PcmsfO4(j7$4VKg3&0Q@epdra_Xlc-b^d zIye%EuV*mVyhL7K?C~NG?MyuG%Ltt&p9DUEF5YBEV|U%U@~WhvTb&0B;tQ$`8NRNp z(9o!-w>lP?4<$2kTvkRIreBZF)wn%!d7}b108+Mb22pugbcVUQ%%EJ-!|;m1i*@bh zn|41o10g1InPy*h@RDS%Vm_xY!q7zO5W4_%KvX@`=dd!;Wf3UAZg|3{S>2w1uXm;* zM@0?A4ni!;!(NAILIO|;My9e~`t|37B<#&0&3uS*ax>fI^4uMui7A*%0;Y<Bfh;Ss z`-31}QK0^plj6V?usDsaC8^c<-P5iK0IsG9G}48>d)bz{l98MDU^kHxj8oe^K@3CJ z@*rMC-GbZ3Vtm%p&K%s}lYC$0knUO5hQ(}c<(CS(55xXdID6H^!@}8bQZit{P~4|* zCfd;Tz|ZjbNLmlqlziZml*sp43K9_ZPb|y2gHY-m33+{@&JoAoqEz&?KzOve+tXF% z$+W9!9#F4N7d*<c<pG(17zcP%x>)IIo}I7G2JR+4`%t9LuyBrloWw!n1K{f%U6y`q zT4JOjy-!aYq`22{t7J=LS-*ZljfZ~3n#NKjWPF0%<MGL%^E#^jx$vq3DjI~mGSL0y zr<U?KH+t+^n_HE-{7b32jJCEues{jgIh)os=`SW%2(w<^Rlz=;sC!YhB!l?G$?o2k z%(Zxa?hIq%)R5;dkSBquT4KVtBg*uEZJgjO!^AGy_kpcqV*1IQ2fUdDp8Dq?VhIc5 z@c@VgPPgOR8<6M)#T|#Y`wVrFQhAo8ZscSOJXKMiT>3&RajMB(G|0R{QX4&4v~U-a zr81HODCAdCp7V~&X&(G0>0bj0Zi9`!OE6&$$JCX~%IvD|<q=wk?1g*qIz{ZAQ!66~ ziP!RL8c8UTY*3N<c&Vn<xMce$V~Y>!m0w4%edl6cE5=OYy7M?$zZlU-Da$F93mP1p zVlfihxL=|`^-8_wjA2vbfy#JGHK9#r#UbKh6e?@v7g~w?bb6(W7Y==|$@9n(F$P~I z=tx2wN8J=c)YVEEeGu>UO??!4tEFl(9c*ZT{YIpc8+omG!-IzEzGg_vDjq)bdH4_h zjoGgsGO~NI9$^R_o?G!EQPjL@z*M`pP>Kyzlg@IC_xnN3cz>^HaUubPR~Jd)YyEr| z+@Wk;Teh_W@+F3cpS<pF4*@w+FHoL6?qJuuF<h<#p63v@#Ea`-xOuz|FNsA9T9wC( zP5!z}N?Viyb`o~%>^``VP2hblM3|rza02=3bnFih`ef{EwM?mA@#|@}Mre3I^5Gzk zE9owe?1SEt1Y;odhXHWTwveO|yd*kyM|i7i?MrD1+hPy{5}#&9Q0VUH@xv1PIQK?S z-7rh38p+Aq_%Fm~^feT_d8y9!PQzp%XWD7`g=te17n`0;EBErx0QUntoMO0@ULC*} z%th7}Vydx&8vbO7@AXluifACWiR{>IRKUz}--Z6`aOe;mvPuM3vW_8#)*_N+c(mj9 zvyHO@{LgY_wd{EIoP3nQngYr8lNl!K#&9Hs_;_|){#=C`^lWoXOGRRKA=Ofd1COm9 zBX_+W^1Lh0K=1x6S|k=Md=c@QWm$pvc?a?R!I@`jMMd_!gC<g5dx3s#10jnmcIo~B zi016Fx(YPo2&~%S+eV%|4R`M{KC33hu~^ctjx$POW;A|mq?hSF@^(RdTTrB050XD0 z#tSYws7JV176rIeylo{WL?g*g<61fE{+gUUXWwdiq@Dj3@|1PJT?X;C3!=zc-JVQR z$&k)Or}8bKk90Xd#xeg3>4cPhg}!~8Bmc?@+C)zGgk0EpMlI5Evc!Qm+#)g7{YUq@ zb_~s&rUDEXkQXD@y#-^37|KUb31_$c-{WbOoVVT(7>63B*>oKtlg{VcKiGYZ?s#7= z$X;|!f~xRB#0l{nV4`8LiEbRZTs<;6m6|<!YdMvGEwM92-;pb+<$1Q^K1KceeS-PX zuddwMo;c05!m)6Rxi&^<nrZb*7i^u?rIr@pz6npD;|vOLFq*8*FS@QiEIC|22_q?~ zay?DeMq!Q$xk;5sk*fPS(MmoBN2^fro&^3C&d&H0s)cO<V)4Cdf-;+m*xBld1n0R% zS9PEu@F2PNAxkq(93-wqD;?A42O@pok|vT*^io?FbT@<BG}PJ2Pof1|2{l(N`BgxR z2G$7ea7_$|%^>qBc^eam(mQ>Fmddw_q6p9c4^$b$WVSaae96J!il-1@9n{p5P)!tc zG%HQ^9>GY&<+U6S*C1o%H7xaRnXM3O$rCRjgTdxtTn`JhT4<7jzGo!%jLv(rg?_H> zq|gN(K)%5-k|kn!O|*?+@3}KsSx*scX#`!+1{;oAOEuDjifuK@f?&t31UfeIH0p$^ z-Riy75PO0EhhO>~o`7cUWmtbU&)m(BmUxQe`8Nq~`;L<e)V|2z;EIF@?xowl%PUtv zsH2ZmtjnrZk-PwJ=^7c?N^&CE5IuzVF0)`Lx%gdqnH=DV6)19OTz?#uLRaVKAYY(t zz5Jvf3U>2bS-56*09^P2WC$$yJe|@Oe6$XyB$}daJ2LxM_g5R#@^32gBr0s&U3Zf% z+|sPQ#PY>V(ryk+N)ynwlP%S=?arSdzAlJ{LuS3Ht=YrM!3wCnf2q2Wt9@lLuY`J2 z7)sDr)M*`}8@}?*+I&vF#Q?eEnq{4%)J#}C4Nmg{SienV!g19tlX1^?VrAcJd}nz? z-!wO;DN;gTLE{gWvS<-##d|XNuu@-n`RxvvI}kAyC%3W19E$rT^hSou7*{KSNG{BK zX*_Fb{91(Grxw|;tw27`eUC7j5J7;EIDBN_JtZpl%IiKiif)znQ@S#SG;?m4WvLaC zS@`y5O!#DEC8GjYSQ7@oQ;;I=^)8%__^r;qIlE9X|MXUm0<;f~@!35r3NqTS;Y>r{ zDG*+`uOg15oKw<A<$jTr_y3dg0~&Mw@uEZWVUOL!a=VU;7Gd58st^9OPvPas%?r#@ z{|&OJfN|Q1;!s{UDqo~`C=e9anJe()*%XEs776cToN0*0Gg*In-5RTrBG6tU_$;NI zUCky7m-MbJ{lr-Nj}1n*hzYUle_77@Mz)R-Ar!;?QMTulRtgd#c8ON3bU5O3hxl*Y zfBexNek~gpx^EhLrTa|PUZd!V8XZ0K3H$Jq*xX%5Sex>X+whJa6p2#g&X0iudBECJ z12eszaq>6f@3+af#{kEI8;pXyS0)U26Jey|f3Peaj|{`r3}N&wf3E8!fNZ$E+L?0r z^H|tta1xx}ORjmP#^mIGeeK`hm!l#<&U+Hbt^LP=0+yHm_eB>1o-N<jJ@8ix{4Uu4 z_2*tm00#V-)%RBe{O4`|<NdKR;G1+yCT9OB?jNWD?9=DYe4n-DCvz2_9@laQhSaRI z_oA|$3s${=_}87PiZEzRCy~CPUxTnDq*Xdvfci1jo^pKiJgT|F=x9xW`3LvBE8!uY z(Yfba<2N>QMUI0m$_d!m5Ge^{WO!;SsJ{ds_At%-l!S&U>hIsZ|N2iKRNodDd7|X& zoY%-cRgzi27jEiEt^eq+`+k3qY8yGYrAMfv{$F?f^$13HXn1YK)7RKHFHU(!2m&OW zapWHB(aj{z>3n<xd+Wcx@1sOR1)+_5RmA%Dzrs_i3?dWDx0)YEy?%6-;K=LbN*&Dw z4bKaHcPM%(Y(k_i`S0?>o@5#-F^@x>IqTq&0x1bY`DZ<V%5IJ^U`s{xI!$#8?qJ+5 z$lf-+@589tdIt2M%8t5Ec9X3p9?Y!vXME#pV>UqkNde*8Tc1zgj0DB(A%Y%8w)7++ z6<^^){`S%yaj2adv3BL_AI#=nkIg3EMaM|f-c8H0&sXB$d62rQ0?;c2;<tZI?QF%q zoaK)DpPMDhV0C_;S+b}2kGAB%@h<VM_0A&ZagB7pZa1<y+<8R9dRWE#bK!}!TJ`H^ z6Xd`-UZ%U<<x_2#8bf>$6uhVPw<jdrhsPmKxVk7j{aZOfPg7ADP7!!W87jT6Ye{#x zgR8OXRG_AV9-{i7jIPz$dS$Hb3A@-%6l&!94xpPF{?y<Z{`Q}-Am}UcgRBl~E)X^@ zvIcOp>W^K{w#(z@j!8b@|Ik_6*!KPNx@dIx9<)^Ut<N0Y!HshFV!x~+Li(SVIh1={ zIKHLK`T63-Y@?0Z-^wfK@6FBWuwk^N3EG)a7#fI0xf>Woy!)Qtax0Nle@oMi*7Xb^ zAb_uzr9ojs;a|1F#SX?Lb|hqfGFhA{Mb(U*++-&Y?-OI-Qr1B5w^rVx0<G+lk-sN{ zjO@cLWq25GVKXqaG6y6mS3o3$piJnppwecM!JrlaYqB`}b$0)s3E_<`7wH{C>_xXw zS}H|li~S2lo?3C7oAYq3%PIF?Wq^$gYN(9i&*Ap5QgEM&5R}uVKq+M}@%FZ%ST#4W z_(kdaVztk&llcX84i{S&8ou!_<asw58q}1f&ptN*w7^Z*iI$UwHycX<&Cl(ZX3d_Y z)?<=SUp{)kn`&SbUH#WQ3k~y5tL}WH)V+=XIejr%Fy7h|R8Z#rpRwqG0(!mf_@NUA zC|f+K&nAyqJqRN;0QZNxaVs9NMiD*@r`DBm)5&YPrt!9bFfy;ro@B0-xpe~%Jj`A9 zo$RjzCqRj)``@(>@fLiYuEwdhoR@y#Bhh*lO<7ai@Shj@OAJy|L2}b5HUU5Ey4dZx zi3@Pc*YjCVzsx5Dh!Y2xp4*I}AI2<o5LxUoDgT1UCm@oQ(y-`@rUxwdSPJ#&h%iDn zhr6qVJ3XL%G579jmnamlpk}zAPMOaE@RbLhn{`b$g?nwQA5sHw=huV8q=xDwB{#9I z{wztqSwJUzBZPP|_hrUrTL=&aA8T2&ibDZa<T5G0&Ccr|Iy}7U_LgmJ`7oh5%Z0C= z_D?ZnI@g-q1?SVFeU{|Ii{!aE!7y9yx)o{tY&}}PNDA^$FtiC|$=(@Oax<HqBepEO zTbDjN<|!A5Ax5;@3j4Dv;^V;|lZC*3ZoxhW-ljRgWV47Vyi<|q#&u=jzRNq2uSn!F zz|}ozQJE=zcm3%K<lN5zGC_Ti12v~Cy!(u?hvD?)?%&s6ChXzH2l;U24+}uz$jn}T z(hCQWfNx<DD(}kvvnB4S*yb&0s4j}LLE-&c(Bu<0dj$i%{)QsWKq=3r%^wA^6JXp1 zMUMt}_5c8YW72sgg1;WbLS`|@1cp_S@Qsl%kdv%>)S7z^UDwmsZJJKT7o#bJolAsQ z!g*%#o{Gdo^sjoPP<kG#QY~`3=0@K`xQA|ccQNEO3jjb0ddGnMi*))sNNZnC<S=-# z?4XuDnXf2YGcs{@bB0vUWztng`HpPqp2x4k8JiilutzWKBG$g8*2g^+64JxOm98R$ z58ncq29MpqWLxZ<yW6v71d{uX!3Hlq^Y3#R%gpXcxP3pZqOP_M9{o5xZd<=e@3Nlm zQV-xv^$YK=*y@E>7N}2Pe2-@*69z$bEj;hw36hDB2j26tthy&+B7;OC<#kSSS}1H* z3P2u%(`6TjN-JtdSKEBYyaN4X=%f#HoZvx}=&4pkdRG)BrCgY<O<iX?$Xv&~uSf$n z!Cq`)Kxo;{;a^IH^Lq{P8AE17pyd_Qo^fAGF|RNEGTmnlqO#fz_i#1@dH}9I_Om4& z;WdcuHUMoZp=d-x_~u^v)LKBzJr7(nMT>Thbo0(L)@49;#Rjm`xPXX|Gf0P3ZRJY2 zhPbxz+P&uCRk^#pK{$1pwGWzkyAq+lKi|aTT9?KVw!y;f>^$c*5kAM#LF7-d8=#c- z5peZ(%z^HwmfFek!$fU(HKXcl+|O2nP9pY_Y`3Bvv-RMK|0Ecblx)nj3%z}lj#2s| zs%K%TdpwM<$MuGGn<mQ2jM{0&zslL4c%DstYdYGKjYP-oOA_D*JiZ`Ztl^i4`jXE9 zdZF{Uw)us*D$izibe<QOrE}oKybsos=NriYC{z!^#~tbJdvyV)1TO8sD|++rWtbjt zb+#8qBPHoM$Wtk8M)mULijMMaj}@-G04iS55s$@FFtQiikH5>Jh11f|b2RK!S?MX5 zYQjM|15+Z)Kq?AJ={LYpeqXLaU0E<c%bMs60>~23p+{iU?|^pXKXK|r<cwIcA9#E> zB9K2qsn%eI;j-_FRQsN{s7{fRV)0$NV6)8GSiTdU%MX->dcc%h%d_v%UV6AvNyiVi z3__2gBwkKs5TrL;v8tJK&UcH(CWGcS0fn#DvJOlt^~-|HcMh<0u!fDCFa?dT%7l=M zP&gkQsJl&NCt(>_R3EiTNQ?u;K<p2KiFY}2wQpd?hhU&LayUL#{KrWUViXqmZWn3| zW|*Yp%2lfE*UexV!L5(EQey%*H%)FQ4q#EUN`4<~4A`zb&w#9DK+lU0^4tYeg6nB3 zfNE`53_wkzFYG`nqA=N}fyY6BFmM?A#i1b)tCKA;a?*JBIMDb9VcaK7d$D7_#qgnC zo?hm7-f>8DzHqvN3T*`>9HB;*05D&JzVp-r0l^$)Lz)yo;&95zsYZ{mvT%D^!?`+Q zp6R)^SHE4xN&W-yKoaDn*gxdKAdEz&2~UYdrEXYWO)_vUNOyj3kXI{hH!f*tCl)iJ zht!IK;bT7{&k%qffx$n^DMR-us@g2gMrMT{0FCrkKy6H)*K(xIJ%8b9`u4F&S2&7t zORYskurs|H@*xDNk2XqV*?HDpwg%{b_>XOQsKGJkEIpnvb1SD1b*lwZIDzJ5H$i?$ zJqBr0$ja}gu`z{G@09@kKO@Thb{`}P;;*^*%g`YF-s)$iI-O6$#@Vk;b9M;X-Uk?W zJx%^8bm7o1O~|3WwKY+!OOZ5q$=l$xO*rqq9rVdnGKVB2Pw1cnuibQ`of6PnLbypF zM9aqj9ffs8y^(WcN56f~Rg#cG{YWwmFQB)!<(YM~XDqO_E8`CM;-L4ePeDszn0&@@ zRQ=hL_40KWnE2vWA0i}C-|qlodrTzK?kt4w^x7tjadfr%ikS~&v)-k@-;2$4e$!5` z<TB({WizhTtN86U<?}@G9^dA0n?|Wxr<3I<D;p$Na!zN@R(5ak9hvyIrt{7BJB^wV z+YNiS9(fji(>9m0om1r=Z3NR_UTrAPxS*Z&4u|ad?RP!ciMVrJgV(JCU#@!><wfSD zlCd8WOMC%A6oP}7f@)+r{t6NG{}$pIJf9xPi9s+5r>jENN(C)d)db{~GKP5wIgvOJ zd29h7aOw9o9@DjT^W2UK_j}=CuU8CI$QqceR9HCJJ~&6iA+z*siG`R{>{<*E2If!@ z3DYMMn?gE(6I89SnZwo)28dBk0^C7re4#W`fdgt0xzPt(*g>K(ENRVvs96O8-SZuu zPnbh+EJmwO`%O`C8LA(_Nw&v5)<Hii!>s~9Oe3<XU!qk>6W`lJrL_H~9fRM$O4|g^ z_rd$Jo-;I##^I+SJYClHn;)oSNxJXCNq8W2-f<B^^X~giJ`c0e$sPdQHu@Q2NIMtu z6efCy%(^%Edde?yq=&wvDOa7Y-OjWoAGbS+40dXfg74AbQIQ8Ti!S-&&87)DwjCHs zT`c;W(4{PH+<S^l@4rHo`JT^u>no55^_H$WVxHlvFcu<Bi|r<N(fcU&5+Czjnr!rQ zf$Ud2WPa3sabb*@WM$E^GKF|I&49JD-ulZFeYCBTFhWXDwsaTv6b3RXK6C*jdP{Xd zzyFkJ8y%<K_=rWqi>)VO(gT%4<+h&0!a;ULs)OtGPCjC}K0l&#`VgsF`NnBH%4q&Y zM*e4VVH?09>mY+Z`uLNi;iMDyjiBY)4)+7jw?que*FP}G`9_*+PV_VNNBU7$nsPW= z;N=ZEgzqsa+&B7mf8HG5lG_Z31>hUzWV$Z}5Ru_5i|`D7KJ9>)Iaeh#9Yw-1#V44C zSd7O%5m!jf-G3tcs{N&?p8M`+>O)+bI3?B`B#X>(aV_me1_4ux)SUurn=eylM*KHO zmY2g{H_oVJU)fea3ip^N;bz%T+&lsX-;td)^7Bi5ZqZu)OB-~edFsoDUumO<1jye~ z)?ps0r5Z_-V1JEXnZ+}?=V{Mvl$KQ%O>~?flg6EKP*Q7)L)@#<A7Pym&TbZND#Rab zL>r#V_`Q2XHcsQUlsi3KyDw^vCF%D>>LL`CEZeo4*k|a_)48HgGhV6eHaGRWbL+J9 zb=pT08*iT6AF~hhGT6J*6d>E_ne6?9U{s-cbg#^{z22s)v2!nJ)6!Rc5=&C0{M5~6 zur0sLrj&FkdBKd`4lR+@#Kos%Up{W|J|D^q!{yQQ5<TIFdsjj>!;@?Vm3=oNrq1X7 zFC{(<Y7=j%Ef|;_mw%eYc<Qw!aI3z5&d}n$qFJW1YsR6qEOfzru6*G^Gt1!RWLdiY zmF&W@cEYw>$=;>;Fd?<!)uzzTM-f{;^oR_)^ZTFIf<xJ**hBoK*RIQXy_Zh2Ir;tV z)v@<^Z8r#6Z|9z*G}(QFe{^lTP!(gTQl6N)6_qLGqAGA1obDdz=5zK@o~PY;3te#Z z!y|-=63Mv=>yhx!+VpIq_V$<WbkD<M#Am%0C~z}=G(NH{2wY9E$BHu>KqDqpW!oL3 zh7K1DrwmWwR6Q70$3AAbqTtIrm!;n{xIIkrrLB0vbYB=VJ<Xnm9pTF&ohPu949TIt zXb<+Nz<%QFGuYw0qvOGIZd6fFF;f{=k&Epi4|T1IWc-9J2MjZ8$b~o9D3c465)n`- zF<*SRZJF|4e%zrjwi#s~8Hd&_q)a1+nzqmAhOErxxU)RgE^ih2@nuq%MUXl%5+wqO z_C0~rU<aQ@szaP^F-)&CEdl?j%*ao^Oqv3TB_Tl+Zj56D+%5isPwZ>6hi|tH?ocCl z?yj2e&@c^Ybp#SW%HMlR7A<h15^DdVLPbEESb+FKnGY2={VLsU`K5V9z>WlbS4bcN z9rG;zm3<&?X^1qIL%>zUI7v5>vK!fIFXv)i3_+|wMI3>z%5$>pIx0pX5xie(uG!ex z#}aRs@&cc&2zM{ZbgH6%A*LXvzFzY0tVBr^NTrV8l<Rr6L{jlfWKau=#JQVb-f{(D zf*17RA(Z8t99^S&_^SB(_OG&E1JoJV^Stx<GO~m}??>vDweu>4Gv<2S+C_e6w>y2W zVmr^j*TCI7l5d%gIaP87;wLwsD7LTOb7j0LT_Fz<)k}@wQ@V;hmW);t_`bRFiUS*Z zjDd|;%{#v6gS|2}Oi^CD96Ef9DSA9SY+FH(0SV#yj+edDz4Y`dD*_N<=TU{Gi6z`F zdm~^X`_BTSVqHrSNlK7B`{vR5+pYs~a7L2A9DdBm!Td7ldslB&t|vDy#l1(unTSw} z*0hnA8TR{)L^~!$LOtl04{vL+s=BG9Yx(x6zemmz?IW3vx=8wa(@J@vR{EGEaUs#9 zE<`^H=LttV{vi<OYVb{xthB+i;KlJpBT^&7Sdx9PSjIXnlP<JJDbI5>5IdMPgK5au zqEjo=Uo7ff{JJ6)+z?g}o@eSwN_a!GY4y`J{`EO;!w(Cl!cv3`H~g862G^>DDe=|R z({v|`p1xMOPkD_aZ>;<b1L@Z0WOAU7CKvBik$NIzngS0kQfCd~8!L{8{h03S2Qhu4 zTa9XonYULyMXVa_vTk4K&x}CVhC565%1RZm#t{5oX4)=cqjxsOP<FR~<-|r>njVYg zySR)rkD+`!+9-WfJI8mRd~{LfG<t$i=uLZj!XYa>_+Vxw!|~LyX}acEsQdj@(5%2_ zViJO&{r0AN1G%SY&edscUbFjcXf9;)*FhBCY+33TEQUR&O_ROD6=#$M*=ufEY$jX1 z2Ks2f?V1BRG;W(MGMDjm+gee+{l#0ibJD7>Lmzg@yk4fElb(hN-wj*eG%U}$FGM;u za~NzY&llGS_nY&VJkQl(L~vMHMp|$b4^Q9vvimir;ikkBasi(LZ{(*EG-~7ijZL?b z9fi{Q(#zdu{=2^0j&hl5)AX0#ru}jxCIqt{)dnlF+dYp9#j~Zel{s1>N?bWAVR)L= zwySyjZCB&v)-X&|sO*o|8f0e}7En#45T~KKE2I&>qn5jj=gkgJJu1outxdOh&Tu3O zBznqZiD+3UM1>Qu;R0+Z)7O%?g2dl=SeeEU6=IKxQAd-(2csNQUCR>A_Qp*9oP4t3 zwBb96qQuqN5V!zYhFqaG4VY2My+gGA?fv;l2%+IL&R|g1gBFb7$dXkKs$!$i3!n}7 zbY!(X6CggeGB<2Z8A!_(h>CuR3C9xll*YrJGnJOG;J!af2gEm*Mu#$I)}E~E(PCiS z?R5~(eWQwMOFN2~*x)%HOnfp+RU<=Q9~l@`@OcOVv;Z}QDFwg50GakyDV(@!A&+MT zDo-zfY#)3`W+(PI;4&xLkvy`Oz~|$V;GvQor{n(rVeGBrqUyf>Z(@L<8HSVr29S`D z6o;-Mq!Cn5kS+-sKvH7p4nd`3K*FG<yFmm7l<r1Kq)VTJ-}}CQ*Y$hu=k<F2n>e-C z-skMI*LttdO0YxZxm1m?*bDO9TNC>1+hZP<L^=|2jCM;CiTK^U*)LH=D-uW5OPFCw z<&i*&=m+XlGFHe%B=@j|b?_(32TlYfz^P|2>-Ie=HimwuR{hi^8nYM>VULIar4<Q< zNXD8~qI@qhbh$RX|EB-(ua6Hs+k!%!SBivx*J=HV8zG+o5(zelW9m7(BkgB5^r^CN zjck!mIjV@yWx-@qAg9pZRMxOIBb{ozow!>R8%lrn;{!tcs+7_#BFU|Sg*hokx7n)X z3Xqr<fs$dazK?;ILW*%7c=kbNMM;@Q3&E6h4BLp5RLOW*%G~%c1LX+ybruQAbx{== zzkKT#^1o9TYD2%Z3YA|~$Lo}sPr5X=h<~RsvQw#k#b!Nu1M9XUwQ^H?6<GNRS}E#z z?lK00*9lg<L<%c1ONX}M@(pl{!6_=jV(ZM@NAfgDY`wmnr&bC$F}~6*qJs#ID&Z-D zD|QfpQ)G<P@v>Tl_`M5jshzZ9!eN;W%FT|xsP;+Z!&}&zOPj_O$tsO0k)5ySR$%EL z123Qi?C~D39S1hSjf>cvmCPK??%blEw{@%YE#UGYzooNfhHL$uvOkx7yV@4z?@bXx z*UG!>4jobaVmzP=9SG+9vQ}TNzgD}`DB5BY9oDw#f8Z9pT_w-5fH3`0dAHXCVHLi+ zi@r<L&{Vy#Qt0<s^k_MdZP_^dVXQH8c5&M|?OT?nr0L>E)4JUVQx6VP?g|JG5T=fP zmt_@bCsh2@Y1U)v{XM@LmrapJE!9J7cHbwitoP>Fg3W)wn#V`WhjkAnt$$3qqxUX~ za%|rS_6=7NpN%7kj7Tl~Pex^n)X%8G?N|Qw#dn;1n|tC1lCqrA8#3?OuM?6nK5@}J z{8AV02<=CgG051znSQ?&#ujb$naDHJG$1d|bky?KM*@~;0=D1~GV<#9Y{|O`LQ;oz z%e`|5*SA^d(*^IJGhX7R@xKMAxW8Xs_y8;ObF#!KG()PmZQ|B!@#}_O=-v4%={pJh zSjkP_T@Lv_&Z!KVN}6TV9!k7;!Q~N-5(NY?)Zb$iHu$IxKFV<c?-x0zU_fhxdqP-G zF8a0NPsq7!Gl`?`C1M~>ewYYEC`)BiobcCe`Rm#VDy%aN#?3g2)YhBsDaJ<Z+Y#bm zYpBQvAnFDp+C1zgx(xb}ujvJ%mz_xHVAlM-bgyfRlQ2C$XJJDsh6`n7Y97baetJZ1 z>=n$oM6jD+z297Yup8B-V%Z)o2;sgpA+`$+-Zh+f=gK{v>2G^!4kg4!96UP%-=p%t zs=SFvtKf;x+l~E~k-<=I2xJbC2&Zx3QF=(l99KEtE1V@q7!fJ+$jvd$lA(|Z?~Mmp z%O@EH4|uYw6+-*Y)J+OOkSjaySa;q~+zEj#%ZutQDD(4t0weKnuX#L5@QZ^Era~eX zk*?9pb<g`tKH^RO98E#ZEf_C6M8d?nnzEmL|4=WP<#j{K*#hxdJ9Dbp$^F1^+`ZCf zh@3RB)UbS}G(c}ib*qN=;l3VTVl`c+PU^A63YSx`Wo+XD`=KpD4>G4Q^?`WL$G!dr z>^;x6xXcZT`<)e@+l}tBb##7?RV7vhjOez{2^xY;RXK==S-Xq)vDf0U_-|zksuFdL znO;G{ONm1WPwYV|B1;`{@3PmJJ2%)KM_(+Nte9Zp!^<8Vhvq)0&Q1VZjR@^3?m}|R zoM7z1nnYQw3XsD^J@kOtKn2+FT&f?g@yb8bpMo9RZ58v_fjhzIBU`6%LR(|>VQFKj zram2Q!R2zTUCTXI=c|{8hUboIQa^0=C@zZe^@6R^U0AkS$Y2N|hH31<<XeO+@?^_* zlKtnQs?zM*TwBwVJqqXEl)l{&Rl*Pw$LXdQ3d&D!h>gr1FRiyJXw$#!cPgzfk?n6u z%6?iLnyo^jXmOFnL<@UvO3`v|r1SO9;?tJ3+JswWFKWija~-GW%ltp--gbEY@%U!j z8xwJ|hB-#S>pPyudMf^a6LGZTC5u`!b(x>e@-n1~NZbIHOTMNTQ!<;P6fDiBW;I4V z4;NW3=1wuwjR%Cz^g1FhWqc|cE(2IY^gTA}oaM<F>A)d_ZI5JE)6RTfzMC&c+f9D7 z{PLomyu{lz$9E@MZ+B-)2W)g}flk$o-=tb3d3rdBElJwk?LxzpMw7Oy>Y--wQArDM z)<0aZo|Ys(8};$nw6I&BQ&=39J-*H!XZ6-zbqN~(Icf16&uVOVve*;#r{N;jg<_IE zfxdSko2wyrxzP7jQ8~Bav-+=+pJ~vLguc>%7}^cq4eUhF;Q^NH0x33Jhvha5NVLRa z`_6-DY%diB*>!`qwXa>}smiU}j-*_RP09nm?;X-wAOGOhx{d<r3jg&j7)Ma4_7(;1 zcSAxf(Q<BO-5EE;Et8=#aUF3HYRM{?Xbs+ntS}f)<|WsAdTyjhk7C8vL{JtokUCex zh$oLLfgi!*5>-Y?1YYepFZ}ZJi8zVA`9jLQx5nj?6Wk}N%yr_BeB`sG35}aV+ox99 zh|Auai!k<hZwl%7mfuIEY|mczem90D!^)N!IS_eNUwX}C=rU3epD-&A5Il>liLBsM z24wqkQ4rOFNdz>8Ipb4;BhN$ZX2;T?xs+3qc*h}^reK(SXTl;{UPWk@o{&a=%gn`G zUcq@^_P*d35)$syfP@<fLYvhlQl;!Ke~UzJ*2@k(dqC&o3W7Z<eYzTJ^!s7h&=NI6 z<Q1i#i3r=0lzIw^%xQRVT{>p5$PAt?@0IvDNsVVY<XtvzoQnV%PKoW6_u=CznJK{# z+hn`wIi~TiVZe$zytBA`!r3Baa&Losk2r+Hh;9adg>`ge-+#eCoXGPK<|oJm8pb^h z&X9i_IBfQko%fCMCrG#C+!thz|B@Gha0H6UDG9qTEP3oob|tc&@Ssz+f}MdLn)ygY zNEMPhZ_OV^a>U^qwH!Gds+&uhJ0GfsmKSBKOuj`;{jLH!5P6bB*~02~(h%fGRFGP~ zdDsLawNnlKd;_ES2G@ud>|i8BtN)_ZK}29A(LXKUdG1!rYi|BirqgAlXDYY0V<vfl zy(0XMp)EUa0)f>n8cwTM36nw=OEL0hVrQaHFhvIwKuP#e_(x_1LXg8tLvhtDo2_uN zNSDArC$U2>1HZ9ZhS-0m7FF0r$g=v|Ml=jUDa<@aveN4;FAhmgzE&Cbg*YZ{=}dBb ztb@!_mP5HS#qI8wZRPCLOZ?U}R8@Kv0M3C5byH!#8sebhZZmTqVv#RJ33E7v1$aP& zXe!WM$P8B|JB5rBJ)Sa0pnye4h#%dHH(KK=W+bxI6?X@E^uN_j30?;xinhTY9bOn5 zH}siZq1;W~vC3?U*=Gt`YM*1Z9W17ya;TfoTaly8;dR7}1lV7WzIxf3_muNFCt(9$ zorB!O({jzGll(+jrM6yB`Q2l7iCCl&UT00j4hRpi*BFP(g%taw`13F;V6AU^7nCl< zOU!6c??gkHxGAxd1Am+q4_~lmJExY&A1`>>YEfeH+RCaRBb!ef8sqX}70rG+3QPwL zp=I&jh`GRwA_vQ@UW9_t2@4Vn$%^IdPdL8^O&Et48DnDf-n-Z-GduQ`bcnNuM$*{& zFu^Pktu8R8Gx<!^z_0Cyv_f*F3Snj9qxL|HW)J9`6c`y-BjRYP{KvS;4h0tk98U|! z)1H)j3q!_t$<eLf^f*+0uh<NxE&I6dZIcg=p$!+jjgoc5h1h)qKYJR=wbM9_;go&E zJ7+8qZdL0R)}X^ny?=NM?4Xf=4Lguk=S|KpIs7`qr_U$sMClY!?QF3HmcLBIm>8pJ z(BRvVF4>xqVU>*BZm3Xy=5WLwVvs}xYp4&#dlVP8gh@SHW?S6&vcZ%Z3`4_mW)ISB z2~#y#>1eA}3D`kFZ<ar1+cs8e_HUFQXWEb2rE4mO4$pH@PezU})_P>=D(M8~x0;6z zze(}w4>@`5%N~KQ?rG>S3`y8ePT5qOWvhjXs(+I9dn1VVow~rhVoE6XRi6=&GcD|= zrk4BcXm)LIQ}D|n0m-S|Ae|@R402#?^3fA@sU=wNciFyJxKkNw8O1w>+1M5(S`&DB zqrlJt?E)>xj(VC+&^4M!es#_iA+b|9Wb&4$G%E;{vQucISS#LssC&$;$ieH8jrEP$ zjraev(14QVut<}_Ceiaxkr#J-d#H!UaZWaPY*^Xd{XDCzZhup!L!!ZXO!l$WDTO!k z5$=G#G|CFkTx7u3EJZi&rW_<^sA;?6OOSKCzs{d5bq0>Iyc7%-^EN<F3Z{sQefOT? z2Et~~K*O&wqlQqi(9*CMAbsL<Ry5DV`9`!=xT>F4@!)saYpO%uS{3e=Ro)+me02_O ziaW@xn>Mdwgb$<=LeL7@22sTJRftTuoXf(Jp;_VsSS5lxr5k+&i}3H6?4Q|M<FTy2 zwT7;_rR5?b&jqJ@KpfecO!kdPm4M>ehxqSo=Y7WSlFccsU;zj!loix_;K=1i$IO$p z&Me<uM%Xt5T}0y|3#t~5D7hsl8A}2p&?a+Jbmb?F6EPu%;Ay5R=ZmZ>b3|N+I|;eN zCGNOHxx^^PE+Ng&-*iw&@oO^S`y=w4NN%g$Y+l}uhGJq|COFJ`Mf+a-3i9Q2!vK<P zTbj>R#0P*V02AzwG!c8D3w$vILoSjnOQL7s1q3i!t7H&4@Y)pda1W5Z%??R8<GPy( zrtvIxIn`D}s#`ct{=U3+r^JL85m3J_Qa&(|k%qI`%U_ep+9}@Fw~c^4#FLDGiU>&a zri0oFKaL|H@(sY8JWOmEN);WN*O96jjdOsVq<-WZO0PIemvjna5`I~A;n5qv=y~Dc zka3>c__T^&jTCbQhq4vf>08w>vVD;qYeN9x5Tz$)i{Y$esn1jW3EOe0p*=h&K}xTA z+LuV2Qh#3o%S4Jnzl=)kHWio}_FGf9#|Lz%Q)OS!pF7X54*!!<LB7~<bfBEs<9~h# z#3p41ZjoyrMjrN1^>14F$@j_|h<4rB<4OFD;Ae;iTq-y_=ocIt8cs8zx*X6T`;?6f z_@8KY=%#94k-45n1vi!$zC<mWjPcZzDv+tnA{!5OjN6LOTgMU-^TH8mREThh|DCj0 zRjItv!slyEYmytdFpXn^$p9{@5kT6`-Ro`)Rk`0ezbVKNAAho2XTK9Op)VsLY_asX z$Fs`g!*Anwi`U%UsXn}@^LHENea);54uUmXHq0~hfWuf&MVkazM0@}7HKYu>b0=;; zmH49xw&<zA_=rxr`@qo<Hy`h6^&cr0hnmpr+t1?V`e;Q&sK!3XS0Cs<MU`5)#hf{r zEP3~)+;TS6DHCEI&9vRy8m}*6DrgPLKSgDj9u!SJ4&tPFv)0mZxwJ~f^36IZn<Tn8 z_u<vO-3if!`mKx5!9JMLrl>B}+`hn-599Q)p=VmjS@he`D=WXUQwfKlnV;K*&S&b` z`%B~ElfGZH&94$}_y@3Ne?=``?S(8K37$aUNkH`%Jk??Ive=D3*d#_(fY4Z0G#Y>h zKaJHUw?_~E5hc&PMq)-d0<*%MG+LZ3&>9mw6T{%@J09Y{IYC#^{0`f0hc6G>LNd>R zn;eL#qd@Py*5{|5iuOEzGu;7sO6LlM0SPd8s=R}i1-|WUIx7eWzqq_L<~CB8@<x?M z8<I~nt<G%v@D_+y1dj(*WzF8MsmJH+7YXXdjeyqjaGM!VA|~L^5Ui@+76!ixgPUDV z8r%;ljt8`r#{QJAE56p2-Q1{sZ|yGSrIbR(B-?+Y1vNf#Hkq+Wcgh&M6Y(oN!CF|N zBelo@h7s41>%{SUnrs&uXnl^SCI-vF-VugBjO1#sdzLD@pyMkK{~%PrhSu9g;Vt8I zZED=SUv+yiq*ty#3}+MCx6t0EZp5&!xvnH;A!bQb$iITSt~ji~GkiP3s^<*$qIra} za(*}b!i+@mhnffR(ehLkXN9hvWx_O=0kRswabvMA5OUJLAH$aL`K3;yHiB)D^`x^( z7TLM%WkbSxuS+3tfe<{$<1L>6N@b9?RKxLq;+tdgYqo$qVvab~j><cM3>GZ><@p@t z6PMTGF$YmjRN++uae48az~s`^pxjXK=_ZFC+v%`LEz7wU`{LII#q?@V)}Wb!!2HbV zZw8Kg^DP0jvR3cD?!%f24d#o9_K1!Ov--~04c2Wf=RcG-Z51x3?Ws>aAKklaKhrBk zsG%bgM9#3!4^KXA*z9U^UMRa~KP#zs^+(o{b)I4zMp5^3C0wrlV$gKCYTIo;FK&Q1 zWE)LNIqm!v{aY^DUX+s>i9>2^`f`P07jSi=K02UYnYQ4bEtQNaaVfO)$Wf5Gnf_eI zn=~){({rey>iY`g7p-Fcl|+O^v)jk^kKVY<9^owNS#MD7Zn4hHm+VieX&;~N9L*Hg zWZ$5WS<kwwB(XQ=g~@#UQ{p*xZ+C*}DR@h3yUttHvoag+i`8(M>C8bkndeDHL%>AU zs4``^Z~gK|KT<jx+wkxSnZx6nU4<4Z39Hr}+Z|}!{BdJAp1Dg6H@C;(s6*5Kcb(n$ zJ+dSh)PI`XI?`T<I7(U1{knvo%(O0sx>!&1w+x?35Pc%%T7rQ|L`1mGZ+)WJI*D=E zAZ8g`i&#?jgJYZ}ECnBlvLziPe8@T;wfK}e_T@*ym+WcJ`C$|9f$H4(A~iqN`ji80 z(X3IO1MPH6(b<C+8Ngad5eGC3*-+XbDz_cZ8<slzLZFcS1KSi$*}RiUT9fAsYyl?* z{Fko+UqxySK>7_d!NK_5H^aok0tyN>;q}5O|7Rs%FpJc{yc!jcv**BzXW1I4(`Z@$ zVW{<)(Pg`Sh8_!u@FYra;M)Vl;^Ug9=?~su-qU)}JILN7$yXG^lSZ}plj5=^u;3-! zLat8TxVM@4`Ix7|;1+%bB(tcN9gpLV#XC+R9zW4+E$kOTs-|{Z!^?$AGXJA3x$T(` zCbd6_{AZ(RW#7+RNo5lczk8v7cU<T5A(nEP*$8?d)7Iug_0bZWrzJ{c|8up-wBwf4 z(X*`|XPYTuKKJq2LzFA-+TE8+j#SD#=)EC-<BXuhh^L`>NU><G(3@Q&crzPL^uxE^ zB4vo|%xP_^IN|tb2#Ap|_zG`D^PLrl(2BS=Ve#kZQX*2<^s<Dz(dL3r%15q*Jkrv) z=|Q$mlq*+k%dkmKuo0!nW&0GY$7145mqJ*Gbynla&V-Qi!=dW0CQNciw4-7Qb2pQ; znZzifBgQ{H;P_^{lAlTu)E(lxy%BG;RJeUUWr-(VP5#kH&MG{1x>n-%MU6k&83ZfV zNO{)3EaI{eB3~`$q|41;GS_VzUFP4@Yid)k_uJ>}CcDtDP5Z5<p@CEpO7b8Tn8?)a z>sKHJ;4@t|4Ymdu1ihn_&#A9^^R`$<*Ow1=Kv$|q$a_;W+;J#bkCQ2I?Cn|jc9zr% zXYUcwRtG-`Ma1%xW@PBGxtbV(^^k`qU;}M{Jk0lZPK68IH_dh3cA6`5#zmw0TTF?O zn%>_o3-nLOLUa$OtaK7^*=|Vz8z(c5)xQG9A1yuLC!;-?EV2P$!Tj*Ru~s$8LTctN z0}}B}#YmFjd)Ex%Ej%6%pz<k&{?`Yk%{C;(R>hx_3QyIv{*2e6I@GS-pPtP*)WyCe zR9YWoR;Mx1GzSX&MJE@Rb}0uI=iCI2@Yf~R&x9+&*?cCd)c(W5i23+Q_J9BJHx>wd zp@{{;ff(Tt2=I9Yf(J-AlR2;?#Oi)}e3a}KT;Y#2xRk8-Z%QxT{ZblM>ue%*7P?jw zu{-8@{Z4ruPgI0|0hifyY7J4ies&mh(YFyC`1O4$n)T;w?P=!JUmEP6oZS?FDyuQ^ zGV=i4QNkf#-Nn^ZAAZN-{wH*~-6AI0!HkSqyx;F+R`*fmL#=VCugc|a%ui;suTKOt z30)y?cJxE8J!r-nC19fT4~+HizuO$Tm$WpMrrah9e|;OpkU-GpOmWl2eh=jJxvYWr z|6KHcbJu@c@b`;u7I0-eI)^WufQ?+~&^tAzm2@4KXQZyjEH5mt50Cr5?+s4}+mRGI zVm?#=qpkNI==^YUt~5T;r`)L^Pq9EJd-H~vp&U1ASnJ<J^uLaVcD#m>(>LBbUZ0#A zcdSS4k-up*|E$t~9$5dMXNQ2qLJdG<e*Zvj|4)<P|J6hPwKp#z@J!?FcGDI3@6P}K zY7(#m8VqdAZnp8^zbyZ+%l*H;=n7L&q4k8bf}gSd`;7nVd63tnJ4ER4!M`oKLW1{* zxhAin{{7Nx*H!NyvQhEZ<olvOQ1EvtyGZn3$KoZ!tFYr8$kSE+*UusHYg9$|->I*W z=wIJM|85@IRUWweB?3z{{ts6D|Jvw(T2>6W#S(9@?)?8TY(FmUC$t_#&ekj7csEte zfc$&st|;0*&o?d(0EIZ?v-Rmwd*zF?|IL)>R~)U6r9bv1-7=3-bDVkqc%4^2;XMo( z2E2&t?mET4e-t9$3@@|8Vm=B~OynrwKgv^yeTlw*a_fIF_G(NkfYZ+aI{mQh)HeVv z*Z@dI+0+}p{`(49lyE&%NzM!nZm}hpf~jH^4b-avA!*J@-p8x|t5tYHT7g8@O2wxx zYyd<7C}89|JPZDN*V6+A(xcEh0uWbs02~wu=L4D#gbIcqu76E`bP46Kje$vs{Q9un zQUZwZYzw~U`@c`1dlPS>XS6_z?^kUtzU;-esH(VUb8iHMW9Axl^=$wIds;4*q6IBZ zxOW)<5iH-ONbVV+Cey~+P<D3hlNJrMJXc|?`ombqx7piiQ(V{P;Gw*J&f@<7^muA7 zHuB>87yIk2O4x-QCxlLbwUPDZvFx8qw{SdZAd0SNtwe&<H+Q-s87o^DQp0a<Ii7OZ z?c>hYlu`^4o7UHn`Hs3Ox;z}!*#*{Mw<p|xpRE%qH<$(g2^#U6w0^66chi?sX#oIF zdGFZ2`SB*4l64n=sB0#afX!u9nJd_Uj&cRyXAK1`Lku7|)O3wBw$}=|EXb?oKdiP| zY!Cel8UsXZ%Ej4wcI6Ak*Xem+%`~w-fv1hNou1)|GCqeJ)Y+v_;L&pZsPzL4f0YAR z#6umP9uBO=^`fHcS(*Fh$cv1F2^c_bHgpu5vWNgG_ZFL<PI1+@-2Ja%ZUBj7@@=r} ziF*N*3W%Czo!tiz<p$E*weSgt1cvo2U+0G}up6KGraT>o9VfnFFJ1x){Il1XqGBcG z3;=fx2K{aZ+TjTxsk9Ys*hQckb%!159GFvqM;_C)$vg6z_q&-)0LuHzf0-P$guDyX zx{aA*A^9e?*SM@Lu}U)zkgJN;asVV9CznLT;?-(`>Z0B4=PM-(;OPK6=;Y7<t7&eY zZjYCG*)M*4Lk$hABtQFaEdZI58A+@`WIl29Tk{l7$voi+-VY4>`bJyXkv@5?0f6OG zd3fy^tDZPy_fhb~Vc%|FZd4;VmP6^Ex&ZK{M;luV5x-afFpBB{a&q_z;JG~-hbE~a zk^p5!sRa7xO-B#mT5z|Ub)h(W+TvM!PS?wF51{ax0Lai{K10neJ&*8LuqO_FqsYl< zC{Ax8xpX=ZhWQ2vL&<D1H~s48+s$wrL;<7MXXFYS3q*1Oy0hVSLKR}_BQr97^m@)5 zQ8n8fnQs~uz1p+@r{%PKB6A(px?5)%C&BgU{q?hsLZ&-JIp&%@ulXuIJy9TX^>QOO zoJ1mRnYT5$4yfI_E~#LK>M59tYf>(IWKS@%QPQyMI_*?r(wfkEM`VwP{D#34hHv!@ zKtEBX&F9a`-D$x5c&|oiyH)Wnspqv0*_pT{3V>`$1>5*HUp#*QeOExgM9N2d6?*+3 zn`79zE;Ff>CWZ=!xkgM|zcp!RBs&C>B;CuF$qY>zJYEnnyC+P)Jowt-pV5*L-BASO z4VOIp^w?Y~vFR_b&Xw-CbPSYUrIJvn=N~@@^c9SOOoJKchMhGE>7T7ZX+R=@?;--$ znsE~F=Omy6NUbNhfVNO2qS?ctalMz-PSe-92Gcu$`4)BAd4Q<MpHLsSnK-FkhKz5B z;7IVIG=|b82oU`F#vE|D-xfIl|6<lKsx3ue%hbccgLvM!uaZLdK{cMGO`)JGA5YBs zd?<@3D&9}01}}2`XNKO~@q9qQHEgZem9VBY{bRDywoMk3+Z!<fWK57$Ptx~BK(!HV zvjFn!94$}{-izCbzOY(!>hGC+dA?c5EfeFzit2>q$^Zhkt6j}|`JrzPx*b*K3+wMx z*!!nTe}7>&FaF)!x+1<A`cCGF>-PtbUiV>k5e~xl0eJi*=n0!tgg<>-M5eU2YcIo( z;asH&l^@Nq^yW%ozlCXG<2Ku^!v)U)ZNcbZ4p$(NU~u?>fu^#2;6NH+XX`574g8oR zBtF;HGOPDW;&8z=OXOm5?h`@56n#AFX<7qB?HhcKeh?^Lv=OnA-CP15OK-70@5@Hm z<mGV^3lEI|aNIVxeV7#mI|e2RfFC4ukGPJ*m`gHDftJ4jyt!$(Ea^Q`d%nKsAaFgS zkeR%l0|3ttJ{KCPy{J1_YcN+*t&eQcbiLSaY8Zz`jU~b>fE#GcY!vJHyb7zbYx?K> z(P@WGS4p~%c~HY*7?Uwjppf|ru}oBdXV5WY8N`;D7!?diRgAd-gS}WuuE#^H0{031 z^k~EZFrWzhIvn*x%1|WwW55#`*3Y$-EGbNvu=-Vaq9@&{+Q<$H(luwbyl{1L+{C9q zv@*Z^+2;Inp>5I7ou|K*uu$3^c0ryG<U2H4KEBn>e$Ky3<jaCfv~8jGu%vRcAiW-_ zZaM=zVs35g98*5Y<cD11O-N6uUW4{ZYef1IkOVxHYmB~@!jI)Q&KUOuFp1AzBY4B~ ziqZ>3VPu3Hhe-FQV5<t3TfQGYRg+Xxl8W^Zuh!U)axJtAPdFt=Ze#)J4c3n-ykLt! zZF$PhA-UiC@xynQqs=~QlTk!}P%UvHlA2P29Y>0bp6CP;?NlNvuAyxCww;>!xzEq% zWjBkdToV!+gQuMvoJK6G^se7%5_G_w@lj_Xim!aFUFz4;9AI%?G~|T)QoFSspB*Pf zc+^F02Ef7Jfzsj3G}P>0BIJ97JL>?z{Dsi()6Tkhi|~;Sv)(!?5ICF1Fo6zPng_Zj z*W=pAIHT+MP;0pfxdsqgg(&{0M;STWO#pq1)?GYj$V;vR9I>D-5+b_bgH+or#vdc4 zrY$+O3!N4|5E^(gB1SWYl;%nDT#~lrEd+<|ux@9)=N?P)gCB0)jJAkDRpO;nz#N<< zKHi@*H``mgA_Ow<dEOwLQdo$?shn`EA*#}l2{4G!Db~OaCJ&3J4yGP-*G#bCd0PdI z0fX=Z*JIcRkG#TquakY6f1hu;n8bAE#Yyra(sUmSJL;zCb_?@gCjsTGSQ;+5$fLDs zrob=M461c&g}G||fr*bqg6EpQrBS32?rp(<h`>i@>vDe>lkZMF!MKoV3zN~XM|j2a zHVg+OzvDNq?e*JVHIs|qwHj~quC#zKAm+W-y$h;LVkUtCDB(YpsE5}V%G$l-_InRH zhmr6Aw!)1kz$AY)eAirl`80oT)i38`VU`c?cE@QKA}pbc@tKu~H8%X0GnQ~O9o~3f zqIaW^jcmYM-9T7{HM(hZ4a(8s9WLa0uPYqM6^(1@GgFJo^`~+=JZMy6xU!nq&kDxf zgIwL+6W-%qK>>-+!HE>PvBS0&Ar>z!Lq@qrxl_y|7u(OOj+W!3Zf7X54jB(Id_&L( zbuLH9YPSm6T(Y$%o<MU=d%W3-Vc?shY0J-?I~7oa<rUOJi%knx3s+hyPjd=?-WGG7 znTP`KvF|XdKEnKLhBBZlqdcWYtu&U74yF7+B~8au!`!ODP(*q$qqp-|Nfa-{_U0A6 zpXho{&xpUvU@qkoxrYW4Q`rq*q2oNM9E}1EvxVL@=^%%tjOe-$h97XBv9d+EvvU9D z@yzKuAn}i{F?w@`+lK<zaie#lB8*W|R-7d@d*b;9>&D&$A7T>AH{1b-x};$ogb2;T z7s?9dTK(bhNHQnb&kdX8dlC~Bh_$|z_NP0eg*vr##}wz3mSjC<a#<cz_U6WI=%IZZ zRyXoPx^wc1+F`d1)!{qDZ<L6DylD*02o4%q))lkqTlQdBqn!0rD+hW^+Y^in!nvq> zeyCTV-R>L*Jv4EI#V!6W!~TQ{%~IFq27f-tCp?zAu%DhV264>-Q{f_u%j3~MXh9FT zdfubll8wZTXrNkmbaRS&sS@`)Q<dT3>%^{b)1Y+~?*u(8PFm*$9v_%)Th(37edL<4 z+Bll<smgo_eF@iey9dVt?<|Hc7aKDZ42|&%p(T{&ZK8m)a?tExl%>q{KE(VX&(IYx z!;%j%Hf4(^@x<f}gtSV9F^BH3{Y{)&5ycDj?SHAl;kw7uJ5Up!#7aQb10m6Oe+>1{ z3lUN?k8z_Qfq?Mv<@#wUBxF$$<pQY-hwQG*1f*Sr%C8*BKq}b|d4>y)idYN<nO!kx zm6)?g<Lzw)@1+~auN;U{-QRi%wM1kOV(_3a3bHp0G{`|cPxhy}7J5$^<(-_>GP-%n zcqDjUF9a%vA80QH{ffG8uQ(QzNF(k<rcO$Tqn<>pF0B{Gqa#h4#XSUDz40z;gC*G_ zf+%`IbrExwklS%k<*g%3BBbk5V1Y0TNs*6O@M8Z#$Vu`FS3#je&$>H~d5HVK1GBBa zUbL|CWAC*ujWf-2nnq+>>mu_#RUwxmDMGqc#fP25VfaUi=m7#oNk@aR=a&7+_Pd|Q z=U<dIo>%Xs)73G1PE74IJ<6^sjb_(LXKx@}rWT3SN%!fD0VHd-vHp6ykaMCjzZ}!x ziBR2l0U<DD#M|SL;p~xujT#;zJoF3Qk1~dxjDEu1o7X8xag^LWmw8SWFb;(2t?YXF zHz<=B3+TB;grypEH{O$wgSqWA*f@twjl7%m+!3sFt~YlJl;OhibMWBlh_-i&T@5&& zU_BV3($qAHRHC-;l?8n1G%@!>&X>U;)_!g!p;TQuKLm)<@6L-JMg>+1w0bt%Ehdni z>IN;Bv`!W&-o0)q1*XnOv#YyT@Hom0!78>n+;hJWj~IMHZt&2Z_t`n|3or}T#E;+| zQVtmR9c|9RJGPL$n=5Z5yzRECRr)(4p&h=14R3iWZHFjsa{4t8zgU}HFu}+z)JNjk zqjzb#IQAK?;#AGBm@fZ;CsJ>ESdAKGs)R8?PFJ_4S`$@S7|-RvrtT^3A<YEbaS)a& zg((D@b~_1-8$_Oh&%(r=I((P&n7N8sE#9i$zCt9bVdwMs+>xb&>yuBl*00x2U-Lbx z%kGYGD{VfG8@E^S@oQ+3I!y308DcRZ$vE0fj`t6H8c(j4?a)S=@r579>SB~~S*;5a z_bJ?2F^71iV$#P$0Cp6EZ?$Aen)a#x#c-_G?HGb%O^NI+%XkZoWyAPa3mZ<!wDjLX zc9h0I>#yq2TBM0+D7~ui(ONU&wqA-JPSe+22qxI<h9e6!$g#|=+;(HVtU<G;$`X@3 z!(GpdzBNN+^z0A?%79x{-)H?nKzHalarlk(f>C<HxyLfxP1-s~YNW@)K`BUn26zDS zO)O6wnDuk}ygO>?>xauH%BI!->hV<;;*#V_m7rq#CO97=u9Pk`+q=t}P9#UNLwuk3 zK2=ks?VvB(tW?DR*X0Proil>!r7~)C%9RYs(Dq=%_S*jp_y#z1W#(}s8Uom77{xG& zl$UY50a)-Inp-pkWFE;k2>l3eMBpV;C)0x?tStKTb~vK28J@@<>K!x&txHrAj7iZn zuM~lEX__4tXTOeAh=Qi08G7iZ^MVCl+<n(m@V=tRzQ0qrM?NkPN&$Au(v!<@M+nre zzodtS(V++3T5nko5f%!NaCG8BG>{YkR!XEl6{P$*=vMz-?fb_`Xj~(6MQ;^eGoghE zWVs?^m_hqy*Na*k1Gu7Y)@ihQg&Gyi>KiWmR~Rg#!%ej~kK$Xb8dnDGTI*-mPbQOl z?y~ommGy3l^p$By$9u+YlVXn8u)LK(;k+Rx38fC-x*hQ+R+kR}+3w}MGnKRIvVjv@ zt(Ri+bIk(ZZ@Huu`YK?m?JTQQ)$YWIW#m<fru%@pW<=0-whReX3I%L!!fm2?v*yU9 zfi50RE~@7VF5s}+j8Mc#uNWp1J2Wx~A)_oXXMZoq+_up{)dPeLYT!3DH(L5!D|p1G z#I$YBwV@GUH5pJlVIIp;nhys<QKUuK-DzPP??(cz!*Q!~LYLk|RAhYp-F<;(no#mc zH}=%wLZNJ#Fd;w0)tzY<E|EuKSD`W=tkxZ#*g#srp+773lf@nPh_1MtVBFMx%$8zC z@!(~domksg*;cppyPZtdSP!;L)P!L*>y`AXf*FJvtk44hK}446Tl-mNV#}Qiv%!YJ z40(RbD}Vr5-y!|E-yv*DdR%xZ)-%J8>gEQ%F}+DYyE6F$n8~*%_eDStePcugs`!4} zQA#TTj6dW`>|C%Osn=ddW%nkwXFp-Qir_p4*`uqsY9Fx6hI6J}hO0<ZX-y49>EKXE zGNZ{39~D?86x+4ess!{mYxbvkzF*n<o*{8C)2h?_Qvr{YbV-pO&}r6d6L2b1ARTYF z?Y<4XVv(~7OE#t>CK_JsY#&vRC|gV;tmxA>BA<1$I4U_xA3}Nwpohstvy7h~7_G;} zNV>DR3m3##517H)nqx+<pj&3+6*_La)6em)Hk6{M&xPDGi@vrZI%UirJyG#=mpke3 zUSKNJH#eoiQGA29{%hL3rBl+pGWSCew<VvXAV^arx0E0t$aeTERW)a2$E(aCal9KC zzuU*Y6{vJe?`F-}&^QXZjjzVh{I*%NSIwK$uxy<mXRGG;&WkYjI~B3bkvJ5x<von^ zUUJk<o1G%Bu2jZ3IEY@c@0uv+aC~^}=>9iP9iIJ{vO5%>VH~&@tRq&xLzA3~X!Gti z;7PzoX0-PAkgKEcIj!|6X?!t1qd8F4ONQ{r^zTB?bIUljRbTU0M4}~9b>%Q#E}H5j z9D#Ynm}s77G?rj;8cUcAauRbW^ys5jWt(uAT)w`6mq%3}qD%68K!VUZb%Tly8J4WL zsfbli?%XQN=7+!<k|7UrQ17w3dS!YucJqj@F39B&afR~rOJrLy+WfI`n}VvljP@J? zEx*VB+j?zuO%G*1ka|8td9pG#r5QLf2OUaWj~u4I<1{t#;3zwoD1bHN0U)035}PjO z@#Oh;sZSc_pb;*%N=>0!p(#!3SS8q#D!(cAJwit1Dy9k^Au^29ME`>5V+udW9;s9O z1)6MgPt<+m1LOzQxM?Up^>5*Ktexq^M^W0gZGI!ppJeo9PqDutF0nTj4~yw!o?E|J zNfL=T<VcU)B!!eP$3}FZq2sJB(xb#?F$x7P{5K&zN@*e#!zcMSdU%vxNq~g389h-8 zOO6ZPX~M=dSWU5;^%0vK2-L<r>Nj?dEib0EpnHQnAqwmic&y$sI1vxMaUaA@7~*aK z?_uD^Owv`IY#_{fpyXPN3BGSu+hnI04n7=cyRjfi_u?VXJ^VAYtuBs?n!&>=0;J*F zY`rEGa>P6l&~vYJAHu8dPIpR-Z{Ahi&bX~V8_s6ru7t}%>kH=$Sx6gJGh59@AYV{{ z1f*aH62boBMA4MEmGfVEUB#ZLKj2NJkHjmk@Hwgvi0nyT@ifp;eEVa()YR*4Ur6Z3 zsu)8)sn;d)WrTY&_0&Gh;%t(PLkLt%`LENMF}C{I<|hRouWT9>dU(~#@`kyg!HNvN zp9C>6h)mIvmxoHb<l&-D(2DG0g*?UxkK2r~Fr9}?NU{*w^JgOF{K(RGv6f$wk+p9& z-(?In(7b)Ey~aI3HPFiN^-A83$}m`ley2g>{##=i?kSIf!NJa^U%wN`$+7XxZ#2FB zzzMO1KRN#^=`89x>5N+^85BiJ!Ae6y=#`AiF3PYFO$}>e_=((dEs=N^Eh&hS3uDp7 zBMXRr*=C=jo~X&san7_#8A=#Vrw$)f!6>Px383A61B?&ps+kL%M;V3hQg!?67c)0S z6dwui<}a{1e^k}iQpU`44hnkM+p2pp5;1a991xYYe02{NtaJuGI?Rl};J^{iSR@E> z#qz+S?-%ml|AcZ`Xk1NA8jD@}a+E^YgBg;bV|y0q#{b^y>)7FMOAtg^`>|U?$~WWW zz9hdW33bFgU!^?1)l+H=$(7EO?viQ!cxYoM8Yi_®=I&F07B6ltdc1|_4;^AVAJ z;mx$+w{NPW=!YsD%o7ssS>Ung<)vQa`}eWS2-9s&S7PUC1zoI3;O7ZeubvsBanK0s zT;~YDg?%^19#ab+<Ft;(u|y!Lhe9_j3X*fO1&FaREb<K+>$A%Um_Y&^)s&SVb!ub> zhdLrCEOArMih*(%iV3=nJSOxLrQn;h1bbDyWyn4iWos8TT9F+rsRipv)l>vfOK6Qv z4;WP{(H#9+?JHEwkg+ZC-QGVe3|}x&@jpe)#(>5D?DzbTS3ih3owhj8vY5Wd`!Y7- zU1myLg!T<pGX`&TR-d~afFntr+n=jr8YJGv!0-8U1kR}kptaL9;ruR`5u0Jr&GljB zv)J3l#zZW8U&<Eqnywyp)O@*f#pNd$pa+O-p|c+zWGYVQ^>q5xc>W4mj_1K%&<W5x z`m;#2#s2c^iK68*IdRUE!JQQ`Q=w8rIm)}k&TW6Z^=k3Z>Id11+=dI5K~tL}2AbSM z0;$i5gXF*qN<+4dZL;uD%JkNZ%b6$jipTUGWR`T|Q2k$uYaBE5jFBij;-O@<gk$i! z$QX64-u?0mD}L_j5Pl=@josLbLRmVsR*ysDUQ)-KQ}suAYv6S+(v;liobZo2*|G#H z#;9%k5{(?3p*U13nU0VKSEJJ5_!|?|GSU?h3fDyXJ}N#Rrs_Lh%cN~#Y6Tkactgn? zrg*AdGh~pgy$n&NMfu`7?<MX2hBk9Vu4Qu8Zso#WrOMynv;y^uC)OhQkmLs`qrtxd zEwkl7??Sz$^ENY4>nb%#S^YFxJi$D75dyj^0_=Bv93|&b-MQZ&jO{WI6V*CS+6Y=0 z)G8u}#^R%hOCH(1F(7e9p#P={I#Jgwo~<oe^(8gLBsm9$u6cJePi;A+qV8@|=Fn%< zIrOv2^rH8&CXYJLTL%=&AYb%(cZ3i+Bv%vTBTSM~0SaY&7wd=J9CyLElu|vVLpiQ? z`f=TO%y1uT|KU|;cwUVAZohQtIZzux#y`pLy|-%3m4|~U{;S#N_o`zV&XSm99jnss z_{MRkrU4n+v+dtM=}TFu<hw?2KPCOBS0!BQc!QlxKkG?`{+-8!km<wc85-%D>lqto z$FniAH2%@O`6dMp3zmnFSQ{1AxTzwn>X{}-mx0_H++^o7J&x~lY#%)JvJ<2mpEE2R zPI|~~-l(F28_%=<c1c?{SgA`@Fg0MVk~;v)s|a_o`0?lS->1ef781o-O!4W*EXD-V z+*1Z8WOgI0jPwyH_ay?icc;BaQam&LzgNV1nd%&eloN;Dy^;ozFXJMmLd36dorDsH zyCnu|RS9iNh~wIIi2PPxbgy8mQ6~-*!?joUYB~&&q4SXe*sHEn=SkU(8)I@@)K9TX z49k5tEWgrC-KCHQi>~<<4k1-<K9-nF_QARWY=L1;N}?H~LO#Qu^1V6bsY{CK=MOAQ zxP0Pg?&d3BYZsNaXi-Q`-wkd#kyMZxx5*<XIYe(rpysg+jI1eZk$}Jfgqq+gD2AS{ z)*sM4=@7fqg*vnhH#5cj5$z(kq?V)%INUc*Z<RkM@~<3Ik_`Haw7DY=T?Q|+tkAXJ zG31Vk0r%U~e=RZ#rosvGQ=d&4B$1j4+QIY`Tx2$ri@doea<Ydd1fC=Yf(o!fNVpdy zGx^RO18JTm_qc`hiqV2?tDJleu|8fU3!9Iy54Yd#lXQfJqOnOTVH7F_m3qK1y?lsU zW@)_cGlO4`<D;-t)q)!DU)|B1jCBqwi4_b!R=?m=kNFskgZZOQcbIIb@@-JL5c8=* z#fTSeWkDkIpEoPh>p<;N-?E)q)<ak&gA3xBfDc|5kFYv!7vVeH9vBJiCO(BA`xCW0 z%8BS!GhNXRszQEs9Rr?em?`4Zt+#5vV47-rWyFLJ4OS%bvIm70LWm4;QV{oB;B@T= z3hjUn+R}x<ZdXMIxST}F%nE&682TP!ZH8nsnANKn5PADJ8`(g<D2~y<K$%+|2=@WB zW;arVGrdT33ZD4EEEX^3;H|wEhLGOPdgK_<y(U_yQbnF@5pocbTv5#+uJYUb@Nhp- z{#x>6Yr5unZrzh&(jIt~M)GqqvN>Az{OzlSyVmkc39pmmbh)QY4D1RSIP}aPM<eff z?gV!p@b*7nliO{Y?4CnB33e*j`d+E}sD;Yv(aH3Rz4>|3_?6-uG7b=4`}*0TL2v49 z@I<>^6X0-ClDo&Mz}i}cuZQ6?LQ`d01)6W~_f&Qn+LZsm3~KQUK0Cy+2zLsJ_ll^g zQpd`|-1YJ(gDETtsZ)OmKP!@ptHpp+nXUEc*$=(eqd7i$w<Zf9_tBIuEE^+U1*2B6 zJyckNNbO{}5!bhD<s1!lx-Juq=}}djpx67*!tmGwPPVj74)5lK0fZVD)_O1Lz0<-9 znu>#+?p54AcP5X*IT1|TN^`$?e^<mGIsf4BraSYL^d5ZD19Vr25bK=REj{R1K#x}Y za>rJjkzVksuGRw}VP-tC;DjFxMgV%zIH^0fk)`a>`;M{6n%<%EKfAuH7n<+yIP6Vm zAL5*I!`?_!{*J0|&P+dzJV+GpI@ku@sy5`{AD2P1K{%{acN3fV*>y~n!YIz=4Tz%n zl%@~xaXGqbpF|kKrs)C`NN~@gA_NRWWtC;4Blhzf3{5^SDC3m7Ri-%C%Vl_>T)%&K zOurzS7c60&HFlmaHcgLx+%U%EyimzwQ<vMJ61J&)GU<DlmFhdsCm(ZCA!`9YF&{(_ zzL;<ko=m80dO7Z^;1gPr8|G<WJ?0jfX&n_hvOJlCGJX?YWtVq@WD;?x4wWkG%Y~CB z-@qt|A<Rj`tGxz=j_#WMpKZgOL!Hq6HsZXahDHTMmZT?N>t=}Bcs*d_c)=T|_(nmq z3QW<^!8ZSbCXCd5)?ETzQ9P1bx^v-^c8j$MkB#b>^ePi*0nw^gh=au+JyS<NM}HR~ zrZ0o{E|G%PFI5n~ud(Ez1Yx?1tP_5t7Sb?d)&PPlsnI9Ae4ga>8+KTEsX10qK<t_9 zDLK~a;#7-?dlXzQ&fwp9*`cjNQ!+iT6X_7-#G09vx)akkAod@@rxiZD2aN|}Y%lq0 za^>{~s~0BPQ{}%!5aUxPLQ-$Ir?`Ue-_!%5^n&9(Qkk5JaD8x2g88<>;A^Byei@JD zj2I$0a+DxgOuapM<uPjAj3H%_&QsG}>V=BlYNM5k^WlWSJWA84*;}yYUg=>)27*Q6 zEI&`5Hoe?$LB@0UrQFV!yII32OZ3rJEMq3o4`jP<hY2HLge9M$8Kem=HZiX<+fY;) z$Q)6bYq22cv8AJMDW3{0)&}{(+;AyB6s9Z$)}sE>Z5}R4XA!?1vuLC8E)#l{uVs12 zSWJ2gy{IiC#K7h$TqTTvxL_Ph(4(oo3rYJSPI??reA+xL8AFUwjKLIS4<}CM2cdYC zXpBRD-X|1ujAe|4sAPu$wX7Qnw@^2A&o5b5=6=EhM6Ps&Mr-sr)xGYzSHF}4ZSP$O zzj`}0d>lcg>@u)GR$U|qlap>K+J{jb{)r%br=^z#nW`e6N@?<~@|<HGEc`lbb2car z69(B14@U5W!tWL)n{>#g-iOXETd^+Mzo_&(oNo-b86IWT%{n4ovs!E(4z5*QE7$SR zd1zCiQ=-tY_IoKKp>OcZTJ<AS-*LIpv)$U}@P@)H|69iI5u?4yVXcUzpZH^ScgpVF z6mp469eth|oOIcWRSD<{>f3ll_0)=8pUZk-B`AZvmtA;?ah<UT#R8(;smSJ*<#*uj zTdlgK1A)8FjXlD}JI6o71sjQYxF8SWlxjzH7=<-_VF(v9`B-7-di9Znx#fV|9O=1X zzvg#OAwL6UcA;$#uhNaYO`UQ<hw+l-%(=ex{u(#l3vS$y4W&al>swXODO1cag}!wo zH%oT$JSgWTM;xPEwA2Tsf*<*=0Nr_vcmAjv<R?OVW;6ayFvKpO75PUo-ojDmk!qPM z?+@;CgZN#O#-{HLn1^~tfLKpX@-;`s8Q7=YgH^8QCy~Ii<YSk0&9DX;I;m6{VacgH z$OM`my>zc;e^T@>MVvyxfK<9<kqqBW9uJS5UpIw{_U>`BSU>3d!5zg9Fr+cAGS>ZM ztlr<mKaA(Qh}gp=`FYcQ%4&tfy!AFmHy_4{xjgZb@}a<@^M^F95g1uK1T$7R=915u z7!eK^(fHxjmZ%z#*iURUBl-H+i$myR#uD`~C#TSyZ$OUJW!cqE#Uj+PHNt;ZL?}wh zOdg}KP<_x@1TovFO2}~x-d;MJJQTu4i+*Q0C`wQGq@Q7Lw=M0rCX1)}T*=f-k?Eb5 zLa*X`#RSEC#pVjZv_wtTkij4d$Xf-+)hX^hWl0d>-menB-qxb$g%2Z!c+hRWCNRHh z#Tj{GUcIM)s8c9EST;{lH<DljSz~)4#YhbT-z51R>R$1NdT4a-mqOriXXT2?V3oY0 z(9<4*Y-Fjb4AKk<!CvDOyi9m$ioB#cWCY=0%Q5`cTM^|tpvNc<a{UM7?_^B6WFANW zDKfkyc*w@Qm)4K#IyQ<l_0|z<{YtGxeiw&@3A|d&kuVOCx4o|Css$_^b*+c`snqGt z0_BZG95+$fe<|G?xKDD#j`a3@QH`&Y8zTfiFKtWw3~cJp7Xju~0pwGwrFLww=tpVy zsiNiE&hHZe&}ep_8-l0ImVod}WY(dg3*dUwXV-GZ@5D+Yz_)+FMzohyd#~jSF>Zm_ z?PvWfjs~%C_VnA5Osn)YngwJ_I```!IVK7s@+>!BS-z_i-ClbM7t;t%90X`IcntvC zCB9pagi;fwU1ty+QpwjPQCHhIy*i}&(5Nc>M~<`^C<Q8pBoTc89p!oll}X+;(J#=# zeZ4CoseK(n*1Z85$$Z-^Ha=W;4Zxv|RpE(<uSXZ(uU2L8Kv9s7z_tJV;}r)WF}X6a zsd?>a21XVe9?w3%n!tZTOn7)&X&;S5x#@S6PyYV>56lxtyi)@kd{TR@X9Dc^k3ZzC zm2&h8J!mogR-!6@c#-c6h_6*<C#3WSzYnkehjRKaa8Eq~@EK6!6^{P<2sq%6E&g4P zPao+3+MMWiFhgQnAz%jF|6C$)s+?cIS}O0CG~aiFfBlTdu3MvhHsmBw=t$tm@ctUa z{TKfCP6faNi`fit|MlxxjJz@jCI5(Yc6Q{h377$ocIT?fXH);5hla~slfdCgasQB) zy>2z_4O|F4?fHI@>uN|~6Fs{~|0eE6#Xk<u!wDdM>clzP^#8sTT4G$ciHG@;#kUo6 z8mY=o+GM|cV5u+p=M@85i2#2mGUNW{pT7cjcL6Wt1FE;rPCvN3)(;Jlmw@M-<ig~~ zIsakY1O?!Nt*A6<Ij_6*|Jb1)ipwDc@PiMtz7Ky6l@C?G!Rx3HJWc+Gb>+bZw}G7v zO4i>^{Tt{*=Yx@%Ra6XXwOT%9;v{I8>H<LFxm;_J`p~;xDr_D9&$-YUsyRM`^SREt z|1{%Y0GWz@t+5Mz4X-Tpt|sk7_^m<s>%YTPT1EIy^RJlf^?<q^TE%ZVhD>Vy0)Kxm zeuW6I<F93jt=s=-Bpmb$2iI-o@i9R*6+Ob8O#skB9+D13)}#=D4I9=+)ySrruO^SB z0~Kok82P`=fX=w)#Rp~X&nEoCFxOF*z~wPDk_+b+sN4ZF-)z9D3S9lE3%AO{oBj`X z8w_^-apr^;U<&A+w=I?WSHJcufCh5Ed{TIt!hnLDOjmE|gAK$%7^k^rZvThXzW4q9 zaR@kQ3>d{q0szO1CJAl@M22SiU-OARW-S;f0{Tbgi-Gxnk0V}uJcP@c=u$hZ{&nu| z`#dTha=d3-?-X>_f&NLj2Vw|*3zUZvqO*O!4OAJd|M7iwL{!>g?D0_Z4`39dVMzHV z6AD>_*;iCWF<?M9zE!}qS(@(w_qlu1QU0(MfiW#F5M_D_hX+ac#@E?=N}J@n9D21n z@bw>p(`ZF7RmNSQ3TaFdy)k&Y4(O%OlGIWrz)|_Ow5H^O4$m76+|7+%1NHaVbju-d zUd|^g1fI=SebfL6-#}dC0kp=z3{-JXXxWfENGSWA|5g3j%ZvK|!OSJ1al}ik6>QGA z9({Ve3Kr_~l<EKJG*XKyV0-9&y)$4j?WiYc-q#Kfya9R<e=E!3<lO}XZ&DG5^P02_ zO_oU(8+on;6th~Hprai$Y4k$5>*u<TO%}8M$COmjIDXH>iP!A1S)N3~=CM_gWV^6{ z&UzU(-P_<s0EF2ENITxQ4sXYm=K&eiy8uEu@dc=Rm+E|Zx?g^gC&lmw5W<u31j;~P z3%^QFaAB_iL{dEnCqzkPHr(m|A?z!_stnd{i4AO0Hr*{DA|>6m0Z|YE0qGKuZt3op z5TrvuKtM{mrMo*sq#J4U&i35@+;jf>pL?I@dt`&~#e6gG%)D#8Yw;(YfIJq~T$OI5 z6QK*wyk*M(P}xO=;8IMExUo9_k)|s|>}A(_MBEN^F930iD6xO_bX<wEzAs_Mxfo64 zOb%*_?~ja%UY8>i`nt4>CCiJ4b%zXjgFcRQGu<g>y(O3D^&r_r8|pnG>uW%7JV2B( z2CR6|zo;{4_1U$ai0uz;1J0J;fd+1MKm>yCYCB!3jn-OqX9lLS1HeI5c_V7SFXZ&I z4$xouY)q!R1Au;}P-2>em+6g<dJBFp5eixVSyebXuPM)*E%Vv>>#zm>VgI)=PmG1e zyz75^_r2o_@(RVXak_iy;tLu!5f$aE)9jN-QYQyV1CxIsA@ft#>LvcCsXX6u5{U0d z83-)e%h35TE2nSid;ijK+ep$Rartnr=?I}~Metiom(k9D{iUMvcL6`aA3lJ8XTNXP za@CDcKRrPBcoseal*@)2;OR6yS3o<Ad%b7X4rU}t8bnepIyCAXp}Ap|*iM*n#TB3v zV?Fr{l%YL$J{9W5(uiTz692kS{js=+r&^*FzilpUi|7F^%7S%OG(tQXE3s%iQDfXG z?Xl(e=i~N7J($~-fcqMVVC$~qjh#P<K)R!YGfPWEt|^FcvbVzq_||hT?WdJ9gr}sO zLFGK;Zk_gzJ%ava$`4t~a9h@%v;>vuPlAv__JOF1lC!Na%UC9NF(3slx!}<PIpD@W zzi+T>^*pve`a?NqS6jK1^<1Vj#-6#~-JNo_U|tx2;NH|NB>>9XCFdCMYxENIgoa7v zXq5&Xm0f)nYt?5yE(&^5^3dBFe6Il_zklk18mULdP<mEO3yIkF`GTDrAT54GP>~k_ z$&#`cVCa=XxvU$@Zq7G|c6^QmFBYK&i|Q{nKO0<j8_YA^nKizY0mr$R^K{z<744Lj z`nSgfDj!Nkl%!NQ)kE%T;R|Knu0=Rg8q^?!v7({8LS;mIYpUD?7_l*>5d}a~8|aE6 zD4indQu2yV4iFNvI4202Ct%@;vI^qx$Wu84Ef_~~ECRae&lvG*3pXIV8(g_F`H2w6 zxACFbD)a_u$x-xow9CC>-^g(2CNFb4Ty`xI50;FF-U2qWlvH7cTrj`lt2f_WV~j*V zVVqu?^TDE!EQ=H#6JZoiZ+%zr7w)%j1$L&`oBT-j)2;3=yx*f>b;W1Pw+2=Z!F_m` zhr^028AOSVR^`ppeVB<v1*LXB=El2=H4Q}aM@cLg`<SN0=T(dwjbprsF5f{9Wx=b! zQvL?g;Y2mr9N>KxW<3%dX)*NbS$a=Rc-LjfY#eJLIll#}C4U0mZpP}C81SX7InpP3 z=*`K8(iFON|11l52P%|^=HB$KE&!9X3E|8@iW{Mj6^~txuTw8|(C%30!kc=4UpzM4 z8xU3#s9)^awEh<UW>aT0V4S51Q^~eV5q1BtJIBjAtKQ|Qo&jdEA}wf&S|(jIFpbC1 zaY}f`k2ySV5-T=M?KH@J0MHYsE#)-Z2Fu>ZHsFk-$25RL%9Zgh9&;8KK{OQnSz0yh z2*@lIR=~o(ZVlA*KAvp`^2qX+2+9%Kc-mewV4>CnP3*b-y7d?%T4C7Sr0#@s^<P#s zpwwZS_St-0`q^@G(3m~255C|nu_eV(WB0}2MmI}SL%C!@;3;SLB@tty%S7g9eFT`@ z3D3|j;4dSY++eHTtDLD^wi5+AGX`!S80Kd{Buw8+oVBTDFJPe*ax}HhX17V%%Ze4h z?j1W<VpqBoId8|vYIw<^QwJ&yZVbOIjuvLRpHCq@Td4i4gdIN&X5nn0oH)Ip-p>At zW~%cqeX#jUlM&aXL;i>Ffjn}~M;u=l31%H;uffW>PBDQQ?c-+FpIdYPfS`B1eqRCe zQIJSJ3=_wbh>uA01(a>Ko6^piCG)NE^Td=8tZ`InMu)hE_Z~VAfemB-#DZNb^*n{m z#pQbJy_i?Ed30-Jwm_(CHs%x)EsB5W?6qK~+ngEcS3nLgXi`md&Fujt6QsS+`N#P* zczZy`aXOktOt|_6=xj@nvEciX2%Uga2J@?^Pa?$JPlWfn`kH|zcRhPq9fRPH+C|3! z=}p5eNg@Q<e{C6L65FJEEM#2q>3IE%s>RM{JLAh@M`^%+W=S3pATO6_a`xzUlJ!CN z1KHZbCJQ*mSAGG3r@c-s(-@=ksWQEV{if4lqsF_yqJXV$*{>tG!u%{mgim@IWoYMt z9{8vmL5=K>MIisGJCMvFBY`N=2&tU}GUfIMIiWOfzL8$%`-&gbtuKNXOIR6SXRsq+ z+!ZEiXuq-z9sYq>9DE59W+c0WZ>f@oBc>F5CsG412WtmYNy#m_KKQcOfNO*pw-JV^ z;Gu{K^w5ka$5(tKQLTf_Pn@v%b>({G{Lgyw6^SUf6}+o4n<fW=na@^*Pns<@)>WGD zZQV;aX3ntXmRiq2jU}k-i$uEPZy=ST*fN3ardE+OBHbkH)kpKsvzkU!hM=1wnLd{C z-jdyup$&+t`|(amy5PZP?o3K{r+gvN4+=r+u^~Ezlnf-4KpwgWWM3<!D!A!->hU_N z)9_CxlemMer>8&bG=lg&^GIVW!H}&4yQ{CxVO{zsZS6gN%#AM0b73`GBTf88xmq+A z=@lj?k`uZ1V23S@-}}|iP=rSlDkPo(SK4618{>u1GEX2gXAPOhf{^b=*UI@#VzQ*K zf++mDu-iu(>EzM(-S(Blhk_BcSaUtUftf+mq?AhOSC=Cx&(PKI@|NGjH+gUBGQ}D^ zL_QA*`$v6ADl-%Ta`9`KKCh#3J@&Yd`Ss9BYKuWxo+KN-7Nw(JgtX(YNnm3uXezzh z+X0hjMh_A1A6jh>M1@JIW5ve^4v~d%jXKbALGM%S$|h7%7gBVntFg+<auH}t3n9u5 zdbj9ugLk<$TV<j7fk@q`R?^vvyi<5{g!opa)P7DEJ0<0Ku=?b(h%uD-Zf6?7RD`<r zs;IIH2b4eolP7W*XwnN<jApOW!HsqSwf6aW9Ui&tSdF3mZ+-iAw00m_{;vOR#jZ)k z^8*9{+i=S;t_u^3j_DbH;j{2Y*B0B&E3RhJe2#c0z^!)+v+q>JR2<;X%zDNf81FH} zHv{RwMD>RXCHjPM^mmYT8yaGLKqwu@QL9>Shi((Xdh5C@p<JwkhGu_&i7)LkS}!q_ zD9l)a5C?|==Mycu>w}!3Ilg*{9m$MTLh?Ytq~{Vx?a-gz*))^k{QXp4<H(;*0G+f{ zX+Jm2z_j1w8680mer{Ou!_Nekh<N<L^he?<Bgv&fyMF~p@$VTs_^H>H{7dtrCkj~z zm#NcVRy(B|ek3k`<&H5EW4oDA>jIc}F2I?h_U84`g}!;Q?gYJ`(x0A8Y<nsXg(kwX z>bKioi0!T<1Ildf*726WY&|}qsy|tqD%Kd%8W*VksYr7O@)JH|v(~1nhJ@v_3*M1q z?={S_Z3RckZTUe84JFiA0zL}jWkk~92Vi{p@<ki^Dq;Xn<t3@LEsC;WY(s+CyC+a) zrnI2-dhv@PGQ~I&aU>MCi2l`Q8ZGA<){qpwz&7@I)7;UQbMm9;hq(Li-7p=IZ-T9< zTMA|LpYzX1%D>t4R;>Oa=>IqmS0>*~x?)J!<qd6E)N-25-mlj1gKzJb&n_PKbDY*H znZ;e5lGcIj;a9&V!Jk`!%_=s{{m)&d0N>sJ1w%GY6d4jXmxH}g3a=#hTRLm`)OIQO zYq$eMIxjYspBXpK!c9D!->8wzQMNe+KQ*n-1-De!`zJFB8AftL^ogu2N56p0Od{Jn z^+fU)>QG{B3Ni+p`D%x!l;8M!>jaG?`YGaBnOU6$LsZ-Br=`#04=7ylWO`KvczD5$ zZHi3SDaaR*hTx8!#(DPz6+Nirv>(mUebSGI+>4aS;cJ?6{P68EbbqLlS0O&cG<zh^ zATMJK9r&owgz55drWj+IOZbwN{<%B!Rq|p43vV^LDONw$R#2Ps;3=vCWxllz>phct zR{y9r`lzw-k4o?D1@{3ms3e+ojLgDwNZ!rkEfyl7<pqj^{M$rs_NoX~ChX{+KY)Zi z*`RI!TGv=fsFs61JgIaX_D{IYh<<SX;EO5Br4kvF=5C5MWPZUv<th7^p$qE{#h>D1 zQg<|ELx$^O_pZ^vorvIY^VKxcOr@ODOrAOEOq2G+I7wE`X{zV-=}4=CT7mMt8NVir zQNy8>l$yw5LqxA@%YtSH=4eVGjry)Te=CcQn8UV~v6IS@8tojj><yA!VadiM5K+#> zGYn9o@je@qgg+12{-aCT9KRB!69t1b$N4KIXMN^tpH!cm333{T?I88VP#cYZG3n7l z3Fy56H5;OFL|YzF@mo>W@`bX8N^Wo9jhW(37|4w0b&NbI6>dXi-+l%gvWLg*Ka0cM zmx!SfS@lB&MHl!EJ^4=ipvJ5b#wd@m(E6%oXRWzdr@TyO&83Te1sB(MJ5fzFX3k@G zxlI0o&sAIQQ^F3YSp~*OKwv$P6OV;qGQ3u9j{Z%uf;~hovOUm$Ah9CF7|W*H0nQ|h zr%$Ai)<YN!?V-iWl!YcjkPDW$xi`@B{EO}r;vf-uq-&GmsRsJ3NAyP-N*to9ozOj0 zj#Z1gK+Oy3eN<4M`><e$yIn!Li1da4ms#Y|!D&%m3>My+dI)N~u_<3X^?gt#PFMc) z`LZP~vmkqPZ$SP=y*%mBM=`^}@%Iej@PZ_@NfsO7HxHde#{!v68>E_2bEF#0)24=E zB5%5o3cMIO1s@TQ2>@<U+)xm2>SL#<V^IHz9+-8r={-8B>R@5z$&a5sba9MK1O){+ z`OHli_;dGR%WhE~3N}0n3E|J?;OB&D@riKYf`ajNJk|>0W3O^XPg(tD4WaJO{JZiz z^NCaRyUd&ZlEZwL2NMQ1_1_9CsY?R?W>8Y4vs<%@e}dgFPA!KpruO91aH=FhmWLh^ z%3iP0vsdoVr*AoQ?L}F<eyFya(saF3La+4U>B~wk=x@3N<Qz_OVU_82I{c7dOnp9* zPd8ZtlT+~{*e40)dHq9~XW7HAbN4B^4E?M&`^fh&AstzUMAjKkKd+n4jGJ%Bv{`Gv zQErU3lK<AsYjv@ua2fCpbEfkiLJAdKM`VtB+uEeRs9Rhz`C{=5BvCZ4w!i!&O<%54 zl~K{3c8U~R(~i$~-G7y%4=JvgMmzk9NUq)@vO$BqEZ$QL5e_JMUa4GuM%BPl=F}*H zAj+chv3<;OPvQfdH+{k{bK&+h6(s0*TrG^OuW@vrHp&F?nC0Gb$E6xu%*+(xD}*2g zA;S*I@MSq*<iQikpOUmT1EO-kmP^=FDSI@*MJfbl<9NO|*S?0O8uujSBKa4mH9dE_ zVG~RK_`7YRF|ATUd~?Xh2NJfl@mk(D=PqOhsw|FYZ<h%RI*cFWvZfM>!B===C5`_i zmaeQ9ljRC3(l-!feB}Qlo(1PIH0{QmsV<U?$+=_3^0rVX*d<@moOII(4Z8?)LsHa` zh%&4U4%3q53P@eXU0<oZ>cG1rL@^6OI!tdS^m^TYRB-)NH7tQ;D$yc}T(*`6Jqb?1 zXG;|J{2<irLn|0_pVdqO06WdyJu{aYOzX5ch@Fp>N+0q?ub?1n97$f1P~y<}#?|Kb zcMUR{Yn1rkWS5ygQtbm*mLF*CjHP_>WrjNVi#-&vvu#_K(<??L#*`DSRdL)C65hAR zJ!o=HdI5T5jC6w_`4S!A?M1&Ez~%@&&wh&X6#q<WXF$DfOMf!WBTlj7!a0bJU^*?| zI^a!8Kd&-0mp&nV(D5La&0*{&g+hY?@`B!PDV#(4h-jZBNj$NXYR_$+=KS$W0wxp1 zzI*n)cfxxWo$sh${HO&hueX2H8b@0|(uuktmf~(g>yXpp`}uN7>{r!SMA{*EfAf!t zEFk}AJPMZN`!eY06YSa6Qv9-v9^BJcookV(?@dx1u?nXqR3xai92wN!ao8%FV&Djm zu`}a5xqVH~`!l=SNNJK&?R$#MNX*pVj)EoT^p#*ECLvMi+~MHtSoLcuyJT8Gl*v9a zWFu7Fk;o~%U3M&&Y%E!EqZ`S;mk}FNeh-val8k?%pAVaruHXD1JIUh>orsH*>N<P= z6sAr=fXwnX*FoA9!)fh<QKuLa{ENw!J&5o(_A&Wh_;dl$wci-x9)>6YCT3oSq%GMT z{ETuR7Rak?vGUZv^GrjKC(<OSCn@!f2%Pg*ZnO>&U5Hn@AtV8}tI=<5_)Mtj{kPOy zmNIJ~$(IWEbBn`agBatPt26Ya?0iTcaSqyg<dCX(wv9jdu$N-LQ!OdY+Mox|2K7q% zu0T0$4IX<v$8lz5XkEWiP^M&_{)X>eM)H)+VCU1b?~g?6Hh)Py!%Whs(5M4B+52!m zZ6vM8z3K^N?BSPGAM@m6l}kjY=VVk&Vtfgm4}9*f(Wno?7-OKd9HyuZ_gqnjeS>!6 zjHI|QHsXwo_))HDuEozEO;Adgnb=ho3AjGiE_qtssU8F|=3b(Y-+H>47{hg->%Nh+ zM%9fQ@ReX6n;j!JV^y{)0eX(Yd8Vo8Lnqnx0NEekYqk}X!j1~3ZaA=xzSLg1cNgON zL`UU*^&bm3hA_cC#m)Q~XMcxlESBp%wFCG_^nuFe4N#O=x;!Ra`oT7#7kX~9B<^{* zvl5QJonCD6H-v7)ND?1Dzs_5<QVk()V@oUJdTTVvtB{@FUMll4&e6OhH&xI*97k$Q z%6?h-Oieb&Z!IM-Tz<Ri)c*UIBJLZTxXP21+)x*Evfk&FPk1G@Q?CcTAr?-oLdnd} zeqh-22G!!w!?E5PGYRh}K%LUksMh^W@}xzo@2XXCpuPBICNQnrpWbcU(Wp3ikdx?! zFVPZRKXGbKXS?|l<i@Hv2|H>C`eM{K966iPnyOZbzwu1Dhu>%w{rWQ}a!-&g;vt?y zA32U`TzZ0^F<nZP@i3;-@RhRInevEV#4`DCI&TUgvpT*y5%PTnIFr(_RC!APg-2TI z(wy1p@0G)^BD~baC9MaUpFI9}ls7nU8&Zqp&s-UKQq-_et%&HWXL^N*Z1%em<jr?n z6*zGn_=|gAUxwob_VzQiLCvFjyU84)i-?)gU(-Z@p5UJ8^`5}2JN=<o>$~en%#gKb zdSFcdykHsO>F)9vgmvk1suesvM&Zdtx*)b34D-rkj3$dR^dpm(p_O?mSt{d&-7U=A zRM=$N%^TR;qf4GRLPg_j`iXK8|CY=K)aP<uuLN6=JI^Z;E09md$A?0L6B!Bpn;6=7 z+jONwHLK<E$KR4%=^2hfMliaa`gnt6pzGSNX|R1TEEwbGd4xT<e&0o*76UhCpK&{b zwgO*S&Ewllw`F%9%n|yYD4!YLdpIKmc%KaCu6*<xT{8~fs(g4n)UU~Ex4%$R+x@6A zNBz@Kt6R?Etp_ej$j|Ct&hNr8(8Px*)r=ONp|!7EuS2{HCTI%vVz`R}__4CKfwKB( z#IcUl%HuOl%fr#v=3;^8!1>@{{qoFPF`+M=JPbm%FkWcrIUkJkBIi#e_iFeGt52E* z_Sn7G)Hb}y1|T!%L%Y*&huLb9NE_v-4WFCj=3N)Sjb}I$StS`~=7|@$!<`O2jY>wN z^<gwpe$~~+(Ga~%YJj5ad+^?{I<hYIZHz@pkomp%7$1kaPzx3Zl?imL3oq6{%>&=x zC;e~Bq?dR^x=Xd4ba(33rVDJ?Sq5vW`-cgleG2|d3&2g1R-o{1aWLki3s6pBh$DqC z8U8@iNMZw@IZz(oc8H?R&2tY$TN)NnI3$%qG0FOhOm(~Yu&Gx@k3ODKP;&>NX2E@( z%jkrIp-s-+<R6KGxS#a6KanSKK>fmzI3g^JuG>j>J^lr5SYQGpP1$~2rN^3v$DOfn zQ5b;tDEB36tVvh&`h;qMOn@rhFB#KZRAutgdz-XNS=S7+ZGnni>v=`F3p>rwALz)! zON*QBbzir=P6xlFZ(^;_t#RTs7?M+43I7l+Y2WU2eE7)FTK9wJp9x~Fq8=UFOiVbI z>(=b_h<AHc>fY5r^SqhfJ4jS1xg|DOsHPLnQXn&K$`94CsA5LJS>%X9^4?3)Ej7Ab zz}}L7RsKU5C~}!$Jc`kMNH+GvtDG^QkO#dru8iL{j7BOhynMnO#>$Fv7D_hyUbCB5 z)|Zi8r|R`*D?-~NV+<SFc>_@^w56E-;^kMID4=cq{UA}2(&gY2+7qNrzTtyKehM?e zopH<AU=yV_C{x5AcE)z{Ia0m@^6|3Zc#Sa^4^EW(@kop>VfZH<m5f}RdJTh^2}w=8 z(mgsTaD81E;w3##ffAu32V%CS2Bn2T;2wnEq~@s@OxAPVTxa9)LWxuorRD~MLy+1l zw^rZ3O+6zegAxi*)f<f}dS!@5N=gwJ#*y9)EY@;q-OsqmbfrSodb<pIz<JVhcW|dy zQie{C@^1w{#Ly!ifep%4OfCP?mjA$Bc0ysI_Z`t_&1|8Zg6oK4)94UAN*X5qP$Fp_ z#+B{QMhU%=7atunG1<1Kr53{dpkb1VjH6ZNDp@Zu+mVk`CR6B(?X0x8><B&yDq1O= zq2<cGWXl!Q535-EU}9we>s3J!<y>5^7b1g<8CyZRZbf~ml_0W`5XV5!j*HnvJc!T1 zNO@A13E`4Hu;(m-tqQw>a;Zp+whphj2?Pb6p*Y!&t80VXW{7ixkj=KIlh)fn=Y~G; z4eT3hWI~A^poHPh^`Sp6dQjdEAo4ItdU`tKyf|H`h73eD`v^aqm-vodluzv$xRPwP zAyh&45!r!oF%<E;|8gWcqfnYNb8Hhi|3+Nv|9J#QfSZ?g5mG0I;UoXQ52!-hsQ2HK z!BC!16Z_|U{g0=9?gs`f5uF$HE5v=npeX2k>&;IQjrBhth-YbI{l~LN(lg@|b7ML1 zY4H8W`(d4i^b_q?P4xYJjr>r^8pHL6=%t!Z|JDxw+9qL=j|f;DU}PVkB-N=6e_N1~ z3zs~;?`P3|(FqE>Hw>;G68`7MXB9-b{|E(j^GBBNZ%ayk>!b1}b8-@W>;uQGUeE?t zQgjqX{uZ#`g087NW}vV3$c=LU&kqV3fDRkwzH%F@UPHB;@(D#(B%N;1%)=DR8t}Sd zEcnD+9XE8wM-<7##}n$m<o;uWDG;(cpr8*c21Ok8Phoe+z2z9!R8IoxW4-T?P~<A; zUUnIDdNhODjDKr{fBBXO$De@R5VA<Xfr8l_A=$@--xYOf)t8@BMe?5-!oNc%y9<-d zDA5J~QNTpykuJfMEO?$)%q>s4*6`i8|FJv7@%a<57($pFwa^JXi2u{+|M7GG4*6{L zwUT#lnEpRKm*M$1X5uU~>YdM;%fIyVxJUi~MV|vpf$=5L&-?v}Y$iz$G@e*3bhM~$ zkAKAWB-W7l@BNDP9iqGT4HP_y{AUYE{>Im8di&+GL96)8y;`t&WY;K8)F^sRKQl1g zit^_qv{?O<@o(xE@&y0wdHe}vCE4<yjDDN`^naRP(iM6Oa{lfN`a#0@bE=6pogot5 zzhK6u|EJC3qS`=)XdmP+pVmIuHv<|kUo0mIJ~lV=6M-xEe+OXx=kLyZE|324Cp!2k zKz#$DOr!Hq#jQP#US<zy-6*-8GPF`t=K<lLM;q>5musP}paQo*m)3yWWk>x6V1_mb zwIYOZ>F-;oyiS3Z3~^Fi6kUmf__xBJfCJ^iV!aa~%P{~Y<^U^!Fw4EOh1Yy|u%fic zmo7q<8Szf!qT7Je;5*l(t4F>7c$iq$r;LzPy<cJc4eMsa_qR#CSe^07kG|<vUtgK7 zuz6r$X)~U$2&a7TCg(G;o&1*}fIrtvNh_Rbf$0QszF-i7aveXat03MBt0_bu_`HIG zLMi%^spP4v^;n5LaL-GQauN5P$G6)cX?#}62wfhp!5K|qzAUd3#rYm8Vdo+Qva-LQ zU{hx?#y~0JYF(+}L!MFWJb`%!&>B|&K70HI@?BK`S|7)kG<BC>1(<E$#7)xh89<1P z5i&v{39IDpz`%`Q;GpSL86iqV02;u_1*GT9wO&q2lxi~~=M@>qOc_8TMEu=Pf0Ene z7()AQN!IhDg_XnWOhm@f;Wk}iuyX)@Uhc2wax4_=?rmsM1#0dj4q6xt0tF<Q=2=@1 z@x#3>->WKf&F4C(ij{U6HF;f~9I2Kw#IYgI*R}rn-8lAoh-3ZAkWK^m+U^4v#fxvY zvlZ=`?mx*_lyftDXY|~z)+^t6HUseg99ZBkP`fP}$?8FNM{@!*ywB%a?Anm%QxStd zkqPAkY95oGO-2dg+aCnT6f;0XCj<zj^gVc4y2bJxSJ{U7r<p8l0C;xl_{yed3U=>K zf8KRk4t=vaTB=)Ld8m8R0)%{wG`=T!lRnb50K#YUxiT=}g3|T6$;dwEuXC>{4KQL> zKI;hVj(?2g<aAE|M44eLJVuqU&n;Xpi@66-;orP2A^>K(yV;WH&j}oI$V<2g!E-jO z0G7NuS0@{JjRjt@YJPZkK$quz%4|ySz5Yc2Y~I$t=g^rxRB3kLvA?Z|5=O`iO*ebG zSxuLwW@*w*0#~iPb>M=UAULB=oZ~bJhCNQnC)Arm;MYo?Y<})P_8L4@8lT<r;%^{8 zeSNbAcpNoAeryFHtTX63)$p0F&E*wPKbyaApJA_@Vc&sid8k(P`kBPF9gr3Kdi`sc zWhwTChGn8Rp7Apfj8gpCchG^^s$9z)O=){97PsW+Xmw*Yz>l3#uTjtsLk!hLh9f{C z@MK}LL7IQzWk86lNOa$(mUl#S;wz@U$M*djfF?H)CON;Y?wS8;cj(&)Ubv@(W4bHS zg20=}UOT|H@oM}vt>di|d2%II2ZUgFs*k^K0%Y8L7Km<J0*~jD5(_n50HM?ZzW>b# zXUk=7Gtf<G(F>cn06=aH0>CXtDD!yT0WZ^^5)&=;JH;hlrqEVC!Sq;>13?i$zqs?5 z53QEEjP4Y6-LpWb<6sXRhL$J({`k!ACdt(i%#;K-qtiJV!(sy-^P|<_mU)o%mW^0f z@r#H1Kew86s&DF7=2$*pz2oP*&;T*E6j0N01Pw6yb8zM_+lwf3AtNZ>B-bQTkTs!v z8-$s1=#cl^Vjk$b8HX%fm!_9TYpw_@X8=jvIdC=|N#9)WmPc=*&@)cPn%e_I#uHS< zGT^8to9e-c2o&EkK%n^U6YS!H2!U|}5Q}UB*EzH0xe*0x;rM)LZhW*_)+Bcnmhg`_ z8Lyr*piXt37mAO&C8-NI7cF^8j9J6XdGX?xtEdKexW7T9U7WAAu~JHYc$_gp&inc@ zMtUoX;X_aiZ(hrG>0^u0HX5%ZsYZZxH!Dc%&1Q8=WZ?Iki`{^@;od@c49qSsm2rD+ zdnA6Zi7)_^^NWG&uPM!&7?hjQ)B?t5^5iBzgfcLNmD2B_^jH>V{G8$Lh$zB@+i^3* z{c`3JEL4XJMKyJdDaqsHYy#Q$3uTM+J7+E6ib)BCZoTh{N)R$?MIsC1M#8(LReK=W zdA=$BW|Eb5-;Xz71IisnkslO*3JNtK@#-N?tDsk%)9+ZHg0J%km8VvTnTBU+{GVKh zDsBN$<b?VgplWy=2PCDloAo+oA&uOpc1RZ(!xJCaPM^S(*FwC%T;3R&$StM=%}mlD zfrFCLC}p7$4oe(cU>WV3)pOBq)aHHL`sZ$Bg;zCH%4@+{g7a1NEIgXRibIFL=6wHE z<7v@{gEIHZB|rbe4aNEg>i<|EBeiaXO@varrnr?c*w2(`j>wPEo61gD@f`WrLWfo7 zb;5{coe_q)En-qSenf)pWGSO{4knFY8uMxluSKZbSpgo2>@3qZdtM*8-f#<`2o%|= zp&>IyJ?}AksuLu2ubQw^68HRmWjVMVeO;;SRksi+n4mWhnsngw7@amU@EHj!-Vlg% zrDmLmshY~gwk5Ku?E%->n$|l&I-(ALE432n1GTv^*L{q-PnA4TCIOgNx2}uwM$4G< z@alxRi~7PaCRzd8bURXRuCQ7!{QDLwqcnv!&VaXc<1beIzAm&_v-|)<id%9MnDzeR z3eU~PRbB|ai8+7t9dg0oatJ0^^etRU{%WO1^<CxWXf{llB2hjnfUDuX@BnH*$%unx zLJ5&U7aEI+ti94=L99vrzdw;gfjcx;3Uean$6iJh!EA>;T9--Hmh}dp2XxIyPr=m> z?GdsxwqG`Jh63yC?-_Z{1u!Iww-}vkf57B%gNH$_+=UK_0<6thfx+#HQDj3?4U47; zqqREcbjvf|dA3==1+xrec5dMA52sM}6@DNaH@cluc2Ddqjuc5yoSN8CCe%dk;v=sL z203@&Ff;=P&NB|18^9zc%Ol?IWfZKSX-6vL8Dr^-s>aEG<pBg0y;*|raQ5sUC;ars zBWENEToWwl9ClxSxGIXzwG~IdMOQ>+--hgSdc5A_iNTY{6fV7XO?N`qmcL%a+>d&U z5(>$qOH~QF%gbAkZth@rX}fB3=l&kQ>kAlFSIXak?$yS(@`}&;PO(TM7&A$|xp}eT z!Z4RE#}lFT>fAgf7Bbj97Gf0g8B7_A)l`HzaaAc1wG({oT_sMTs<XP$EV=)?VX?fo z7&v5xh3Sq@w360mmR$GWP|tt;!lq_EdqeB>#$|UBvG^0pd3e{GO+_nO$r!KC*?N*} z@S@p+ug5uWg1$0*8L`fj^e2=|yac+GUN?dKNUf-!qE>8vUoOe-F~17r??SNhzCEf| zvuLD`3VO`%wUXe&!;Xv^A7I1nBVyZh+%0=`i_SgEfTL@41ht9SI?u7`zQX4Vc<X<u zoECLXwV;N#YyT+J{XLkfED^es-?co{s-e{uV;zxrx-#?0i&keG7TAOu{#@T&3ZqqM zgMY~qnc#fS)*BWZqSD`!@l5m#tmWNb1IwK06;J;sfV=A@5-KIRs3gmLdOPZqE2fgV zXqOmD7J95Z$|4Cd67nWJ*u+QP7l^nu5rbz~Mh0)$T|W+UhH^qV&QP^T4!qBEh98=* zY5|!~ZKl5+)mQ~|)Gt7WLF#Wul|XUEgI>i_WWeD}+>YVh0@UA&#th|=+Uz4j!tZat zB~)yKvgHbGWg7}wY-hve&qHBqr7R7GV8ULvdD7XZ68c^lI_wKa{hm0~ANDT0vl>XK zT|V1>e3VHfD%G}1#YUJn5uKN!s{ILqBP>ppHf91sx8p<J^^~Y$b9EAGGAdl>5B8#6 z(bq3%^6mjIdUH-u`-fEbWGhY0oRR8XqgI*j<7dFr$)jdfUR#fB30|IWjdcQ2lgLVZ z9%`@Y78i)4cM1E&W;%*~H<4%5Vg3#vb2y3+PP~P}g9Hzh;I)pe3_miQ#}$v4UicKq z#PoJU^~NcJh-~^?SC`i^SL+9rvB2fNl)m^FG5ygAW4B4oQ=r(P0hj#xbF08Yjm^gJ zCn;&cXElGOA7+VpmU)Z)&|!gmKKYjJ{9W~YO+L%+S^T^vB8r|wAz8i;t2A6i4rIvP z{_q{cOc@8=Zxo)r-?8P?vYVidk48pE5M7KDvuJt~WG0v!2ur1$*RSRy<ML;G?<^ua z-5pDNhui)|DJ`Lvie&uPsJL`pp(y$^R}qtz^Ph^R<#K^YHhA+~)$Ep$j(Uoz5f1zH zKXHl;v(aIrV?x&!hxX-$Ycv^x4!NA1I6pB1Go`VHM`I<cS5wG3FjOUR(2ePc#;B-R z68rq3M`<w!iUe-BkLXh!Vkbt{GFf&|WM;E{ZuNjq&+n^faq}FipnGx#5DLV8kQEc` zzY>E=N}c|0b-WnxX_w?N$Q=BREGbTN^2k3clWF%<T9_w?h+aj2RGZtXKgM;O{R{Om zdIe%Md||dRldhEsRcHvEBnE@?tBw=X@*kbi)9-DHFx;&Izs<;xuvrs&%Nf$01dg2s zHBDF==WFpu1>g}bFu?6IjUK;jN}%nRx5y5ZbC$0FE8Q!q<~66+<x!W$%TX2>n8++i ze*UXnP{H)+s56#98gn5=;ncRY7={_;<W|Vr1L+97AUsH$p<t}EM@+@TCCyAXh$!=+ z^8Kd{L*YAg*I52$R(mDop(2Guzc|)~FDW-0KJCEiev4bh;Ql^I`^+Y+b9276Jmh`v zao@D~yw=~horV-MfyjSDpX6#Q-UL-Wwhfz=&3&gL5rragvFOBWO=4pn<Vpf7*~SS8 zBS|c!?)6CTh!SM!PjV&R|J?qlgY(Vtxy-H8Z1SDM8^Y+`HcahfI!Td`YDJu3BQCYD z3cCI<sTb8U7H$m25ThvGLTVa;18Uhab&`V#e7Sbl!Fc)B5YLD$jIPMim`)#2P8{J} zZz_TQA6JZ(!m_5L%qFAvEJuo1HVNl%jC^HfyBfIa*dNaP-DD7%qY!XKoK8*E|IN?P z5Qe#02&p&mhEEW%2;wQj@5Rfcjwz`s@fWj}npYG1%GxXfd`;XdE&h(`J-TnDMeti{ zY3(shVQML)HL(oJjv9w*ljBpY8y=6?Npw}l$D&bn#_n5ZvS0gl#BwoC?MIDT!9uvX zN?<Sz_8I%s0bg9jR)6QIDF)+kF3D0REUJRB+(kJGk8m^8K7bJtndQs+o)up>X)>+h zxaYU-Ay^n)59`mqEWc9n^W+gF%?YG>({{2YMwnc9^W+I{5d1`;kmp7B7`gdD^5-uk zLunqzpTWk65-sY*f*?2WBQK5qXxn;MYwHvBy8grXr&1Hmnm5F5oHO<#SG787-uvu` z_3PCWzjnO*A6=;`SX3>$S0?xvF`DDj?;c<<zTkW)FBpcWZYUHePloTmPQt=HRue{F zok6yyd=m~^`;_~vO4uPrMGV#~gcqQs9KF&soFQ_P_z}84nZ%EU$}Zhyr#vw2gC_5H z6LXW~8Tj~fPV+O0DxkJ`<(YBARlUJm!nQ&80mj!Zru5_91@~C@r>N@ZvO!gxBN!Lz z!rgukU$hWxz^L(My9iOAC@6h%gkWCFo?$BBe!CiX&5ec8PRja5c#19;C>4s&!x23+ z;sG)yncT1bPs@naILP=(vm_)+J-$>Ur+z`PN*3)vakNbl?Lo08*iPBFg)2OiC@+(V z$4V%~^C}K5q5Nxb2PVOsL3^@1u5BnS4tH4V-FWL9hL71hK_!sP9g(hE@0`4KJAs@_ zBgEIS?7%eI_nL_~7iTkk?Xe`1q1dmEV<e1aMjY<1l9RKUR?^j2@Hey!B4lgdc(m3m zUNao5j>a6&`l?i;_b{M@6k&DDrIs^lQ=renhNSz^$DbZYj7rDsa$QU4w}_L9A|GIu zv0sodLSW4ST1m?LWNZo#*nSGNOC|S{p)Jl}YR|EW=)YWQsPPgDZ%N^|2_f8M)~-L< zupZHGY}{<k+3jU-U>Saz1rl~o9wEQriGTeL84X9)@DW2x;FXCzl(ETDO%!M&`<w}% zhJJ~0h2{;)i1;UpJv33qgvaytAO${3kxdN`yQ0oslGb76MP^JSEmJt-l@{1$Ry6ND zggL$H`W6C~1ySndgK}+t`196+!Ip=Jt-elT>Kk7U&U8qfU3e{&Ewku8YTA}T+{*}y zH}jvhm)IBW&Xnrj*ZbBV*0;jAW(692@iDhhxngNm=>|vM4LcOkj@(1_A{+eHWG@;^ zmDU33b_#N6P58N=9f)^=f_Xagg=0jv=-voAj0MUn+RF1cNu!7e*!d-&oe<ePe_aMi z86XL|?BlqKpt!o3%B%}}K;h;SeP;SN6iYuAV`EoUYH7{lJhr~{(41yi!PmLJhvV^q zz5drZpiRq}^&#ZWp_kAsuC&y2z<&OFTu+J>BNQLX>rAzEHh#>aM|cy;V?T=EQi{`Z zWEc&HyR&auU|=s4TvH{7YId{<(F#8kB(o=o`%2MyC1Ej2XP_B_ECK&=8d2p}&y3I1 z!A(vMUqbAK)!-GG!y?iscvv{`fke2@v+uOeykL=!8uxgzUIlF3s~b~I{|V2z&-(%` z-ip$kuUnT6v9*JTxl_2`+&f+aB<oZ6WCtx+Mqq_xkH{kJB%O1Yj18H$!aN?8reNi4 zXpGl`PT1ruW`yec7301F{<2nR3bEKDm`eVsq~XA)H7=ldUimETcbe0?sai4J2Zh2l zRzIr+_W{!Y>~TLJIYn^K`b*(^VaT`safso0k#XqUa$4SW@`TZbsQ%iLWwZse+Ya@V z9d<?W6UWdVv-P4{C(L@4*QRLjq3n8yje_FUw2s|XtgK^PcSMoayv*R7RP!fV*AcM` zrsdOAXQ`-;SPHY?THJl&`IoZ6ZGP8g{0-u-VwOquQDli6^g6wzp246N198jYQfgza z4^K_GFf<q6l327(s2EAx9>f~vzrr5DVjGt(ejs}fLUiDEp!v{ReubVl&--Z?+6b%z zbz6J8N0y^H6(6p^7EIQ8N)ppv3+0ndKPr7a{W3DS<l=A0(1lvBJN~h;%^-STHSUf` zR7=v+9Sv5MH^7dlOHD#+EvG{E$t|5aj+-aueXIm>ogxS`sVbb0EV$$;`+!(rh2&-u z>?$!7m3RJAHcs*c{YN#aO@3LzibvPt)=C*g*zh@Lg)J>6tD=c*LrUR=$G3r~d>%Ao z9<cq<9-*1=hE*~ucADfN2Tbfj+r+fur^DgD#!ff1ZslS}xG$-MnG<OR%8+9q!VjG1 z^SXaiu?u3LsMH23rqj<5yml~0qkg*s6V@9ukzJ8@58mL)_L=lQede0cS(~5Ez!RL_ z8YWYD%h=XT5Ou?`82a$ug=M8@;%=W)P$!G6b(XSl$feJ=Pl3K_k5utpQBRtk_v%4O z!*q@}r5mm0$VvSZjhD8Me0TR_bsrtvpWcj$4zRFI{#=Ow7W@v)eKuuuIJ9+&xKumX zC{>7`+>sFxyl^8axGsLg5SIlBONTo3{`gUMX0qiO<nzL{Kbu;P*1v^Jns%RaJ|gv( zN~Ky$?cc%M#GDPvx0p*$5MV<#8KI#%jV~GQ>MB!oCeJ`##<WGA$hCMPOb;$ER^<#4 zyzR7*JimvxaCw|C#ol1x?71v27p-mvA7R_eDrLlv8B&mQ-0O~>6mfn{7M(OWn^hEL zn0jnVDa<^!-|6H0Hh^1NLN+7Ftm)nLHlW%sei!bb^JrO1&%Ft`pc0uo2B^hPYJc^a z`wgOVV*S6KG3!59t2Gx>u5RM$SLvBOhzq=M$~fTBjyZW&C~EUJFT@ac0|6O|f<;dC z`w^1d^c8&H(V&kl-MH&v&J>`h2{F(iGs@3aC;V?P#5A_eWk&CPGxdqRm2A%ER65>! zB?Y<I^vGS}FUWt?(wCYtGj+%I{8);jOZ*2;$PoAR?IXp_^1tB@L_EZSN!EaYco!hz z;~?ikQ?MB*j8u)4^;sUE2r)@6+cV@jieLruOhmW!8co%tA+AkCiE`cYkpKM)76ueF zX}Sj?J2&}~kNoi-pfFSrgNSO4Cb|zkBc{`8=%|+FrOQ~u>tdTVI>~C;$HW?IMM-b| zqMnG~KxDwEQKXun<#ThI3x9W@QZQDH=NQut|08Pjjxa8eTZok7pYRK-HX??X?tZTN z=a2r00J1Vb@VPq-V4o_B5r{4nAUyf_`a~Lv0Pe8?YrApyN8JD6Ds;Y>y~io7O)igN zthSI2H-)zxwwr~gASufF8(fU&k5wrzVuk<j2WtQ%pp(0aq+RWK5;!RqGIEPdfZR%` z*<Yy0zvC&`RT{Mj7yoTSM3ngFAsNnuFN>|Ol=NbzS#}vBYzagKQPxC)4q@S>^+>=M z9pt-3kZS@?sO#}q|2Ek_8t%XT-G;Sov-X&HlvXE!vd&~kfM0tFB#Pt8A{>OGH5P!q z9vLuBJx9Fbe><`v1W>#lfYx~S<S}qRS$&qRM&b_=$!^^MAY_9%vy;8i1k+*w%kzTO zlDI#7m%HVy1Q^jRDi0?q!Osa~=%OSs%kTf}a>@PQuk!C51!qd)a|I9*$o~M$&L)|6 z7iZ=&S^P~T*9kAsK*O8_NuJ#VTu2?sB5inIrn6vZ=KSpip^zu(elQAmf6MB4Qg7Pn zT@5gfFJWO3#B1Ibd%+{$4oh9&|9Ty{c%*$bs@R<7{+rQqT<_VVS41N!E&%rHrAEo& zr2NxjD8ztHQrnloSWJX?S-rF<_g}VU`;*?Gex>lfa+=s?Wq3Xck>2E-DuEXeoe_^8 z|7&MJ@h|G+7G!pShy1p><=ZPnG{rkPIxo#2pGW4jExd1Or%(0&fh2`Xh7)l~&vM{4 zb2$b_l2G`_ZKD*IfqR`}!KZLuOM>fN=JEDkpk$f->-{r4CxZsLvU^XP-c6ehV97LV zV1P^9GUAi6=4Ry`o|eOf-~Gip@DQ-$XvKP@NYIEJrN`JseW2z?#5jD3l7md@d%v(k zHmbv8O8swQ?H|38bq-?DctU#E7{YJUSCCf)5Y;e((F^IskY#`k5}6^e+mvSedcB)2 zbAIpTce!3m>Tclby37?$kqxdrsh&C;SQ|wC@dMTx>HpeQ4+!E+c--8JAOBbP_wP{3 z?%Gh;7BH;qitO-|D1OcG+z<kPnr<`VEj%ClnlYG&gm&(wVbX;Ezqamw?}!Lcn~`ON z&Huf2;X@D;@ce06hK_U5I)b|*ox>~<{q3Ek-(e?E-kk^Nh~qEk0RV|=6sz}5@tihR zwDMyvUwP|NtNeQp2SE)B(Riggtq!IxiuG;60G#tb!vx>c!~E%y8NF@iUx04*mJk7w za!Wk7T>wbQUAhc0`^&-o+|$oZ#LBbrh~W9}#}8_Mg7?x74xbmBg7bZsrVArotEo$W zKP&@rd;;t<KDvKz8@BYWHuw!&_2lC0inK>B(JaTai~O<c!Q!R)Nw;2MS}*CpBh>!6 zk|0K?);%fC0|U1O2F;awJM<NGSJEAB_@g)e9Hc-u>uy2a+bB97Rm%EZWJe50uzv+c z7;I)5Dnc8HPiN%abZf0se;ux@42zyVZ3KoVHs8C#$EG|Cx-jwijsXZc531*R())mC zjtxLJ!_5FWu~sgU<i7Z6h_^2&OU4<9=nVZiL`fPtF)H-m9y?4jhY3WJ=lUcXPY?}_ zCE<@K8sK+3SnM!R)$HWr_7qNP2IZl+EMAi*uSTx{V!016*k~G_l@;?))#CoOiWX2= zXVV);KV4&`dDzwhGQXAIBsAt;WzzU>X8A5NKTU~S?iQMj2*ZRF&**z{bS@)sL}0?8 z6K>`uaYV`|8(Ro8>l=y`S`8YU>&tz2`8gua+>1{BZD@f&^gIO<kTC`|<y}Blj};$9 z)!gOG+h4sPj>Z`jTl0g(b(*kCF+gCKVoUWaO~d2aeF31^y|oKSvO_a8A;6@d0u+MH zfr@CJbl8nCz>m)us}epI8!dr?LsKAcKTyHBp$w{oX(LTcPB%v`5^xzM@!i`uK>_zH z*dXlA@S>!jaKR%18GFRXv$gFmP0X{_8>E!^ZRQ{Q>Qk8j2&o20)w5fFHxP>DHtE(9 zwAJdns={I6#36a8h5z!SmzfR(X9xA(Fz+Pyo~)SGSCGR^<28>le>!KsMz!93E-T(O z5N<~*4&dXyTF{muvA+e^yQ8Z>GTL0p>k?o(MvIhxK#}eKJEcd*FtRXRP#i3iYu((Z zgJL$2{Oj~dz9-P~bd?JRgX(&dy{ae!^o*OEGZ5;Pzdq2m6*wu(vbj3x;N9$6IQ06l ztJ|JY@_#d6=<J}0b&9~6-em1Tjn^Dcty-0Et;N-Y8<(H7LS>7t8tkvqsIBJnwXtmu za-;KboOHF24`*vtpINDwggi@a?qwbvT+GpGc0^mqvym}aZ_g{7E9Tq9syi3<lEQC8 z9$evHuvWtl<(%x1HN6A{oZD)>qM%YWB<}>EEmiG-7z>X#FXhz@AA`<!XqQjZaC<V) ztk(Kws(3la2S8jmF4j%}5uXQ|P_~Tls0v^y;u*@qcnKgdbJ`^bAV8-BI4@D&FeTgi z4H5+W3w&Q%|18mlx)485ulRGjDRB;x;@397LdiBsPyZTlrI%(-1Mi7f0Jn!xkr~d0 zErtbvjy2Iq&Qnsg2rdJDjRgX;9l7|^%NTpP4oY2T5ar_r-5Q#D8|B!Ww_w?*wLf38 z573MXP=+{B2KGk2<xK#m)1Q^B@W+N>W(d2SG`-MMhksg!7ChWRpvDVe2-_m;nD_v$ zcNp?qiW-y#qcws;O$6@6@4BZ|qW<X}sp4uB)SsTJ{WEZ0`b|@&QIZTpL(Wt0{<VI) zI;?OFifj93GQ8ga`1#FOoB^1%;Jp+yZYHQ87_8nQHoxdEFd+_B;4&4ghc3I*SLWe2 ze!HDcFI#=Q4Uo(3bue78`|8@&4)kB@i~gEaYd&gsL%w*mSai>_3zYBD{AoH)xBZ;- zNUvY~`qHVypuDW+aCClWa=4*P$8%8q1`tH2d^M>m{$zgQA9F;^BnoLrHp7Nv7e=Z2 zh*^TJ6&m#0?(I<d`i>xCT*r}vb!zG;n`S|^#wV@e<nmWmR!dCLa^GV1r>4uqYa2i7 zHV=E~-Q_zS+1TP23WqwHE!DqdH6K{4FI#Xf)1;{irEaiNy4ku3KmS@N{;b9-Udw0T zlc&xA`oh8lZS3HSHj4@wzQ()KyIXf^pVP?mMo1KcL$pTUEu&x6$*{;_H8Aq%$A<+} zeV_nl3IgK6_{x`tf}MeCiPgMem|>Ld_RjClfvF1vWDF`e4wKaiIr4*jdS0e0^oNGU z9hC7mAxW=);0b_9jg=cnSj|;_G&mcRr<7L={UvL}6+ra`1v$_rl`+s{JxcDZ4zLMq zKvDs>kx9Q5<nbkF(P8Mo-{>s2^W%H{H-iZdz4W1%`(ZnEAS~Lv*K<7{g9$o>XIg*? z*WC0iN(fEveLRU<dy%6y)VpFJ#c&OMUo|W|;QKQ@4C0Rw(t89*Hm`sI+&<`1ryaP` zSTUA6%YZ{D0zy@DVA2VIl2*SlwK|dfA&VZVUjeg>KIFULSUv9dMnZ><CUhu^U>nS# z<?=hW$aa2$=mJPKYXbmfy>Z*=5h2}msCj5n8e@!L2evmAO8j?Faa*}xyD+>W0VQ5s z2PNq|2j*SeQJ$a}+T*wQ88**VXjmWb6KAv$-V57B`!)xOlXPI_HQ)+L(!UAxoo~ia z&%a8W=2&dz9|*y_8(u*$i(N-v26_>v`BDjW%V|ZsT(~gylq%Pb$cP~3EJ?74HM=y? zR&NSxxwn8=Ndit|nxt;gs*|(!nYS&i&c@#zQ3F`cn@aEGE-&q!-MLkk(BAd7kn!;) zaA40AJMfas2Ha=2>2CT)PSKt^bu!NAR;6~nZSh{>*56y~waJtBUnVxSW6wqA53!S9 z*OpBGJ!OC-h`-(tDPw=nz_(J)$nIBt{whpzlRz&f$$rpncY28C?J9C>1F*0<2g(_9 z2#EVI?!GiiC%w{qJ{aBNV|92P=(`Tf7{>u4eGj3mV3G3$bcm5c(TE7TzH=k;?+~_6 z_?%qu1~uPtMKt8VFtjf0s0+bEhoeFQuG^3=z91x3z_!N<RcK8hVjcLZ#O)xhb&$t- z=`|{aF$Y)`+gCjO)EInh<<dJeJ8>C8up)NrKtI$hffX-aD&bCcWBgwo?!zuJVIBB} zv$QQ^9_F*!w2nzgBXb~cl;+&wk!~1D<55&&voMWqpN}rnwwk#yxAqsDoG4SVFQyN| zCl9Ji?#CDYbN;pUDlF#+r*NJ>V?)*y;Wjv5ZE4v$^1)=i`}Z40AF_?$=wyzx>#$<y z{=NhLNK#I)5Q}v)UVhxVtDG@k-}~--jsw2%m(s?9-y$Cl-w^X%6Qd0JwWcwPSVq#7 zLm~bQP|~p(V61r68Deu%jQ8L#)>MhuF{9-uKikzhT++Fz={d8uT6!f=!6JU!-cVC) zm!a!XaIZCOD|zbc&tJ7)1wvzfStjEx)g;w8=G~TPJg_q<7^)h9D}PaJwR^hed<<)R zr9nD$e5Io1tuDh>_~s9nL$dctr>V{tkIzXiV>CA|wr})aO;&xFVxOaWU%5S?I$=Fq zx8g;OH(Out;<CGAV=(oTQ{RZTp$IA)L3sYgZvFM(g(`!mtF?9OpD%+gE;nAkCx~<^ zjiaq@KkR?sX)0&;ytTu&_IyuL?0&azv)#{kzQ`is?qFQ_(`BDa(`~O#e_!`HpL+lJ z9(<PI>rf9P^PJtO05;h^<xHiR2%p1dbH=l@s$Oi7yh7{rE>ivcH`lNC>@p|trXI|d zAKV)8c^Y+NI^4DM-|ad{nwM1R5p$;Rt<<E(cUa~w9DW;tFMNsdR&y)WR+e2$S40j@ za+S!J4Rv;PDOb-ajs76ov;5~=(`~rq&STsl!`;w)VXQFvl|>RTdtO+`=qa<IsAEk# z`K`N5Ex!D*zdt2Q0#F{nt29-nlYJHR8F;*H<iYHn*F~RA!|VXPZgx>bt&`u{_pte5 z9xOp@^E0H0=!RgY>Z4(=W!-rqXXxkn^T#kl)RIifbW>eyy?;7|VZ$cZ0kaPGn+?oH zGU7ox!5p_N*$bukSCJmDxwfziLwbV1kwk++Wop`I1k4&N8qZS#Au#{21ZNz)L0STr z#|hmJGz!sj0$_h+t>RwnMzEJ14co(i(E>4w<($knE6zK4Hjbf47tj&HkZif)uZB?5 z(vfibRhakjAn(X!SgENQT^yZr#So}cPq9v@PIj>KxjiP;A7xi7C>_iBx%}Pk>V)|G zE-dTT;8n2AH+YTJlyj~*XV24TTc6vC^uUZqg*=bG7Ta4(XL#h@LrbE6hjI58ix#EB zpWn&RlcS7mjbl(}fYV57#v}HX%-PGDSf+pKe>~3;kC^hTUJ(4UEzmkxk&!`WuYSSr zdYhRhzvTV1E5O_J&71eMH9EPE&*?qZ{dTi{p~!);AY_#57;<OdCIBj5JPl}f2AbBo zGQ;oOCyLkb^xNo?CM<7U`YU1*Um7%Ak>~z03{>$=-$TPoW{eU&IdBtqdEq5e`*FD0 z&V7ug;f$+9%Xa<qXr4FY%Q;Px0wGwgKcT}b^3A*9isRbGG}7EZa-mw<?*l1hxP+#r zcISK0=L|`60?6!-9&zwYVy>C}c{H?_FQR{O!*t{3N67K2v7SHICExlozMFkkRcziP z)9d$4>dm}=*`6WQ`q9#>xvRUCFB=C<S#>)KR=R~D21`|)-A-5wCr{=yshT~V<Eg*M zTkSfHq>(3Y2ZGt)C!}&mE5RqMp4HyoBwvJr$5bIiS|(4hv*Q`<2LZdx6zB)l#r!}9 zkAU@eaJC%_m0I6ovoJbAM{Ze?^jp3+lSjjD$shk0TW1{=b-T80MT9|W2nD2PNKrym zhVB6jN<@(E?vid88U&?50R=3&yO9_K=?-B8>2AJzeBSN%zI*Sr=8suE>tUE5cV6dt z9Va=R{eWECwemK9#;$oMQ%uXT+6_@Q#Tg)8bYR0lGa0OarK4Awo5CGmnhplLdgIi= zYu|)BX!RyN6^tD!Aw@~xl#)}828HY(1=Pzq4>ICnz%wyP3T3X@`@UcGh{;)k^S-lc z3t6RJ)`6}@#yVFYoJ<O3lOKtC-_9+>m4Uu9wEykR(~T+D-zyukxK!vc%H;Um$0f4d zLRpbkJf#*>1Mf>e*>R~G-$AkoBfV(WTdpm3SGl`<tlTJis8twYSJ3z8JVkQZ=jjn) zz||Q$uiPzfy0bb^)ydWVrw%E|47H=(PTqh=ZsZq=)h_*{9+$&zpyh9XZ;cX{$7@!{ z^E|}pbi8AlaZc_q=ESCct?b8AT(b-T5u?Blw#rUCwklgSkn8G#_No8LSb3<-bB(U_ zkrVCa-e{{zQsVr39>C+_&dQdKA9vLsS#q7Bm8OVCK1HwbcrUW`O*i=@i_OS6rB!br zw+xdatY5kv;{F~jEw2+aPFtIW-47sBY0|zf{y1$7F50|(_}fbF-1>D_Vp&UCiSLQ! z^}0&?IN_1p0?{tJ<6oXL6Vy~He8aLXbd^pKL^XQzS@KXG)CVS^d3nqxd&-qLyvuOQ zE1{8P*KD2VnH6&+QIe079+){e$KRPQnApsva)Od4iO_8YIIHg@elE;Te<`VUwdVn% zUb0rAkh%Eh{B+Ing1s*P(j5g9m7ZXnSw@70;IQl)T&@N5TvkgB5HM^ScU{?0gKkcG zs|#N@G&*!Z)hJf*GFu*7xWQ<lfta0-`Oo$P!&eqUvmn80FFy*4;yGmF6z5mCAAQ=6 z-ul)l(>2H6j}PJv_ubEuV^d2Ndia`JCzo$FcLC?uT0=o5AWg|QUxDFu%+``1X8rCU zKfqaH6_?KrW)AW{CRL^!F(hewSw-fN(KSLyok{YpSmdD0XKR5KWtFJScl#T=?pr30 z;CouuF(@ePev*@)nsAS}e`A0Vt^+f@k*Z6VnJ03z0ob%T-K1FzR2``8m3U(yBWXth z#z#u};NpC)DLMF1pf~^%T57<h{<$#r#WhJDorN*8j6~nF-+J6%o~9<$@b!aOTl>tP zgTP?6lo`5b3+-qPdulWAGoSl7?~SMWe%W}Lt30Jv$p^M5rN-~rs*jX{-?^bZk(j7? z!q!3VNnPTfQ<edf@`y=i<-z3HXM<kLdK-lXsXwK-s|pe`Qk=h(lB$@B@cdypj@Jk; zG^)GMm7Z_E=+;d0SiW%6x;SrcaodW!@&1v`LgL8OSIg111`=12z0jE>wD6ciJ6tNk zE&BY3o1RkLbK;ikK@~nV&LxXDp?mp@X_`K-&rV(!Sbung2~zf#y&6fIdB~z7mv;7z z$bWWyB;@c}j^%tMvDLE!i>&7Tob2#SuHR6K7l<Mp&$Dj5)%SgJC-N~h+B#&m@+Xu; zO|yDDKFdF(nDzCEUGp;D`}sox8Uq^r{QRf3wx5>|JjtR*=YM_lPBxr7^1=C+KGOX- zwwf{vbK#25n5!fWjz1de`+N-|5(^#-3)qX-Q!f`JmD0f-14}iY3A_#)g<WpR?iUBG z6pbLDa`i_u)1^sZ1oDwuu3U(}C-wMcZxA}?h0t2*kJF&~clNk}=7C9ZL(HP&DtOon zCY3m9{?~ZfC%4TKI}n<C#z)4S^!$pP5Dwl1Uy;k8ebRhR)XnJOZtj{MVN#C7uu8s_ zX6;KdWV}TO6iOm<^xKkenY}3$M+-ALBM5nFdC9)``AN`cwI3NTmYQT-3c94rQ#p(C zd#a{F>Dl!GtGISf%O3xx)*hKxO!p?i9V={M+P;O@XFB%$?1YxW8ZM=5YKntrNC|_u z0tfNoSrQSQ(K_zZBa|+CL-U#Rs`*TP-4w`)^dW;?i!TSxX;U*tV1;mh<QFzfRsyX} z>Y?Qe7<{5#@$0OwuG9NwWR+<>Ff3oB-3=2sczG&F0=5r#haza)7C=VrWGRfk!Q2v3 zjq!{;HZ~J`qpbc?r_{VCie8|937x*Nj$w2C#e7n=5fRzv3O)t9s48m^Y>M_W2J)Nh zi5zVy1($vNm<To>0#;tnImh3iJ}UZh&j0-6mY1FEgexm$l%f`>Jo<r-p-$#Q&JrrN z)`)QKEdP6tQKVKQHiarrF^9iGg0`W8cqayr(w>T19#nHg?kVacKFZO4njH{KUu7G# z)hMa1!@zI@zPu<=xlNFnUC>ZTP*GA${MBpVjy_^9-!A!y)FbtiH*PLc8jWwhyjai+ zeAyCO7<~}mB3LbmC^nMG)PJWP6j4Z21cM0num)6pXrSVG+2FAzq+9!)d_d9RE0=aF zA*khi4DwSkiPvb_zHT+_!E8Jn5ar|y{RRW46#1A-RU4$jtGqLL@2^D13)>>59ZG*F zkXl%ytQ$x1L#+nwL--G_An)P$enY;3U*mP>jk36X??W;iZVQr|4{lIIELe*IlWMJ> zq-a)%pF=YN`=M+?gtWM2j@*1qT>O?dr-1Dsg^{yYaac2%h&`-fvzd?v;b03gd$%bp zJGy23sz6mSe)uwG_x_0Xf?JrQ9zdPr;X83qnC*ck4{|XN%>Cu+d20$<nd#Xc<Xgje z`{-b}Fq);fYI=#;9~?v7nYnx*G7p04^>gqDmzy*~Djh&EG;~O_-qAPRV<lh98tc|F z)o=v?(<X;Kp;${w!yWaUBEJ)d&hH!AUB$@qj`bSEyW)WLvU`;l6kzFUmi61XdoG0= z;=@lkvZrDL_Rt3u)S@mK7hkW<Xr+$)O8-;d7YDTs&ZHXG_g31r&MEvWjB&7)-!UPF zuRI`pmul=91#AHcVc&En{?(gWQyoXLEQNHNGnP3epWVPIpJAW!N8QI_*XH~MLRq^6 z2YTzansc)!WoBF`qTd(ZeUVvs`#hYtI5PsFQEL5q=wne){p0XnQdM3UavsxFZGtX} zffU-j4j=x}8_(DIM2uko!CcFP!j*3Q7RFpCa|d<jHsSo$jocba6>5ri8*8d!PmaCc zWoo3G<fOuIaJd$_sdo%xNg_JK^%u0mIbIftbLKF3IaQt*oOf4OLZUfKZoCk&Wcx=x zxkE5JOFG~5#!7&PV7_gMb-AJ2I$+K@I(;loRgh$WQ(&k*KU(hIH^AvC*YF0E$`>G! z_skK&jJpYlArd?uO!GO#pI4xZ(Y*Iedy?*i!}dty{W|W@<E^&1ZiV$Om@GT>vo`J# zADHN-$*LdNBiQy3yRm29o^OH8$)M;@ZRxE%IRu6*WmIQTlEIeXIm&T2cl3b~^ZwMi zWKnPy1-4ww3)Df?w`Li^$%JnXIZ#&7zipq>*Mv?TPf{sVoO?H^Zd~dx@LA-mnQ-Yi z0MUp!w7D8De{gzwu%CEgyyRFKO{*Pqdv#WSJX!mtDylPClX_u9AMbP_a_4s*VR_We z<@|szj>`o;Nr>(wsMj!K_vZ`>%Ov^JY6_3hJAGaZ4<6Ol3mux(%ogf=PE6H5>Gl+e z`OGqPy>`1hiR#J{MD8HNS9!h=1?>?CKs8nI@d;`#wEtYvi%wZ;BVD30P<6!wls&xO zHLiI!UF!0CXG4451$5Oy{cBm3W24q%KivAnZ!Cs0Ai;cV62L07ax%M?1&z%TywzO> zk6+39aWF3xeY1fFuxB{lDKYwvepSN5FZBXgJCrE_L)TySUHu=8;v4JRjZd#U*Ibrh z%A?qo>}R;hEOKeaUP?)Pq_z09mCd^dZGC5Pl5O*AdC$0qRKyc;RwkvZkE@uHJ|E|P zEBW#~w0*y0Aj(N=*1kjPW*#fo^Akr6<fYc6e5W&Qav8_ldS%1yk5hlMm$q~I`dqlx z!t1>k#%-s=2gJw&!agNdQ$86qF``M$=0FwdyUS<(6d2vLD~{kbUt02G+Ma(`(XiKi z^%Da%qUWniGvSV<{nz@)wr+312!Zzj9@{O9-kgZju-RGaK%b<aT}No1OpL08`-9YS zxgt4gPOT3KR0^j^h4Z4`{q@Rjf%l%UV9LeQA`4xp>l}aisH{J<&9Ogl!~NZRr=9Ar zrvvTo4q}f#M^7F8WY?89%yL{JmV~SfmMYGBOwJDLIqa_cZ12)r4Q-l4XWZ?eH+#?L ztANn`h@$a@Vy}A~j=1u<JD{`Y`pO_bDEF0ux|=|pBNxdL__rvY0W-4Br#L+^&Dyte zM7}+VKtdKxt8V@2-Mz+tnV=~6XeG}UY(x$?{TsKZG0wctYPG$w8k7GjbhLf(#?0yw z8l55QJYkzCma&$?KhKkb<|x4_F0m<gd|0EsT1DS$-&Ie)wqjJ{nS1IlAcCRW&5wz* zJ^L}motE8ws_*GyIgiPMbiX{C3ZoJi-eSu|R>>&kJbc&Yft%HHy9V=0Q}f01Qi9Sv zjB1sRL!Q!%^f(NOA3x2K8&ztS;XU*ZETQxXA<+c?<voIq14XNoFH<Nyj{NW>qkt-! z<|A91s&PH+Wn(+w5)N1-A-7PBT03WHRC`a8|6E+IU#{=SvMB%}#YDzPUF?wUi$BeG zSEckfb#f0c-!85D#Wlc#wwS4uP?W$2mH>_ixIo5ifB*P-?c2On>(tfnRd;la52%-i z#i!Pqw`hmH8eE7N&1~{*9iO{3*aC|zqRDtV|2EfFz*(^;cYgHyMeGOv=Sz7K!f~8c zsiTq}1EIWwb&3w}b*b27Q&?m2{Io~OE^M^^#R3Q`eIfeQ3r6)&mF&O#pjbhFHkb0U zC2sHSn0QlmRRXj6&|%<&XeD6M-u$O`A^<D9F)d?$6wQEg%gJU<*pc%+`ak|fYz6G^ zi;2d6mWZg}Tlu#FlOe9>g}1JEkF5rGhd)*mT8{l~UEwg@$;ze9uKeti+VscjhALZK z<dR|Qy4b-b@rwn&f{t-;14|xNxBL4O!*BSj%6_W;XroBLD<|{O9p?Dr!#)_Q|L%QA z!Ci0I)b~8d%+=^!c^%$EusZTSzhH+3e>LG9+AYJ$Pfyo3)G}-_P)?~t(-z(4z`w-) zW;yC#x~fD!9JqI~+<MiF{{2S-pMlI<$zDrWiIJt@d`)_;g)Ha?w5IXQlf$X~-;;w+ zsS(DX&+fTLKjV1bZYz?XXtVH!giZ)O{AEJlb8WD7T;QvT)zryW!<|BZX`iC?wVPv# zUvICbEO;DJK02u1iu$6}(6qlX&{JJ8(~tU|B<5CBx7Uk+v)Y3%vIc6tWrEyY{`cCf zrIYnyl5LGXpv!*j|2BTDBhwK>VMe2Q>Fy(wTC<M!a;?-5F{uFg@Hp;Xia2ts;V%`o zUuZ|`*K1d-wb}@wjFs*boDB}?H(mE7b-dC&UCoV!)jk>9RXfR){u-{X*Yg=usTpH@ zq<#}qY`W&5mnhr){K$oBZ+)rzbUruVbr#+GrPk<b$w5Q9KH;R;Xj4t8J!YuW=K0u& z?_!FJ&k=th@<r6G>t7OuZBvo=ZQ4G%?01(|?T37Fx<}q>_u2RF$g9FO;(VP~Gx+;2 z|Nl*_CvH~)x5-6KR>csw8D)K+ns@+Ihm7=_T0`NBUlJ(p+qWOsqYql#tQIRymJ(-H z8FM#G7Q1cN_ZJQ`AGpO$Id^4*6+;ONJH)9C@CEVDhdNx9J}>mn)l?LVxiwe}E)+g7 zkrR-JWEyW6e9*~e>gi@_2rfUiZgs~l&LyoU-jiF$>2CV-{B|A)zMoSd_aVlWcrC+; z)EQG!bbFY7tgcMwaMn||)?C-u^M+<g^~6yFE7!;<=ZW)f_hCm-k(v0>H^STLDZ@o3 zpN4N{UEQ;u+mFe(()~hUvdPwKo5C&afh&-Hj?S_%CFu7#Fjl7qLXzTe#a&2wqS3{e z(o+_FT&91ucl(RL3XetvVo2T^{#W;cBhpVE#iZ-CJOHaZJTjk{lI0<yyNk9Q&a-A; zA8Oinj6QTUdBhI8>!VjVsQy_q70RP~Xq`X|>Lfw}1;5j`dRQGMXig5V>74zNE4LrJ zrM1%Pw?jJB#&fa>w5rLsnXBtNB!waOKTVwLq`H$ar8VVoI(fC?O37E<eQ$GiEM9kM zpnC{gNzuJ6&#GVQ5FlBom2oyH=gk}1cGvCHiFAFXErL;-vO~0hxafEEh5@!f4R^J( zsSvve7WG*q8_shjK4~PlR^WS7(yLQD>EoipT45_h6@(HbOq@7v<7#Fuf2p$u<45H& z-MZR@PZrquT9^Lj34r{%SL+;%GM%huh^gm$Y1a5Q3aEF>8sh@p0+d6xD1s=GvG;?2 z){0Io(7+3~JNoGSA2S?SbNKwl-+bN8PvE#@c9L$kv4I=<+UMtmL}D}K6R0z<l{|g= zdk%KH@Id=s3od4qot46Mr9NHzW8V4$*JF_j_x9S}=z}8uC7J+S7(u*;QI4v|<|}FP zW`$39sj~RP;(K#3=hX2&dYy8#_g$hzkNRW8TqrXg4s(n9x#`t-WfHPI%lA05pi)vn zvd`IHoMK){e@UmHDO4veKd{J9w|TgHuaAIgkfzA6x##LTL?$d^(MspmXSEQ-_UH+G z^>vf@$rC7#rCPpz_wz4XnF>#2gC1!<XS7~iaq(e@0yMU6-}>z&(X{U+C9-`j1>gU+ z?)!@XGzMI$@T2m7dn)uem;>JqphyjAe_)&VYAKt!w0tN!F#&Y+I(TOG>Df<RF+)F_ zX(uP;9w!wD)voVI#Ffu>t1v1sg<|8>Ig`n3ppo7f9$kwD^l3{N!;Z~<vx&iL-}DA! zqabOh{0F;m8K!U;mk~NLHRI^E$`bdT-xCzi>6c}Kwvon=_F8f}-|f$`=Z7*PKi^<= zdMepgg~92=W2%dy-st;lVu{=zKR-%t(}v4rH_mN`irepvag3I_PKY=!8;A+9zW8G| z`o~4`Q|$8l*e>r6w^aVuhV`$V3jjx)9^EUbNT1s7!Kk~PeB_Q&wG(f8up_81W5D!K z?Q0>QM*!rCsyttnOBsk@OFNk^xBaqmg2MZdZ$6XrCdzTg1lLO2Q|rK$HkHpeEKWBJ z6|~XbS1PP`G%jmzU8pm0uP`6I+_$a&TR;{b)Yn7fZ&PBy5LqZP#^sW}9PQG2hi6QX z+how4JH;RJ%JTKC!z00z!LeaNyb*D}PC}aWlp&XR(}F!&n^9-FffvtQPwdgmcLRv! zd1Moi+G(g^_%mm`jt<mIX3>#ChlVlpjxeXd3l9OR_OOZu+tBs#f#Zz&icE^2ur^;O z%>SAf!Z@i~Ozv((uYv99KTjF4S8yh35|9UaFALprc(kg9!>AU$IhlzE-!igI-0yHZ zh<7iUpE6iDJO1EOQHIYg)S49JvGzet^>fl}7Qu&V6hY~w-4Ho$@ku-1Nt=S>Qss_) zOALFpsg#{D0gR0MY~v*Cp1RM%m%|R3c{BRKHg&-wmY$&~1n=({ll|fE4#@BiI%%`p z%R1iLQv!$XBI~X@29Hmth9(F&*KQ8oWn;i>L>2fH`PdQd&Ev#J9=N3y{#d7rUAw71 zl^{kqjbRuVy68=77<>W|8z?cXk1139u6cpU3@dixzssVMH~rUQWXz;Ij~m(IW)pYW zPwXENSNW62`^|rfD}SGiG6&@IiyCzO#h#nhkHQa`@*d-pZTnwRV?7%`9P!96-1~{4 z@tF>P&3!!kBkrkJT{5HLWaQECsO-H2$NXgIB{9e4SRZ>6X5C2v{k%-tz#~S}8k@ud zU8@V9MJ~7~WxRvHry4N#hmY<l@+VVHe#u;qj`}ijucI|hw)^ZZOpLcnKb7}+upaeE zs9(TB1G@Z~b=fE3<>Vx_)M{W%;kbC1Al-c|{IW<tE7i=XHns1HQ3f$OSN3d8+k5!P z5qdpolU60jDY?cx_>R+#CU27~vA|^^iUgyaXv2)Cwr&9*-C{47c`wvF!n#7;M|f2E zBAolZdSJ@XYFG9FZ<eGyqpVuDo^9Y(^lv|ABZ`v~`n|ulHzp;BHE5R+!h4oLtyN}e zWc0o@txyrPFEdTxKB$b-1)iU>yCz+SXkDRqo8L&bflK{GBKIGc`ZsmEqR2H+x-|zF zGtUSY_aZ+u6=uZ;-x`=y!ghKijPf627pc(~IKI_n1zvW*iiduf$X)krrcX<YYVFTC zT#&i(U=&#BDE>L3>y9)e#b=S9#7gD+JAD*)9y9Q<jdauAm7T%V%YWwS6uAHCc{#(H z+ho?Ymh?mN%%?^XQQPj4o&uVOP9uy9!Rdh)`)QftEVr|7$?bV-8p?|4QP6*#B_OK* zO*x~NvsPB-y$~QyI|P=Iw;TW^Lq;uoWSGDHU*-`MBI42;$9>aaL7Q3zCbEByD*V`} zcd$I!iWbZJePb`_Hyeb<8mHZk`x&JQ?K7@76(AgCytl5XUCBdnG5M*?j<&S}P1(QJ ztL-SDg?LGSxdN)u2{Jf>QPUh@pPkYF`-8{ejmASct|>nUX!jU-Z;veHck14GWp}nR zn;F%RrT<9%b9sHAk3sJG$hRcn9PP1z{fPk92ZQgIJdPLQXxOgtT*G7w{SSIY!T~7R z*$AB{=@G!;t4_vr|66CA(Pzm(5A|HdFJEqPt!lq_T>ST`68i}kUAM8OeW!qhYQHTn zzdiG>bL*`=Fj-fA%pU(U(Im-7+bsw4Z1qTKY#B*!S_A9b?$NN5YW8a`0d&RF2A`?4 z)vw+%Omes%lrn9BlM&rt|IPJ9sd-#)y0F05tvi2r`Tuh-@D~BzV|X9g?@Qph$Obn) zm`DO~+?~<CykpC3rzU-9PCgNP?OdT1u+2)fcJMA&Tqqlv*_ue?dj3G`#A0EReG~A* zN7pK5G8O{#08GVmDcQ`i*4JnKu%h9t*XLaDOpRF2d++rWkV`l}9RdpfD3<8rSf~DX zQTab_By`DR{o)dxpOu5MY#d8t?e!>EYkhpi(wM!Ks?^?8ff+oamwm`n-Y)ge8p+Fo zXAhj-i0-U@@=2WzWlUNwm-SxMahozJG3~vzn~Sw%2pfE~7~jJNuh@Kh#TvHud!%4v zApE|(7dk@V3La4*2r{|L6OJzJ0kJlw5l=n@TbP8wL1*TR8emhy(qvfICtaHV_n`Ub z{gJeUlm1UqGkRGtt|3r;l1RzG`cm15L=9jqJ!3S)^9A4#2lzzCNrSWE;;(FyB4Bj; zP+}1`X$n9=53EOdu`H3^4AF`4GAlDeD(+p3YQE|pV8>?=j4)hoqm?;ezB*cj6v_f# zM2$L+y;IlC^Q{iXFF=6uIa%yZoB*xf#?L<4E`<a-PgXiS04xt_d2`S?*1$knXgzk9 zR@|r7SN5&>WMz>`0mxDq20zz?t^_cPLi{AFs27V!_m1a68NH_RC|ufnjuxr(*jM!4 zKfLbiBfMUjom#o2)F5`6D(Lj#NgARbq_-Ob7puY`CqxL#wgFbiLnoWDViQB}QSswy z{U#j1l<xDQ7i7aora%9xz1-)$HQzQ|@9p_Xr^eM#03EnvG=oTNMXnR~Qv<nHp0g3~ zQAy6}vQHZQtWxOv*{d6-6X|eFx)S)-H-Psq*Lwi?Z^{TL*hV$Y(qHe3jsF*S{7*1i zR3t_Kqj7IqvNcaPE!*7$xIRmOA=K0!f{Y2iVhd6)KspUSm)3&~)hU3*=@@zEXe?z! z2inv3Qwtb7F#L+pv`lvkgp?q%lzU8&A-YHPJ!NeIy{W8;Rz_Rh!Md$TrU)ql1LX$B zSL+7FH0%3T>-uZs<)tZQu7xgEBPNJD`(HGQ0%q7-!VM4oHzKhn*@(-5_@w)N6pFh5 zMLkJ)si(zHz8~1Pcqp~Oqt+#oNIKl`y|Bv7^r@x?fCV2PvMhQi&0%!j)7)sRM1tje zOkfc#z_Ycpp;c-=*B}mM!1@n)UPdyAjvw!@SpnOhi<HWJy&L(lx?Wqdz{Tce#Ex4? zVi2q*Pbzl!mKiVBG;D+JE6<FujMgb|0UykF0hwp^-~y!F5RnC}ftr;l4@w(E!}v@A zo0*lK*H$o<4fHOQ*S2m?U5`Pk72tHNZkx@__+CsA-b#LN;Bm56adzaSXpcCY4Ya9Q zD=#7Bu59F=6FwEcIEv8$U30FW20uQS|8y<I>T3}P)ygoS`VzU(<`;0#e#nokcANtK zPO*k>Al}YK`)LpiIRv+7n(dTfQp9?)+e^@AO`<o6n8}%AJn^^4=Dq;*k<a}DO3tZK zJbzM$F9t0k2G9Q+Y^?DH@QGRbv-sYaWohON;RnGH(cSTZ^Ac~Z)9|n0lRWl_1W$ED zn0W^1Rz%sJ@wRC#!I785Hfncj<4G~F{VuM8m!Wj<!Xl6!Fd@8AyFl*<l-JLCZzeA6 z5n{llH_hDp%Nlua1}I*fa%>$jO6fq+72N1-t?~fgR5SbW)(ReUCe0DLtVJ*_wH<OM zF#WP+f5z8$!wao2hRCi8jRq+it@0PE2`y>Y0ihk_aXqgj+kcu4_jq&PYJ4<WXd8-= zDR{;4(J=U0*a7PraX+VsFbYbg<E(;*FQE8xDHTFSS~yqrsW6O+WKS{>@5uX#Ko+BY zF`NTy@tl5#=HCa;_2^dsuiTXbZ76`fZ}?8|b<i1MnG+mrTMy~&58<}@jNZE{hV*t& zW^90nFxDKZF$54=o&b=%hV7aRAiyDnU5lf0FhZjMS$f<q!n_0^w`xGFMXj=gH*b~% z)Doqye+GhXj2q66KQZPr@Wk|ie$4VHI>7;~tC2@J$R<x|7VDln;vmK)lEF`_|5h2~ z4aSjo;=Z+C+!B{eZIDa8t^)^LSJ}2Bn!aw+Y0M<?{kV4bBgADNd??3ZlsH!Q+z^mQ zP0v-lGKawuDyjMeF?1Iqk26HZ09A-oi6o9}OBx4B&=BW*{O?P2>{X!IXkP02G&EK1 zvZMHw_ZA;dbl^_Z;B5qSyBlQ-QXY8&uF$}{g6{G6JAvd4x4J7{U`^OTM+A}xb;kTO z9<<XP1+cSPX$rI7V5Y3ex$>(X16b<=q_*7CVHROA^!G$i5)!6zcu`EsX&x<perTLZ zbz%}}%pQLAGIs@0u3ZvGGTFI<(I9uW%Um>{USqXOYBrO7P+XTWNXlyOoCOZOPCdr; zy4BIiD#F!V74e!~(NB|*li_l!3bcB?*U>7aN>;_9U`#kwBh#zP_+n@@mL8NB#E}F3 z(4u5j1Mj5q;m4OJ!1lU^1<d%KE-<?OjFV%75usEi@`QH3OJ}#SOdtH}hcoN4+-RS6 z-k6@^k-TT%nFXzME54g0ahNghc?te1qF950sEH{@&ro!OpMtm9XX|;EpMHBiWI)DA zAH{>sblP(v<FF6gVG#4G^ai*$WDZ1yWBDeTyND5riduy!XCz$AZ28UmwQ%vv8JB&o zgh9e-XXYSIJw*Y`+M9Gtjm#@s=_xBmQHk&W7+n5d7yi6qO$Dd5+h4_x#%OxGIYz(g z)UY9`=as>>lc40(%oWX;CRVdvZ3Vkd!AWjk{L0Y(EHIu9L!k&0+Gf@vCt)Apoa^jx zmwORE<vP)8zZ6W?5h=!ICcM|g8R8T}$(m1;`?Nr}?k+;l;dpMexhdiY35LFEFuUFS zA@YioHl2~oEqw$7&C#PedyPW+=vr*vO(tV@3XRLRyq=AQi)lhi2uIp)V8vLFGg2iv zd8K>RDCnLd@qkj{6K5ImJwx0F?$b2yqJB{z$)A$0I057EiORR1KiW0PUmiEZFF=NY zN@n?z-xZS0d@iVleqd!FoVP@KGLk{I76H1o>v*M$5ENl=IrDMwh#dJBsV!0}NfH!N z=u~55qE6x<^y^1V`d(myo}UxL2RW|*M`<<)?rE-El3|!@d?Fw&+&3De$6kZ^7<b=p zxK()iHTP`~)?y#Vm={bYM4YMeC9P!<A5sY3%RZ&tN~et6z*FTRD|6_ecYE1C`$o%l zYbM4^oUd6px$SqXb?PrSS=1oPmx^s7##wF7ljCzP1BAFK3)6BJre16XD9CTZ@2Q|5 zDz;u5_}nrzOyn)BX#x$xr%0$u9K8y4hof@_@yg>DJU*$$*w#Umo@DJ?VhK+UYR+R- z(HaBV|F(cjFcpqHrF`@2z9ds*H7TLJ@jOd2L3Cjghx33(4>-bF&&ysOkmh?um5Ye> z5ZaPq(?_T}*z%1ha^R+w{q$uQKLLAb$~zHccDzTvQl^;C3^*0g<YxrTQJ#Qq1Pjl# zvgaBJbFc3a114Jo6;!@oCS863irj)dm@SOD8Fv*l?btiVx#2D3nFaAJ&dr8r@T1GH z2tSa2N03<@l&(<J%n0Ar?DL5nmU+u81*c0CIZhKNu_|vGi!2O0bOd2z?w8?ec%k_D z<{U8zyof>tOh8^>)2-w<?r^e+gowFOVQ}WDWomOkwRZN%Ti`D68m4+f3-jCz?xsmS z{@C-gq3K(n*}9+@yqXEmfpOMPHf=s*>4l@1He(Rt4fBm6#w^Nsni3wg3T|0mC$8r} zFcaNoDD!P*jya+wUAapwW04fjDXBmF7VLTWaH#kqfBQ4Z9&-#_ZfhgN<!g<|V^&ud z$g(($pgrgcW6${Y<1khzQe|bCdT({e>A5&hWKcv;SktwI`tBa+1*%KJuTkDAfnK^+ z#$M#;XZ#w-+uB>sl`ji&5SNA56hGyj>21<f5=3ZLRY-fJs$qgP8V`I2p(YNy_=MKY z7-zlgj-NG2W(ie-g)c4ZIH;CdBo0XeZdqhP_Yb{i$IJruoFmO*<T)~QvP^k17V}2q z6$JtDA!{ac3*+zdEo)Wg3APUP@Rt9AXE|qn?$;fx7Tk(^UL0AUC8hoB8Tij{aiQSC zFb`Y!-nJD2r^JYm5kAiA%6pC*sW0;|HUxs9f*XY8=xZSt=9yaNPOwBVVGIobO0#C& zgYv$jK|2h*4_b)lVz?ZbN7zaj9jM&+a}pSX4<0h>w{~~T#k`bcfi&Z|<R~`TPcrK= zMaGgc;8O?S!^fm;-OAhMp4`KM2PXRoq;X-8DUcvSy8ci)N0i%#h3_OG@GD<`CUqzv z*WKv?BxeaGn3bX4{!i1snJ8SA)pbpK$-E&varbT}2NBXT_u-DTAmUpK#B{~4g%sWk zh0Dg%)RH~2pI#UZyt+!}WB(Gb!?4(!(2xc`LU!AJoqr|8lb}O9jtyZc_?)_sUZhH# ztlVCM+$6xEp+LI|WY<S~W?FT5cYrgCYiOy;YRqN`wX8?(Bc8fJ;rB0*9HEPoggs_O zAo;~Zjsr&DF4~FGE@zISHgRZRbt)y7Z7P#RT|?3rk-?EK`>(15Ic6OIy1AlB*PBJL z%XE_{6E8W3f*g<N(U1+Eb@<n-%{J9Y7OH4;yW;3i;g}8epnDl+Sq_Ki5*$lD^MWSR zk<L+O$tXsdE3JmG0p2c*?oVOV$%9B3>EiZT45Y=4EQ>9UTtq4PNdo<T@9K4xI7fN+ z_M^slrvO?Ug0#T*^W?)jX)PFl<lmf06gg3u<Ff{Rm9MFGY&X*%c`$yZHH61G-z7s) z%nIPmCC_ZPMNpk!_|s1!&4~EYPf|IUGqf@U|KU`s;ZQM7m*r$sqp|j$SPIA$B|`W6 z&qRR?OO9>t3y+{1@Sj~}8^AFdWI}ritv1=Gg(?_3?80$oCrP5!kTpN5NS7&^^M(t3 zPp`AzjKfJ6cH58k0l|VdR$53Qao4D&uFPLTPdXzz=kwa-k7QVINoGKRB3Imu2;CKY zfoQ8prw?9q=1umW`CvEUuL%qZEexTm_O%Aq(p^c$?Rj3&m#NZv5bN_e$UH)lM{K{_ zR04t*-)X}*1E|T~$m)fX(68(?#uJL!YE#f1K#&eb&9+~KVOOI?x|+g{!8|=OCxJOY z1+JyWEk(wSYEv9KHt^!mvfmvcVh%*%(Iw=FwQSKvI=_&?E#gs}m~~zsE6Fu$tm_q% zgv>LTWf`q=AtRi4U})xDCXPZ;mB$Hza0GRBS6FnT!*$iS4rdNtvT|$1qGSx(PPiq% zAiGSa%J><iLF8|O-JdrXL3OhZY&E`)OfpLhQmCkjFy;u)i%I_qAIAofH3+z)D+{32 zP(HqTy|A|^A)X^{!WnuL)ua}r4Iz3IO+Y39j?UQ^8O?KOH_Cnygp>lltZ3E^*i2S8 zbl85?DbjwXIKy)j3o@MN4xlA-kr8GhG8B=Pe7vYB&9ZR9BqQozol%#^r@-gZ*^~4u z6~YhegPK6yk4Unt(P5?LIRnj=7;xE<?F-&`F|cuU3(s}#U^bE;y-B9J+QHKOEz)C4 zG;*tU5@17gzt7bkc`w{tFn<#!k#?!!x(u%)DRah7y3#}dM(}1_>+yHCETRE(SPxm# zLr*_*p+95n{}eU+AUS`!9B7up8=(XN{MS0TZme0$v3HuP@zTGHEEUX|GuRbJv+g(L z(?%I@(zc(^v2<{7S$<my?DT)18h)AYYKuZJGi+9)Q4kdj?4JH6O$wx;`tPE>qDT0x zOUeq~aU&?M_@*(a$gy{zhFN_cXW;<GAvcdc^iBYuV=~=7Vu+^y@h%>^JFki2@)eBO z{8jj)u@DF?T_MPTiL%wro90)&nagF7X}_YXx2{5$A%pKQJ$K&LPdDvEE@P?Be4X;N zkoWjz$L#}0-mZ3)F3}(r21Q)}l(7_!9G2h>yO~|fmlYo{7ZgQEoX}zJO{bTWnI(eU zq;P2|c?oP<p6r@X8U+^$foOU+(~gRMOd5s6<U9{G$wp-pqXXO$Vxv*%+V7HMO1S(1 z%6j<7)Qbuld_w@Yw9=t3_=NkjwA#Xvk}0Z_d6Dk-!pwvWg84HW_^Zx`9QrX2UgZ<6 zCT<{xkjf;;+_8srACk1bN>>_P0!eAlU;b`bume!Z3;LVB^`j{H{KNY{s~)o*vRxaZ zB^#CTLsc28I6+(u^zl>MGeuih)HoTh{^?BlE3p6bW**!xTf?l6>Da!u`$toVAkYpH zvh-PqlX#l$Fos6HHi+>+04}>n@mfo<+G6lAw5ds(+5pF-H59rB?ULWSxm_3EK+hNG ztSVWnpE-+a^p9!bgV3k(qb--@8dZnlTqJ*?guiGe(l2-=*Z9SCAolE?=Npk;sGHqS zY4Stu>G0NNI%Bs{gSXO1>8iLLj7s^IEm3MsPz#QT&Q#F*cB|g~-Ej|xOIjy{S|f?; z(pG>;Wc1>x0a@L?HEqLJgaDt0J^gG92RYT3tPwveWGim80WybTnXJM-MkaA54YYId zoHG!PL>L8|ld8%F|Biv**owwPco?AQm~X)oy1l#0h|t@G+66FWWn9#u)MNy$#aQ!! zlb4RImube$0pj*33~Gk`zfAxzA3!Vox4MnsGC-T;Njr)xZW{}tNa{mKD?~t5ADXDs zt1>V{dBf8b-YU%bm%JuBV;+(-J?R+Xn@@8V&e37AA&(=AM0RLC`55CInZT(ex|iTa zPNCx$h_H+t?5K(=p~k-lcW}U2c*~}vAanx>!g_aD?H_mbd~HJQlIK8SF~ZsL3eSSB zh>hj_R$Ihp7eNaTnDFJ>P`9O7G9qK<z1Vrgq(~LzR+_vRb82p_hO}gy;Kp%*o~?5u zh{VtRm<XzG=zOD&XfaX9Jn_NJ1OBYbaisaT>G1onG(~vc&M8qSBkc~eXC@}=`zA}J z^YcK`xcdC~_n9rqGG`}CaWYlrmA$WhItQZ)T&OD%MX|&waho8HHJQGF_e-}-JlEr) z+r=((84|xDuGt;A-1VOHLS8lSs*uBw+(HTcO8WN;?mzdZSPHBSPT5FC;OHc|Cq?`0 z$D}r;jBb$j`Qw$yorJiBCThXxmNb=xRp~)I68nLbSaO2gyYrVQxJnpLo{}I*9L3@v z;<tQjHzSgxReZrV$~GemAIc{snXc1TJXAx9a=>NGXOq~8$)nwaUW4AZ>D(Jlf_=X{ zqor4%Y!xP@VjYeBAku_-gEJ;=s0n%l(O^&1%7C2Ze~z;phTuW2mN2^i3}kNPH5BV1 zXg(@>0)@Pkb$$szrf0^PInen^NiRrkRzL5%)y;>yM3?}-pqA9ZyUg^eqijQ5?#JIm zXDaOUe5Z39Id4VV2jya^l7za<ju6|(X0~4Pkt=+WgWB3oU+E8!qYrrJJmQzGGzFgc zmonzWN>R_96OW`>b)L(t@@8J<tf)L+?K>lbam(LtbDc{GUD$k>j<S_JG}Ogex&m=O z(o_;16VSFp$5la-Ag<^%L9t%wJQMP!z><c9vw`Mr{SGbVwy#N-wc?0+=cgAepE^Vn zzA|aCC@KF3Cg2}M-QQ3~pO%WV(81i5Pbj}fku}4Vt;D9nlpgJv_6dYfo5JoxmLroW z0(V6tS^Dl6sfossJHQjY6du6vpklmfzfe?7$r&V6Sp@bW@LS9wo!c3WAn*C?=QosW z4|6<)k<<}DlMWHWP=<nhFfphlbiZ;R!f|BKCvx)fq(09A)Xm+$#?^{&A0RLfTd4!o z5i_+SAG-b+&eF*B^>KlFYwk1ygE??g{Qdb1yU;N`^xNQr1xrsvNID%2p(BT-H~w_{ z0$xXh`~=tT^}Y1hB!bv3l-LQZYimMA;B|+*GcFOE+Ts}qb3Mf!kRgjrxh1d$dKkCz z-R4d1c2%-mR6<#yQL$k=-&XinrGg%-Pgr`dLz#x2m~ws`5WHs5^A+^i=fp8AuV#Yw z!o=HUjL691s+}8^f`~57?i)|Oc%KXl`Ya)%PsbQjivJhN{{I#cz!c%;kAU%RFFjzo z6|gG@%1w2QCM_I3uuJk2lmjx0y>ZV#hDGBrdFL%0qqgwZ`_m_xql&_16>L#%&Q9K+ z9s8e&zu3DuWIbZ5Q|x`%7LhorW#{|zV8Wr}xV&##v{(nJ=n8>bHgh!ceq>`ev0%i? zZJky);f<YE&9{Ipj;Vma`Ux&xe{s)AyFNWEcma9y`4SP!8rPLy14RJha3r`cKlBl` z^9Ps#z&KLADrD5GzpH;+%f96$SH?v$=v<cx|5Q*f6!Y+T5%@w^74#=7!-kt>wM#9> zdY)$km#nQ~^!k3g-@%us9pzd*?5{q51r&9+9k(8ro!612i?)g>#oRhWLW!ype;O|S zE*uUxJroB3e65u!=6x#SvbERakIk7szV{hqi^mk8H<PPKl4;`xKlMD7OIgH%gOmD{ zv5hbXxNq)gEoBNv2Qhs+jiZKP0<IFCdY%`FaBI906X~f-8CCw{M|+z@0qXHRJcWut z?PT)CiR3++4eYa?%WC89U_TmqbdsRFrDlEa_Q6DjSxA6|#@%;kTm|*%2JS+P`=j1e zpyfKB4?pCu0`^DAo5$TBH6mp+=m+G)!;jY9y4BA4I)KG3#xK#}bLORcf{kznxVEd} z5Hmo}?^AcjVlA0YaIvk=CjiWS8Vy=sO0dP>2E8iB_n>a(9fpHt0l<mf3t1n%Ioy+Z zQpBwT4<LlU`lmxhHV)LHvR)3UVcobQ%znxan@uOjVPD8tq#nMn^xHZ^#n~G7NP%Q) z-7JR3ot>xGLm6HDo_*F}E)p3^U46`v`H|=jz`6WY+Bj%%<+n-!H?qdnw5^pOhMKQA zgoNG_C^38a+2mYz-T8ra+Gx58#1#zLxwH@qfR>|{+Pp0QSWm`{d^~IM8qoCpu}y5% z02&Owuz3i1*k=j-pJOCAa?V#W_JGyB%EvtL*Zkud_#14Q$Q8sT)ZE6ob9YLe3p;<` z7GjkWje^J(R$vfj!hQI9y#4&xik8Z|=!l0~ztn1?Yx-jL>4@fM!>B1b>Yypoi+wq( z$-H-jm@nE)d&83d+gcUQb6F<jxvqPgqWGEf@5!nXEHJ|rwA|OY{?<Fs`H|jYczU=s zT;sNZn<q^wI!JgkC&mL*3~hoR*}SMK9xow~0GRbu2-HU0>(HK%Gc9SM6!`leyxi0` zQj{E!;=3Tq9|Nca6PZU?feabLur`7Xl#U<;s@DPMTPWB3*<+Gtpq`f#@Drp+*z_dv z=@v$cZ48=$?s_Z%Ayve^m@#MsfKx6?+!*W?pN%m#tbF9S#i7AD@GOOiNkbz1E$Vuc zZeh07#&wm|ua)~>QN(JLva+(R0Rv=E85Jlc8E1q>;kxg|j_CTgdIAMDn!7D5N9ld+ zJFlJt1><DhJ3ehj6f-W!rkG|ve-#TEVZE(U$mF~_+P`m*{$~t3V&f*XtDb($1!86} zGZ28ve(M?x<XFtLIK;Pv$iAy2j!>20y9oZjBfcx85pe3C)H0Q+ZA{m-V4EXM(P_!s zr3fK$AhOxFlF7C1TY-L`+2BI|r_Kve0?{@<uzgq;WK6x|weCB&j}3t2b%WKRUzRFa z!jD=q<pW3~Pd?lPJw`#G$vqfLdtWM)pk(=o<L~co{m>}K7l2kQHHr*n^Rz0y%GxWV zU$H)F*0QTJk%jr(eo@MCTf34s4FF7rXU?=ybYS2T(+fFoK6~+p28PC#VE8K@UI$*@ zJbB#m(OS#VT&<39HP#`Zjsm0b8^0J{^aSBx@Sn!85L{}7D0<J;A_Gji8%cK}j}oUo zlP<5yLBAX$Jy5JwR;{r(lok+UKmqK?uk2-B7Nze=;$BO*<Q++=xJ!}6iTb)(+6X)k z{0>*{p$Kzqq=-a-Sa6$s9@GGfA?!g?s-*EB5l`V~KL9$P?)YFMbMreW>B6B3!AamU zqBkBiE5exJd+tu51hD_tK0Rs<ECY}s3EW!<|DMd0>!$%~pc?RZ2K%4FB*L$TQ6IS| zx!ecK>3jCZo!Er?)FjWW!Kkk=$r4BClJTGhe+_*~T$2*IiL{BofdL=$AaoVzu5W(X zf5BSEVG=9%Tm9r1y$4$ff{0X+29Kkol9~p7NS)1Goawy;i&smj#gE623+W@yV?TU( z`1;m4pVcE(d4p7&^5ifU5xD&GV2Lmb9J`jc;^3DMe5gM~_od?Fo&VxVx+-@GpA+85 zhxAx@+p3b%)9D?PJ=7Kf(s4t;GWtS@78#Q1GORfV2-H7*tr}k{)5Q&kFzsX4)wxy* zC8D8^&j<m71+trIjO=1l730ISg07vXOBCic_T+kuG5d!gV#bD|IsBh-9_0t)bzF<i zum8K%{C#uvi9QfjO4RsrBA5llj}D%WA!%)lQ^kRNXb&)vLFG0RA)qF8Z-{vu>@=Ht zH~=m{A{|0R04N04KypaYc{w;kYXwQ)mFK3jzirq7#8rlg*GIhaJ2DL>BoWy7nNlEj zTbB)~Kgh*%($EK!o&?bED+ZMT@TWrX0Tgyht%`hYoDc@a>>zri+QsVk1uK2-8uoWo zjsq<bdGc=3F4#Pce|z~Oa1e^XqH|s32@%ERg;P2psK3vi<EQWh;Tat3o%;DUKoZuE zyU`OYc@K|_`YxD*yAURvU7)srB?-<eDZn`aC6(`1!!Aj5HP|(-;_AdNBOs&`tW8vq zIxY1OJZ_x&tXWcMIdp3xv=4h=p?^gDQYi?3dG2Lj&TMTGj}egD)fJ+n#6yU4;<8CH z6r-!R$1oW4A0MKgtn{YQYuQ$r<muFuzs|*u3RvtT++ohHh=WY+kDDpOdqAPm`~h>W z1uIYn1rt#w+5N~AO_084<o>w(xENnltn?S5N!0hM9~mazx41HSI<>iuRE{pMj%abS zk0|^(5lZ9ah|E?kx_{{2IZ88lR#t<xgtM?TIuV8D_#VK-y^BkE2nabAAJ${|+<E(y zt${`?5NgF4@dImLzADw|%d<Vz?aTG1ga4Dn=E_~LmE2_lUUDLR3jl2Uw`UGcQ>-`$ z##GSq{pguGw(lPMJAfAx5>)1hg8#o64g3<V6#Au`Kwr0phb&Zl`DUg{tCp|Y2Adkr zp`-u9LH;`o|2&xn+~MAtM?YR;SD}BsK674n<cVKrnLu6>-WKfspAY-{sn`$3f^EKa zn%DjLpCojlNdk7dhv2TfGylSw45mDd+v&Y3_@jG%(u6rOL00tHhyVZ6|L0>G$AN{^ zXw7~^^Plh271jt&csF%HJgB2ksv;cc=*cWl+6jT+Y^_o4Y*9qGxPwiR*E#?KYA_Jc z+X4E^XgLN9u>W{m@`+%RaaOSS$FJ&NCN*2TgC+#CNS6z<lmonC5U?g5zYuOv)ZT)e z0`w9=Hn|w6=6`SSz1Rf&hBp@PFE%dDd6YxT3}hZNNr`~tR-58Qf$tgD<1_?cxh>dI z=lt;*INo@K3xTOTQRKb*pIr^0N{_Wau}F<`|5=V=6E2ZV0I`0oTTW}??I~Cbt?%uF z<BbW<rK{Ks@;ML_axJpweC1O?`0FFEn4~^+{`LLc90-;wvB~)Yj*X<vX@XA8p!twW z*Z0hYD=`Ylt41$@OxqH{Q=ep?Ab|eCEFBVrP3IVOf8{-^4U7^c+j*HW+-CEJE4u*x zG<F1Z<<!rRFFa73(jlvYx(B>PF116z4C1^teqZgQ8mG@wb@3S>f>~6oea<*+2nNeu zH{0GhfVjoqXlTNt4H9x$2?8@na9M2pKW-XeNU@R~YAFbtdybLmQ!Z3GEHnes7480{ zQy;lfseV&HqZKen5E9?KCtoS9SP2+X2oO#C#sE-*bZi*iAa^~Sz}F%5J<%GwcNxuZ z)K2uNMP1A0`lk+HQ)vO57m5dC#_`|5>L6iz41`b(ZzExoBjV^m5W)jf`|{%cto94D zbeCc;yz7Zia2~I8iDu~~4BOv+^K63KCVhLWGL+E=fptE;14fahp2aFvaA4j9Pc|eD zE|(Hm0?<CL;@H2a1j|+L*pauAfz8*SYa4Xjy>;^O)7NXjY()xg2N_?)fkQw#S24XA zq?lOe2nWc41xb3M+~y8(uOKMnVbjU_nt@PuH_d%1xm>*O8F~jCvV(zZDG2L?8E<Cr zT#ehlVV?oiZVs?k4@57DE^=!Yv-D(&&me2~WAHEu*SRl`Hz)BKeXfgP6rUa+206s0 z5@HvpP7##h7mU&`SjX=hQlA-sVC!M@;Y>$~B>>|Y0Qb=_NQE&c3l#P~-YvABlk&Xr zz+!-95S$fZ!fa1cjBT93L1>s8*w^R)Q_u7)=%VH{X39J}N(!V>G@GW{nBp+S+y7u6 zrFs{4(KMLqwBvm_F4n`T2izMNK1mk~?3RFQtRN8xF+0Aq*hYJH48qon>!-fz2%qRN zHvHkF{9Q`^=Z%B{Zdbdf&VXjw6eRY|PcVat!8EInV&NtrgeQVxNSytzccCG`H^Vfy z9{Hd>E;KNfZfGmS2^$1kK7?SP5Tu`vQNZxSE@$6y7|@SQSrP$3E<|AbRDL-DxHvNG zZO5}O6OhdiM2uo0_iV-o=`xClH9Z1RcVBMKZUPEg%0ejRy$S1*CzT)`J^q@6rjW}t zRf&0jmS0JV>zgMnngHzI7Yxt?GvkUDUApyNRf1Wb`>Qlyn5m_}hFAEeLx(L{2M~g2 zuj37@y>C-@OS=Ye&y1u7fx+%NmiuH63>%uukW>gRicv&ZUTz^;PX;Hg9@s4i+0*O; zWX0$Jon_cpFsb-gHyF(&uY=!qJK;42{vsVG^JeUK1hZ`p8zFV3diIW?c2b^3w)Cov z1L!s`hfutaa})}$Y2{R6Aq!!W6m~PBjT1&0h;jI1SeD<IpX??BUzmok<gE0iw^Khb zWH+Wkhor>K4**rKbq{)GmFc}-WDY++0Qoy(P40XHYFpEANd!+I>@f3T0%QXuKsEb8 z15h!S0xCzrfr!_z6;%k(d@0l|f;8VHro!@OPp%po+*+uSNzeLqEr<Y?peVGQGvtc# z-TaVhYdND?sfhdNztuU7v5h+)T5lbm1F1LgeS!RqcPclA*rx~;k#zC+boPGfIQZ8T z#gS3fe3sX-(OA7loxhX@8fE0tj_b!XV6(A?OTcSV=E1Zc3k&HVLnz*VRlS?wfMoWW zQ|^Almy+Zxosi0Lc5OM3nzILDK!i_6A}ug3q9{d_3v0f<R+JNW;NvB$X<Mvd*<m1? z&z{{Iwk?(O*m(ECoRatiE;I?QzvaRKFcO`#Gzb+!Wvai+19#dOshO~5GN;U@ietvz zF>nLQQwTsg2n+h`#iyjmk*D~$LTt3AYPFAXvv8rZ7PQzi78ne6&hclN`MP!01k`O0 zD7_^h@cT60A)SQL>>nXTYe1i=FuQSfsh{X_;C`=JP!Je6L#<_Z%14{S7i&=z;1;6K zM@Dlw8UxQFaQW%WXmb<p7`6km2Ir@ibE;y}_6x&|*K~3+SG_Mu!s(49u3nso1EQee znW)DqNbWNkX}d7;^^vRi{m<6?uPyzbdH6?iA)u!-2n<(EoAv96Yb3R!`xF^s{F67k z)uEpM6&WTVCZ#>D9ip!)V-4VyOCnPM4rpjLCwI<OP-__fg3S>c`^LW$qIzepQs3Fg zS<U|QTNb-KioFOS5{FmNqsIGHM!0gpv>RdTOnbN%ZivhnhW8BG!ti%AQ(+pHDY}}H zrF35obn0shU<~!>zH2v(1ojWE$Nr?I;~&HiH60uct&T+p*dWBTBMm6I&{Vik$BBi! z)sX_d0X50UPSaNQJyw_YnTvBbr^(nFT8sd^+T=a^tWEtc>*<F4IF1cv?hcJvTG0z* zD48fQvPG9Yar2vN%vP#~E?Owbzjp+U@NEOsbNVqK_)catOLn5q7uLL<JZ$xk9?E}e z^(36L!pMC%_5)jTTs52Jq|y47Gg2dkaQ4VJ4AvtdtISJIzk><(MxC_q=P367+A!D5 z$;o~)pRo5}F0?9XE|cO8HqZ#Io3WfzynQ4>zV^u__{rOQoGT(yabgR7gt&LlG5r1a z+xZ*Yw8okGrFV&8e24Ylf%i=#ft(Dw)u%sD%EwNmVxG{l4K}O7VltPpnQn}4A#EHD z^`4Zz!qCAfwVrL|T*w@-^ObBoI<-?YPK%Hv5twp*s)%f3t!BgCtp4p##32q!;;#zX zSYO59b!aYyEYRlW$Mm!nH5z9`K0wws9<9I`1Viqz2~64t65xE^n5eL`9y|o+gQd1{ z^3c}T&vh;GpV~i|rS=A9=G!1l;sK>FQxm?bgt8r-C%C?q3i8T7of~NsoKoqUt8D-P z*E?-j=dVWN!Kmb4OO0O-!tF95SEPGGO>$iZk1jd~G=E3N-3+7>tapGp(PclQx#RJT zHE~qz)Sy`}?K^~NRk{=}8!;E!d5Jykc1{PjG~NQ-luD^Qfe?}bEqk%F2t?4UUZ+NL z>$LkBscCU1Ih7Jn*lWBv>LXJ`bEN=8PNjqQ07vE87J=louRYmP#yCV|>Cggm{?$N= z2pdE(%HB@^K0pTH=xDn%&YpE$kzX~gvapfvc0x-LqFo>D9UzRu@H^=+*$J+!B0f$` zvJO%uz3y+}u+#NZsVv+?h%44b(+eX7#yq<|+(uIHA31^Ii~5AwljpZ}szn~B9jY9T zgl|NQk5|h|X-$2%OiW+%w&-FIHwdR!w~2VQ)0g<+)S9tHn`&2YT}xrv6d@o*-baPZ z>PXG)nmYpJG<0uzo!E=Cy@X&V0Ts<s-_|=BHtRX>>)bOp9kU;0NhbCAncXKdK;&%z zcBSX~|D)@z!=h}{|6xi(YDN%=p#~(B&Y^1<KuSWzqEkTzhHj(==@g_CQ1OuvL<B?_ z8WAZ`N@?i^>3FZ(-TnS{_u2P2`~ww5?_sX%JU{t{^B1~@Q|bB|bpp}pZAF)_Pwpr! zr0prIJ>hqqGv{a`?J+&g`wcc(v&u6)w_@ejbGYvnx=)?HqGmr@i#=&bSY-<|<n)@Z z6LH+DO-|otAs38gmA<r4iVg<F0S2u9^JrIpy8U*>-aQ>LcA;G*-W4f=otQ$kE~qNs zL(+;N3YmF2-0G(-Ew@z)2yX5Z=vM5H>4D!m4>C!S_e@?INb?iL+icqK1X-e}bnjD& z+#$6~e()R!m0BM)z0$KK9SqlQ^h9zbS_>}j5pHT%k{T#w`=VaC9VA^I)g<Y+oFIUt zm;2?ot1?CxA7E=is^qba^QZmED3d40nXgH>sU8?LXVTrq;P@ot6EOJ`h$-cBacY-d z?R6yB{+j9cLyH<O!6r36Oy_bRh&^F~6Hzc*pHYXaQ}B3-^95XVp|WP#WfTvq(q<{- zva-m&g)N|UGZb4TT?!aG+c~TBi|ZcO3!@A1?bYwIDU8k%C*rt@EC)hORW@+fd&%Jg zinUE%A_vXytWaMZb+f;okr}<ZP0@GuStRhTgFIUsAOEhQ-pb+l$&3PeS|$1g`1Ru> z-K6ON<5vd1!F+K(S{WBJGDr7ZKF9@uwq*$@tC?l>Cr8@DOVYaN<mb6QoOWe~5(sZe zCP@kq=*VaW{#y!m3z4XYL!WRV12U-Fa1m`eug}8oGYD-p(Vb1$v3|_q?wTtJ8;S73 zD`OU?VAw}TLrRuPLDxA%RJGRlM9s2`%r)PU^l>srQTz<xLCT)3SfdZPOSgWgAMMUZ z*-9-kYQnkEy;Z(m$X-bl(R8qEk96m>uU4kfvqbsc1RwIP28QWV#A%-Ij)YmLOji6y z6ULuy((9)W=PsV|OG=X~qM~fulQ$nN{R#K~&-)3l$_E(bLbaGAAOiH5yHr5wHYV<e zz)`$9^=S|7p`2`{Q|LmRMZvLL(-W;QW#)@4D&;~>FU1gDXw`|3W|l^`)i>|hCHCF| z?fqz0r9c<G>R(aw+J=}Gn^+Nh<**o$+76886ipk|N@PKV_9Fn{j|g1N7DOSjPy89l zUh!hz>^Z2U+YM|q`5W56f3`1?P_&Te9gPki)@!kQnxa65s*CMkWicXd2V9*KKVoJ3 z4JOh2)_k0ClvJx1X+A1V#v(gI4?iFC)3P%4q%kT21+W(iEDI$r)7b?p?&D4g2*Xtm zL$>e<!ih*rA4kT(A(%Sf9e(}jzZ*XHOjx4t2&mAQ85*!+lIP^cs&7;VBL(tTzH2q( zl(WZCRUpDZm~^9<ch1uzc<gkeJx^18np4n%Ggwh!xzeWjP2kFt?^>6yjl2=axik7^ z;<f7|MAqj==;l1#0C=OCTo?x@>zL10PQHJorsLOI%>d6!%MJ&JppfB0hBw8tvs$IQ zf&GiEFJ08<d7G9Qzoh>w3n12kf~U3SeeT!14rw&W_vwI(e+kRW(y0sfTt(l_)vvs^ z^NcQbzHMU>d7<fiAg9{HIih&;crBEH{Qz5IDvsxk1WAt3hVr=_2NgjqRs>g4(ZolP zq<BVC9<!r8K;I^Lp)qug0-eS^u=!)^R7w4eOZH9&?iB#>cTTrbO$^Fye1rDOiznp1 zoL(Wb?3YCnx!18-6U||;v!{~Zfr;RL^EOYu<b2e&cy7uzb@yj)hS*T1ZO&NbSbQi^ zHy6d)<0|n+&iDdlqk@L5(~vc-2OB*u^`bC4mf+&Gvgd!pCjgv-Tz`+g{BAXv3@cx4 zlg2sD+)dpTd^8%Bud-_T``GQyI`SKB5?k(SW6mxrq@YciIiBc(Za{RR5$hJN_G{+- zr(?>sLp{+p%{{+#5g`wZ+M@@@-`m|^@N8t6>BeNQZPaX=Xc|s*wZPH$E@$sB=K+t1 zlK~e}3(vT*`S#lGBV#%ehJqHBw3zvbb&P+6aQsa&#E2Az?Ws$xn^5Fi>aD&HxfS7F zajH|1DKR@UQ;c(jXKmU(`I0{}+4T*Z%29dZ#&I=p;jpI<aigR1c9V4l>;_MyK2;e7 z8{bNr0;RO2k8-j)5`m!rL`Yri<Iml^R3*{M)~#~jGJF4~Q?{jMV4XpbK$5Ayx6>M@ z%cuIn4L_HedF!RG`)>^2$7>oH2g|8_9d5{9Zhm{VTzqWaCOS41m3vR9HmClP5397R zcX5G>-{E#3_UzUbTa<0)Dc=|~_gek~4>r09^c;TmD<DJ&x_l%sRl>yicST#uwPSO) zH*1~`VN7}3a8gDe)aSY0Sxbz9f--%w_y=>tfdJ`8-xxleKUF|G(v&yH`8r7GyluyE za?6heoUmGqzcS$uX1i_dYX1KV44u<%RS+>*iPuO^N-i|A8j$CS)oBiE=6v}<K}cJ! zb>0Ibr1gdU14@nMIUbj|8>{L~jI0foU%TtfEqx}57gcq)Zo)@}zxx5^;ncF`Hi0FU zv{hLC;OF3ee*|6L1+uvZPO-IO`RBFdcwS6KGO%rM-?a(f1_{Wl45C=;Zm{6ba&cQn z)}W4*3vb(ttWYRqzvrNxp%XKXn>cDWiX_dHQbyqlW}70*3XZKRRYpWzGW{o;64x%= z?cafm9x%pD*%gX9)!#vH9iMx5F`Ox1K%08Tz-c5YMzHX{+8u0Cc*W3TU)uSCY#wtM zuf(JK+l&rDC#JfcBi?xi*EtO2(aei%r-%#*PfQZwZDmnVaCBy>P9QY<<$D+(mhe4z zA^)-}jgxpp!YO|$&Ox6~{l?M8fe=Z}m5{lbQ+h)$TE$Zzj?KVAA)%9C!<*R}cK<Z| z{o8RqBLaC1>b&)y=#M$IkYG3t=64{e1O_JwmmP)6Y14<Aa4j<1k%>9wVrMEujp$L9 zI;3hGyZy`s!kHRj1F*Vws@S)LoKEy@u_rl3E3qBCc4wVTnae-%{#;;=U+gQ;ih{fX z-K~X_eSN<dQX7@=$}`8gfady^mU^ME9Qh4K^Hmxl%q(bCEn;kRz8`N$cGftP%g>jU z;{pMDkivS&yiU6%eMkFV?qhSmPsUkTQ5bAWt5YlC_dFt8!Z?{rwUwH>@Ax<nLU!^L z=F}@y6&uTEQ{=yz!wa;(s4F~6fEhL2p+b#oTbyTK(N)S+2y-m3EyzFq@%*OD*efIE zjm|91*vk>}p7$dxt{=1V85{^m-7_<s(sT+*|0+&t{)%r)<mJ72Ddbfv%Joxeb`8Xw z@9H>vzub$$z`c`ZN%@>p_{Fs6e{lK#MBDatEkEW*XCBV2{VEBvi$xl?!#L{!EpYXv zz&q`^?wl1EqWTEmKHMn~WIQc~%rWIhwQ4_a{&BW2x#?A>-{y-$0Uu)?D2_dT+GqAG zLC3I=wEG6eUox1y+aA$45ZbpbVlO63z66sq%j;l1W57$6Pm*GF1AxgpFLSeF_Gw|l z)pY$96Uz=dX9c@IQ|h)*cSlo(Hj_Ar6-+7JB6Se=w6|4Q5XD|%XbhDknUk!;s;1OO z;ToxVNC>{}B?yg=sN4bc05RPgn*jw~#5(%*L>J$4qtxL1rC{J55{@|MyZDK=+qQ1Q zN%$Q5W5Xp&O*Ykz5ZPI|5x9us?c%vHs91bebT>!ly#C;s;8i&|2!A9f{W8a{!D}3w zD;?tPDsGLLaJZxj(2Q`bgdXdh!33+RP6xFs6g$$VM)^b#v}Ry~lbF%`)tR`LdPsFg z>TN2-y-M*B@k6%<EmE`fs;Sc%dS4=x6Y8J-C@N_<8GqDL&uX<=cSiGJZ}Iv{{@SAh z{ha(ISHw?Y{xMw14@uO)?^$%~H61{ExbqO+hMux3et7$PN`d0kVJffemB^#H^KGg$ z!RB`E0e@Az`=jOV3=0Wf+gvjbp!kj}R_s_pAQQ95jy@Px-LrTyN9)<^UFQ6gI1Q*v zuHGV9VwB@NJ&-mVIp@Ay?RZd#c<oodh$P>enXC^DzLZ(`d1HFhDOzKc-vyH$-TgDk za4@rM@ZtI<m@$UQRyJ@Ph5lc<+{A#@Qupz-k;4SZyq)HRE8fY^{ZH<UB#0K=xr}6- zdTHS*ayM)dbRk_ukzw~XeyH!^PZC8CB(=uizjcS7fQu#eJoy=;UD=Of#N~u70uOcK z6QYK`po0Z||LcWgl5a~CU6~y_*6KaF{z-H!W&(-K3M7$%8jLFRE3-SBKk51v7KzIz z%TWMJ#AmX-<QD45r<H9R_cvRwkYJoXEuo+_RzLy#fzJ4nE0EBg6Z$ynZ8wsn#vmj# zbHSee)AlVmGNAr*a(r5d(K&7xpfL~-g+42$vK#txl3=2o=_)bS1T@20Jm3XLYKLo0 zp-3w5IlFBKPx<<PN@$G(?BrVgd2KhD{5Ch^6b|{(9l(+fbp#skcDkn!-Mr{yo|=|a zDwjhX4F1?6UC|xzB=o3KgYdW)4*e(p!KwV~efrBF#FzH1Ro89?^$sYcj(A;K+xgd( z#a|#hw?zG#Kd`5!%fA=8^m}L2H412!-U&Stsg__F!W@3OE=9H#V$2~r%ceh=3nUI= zz&C6CA%!HP3-Q3UZUeIi(0FLmDK9KZ`9mLz0F6n~XKzE#e^*%i69NcjB*WI{Vw<Q0 zceI1QzIvI<ify{?F$&yW&1w|vrhTtp9bChbbZNMOT94s?(BYy>O|77u9l-%mSux+u znaUV+h7V9GXm}XhXi0Ot<(3~yPRq)eE_Bnl_y=H5N9v+luP=hUVo>+Q9J+14`l&p| z*z^C9RR6~taam9%cK!l)0Nq=M9y+uMAa?l@k$5RF;PkEh4IHs?cUQr$37yeT;nR0c zm5Cp^VD8g6o2dZVDpj&ynY_@WDl`M-4>vnKFnBJglMfI>ujDK<Lm>Ku9%?=bH~^_7 zxC|*L;~`KJto}J&xEUfxA^*2s3SYEmms=ERIwdh#Bv77zMl=Juocj0DV8XW?Ms36g z_g|e?KX|RYY3J|{kCPecsOrg<lU#pDJV+h|ti9nc^s`vQ039Xd0n+fRw6wn9R)L_N z0?AnfYAjY+0Zh!O!2b&vgT=eDWP859Rr-c*$IW%WGuj5a0DPLbRa5wzPkdQsAEA-} zU`DQZGi;v~0V+=@e9G5=s`|pH%0VQ2^G6KmX_0aUG|BY_U?f+pq8>Z~B83c}fxoU@ z{$OrMOlD#>RXzK}@$!SZIn)T<pxOHecWr>@aOqIw)(bVRYqzzh*M~$Pc)SkSbfSl9 zJ;tzQfIQ>?<o-T(xxAfE$rjMeQt)X2t{c=Q$Uxwrst6>s5*d^JcJp8C;{UyHPc13M zESf;qhmDg1mS6!Gx^nmr)K5U6Em#XNdmaM<Ei2@WV;>TCFQtOqh)9ES|8V^Dfi=m} zgZlm1RD)~TGhL%0+>u;<VkFtPAAnp+&!?i0i^Q(?1fP6GETVc(Hxh!wfvaLjCLU@F zX@)oy*v)#t!(bcFTriVcUI+S;NT9yr6{8?B*a67-*Y4ITi0isvTEmA`5}ROsGua#! zMNCQ_?vU%-)*WXi4v2EqE9|n1XC={WK+4;rqQZr;9C&Zh5ENQzQWp%KL-9$FbN<DJ z0ALhuwax;?^>#?Q%W$M67EnA-9K#4$fOWMoW9V&5!=UDoorudc6JciIZY5~qUUEws z(rTN5T|g|p^=}V?u)%1Ss`7byx;3^3)s68s?601qFzGDBXlXNd&W|}JO@kJ}?3j22 zOZ9GF2ZeD-U%g`%8dJOwz=RkF>&w#C_O5NDHby}^^~$AT@qfg_)u^h%nQO3*O|||T z&ja;l7YU9>050b8I!0-`Su=ztc2@mx|J+-kMXxK319GQ!ufX+23XR7icbkA&+-}Jy z!364Vr$sQhg8z*Zq|1mVftK1Kz!TVf2mriW=q4bp&fSh0n!=cpc>Yc`z_X%V5ne-9 zRn&Ie)s?Q}$}qKZsICVPKs7_W&3I8@=$3i*kTTq-xiKb1WmwynjHZ)!gp>`1eHyLo zGFtVHGJbz+E(&78oZmE(Kl9&Rodnw)6)@S|8M^nnWXdpY$AOGuc5Da`PhFvL0^;Cm znnnnRcTnd`F{d@OGTk2HYhgkQ#)I-H_j3Opy7iWuaYJfkbW_wvaQ>qAqks`r2U0%` zpx+BfOMlKq2;@0OIr(TlAF!QDu!yjsci_Cu?1&U=_dB3>IsYt7fE!(1R)28m`-!fb zpF$xhUkI(=h3FxCT5&dr0PY)MhqG-f{ein?NQpHqXPWO0NdJ?_`u71>m^k|+w$6S) zrQ19EC0a1G4eM^g6z?L74g<W}6WsT~=O1{LOik-1Q2D&zdXbJ%=Nb$SxC?yi@XNWC zT4;=AVI%VRT;Ew>B=vJ%CB_g^BBL3vMbm8XWco}VPWO89lmK%PO_Wq02PGFJ9ojFk zg8!Sgw<!O&a~q@^Bs`bG@7uQo)p1J<yuKmIXa0u$S%hB={CE@4Yr`M;FQ#tUDz(c8 zGeemIK^at<cnx$7mlxMehXlXswgwmxn}N8<#YhV9;bMJprZ$w}V4QY@%=XW@HLgz8 zbMa!k;93YPlJoh~PgozaS=&q13e<N2WNHk3ex&@5%w-dja|P6-)YAR^JG73MpzVtJ zm9iSW&(l$m*O{Mk+_o0Qzy=Qk+5A;weoN=Gcu}>&-wyYT#tH|xmComb6fA4CIu}4Z zY`k8U#7T)YWoyHXceYnXWrZy2e=J6HOl&E)a3U-~i%dZL3j<{T!wOg=vtWV=Gk2Q> z>IhCQQSLLl;Thq5B;VOyp0j8Ui=K3P$Gp<>ga1KS4m>W>N~urc!JC&W6MOdO=7Ik4 zz3J}I=gR|jpxtG;KRQv37m38nT?2Ovi$;@j@wBEt(w*FfbL6H}tLgGn<2vr-vu=q& zNnNlzuv%?9Ohfvg+qV?DeV4qi{{H*z3uLf(5&-Q~nX1NiC&bUR8+GCXdcLgnvC@V2 zo#L5LAH<O?c$#%NUNbFLfljQJ@X}PA`x_svz@wmnH0`tfV&bo`FXC?-|3Y91#E>>g zGD;=ozT_v_Er&ft#KxT7oaDl*AKGVHv^~krAXTyQDaq0Bt&=Nh%4cW0#wT%XT=6Y~ zadJWd-SF<uaxBj|T?fL77#f0|9V{9ytn(g!2lgXNo~7sqz%J!ldihc})_DM?r9Ies z#EgisxeX4mS-wWIrYHEvAb;Y*{n1M9?;FU#Az=S~(BAtVNOb-hcGo|>s%*sBwV&KI zKV5iEqi!=O%h{p?dKjU1xSq<1xle*T%D<0DXLO%}0v;K0Q656(5o^@@gqHT21fCNx z4!s}H03(2embB9|v3Sh^W+}(SUo%=nauE7vj76-YY%GHI?P8P(nR#9KCqsa{b}l71 zp5uKI)6^piXzz8<d}PMTyV&fuz${o%#8B{Er!{OZG%OFt5Qqhq)SI_>(eXgA7okBX z$D3pAGN34!55BAl$g+Jr0U|r9Y;;sK{rF~y)O?;T1CDuUHcwl|FGosWxyB2`s5l#( z#r)Euoz)XDkfIW7$mrS!ZsF)v>ovH6_HJ{1mu6Fap})1YXY64V{w?rcM`TJmj1>8O zw}Qe^57ojkKsex>JO@IJhGkB~%E(_e!fasjFrA~JAp<`XB=G^oO2YmX{JH!d*te!Y zjV|>84H%^5BgsFvWl6}TWH$Cms*lxXF*fWgg;(JP@^kuvrwbgf{M8G**d|lxpM^rx zKPuV(ae~Q*{szHDgDQif$dm&uEk0ZK>>Vgy6hU${G|_&x;M$&ehQNS=g(J4)NZZyl z*TS{_PFAS~(D*b^uGcl4{k5NM;ca*WjM7BJr(?gyKWb~HtnTV%CvC;>J+b#t>SG9e z#Ai3_J5=pvgR7PWygQmUy9fw8#Q0SVu4fk%>NYJrBF&M&KeFUB=H-qQ8zfB$O(_-3 zY|cF}xj{ykUE0+Xf>%4>$$r=8p^Lf?=KvAOR`J7<-KggJ`^mXf<Y>PMnjN{z0$~+y zJ5!c<Vpb2o#lV;KZY^(_C(6gH6^n6=gi77Ye!N-Dk>~ob7Wp9Y`dN6pR+prl>|o5> zeK0G_&Z!(C&BW9s=U#N91qTElrK)CVdj;d~g`C0RxM;3=w@{dI!QOB<{02O;%NFOl z(qUnWfduiVrKqn@4k>W?%J}&Sj>ZVaJ0e%z)-ub$;Y<9PA2pXN+0P+TxHOeZATx@( zKc@sI)q{0=8d1c@ja^<u>KcU9Ut!~7C67d_5FRT>2!xx3PM|#)7{2mUHD-SLU}YFw zK-<4#2JEz_YTHlmwD67S))BPWey=GF#2>~NX|XW3_j?sRep#O1Fj!>NylAg*{&@07 z@oSTT++(w<zMbTEE-K$24`_^k%#KV4@2~qY1bI#Rk%l1J(h}CxEnnTU-okT>^B&;0 z&L<M7#4^L16DaEEpCA4zB{9F!d1=FL;49TSX<wP_FSU_B4XyX1i44ecZ=-1QRSE}< zJw0wgr+P;QQIB}`0!m?jHDaqKKd@&;?hrhu^SE61XQ(@HxwD^OQrMGrw(gnv@QIDl zeZ3KWbEu#${|iW77Np|p+^7?{%#(9XzK7%VV~4lsX-P)6o82`K#03`2YO+-Izp!f` zOYi(`>{KPQCS(4Q>=;kRcTq%&xcMtd>%`G6ZNakcIkBmPJ`gJ$9`aKA^Gt@vt{n`I z#(OwHg0Ij=>OgLwS;O#G)c?SAi#17NE0h6YK4?vQsrwb&<;v%Wrp8?<+zg@pFs|o} zeYYqd4NFzf*vgM%WO~Z})IC3~g#L|{GajH(RCVm!)w8eaKEA6J178Zk_mt6CE?~>l z6FeuLL~6l8kJpe|jzA?4k($yA)U%c@414#<pT4_Go%1Ij7|r#P5@vh~f>q2;W*=SO z0OIW^VC>|%F3cC%m3|D0C%t~!Wv0m7_PhpqlmCZ`6`8mMEwl&hrpKCG36y)3^hmCX z-<>>)=NFB!Gvh!TM$B!azYLUe7AegP9EV_ofUfn9DseS?NI4DcD9e)1hM+B}X}bUB zr*OYJyHCP#xFEi@)M!;1%3>$ZE)2VA<o|efsppBmgc@D9y;cgI1BMJMH9d5fp&gsg zAfd*xe}C}q4L=v8@_pRTe9f39pp;++Zp%`M*KOo%&M=YciHE&!tTYtbfu5-e$kR1| zRQvOC_Qmsx*a^ZL5Gxf0sF?K1*Htkgzf>@&Q7{@_FA(=y9uflqUs#a)^LRn>0nk{5 zX3vBCHuDm?TmN3g{I3UPrvqO4oBh{@!J~6xutclCnTKUM(agghU-jSKt?Z0}L2_<L zRZQAP5BkZVroyw(I=-To+S(G$&<uu2=l<&NCAXu%HW%IwSe1#4K+rOxZwtYVg)LLA z5Hht65~3oZMG!>#@B@h+_pIJ84$ze+9{^}-s~F)bN+8s|<h9-uL9GE4cqLGEBPApo z%SnkoKU(QzLpS9%-4=24t^LiMU0_VU3O?P81&Dmi_rNzm39U5HYgH+KV_O7~cd0~= zbG$|b!M4Kj42-IiVEUp1e<!tGSNlE?f}fjC{Y%m1@*R@OeE?w!LODvW)rLUwNy(ST z?^ON4m>mvi>pLk)rCt=3>VJESJuL=hqa7h)@p1?%;MX=-Dmp{W6#mNO<&(F?_XkU7 z-&|QDROf)HLjmWr0(6LOx3`VRHp7VM<||;L*>p}}wsyKi{HM#qZ@)A~zdZ$ME7D0J zHAoTQB*FE+2M<9ANZRy3S7{4Tzrdu=PmmMj;^AGvYD}KQ3W=KW)cEt1#KktIdtkd{ z7y~gxZ@~JO)eHHUFR;a(0Lfz3)lh9rcn`4XxXyXJT+8tub86pk&QtVt_W>_OGtiRT zTYm;)I~=%2SmnKznbSq?-ix2H{T*8xy!h&66S&u13ug0x3~wDME}_juj>&Gu6VFkw zi-Z}5)NcaS>g^9!-7Mi|2Sh+AS4h|;ZF$oc$2KY-u8fqxD;AXSFm8T~uz`lcdD87` z=vL4<8VOYgT3F>W=gUD`s_MYGJ~gy3w-^#pdh1<h6<D<A_}bv#+Qc~n)<eHprRd90 zeORmaFS=gxBsz`K8{iVukOOC~2^56dcs_Lne{#$%7d!+>(=zj)i=}^L%m4be{^voE zh!1i9i#I>n_U8qQ05}%?+y>7Mz>RvjR#ZH^;rTmg(E^pC?R2LLFY_+VwA7TJUDP*V z;JOvcs4y&%ZMIEpj%w@|cdwP~A%JD{uCw<6qyS~Qy$hN?TV`d})3QnD%8LW25FWj1 zlaNLaifs^f(n1Ns1+kAf0@fQt0}Vi5FN7gH*-D+KK(c2PAk$Q1U`Jq+hyd0IX#~ja zvLb{K6Kh>EqC;7`Jxb<V1Ot_fQ8Rnp1{v%sc4R8!S9ZXQk_JH5Pl6Zqy<gHJ3VzW( zhC*pjJ(}@tzlmCu23W7?Ath8mIhBfu7Fi6SeT5JJj+&jfYbT{c5y%*k+C^bnuXu&f zm#K4!nh20;5dovfPf{z^+SBa77JNZof~_>yiQ?(;c4)1>3%;f9G)ZifOm$-M&l2G5 z@1Us+P_r^zkys%k{UI>FIgy;n=a#W*B4ZH6+fLOSg0bPY)K{Q7B^|#FGlJ2>4dx35 z;tpt7BwE7H*MEjIV_qDWuLl1wbu=;98hJyK<F29Tn4b-mSu{8^-YBNQkWbUJ5QCe> znSsk4FQxGKj=RqFM{P+FJZ!|%88-1cm(Nhe%V3%$r*f3Td1wy7DdQ})0hlj`Jhy7` zk-Vh6SoJnkI-?S#w+Z~7x5-WT7^={tjJ~|e;=AQmxU=}}bM|TM4u*&;$Ak|v+L&~O zl})zurHd8XQ3@dCV_Q*u^C;)9;++^v3=OV;)=0*h!eDT(BCx?!_W-`akQCu{hbblP zrF=uxFN#nwHD(p5GPVNQ>GkD&7@gw>MT-KAExb>=(gm$f7GtQq--6`EcS1m0ad0wS zoDKXdepxmADJPHh8~VV<7wlkX9*SxEp=9F=*7~a8Q$9=#@Q2)V2a+M%PUwW*vNr&N z9Lz^m=R)Ahfi`GGan3sV`<{(gRRm1Z1{#^CqoBdcXdIk)LeNq>5OH=GK&p(ely@Zf zW3;E<H2Fq;4MD6ym;<~a_IgV+p$LN@L!H4YPt03ay7uHMeRR}qBqRg|?P<j&HRY=0 z*u8)7Q|h7YS?#sA>X!P*$f?V!x92>8d8OU;%6_I4PazZXF08v69cjYWJ_vTj3-KTW z5dFdNt{hCY2ns0D00D&RhdV18Ir(yzu+_D{7ryc*ViFWjfDi0>G&6s$Prj>&+o!kb zN%N_bZT`km+;kHH7un;oVs4(ueM_!za@erj(rcHCDgP;)QvtA<ySi$vk~wlBFc0u% zQxjF!g?HeIR>V>qD%N5W)f!a8o3)qF{#sAHw&u^)C%|s1g_DiKFMyKF2Z7Xmq|?4^ z(k=7{Qh^N5!YZQwA_&B+sg8**6g&vXYbxR#&xGm!FOz6uEZE>}Z6AHN01gN~gTxWC z(9qP2g;%kVvel(hobD1j7HFd*LB;ORY_cP>ISR!B)|(O)Nv6Cgs=a3_;Qqz}O<m^O z1S)&bGHk9#u-ukY*8-(D-A>soY_4_XX)AI+J{sJ51g47#ALP3Z;KtJ9;yG<lDAS(P zu;5CgS{Y`yL^(OVN4@n1;GlFoEWZT87QfT8e9=Xl)Roga`DFY^uWxd+ySdN6wfN9z zs4%gq(eT4Fc68jGBZq9aNKGxMB8r%pRO@n2TXJmDY~dQuZw9)aqM8Cmhed$S-pkUq zO6i*FSy*tb8o76w!7{&ngT_9%Q=^w)oVL;~p+eEeM=3i5oO!mory7}sIw{er@<0S5 zqF(qmxFQgrJMp0zK<D?G&>juIu{tc7RU@kXQ;YNBCVty6o3nrpk+7liu*RNFY5QtS zku~8=A7ioTr=wwlHwzkI=EceJ-@N{gkTmgtpwUlC{DB={_;49OrChZhyo1wMbtd4S zSoRNrBapyXXd6BSh03*y!G(<2VpZcY*Afpt#lfS{u41?37?!|X;scVkR!|_NIy`&l zOE>|POz5X-pe&{2Km-`kWQJY1h)cF|Q;~Z(YD6XQ8OX?+UAHzB*`gFvyYECh$He2w z!qS88>~e*<qCR6YBt=P%r@&MaH?EoYIh5#CdbPz5elp>F`%5=UogH4RaP3Snx57Jd zDP9lZ<&8(ocm~v!6eW7!?;8kvbMAaM*jt!Th9RjD%f_R*%dc8t{rNbOp=e|<ir;rX zQ#S&a-2G@enno>_?>wE6hvJ7NM$P2J)yS%2Fg#?=i#_;Jt?d*&jx0>t%Bz$^Xl>se zC?f5)AWH^QkdBdu5z4QDH53>nM)KA6y9u}p&*;Qmfi3;}bvTpb7T)buY!&8%1KnBR zCUZpU`sPaFA2y!fHsM=syJMzW_rd~FCh~Fhzl4j-Pb)9T9zXPT?H6C1a2nYg51sg5 zd9b0jVBF^AZl**BRcZyBZB37#p>fw`u!DceikCb)r;eP~lBavW@b%^Bylp3t{rctK zeP=-SU7mPEX6qVE4PbVl$M{J|s81tr3o4bxD*kImr6Z~rYtJ6EH+kK=KN1Y&_Hkr1 zQ6Y}r->%&_gH#FFE_2<wNT-CvU|Gwe9jAUd-IO3+J>wF(eI<6;e)E2dNXt#WGJ9KT zYa$Ychi3%W@XS2-qNc^Z^IYL#Vu()CBRp05y*571H<}B2+vW7(RE}9gfXs5HGt2#q zx}|d?5<k_pulO)(2mOR?gyG@Y_&c-yR>8S_g@s7zG?lz)5@Zg`3c^9uF6CCQ*7HNT zd|fi>#jdT~4mv*0gcmDvKqg;e$nA_3$pjfLs<*YWAxE+E=KT?#*)9D<3_Uk-W1P$) z&W`J#FMj`|F{b{?U$VJrT|Me~PgSfdhXLVnn{%Qjc*N;t>%oQ5O#IlPAjl8%jl|a$ zuy5Ust}+N`#NA)#2pyjLFbu8;8>4^$`i%$&Xl1Z*dQp7!_<!5dz)~2pr-fmde)>rM z6?4w~Y&TK1)q^^RLR+Lwp*#;GJy6Wy$RxGMjS!z`9CG_LE*2F0w$mqS7c&r|p<sUX z1YbnhVEbZW;NL#^*~_9wyv~79^q6-fYAF3x5^_GA!GID#<axp=>^%r(R81z~=Jg#i zM;_GfPgs&-L`vD#bL!hCa<#nqO>-zKTd%swnPre>8%GEHYsaKzJ{rz^X=VfYIOhpo z&jO`Z!}V@?<1?F&WOJMK6uUpiZDPBVWyF;2=+rs3xY^xW;PoGbqkD19HM%p&dSv|< zVR;70)5%mpc=ilxmOB0sN{xy2m8z+RV0;zVh(IRylWOeLA=lMf=7l9QjEPIKJYCGr zD4;ZMR;IZ0{&D30w<0(cocp{Xdwu%oGdzC#<#C$0ytnZyDAFreMhWGydTr6(psjno z4=Ed9ZH8z?`MbfkI5xru=stC}4yQl(i(Db|1g{!N2J3}gbS%(K7b;JxuGBY=CBamy zW}DUdlmp<#Qq1phRZR2aK<4NVFQy`HWSz7*S{rXp^cvVw3Zp)0Yw>>8Cn*#upw;|R zAe6s!smXs)XB;nk@DO0jT;jy}I)DYAQmVZEx4lJ`>=ERu&(>OIc%`o$*xTTU_TF9n z*?g2ga8=KAN$#1>VPnw*2)i3T*BF*ci8k{I+BLJ%blvOgJ|d1~e1YKW;&oMQlgX~o z3mFEn!n!W%9J{t8<ojQt{8BbrL-s)To0s*1(OlGIF#cS>MZx=FXzKkAKg<yl$yL?I zuPv?FLVDN$mKB-zM1jPO-CA!MoWgrUxti+4^mg=o5n0jPL=rkuD=L}5X!K=vUc2h< z(q)-Yn*^mQ>l<Rm3N1B&2vx4YxB{Z|3i7G4$v>#;|9X+|{BO*YNb7@-Is;CQz^wlw z&=+-IhrY?ty<aqugzQ=9Q8&s$r-vYb%YIv@T}B|wh!vSpoU!&6F92Vb$*wWH6sT&V zHLhI3q^DfYQ5=X>wqK=nuiy#C2IS;te~;a^<NR&|L=*c0)Je^_4=)3)MvTaeVNX9o z-trN7m)M=}<u+RPw<x_Ubq~m#u-csJrsOUh+@w}vH$dQ4lgNi<YX>y~mx{syW?mNU zEk^887qS89<Cc37xD4fXxgYbSXsh0rMWmR#m=~q_dT6E21P)zO?TQXsQI*=laTAL8 zg08(<%<h-pyLT?{BH*26vV&zh5R~3wNRnGoay7SS-}i#&HPF;WcI5vUm@6xk^BNqO zc7A^U7DIT#Kqzb3Lf#g=m%1SNGBJp)Y@gkP3M@=^nwB}h9XG9Fcg;srNOqC81pnJ4 z2mKUAwf>xvxU87Q;Rc^NXLmsU^F5=?9)rMYT#4o>g)`EtVXUH-{vSQu-@}Pi#(W=e zJ8EghN(-8_|1oy^o|}-1)aY;U7pD|3aj^FNeq-(&G2Bdn%m*WO%G>a*!lh7c?t`iP zY{P}&@!-q<u6tOr|Dc)%%E-7#GS5xuUahsrmk`c6-mkd$cfCG<u?#}w3_q*aP1H)~ z-P3G1{3{QjE=ZEi#f$m*p5U+eW$+a6)m{de7j|EnhtqWqikx$A+x@$Z6R-LV&a52Z zGXxINnCBkCQslMfa5Dyy;S+sC33U@?()mY)c;h~Q2s1N)FtY{?@I@FYiTgug-IxCB z-(==bmf<Qc-*e}Mv@ckz)pPP|5Cyn?J7aREJaEA6UVVNgO^@zt{h2G4t&h&LJg4r~ z)PwStzvzSa*QnX=U|@h114b-tr{K$>TJWu`EGF;<uz}@)KF#F-vKRasOVMgj1kfx1 z3X(&B8_m<dwEs3Tf$s`w5({8{tOk7d;JtTR0Ms-O{Qd3SEsC5vYq%M3%9{Z+<zCtW zAdH&;_=SMT_HR{oxK@y52?L^q<S$6cOZS0kZW55{Gy~0X0&xI{*>7J5S7bO?ti_?k zf~t5~Nr&!A9YRdW0L32+R2+&kDQA1J_;;lnBL{KzJCGUp05ZWAfs6(y2l|V+9K`p7 zno%;uY1i?05ZI#&hf2~SKzj9XJp??xyFV!7h*E2hWw9}^*jej+rr|hN=lk>svM37O zuIj?L+<1Lm7~wbn%&QABQUa@?ko4t4S-_Bbk-jj<VI2d>!LM}zk@xkAz9dLGSBP{> z0C<SZGT_jeeyiPt0&3%m9L`OHkn`coUJ@S#Q6%W;9{?Sid`K-q31)M*@}+V2&%(`+ z<oNz*tBm~y=|k3G62I;Fq*i0e%YT6&v`GLaRGs83cK|7F1W-l@Z7&Uq7Jn#hyUagb z_#3=jHCo_%XZ5G#HxM!Mf0BWJd;n@f#lSEbBT5Gt2zudLm6QQ|QA*a$AVC<c`E@Xu zAmESeOd&Z5)E)e0Jm@e27-2@rf${f4^cg%wUcjbKaW;5}LW<zMoL&`OGc7Y@8FsY* z6Zc0-akI-w+++SKZY;TKHd$AM>irLQUB}+1YLGxi*g9-Lh7u0YRU57|raC)N&VCR8 zU8w8wP;U8huReW&G!s$!vOg=$*sokN9NkJGf~$cnrK-C>K$9cM78?=?46&b(bdY*v z)X~3^CH5HB0LoVndn=txVpNB$qS&3y)4?gzd~oL1gYs6UXCQ{YeA+Pzs6J?yHB>aj zxW0(5jQ4B-uVW-Yl%l{4`-w~;Tq)j4<p9W0^qU}U3O>WEKESu=Mp^D}qXSxNE)w>` zAOLtW88wOHqb{=aG2QV#Jvm<St1d-<f1%Izx@W$xKx44<F2l;7a{!r`0s+D^E+)_a zuDLlILBvCVpT}Ba_{T5an*xAlC43Odh(MrR!A(~K@Hp8FleDzLG|;jRVkE_)oCcf@ z0GM+IQ4Trtehr_3+0L5h3!D)q+YOx94B7%QI3ViC;<Kb-lMz~eH)zh6_@)G0Hj|)# ze!}I7!ohrj&1iH53cOyzn)GWxXS37`9;X?*wZfu)BU}~z`sUjgR3w!4Xc}%J%dVt{ zy&=^Y(?n`!&fueRc8$@%Uuid*0FPypPtNd}XXki-F7JCfd>rqHf*7!e<bknXpX4AN zMb+p7h5J$9E7MN5C%l*NHQZ*vY{S&g978zqWTr!IdBr>@qzMXA%S2y*Q$@T1PMCgW zxL_kfe1O7;JoGtlf%!H=i_U=;a{9?3;}>snO9D~M9rePbKdi1Yl;A<{Z8Z2_FdX=4 z;(Ib|P%_`8OXhp6Q@wUG@7M%ih-DX`yv30+KQf~y)Z_&)Y0!zs^bG!`#FgS`w+CRs zqy_D6WIVS(7d(RpkJrRg&t`a5QGET+#|T;9O<Oko_^rn_MUNjZ9Xj0{B9j>pz%l#) z53l46P!}<UsT~NIkF^!B!JA+!+H#tvEdaT*htuOJ+7Y<ece44+Fm`PtO+SHyK7e8C zC8DNdC9PA;fdQ_Y$qCI_Kwry^{gYJ^47-IVQG3eukg_~t{wx^{nKDuYzf8bSaD8Kq z98y!!(;`>~FX|1WBe+m}5@f1m$pFScX5+f$qP_a${~U#KKso2Wn*OQ@I;;QlM+7<~ z>D#B+R72%UIf2@;Vd7dCk8UDN@ih9P9pe%hpT~QF)<yTHEd}r1w4Em)Br>Weei@fJ zmIf}uOLQM1T~^~jBv4OwG3u6EwS;Sw9@#ngQ(EL%TkA?Sw0JyDEiTo#POA>bbDoie zJaD>8vWKRN4F{l;OlA-_(L|nJL<b;0vTV|45dw6xnUhL$yFu_0QoFvfpBWB(U#U70 z<QD~E+|>(p><i;R00I2+E#1Y0Po2Gf(0>gCweVV+7JhhE`@di)1Tp4ripnWCS`y@J zr@f*Bd5_P<-$L>$mZZAc@}l6ZdXMxnLA`8kSl<+L_x0~JlZkfbH2FOFNlf)QmDdZG zx%KHWSJ;iW3oAhM%*|R(OpT2m5r?$#FZ2@Z=ZoD45KyAnG}-_X>d&>7n|f#;hfhS} z@;c&*`o`uZArS#+sDJBV&g8mPsWaPvXNBva4SaZ8p5_l2EDSZA{4N`M0OoM<MxH8U zoGkv*z!pF(uGGr@wsYSCywG5&+(P_6Ec<d0MHc@<;F`(bk8Clj3Eq#OsMw{HdbW(~ zB4hjz8skA$&`v>zU<Sz^u#Qnf`5XXLf1NGj`bo>vu45PGbG63(mzj8%Afdw@Q4N5i zkNRYKPY{^rJf>Khg*@%gVYv4<%FJb=Wl1OmJ(wE}3{FiWzg}=y1Jkg*HN}>znBd#n zpp&8*59d(_A@DBoq{e$4XCD*2>cLC+ZM0qx{;QFH^9B34k0AnTrmX;mV_pQS6(i&E zL&mE>fmB6RtCJO(;SJ`J5yS;brfoQqAI4Gz)OBVzD_v&0_P`lZ!U-!;D?GC>pslO9 zSOh8TAWEg&Cix?`U22Trw%~=$<dr-}C5G4pb_JQf7en#~@SaCN_Sf?LAAOHAm;Onl z-?(h?#P6{bYoV0gA~Tqsj*x`Mmh^{qymVy&(xqvMju@#8JEgobX^XXIrMhI`2=2LD z45ru!cMH!P<W=o|OtIFf9<}2iGoCWf3GnpkTnjUK%qW36ahu2R|B7@18UqqKz3>P~ zAwbsB#T{bS=nk47WH!W-7%1UgN^1AmvMVS#a=%Bq3r77oY&hDC(ZADG4<v)PRViOx zd!6pWqeMSA_|lPN5=0vfi#r?Iq9WzmkM_5Or=|h3T`{1L9py;he{hwl4~dG;Y`J;8 znrxn@@-d(zZ_m&fX;%8@Ux1AcwJD?d5|g8=G-hCjT#S2lm+-hs;r!T)(TJd-=eif} zw|hPcrzfK$qe4Cg1sMxJU|Wu-&i6;FN;I*(JNvZK-m7<(WQA{6RYo_!$Fy}cgY!ku z@>Z4pWDExs7&Ju_uV<WWcWe0rgvJ0~Mbxany@sPZs?QL`KR6dz)a;3Uppx!#=l=HF zwLC{1rR|@W;VgebgA9QTI*|Ba+@xHwr!Kv_RfXh_)S(bbxL{Pjw^1OGmva!n^6S<< zx8CZFhA~s;%0D{m?@Yu9TE+K@gZ|1Yd4o(gIUv&XsWa6&!bUYGcvsy=dobFpO8RnE zKNv$?*gkPs9Ds-q<}5C`pe*GWRb>XQ&FD`Ja0BCE(4?~Lee18l@3w5}hX288-#3>1 zN61Pvr9gx!@)97x|KAA-;~~%wIct?4IMxs8{4+0vtBkUGJ^RLm=P~e5X)aY>3L|cC z<?|H2zC`_*ck{JScNr87gMKOnas`c8@5zId5s;=QK*CezS|(xuegcAMP!n2GNK93n z=|xJGg$#uzkU&T$3`wo8!l@W<kzq9JDE>;JoH<L($28~dBoik@TIi%J`$!#-qlJGM z?(g9stLS@pZamP1{Br>X9Y|NNPn{VO$jbiq??xJsr==|u)pfels{nl}P?0P#bw6Lc z@{iHuY!U$ssw8EmJCI!SQwsmf5zWy{M8tf^Uuj((?~cJ>adEWxHxTJ{e5k<Jt^Z}~ zZ~N@=>%W_?RD+<)mvh(X1~-YX8WBHB3akB=W>LM+dn&*Y%6{j&;(wl!;bJrcxcce8 zzBCkF5%l=Mdd@Px39!TIW}RRFW?OAIJt;hdG>}%aU70%XFEmAh*|O9qSTMQ|G#s6S zEY$164teKCe}nmq4ixLel|ZTZEXqgg%|i}j#kbyF!qVIQzt`{ouDV1KPziYDaVpd( zD_}x${$jgdrg`C6(et4v$A^D3s4i8*FHGB)o<1_1fVK>fd!R87Smn-6j^LvW!S@#q zFz5+T-EbM2)B!$7=QPO`@f8fcY^*@)^!)^_7XT8uCcyzk4Mf>@Es@$ZZq}1c5#<uI zU$QRDcIU7?k#af*g^Vo8rF;JS>+`P{Q2Q~#qCx)a&)bK8W*HV3Vc`X0$&RQhHs%OW z$W2hxj(tzAi$jyu2nc%sRW9`55VKY#47Q(a5QAj}_-Z;ZJyAlmw5572lw2Zmw|2-4 zC9QMZ>{ay+$bF&67%`(Y0Az6B351)S;W)6!Q2|}myS{Oowpc0<V@40&{WL#6cqiy% z-h-qKU_5y9NBR8KKw;R?gRl7VC;WF`K$fofRSj9k^a35@>s^Ry0U-VBH-qN>t&g78 z1FNhCv{KnD<-3C1o8REJv74S;;sgL{FUSG93T)S^>{c6KPl<#A8Y&<B9H}Z7?E(>b zE`vY8q;3<Pl5sz9;rZh(xnsaZlJ8l#wVpRWx~Ge2Fnl5<c(i13DnSQA<P0sFY-8`U z%efb7UcPDo!cf!!r|*1wyBa(&<!m6JZ`%RvF%^)$1({XY>OdV*;xAW+3KEp>(c!!w zrpzuRX>m}2m5Da((zS}iY9K5)W9;ds0<<u5y#Pgd-IL{7@AL~A?n7}C0duts!(bqH zro&x$i%kY+_~%KW+ITPVS>l^f{()(wr(TB-SeC<u-~W(U`K!?bRAf0(Gc)Q1&q{-6 z4lDrYcoheM#Nz(SDY)m)0vZI<6j=EuvF*S1Fn}*H8efEWHhCegU9m|ylXwYPMwR+} z+DPvE+i{N*z_nvn-VHt}V0VyIZv+#k1HZai^>W2$y;w)EXAA-H1Qf#N9GpE2@^574 zcGf4GZO-$wGT6OQG4RV?LaDw7qxh%;5F1EQNUOI%>@-x$<X<}Fqh+Z&Pk^2827>N& za0_R>fmHCSf&JxxBD)A>-Na`}I>e`iy@~Wu-5<l;q~lOT@n!H{ViUIqI{#Lgk6;>{ zJ(}~`OLV7r_QI$DbKTX;p7-eD<2%-L`%q3A_@!aIUlsQ%VHV^j$;^ot8xI3nh6Y%2 z^nI-8V2jH#AV-qH7lwd^1TZRD6TpJZ1jBlb2YNGbVjtm@K$KBUwEBnT3SF*i47+(= zA>7XE4c&2ldz1{|0QpeDs^C=|EsW><AxXv+E&>jPdsbj+q5&X7h5s@##wGTU)Z{`J zlc+hO8;EK$xHiAvcFnY8@YZe&K)=xtQe`e+uSv>{QC9a4k#ovDs_&JZkE+y+kFb(& z+W_ly@$b|5n*8?UvseJ4yjRvd{Ih)go6Pu+INym<fTTcbz!=d?@0EQCWi1voljpbi zYIeSHfrlZqf-B^0THhFG5bL<IfvUw;81uzXZ^~r1ffL0a1?0b7HA{02w(_|12=Jb% zTI4+4i;}zPR#`ha(`xh@-e6GZoK8uGN@4L$c&jkxGsewZ4HsA4ZUjfy@@wZAMK}#5 zCu;jA^G8EQ!m}t2R*>doh?|h~8`t{T04BxI&0`K%Fl|i&)n(;84dM-D+swEY(X%6v z(%2tkP*V(?{y_gjt(O6$2$VEPay%tabY8VAl%Jv=)Hj7<l#J6KJM%nbRi{qk0~v@~ z<v#)A&W`P}ITEb_2|&$I+{a<pDKnz|jnJoV#jUO(5p)^kBk(fBdhl@l000*g?YYrc z^R)2~FzahTY0>wMDYNNgH8jU6CCQ-e2@f3~dBh$oS{H)Ax%43508t}NiUH0>J*c5C zrmY6Z5mvTQpPeKl?qxYwM3?hkI@^~IAdkq0+W}}ZSYvY_k31#u+3%EQKQvnSM|kWC zZMMac&+zq6UD1cG+dkpt%9=(d09^rM`aXR>;E4La>*8M@IKjc4#`I#_8?49)U2?r; z7AgvOMgi0f#S+ZHMJGeJb{-MW1D21u!o*>H)u<2H{!&_EQVP)pTWoy$oLNHrCZ>1d ze4b6t(Q-w_#Sq6x2KgkP#!R;>T5&~G#uWQ44Y}T&&teai+@{bm{gx^t9CW+3ZOXCh z-l5@)+LR=P@ch7Dd${P2jN9DoJntC#$eEKk(3q<n-JaRIXhtr}#Ifjk%J7taW`n!o zD}ep&>33%LnFxIb^1ZJ+l*XOR4U)5&zuCHv{Ans53DcROhEt;|t>U?rCyQqN3dp_9 z@7UBCmCYY9+)-F~ZkAUX(g$+7%*ydndgNaMg@m<MX#>aO{Glw;Q!}h?ewO1Q-ed#w zL3uXAX1Sh0d;_e9!y=Tnz`0V%=wy_>(awJun;6O5bjo#sd3yKaPv$@fq@w|QwZ)Nr zAe7krUq3=q!TwfAXf8q<2d!)5N%75?wOdVNI%#@DyZtaS5}R3l&4m*Lxt4h}Mu7v6 zEa}z-U_frgbWc&<2Di#QXnc?Zwxf0~17`P*msg%o{stmGu8H_T=U&wO(=ee6N<7(v z>60`(2?{*@DPJTB9f63?V43hhL6XAj*Qht^-n5tJc41#&;*ME1z8pVdT}hwgGZ+M> z36Y7extfDEHdnOw<(=FL7|e%Hi}t0W!O31~;KB}V?oT5PW;gB#++9#T$ETP`7hQzc zqj?rN&n4SA9ZWv>=?8ORZ@yk>T<RSTyP3l+75u!iP;SW@!(C$$l1~srJVp5`s}xuX zMlZs7WUvo}ayge!d_f%WeEw>Y_w$E7>C4UdW9M5HOC7Uvo6m)eJ$yaRtVC&Z$gXCM z`&&F-O|IAE?FP5aIRnLwmcl6b8O?24BaVMg7c;NZ=>C-j@E^~;Bb;y=S!C~S8oK;> z=C7GqzBI}LV<r7Fk9)M$``sWL(=5W8OfX)A&#zUdnd}{hXQ)klUn43w7euErD`k@# zDsF_!(J@Cq!o}hwjD#3c&b3bNx7tvEwTqXV;Aq?L0df1Sn*@;EDK1{qqf^G<DKB{s z!t*M#=h2F(wkR1n@^*o_CkoyVmSOn`_>5}6%eb77cqjIqu-rWbAi<DKc%w(`_WfAq z7u~DXaVqhFSf8&J+G{+QRY+n-_%4OqkjF@oCW$LvC=iX;d}FD;2HyHNO(~K{AFN7g z&3hIIVNQ6qF`tnYp+&IVf=b$083o*|o{H43WPqn8kmh>*a`J(l_o@HdfF*C&%4oUJ zbsFk;s+zGQzh93^)$v7Fo_W<LRti!g$kylIxpnK&yg=XM3O8X&Vt(*L0m(UaNaKmI zbr?(ZDG=GVkv-t;p-J$;H;nC799P@wu1bRF4Do!5>i0oCdn#8xB-&v>lYx}UbLmx5 zYs7d=GK-O3A(?G1?f=eb0VX0rM@^j5v?(&Mt^c{Miz&*t$xvZMDl0_#7D)3#ESdo> z$C>50d43vPNnMz#6l3D{m^q_%-w5r80uOnj>gECbAmh+AqCLp~$oDyNVhq;5kR+ZL zk%Sf#tIgUr&OJnEiMeEXpk_4N8*4!990PB+{F0D@$nbfFq!!!aE?U(mY<x2IO;(ug z{#+n6xq(|v4$JB5!v`1oG;x3SEn>iN-@$#6{$v2ZonVqo$y*v7lp@eBkK{UjZfF$m zxl=P4$!6WYq(6LaBD3QM&yNe~KSWnW4LZ?nO10blx)41~x^;7+*nV4PODeIJ{28^@ zCBYZ4=^s{xqsS)OXK_2N0gRB}sd_#?MyNK#D{h*#F|?|qa0oyTZ(Xt}wCWA7<`kLt zc`852o~J`DYx{>Wue8;{=#{n;-vy6&U(!%y7Pk)nb^MZ3;w1&H(-Lhh#+u`+Si}Zr z&#j8y=?)(~YM4Bwyt9x8T2!??Yrj=BGB#!hg?2~<pBxP-7ak+!6Y(@iYi-Ytcapnj z;A~wgVLo9YJvH#J(ed2s;i(VMVOJe6UnPlA<owk*(IUy7bUm8y>*{;qn(_;=0F}2A ztj@S`W(>O}5T@6iBYK$3N3$AG2I_?N&60cD-tnk%=`j#rIW2HWoVv_V@Dqu>2KrMM ztSY5P;$BMV))xG+`u+EC5l-;ajE_D^>hV35Nx_o`b!>&@ZcFiK#aEgd#=>6EU{ZK2 zTNHF56x??xIv;Ce!FjW5{wk()3eP5Ct33oJ#xLCM0=Ui8=@4!g`fj_;8XogK${V7F zx^O%{0q==<#KSB`!v2zn=bkS&*F>uAHcE8F0|ZgJRG9Y<O$ga~NUzZIzj&#mQLN#E zH%R<4^9fZ7;r0x|*yPFi{5zWy(_%KZvIg3Sr>KW4`*D_9r5>FxN~WD-4a35wzs3zH zp$4!R+}+h5ZNz$<P2zFfsS_<TN3pBzI-lQRg#x>29p1hq+4OvseutvlBR-4@LTb)O zNhZk!eO$P6Sr4k4^<DG5K1ntgG>w>3%D=h2k7sVhB_$2v-z`TKefC4_Q!?T2qe|Th z8NSW-DCa&#Dfz;wLa(adM0^e(Sk}E+tksKr5+)DZP-U}rcQ8(di$Cr{#hV6I%9chc zKg7daUJfM9ZPm=>-kz$X&5o%>UMHkQzd!ah_~?{S=s9&tg@98!;<6L&PY096JMI*$ zT@CIG<&5>o>qK2pwAAO+6lkjH3T(tWf91TZ{ZM?a*o3!<=SpvaZ_qji-$0EGoS`(T z{z}fobYR&1Up}kcyXjQl<sxg{@4nF}T;CTdQt5%m+bHzVcTPR2SsPGFa?7jc*lQxc zj#tI<{$>ZcVw0Iy9ov+qgK!o#gX_<J5*~vs;0(Da(moqryx+BPq{5}%zV=!&Ryj{F z!NJe8*pj`+^ZQqf_^Of%*Da>q%p2QgBP5>s?LOvK*$LAE3b%sf?HvCI56pm@9U^Y0 zGK=SiM(TLv-vcI7hwSXadp8}S%DX@$zXAu|({nq84VIN+zFD8vVl~JeXxr!=gc!tI z=mZYJBwZ#5q3M_9pJ=haq=|=OA_?B_>?HUN%5%2WKuWV%=O`@&C_Kc>VA!=QZCcJC zDp4XVRx5zuw|Et61CzmefS4?-qFX5tKMkKFKC^*bT;JSU=ZQN>(HWoAVz2r3socOq z&px&j+QV#khErBv{sv9h$Go><ZwzQJrFCF4_@1;pcE|Td-!cuELXm|O^_jz$&#@S6 zI+EqAZGll4G)kQeKc*C|djquNW|hgVF(TuFk5u!&d~Fj)OCqJGzT{M*!hCBq`M+SW zlW84AD)Bz%Mm9=GzD71Di9Q-A^;orz$zN?92Sspcc%0aV3ngvcRNNsfIA}a7Xrx?w zV&WImM~aQzv(NZ$F+EIKOTa#vuZ7*6;yLTHdNJl;!;i5uc~0n|K^-@vW`rXdhq;jk zT5r%NlK)ZfQ$tLNK@u~Q>yfK_C=Y~Z{nsG?ehSFtb7JR=1aCzZP`6Xc?Uh5TRk8{y z+>J4D=M%d~J)B=p>c)q%-HYAGY|p~qjiJ-s%$Rp6|6hAw8CBJ~woNT0rKJTa2}MK} zDX>6VmvpCubSd2}0s<nSQqtW>w;~|jNC`-HcYV+FoPFMX_Ph7^{(L__hl2qO)|zuZ z>xuim?(4el*bury;=2j4u^$Nycq*ycT<j7CVnvQ;(5YpS?q6p^9^guoY*458Dpq6R z%$Lc}pYL*O4s6<6)jSC6HwyD(ei6(K5{HM>k^tM{(f9g{_w$T({P^Izh_duRL?ji* zPuaz`K4&{);`_`bz7iP0Xm<DS*3_r>PlJ+cp(HC&Jt=Y_U^^lE;i-lz<;4dtit^ou z-urc9ZoOCi5;~7-<i`XXJJ_D0*aOp4OKy3o9pX^$RJ!kf$&sNSf4dsXwnt+65+wtA zuQPoje$I>39+DR}?`|i^YT0K;8J+)5GC5t_J}wU{pGwF#w@XS5M}=H7<>=Axl16zK zi?hVFLiRy<1|ra9Oa{mPi)AkR*<4>jBr*tQkN4{C^{0yj^aWTsneB5CMEETpr0b!_ zzQwKW_Da}qC?BwJo$$TAk^bNjg8l$6E$<^?f(%~5)2@3>b(HDhx5m-?{g$uOG<**T zI(ExC``AC1a4+UQ9ok!@$%5HqM;q(BV+<MOym=0H&fN{{tW!vb@wmBVN5asBM~Y>^ z<fZ;V(?a}C{x9Y{eheMbQ1Z@^&q3!Azy6kjU<_Qd<!<k(i_aRn&ySs&X~jozzL~t> z4+OqqUwwnc;$XeA$T-}J2d;OBNcrXOOQkW2L~;hq1rgBMgzLX}V#FUREA$1UfdBmz zMRN~Ef(SWk_4)UMErwTHSsB2nI=TM7;m09Uit2V<1j2_g6)VM$_jU1Ns}AL7Bc+~5 zs%y8&HX?ax;Je*}H}5mRKhR;Opr`aIzgD<@kETBT`YmE?qQIBRd=l5gzK4C!qa(w3 z-5#7-l)4UTxK8jTE(Yv9Di_VJEuyVuCTURyxuKG<;z#o;HLWK^W`vH*-Y0SK6q`C6 z=HF&kN8>qfZ~Vq;7i3XT1D9@GnYt7%?d?@RtX|atncRZ3&l1IS`9&=`gH3~1?;X)x z!FOQAXcBEthk6|CPKUTXk0G;$1Wl14fL5jA03puFI#?~Z6k{Se7-20E7q~fB!H4%U zULTG87FB7~f>b46_filzhXWQ%q)*8ro~j>s&lBi9fyYEdbq^DGyAMtJC!xf)gTG(I zN{*IfRG<H}l^k&I{-#9ruSJcpA?l-{sCH~r(I#rwMl*>qO8johY%p(K*8jWNz`y@W zjF8^({)#dnY0Tg_*LQhKJII1e{LWpr9D}*Ry4Z?=u98Z~qyV7dF%?*}|3R`N=b#=p zb9@TJ<h~xa5S%X;e;I^-v}$0|n}3Yk@AyBrg_tFV7!eerUguP(22bmNSwfK_<?HLu zZ#DqV<Bv?pc^|L<xGJdkmhMaInp*=N=QH48oFP0JZuC^-BbKp0%HB2Lmn2FpnS=K` z>F~t^*7WTtu}=R|Fs7I9s?X|_7pnZJj76`HT?b)l09oZ2?3@5#;@2i$bfcvzP)5D; zf~g`kVH)7O1hZg)-d!qNb*O$a1KiT_K*<FMKz>>q+z?>|0%Kl5XmQ2ecn-)_2lA+b zGWu<D0R1XGh7wQUgpWo3-`Hz*HU?C&MYu7ivIEupD?8BlI|w4H=029o0yRIFl0ZqJ zX>Ss*#W}F|CIE1t>oGvz9)VEkD`W`0zZ;xALj%F40B9os>~b7PHMAkm(+;#ZmQN=k zCD1t#w9MLipLLcu@rDZl7W!8JKtfn9EhfQDE20so9-I+-3V_ZpfZ*}$z!Lb3Kp4=M zAZi;k6JQO^`Vi!*6$OAC$D7P*&U{r1!HxuwL`lLjvcsZs%Bd_`xwsl+tX)K&Kw>i? zklKHXIVNu-P}b*gANWTG0GEY)Odnndw|xcj#TVt)V>&xvJOhD4Mi2nVOv*H3KuZ<S zj^Qz=Gxq!xRQ=!LK0w5R`ey*JRuHo7et31hw`liGK)xmeBAR1BSn~&EI{TETiGnP8 zJb>~7xeox_bw;)dkZ%vA-Z%uj%0A#ZO+rt|-2=+q#h@GaV<Jfb05%f@GXuy8ADAwe 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 diff --git a/src/main/java/de/bitgilde/TIMAAT/di/binder/TIMAATBinder.java b/src/main/java/de/bitgilde/TIMAAT/di/binder/TIMAATBinder.java index 81ced318..872e7cf3 100644 --- a/src/main/java/de/bitgilde/TIMAAT/di/binder/TIMAATBinder.java +++ b/src/main/java/de/bitgilde/TIMAAT/di/binder/TIMAATBinder.java @@ -22,6 +22,7 @@ import de.bitgilde.TIMAAT.storage.entity.CategorySetStorage; import de.bitgilde.TIMAAT.storage.entity.CategoryStorage; import de.bitgilde.TIMAAT.storage.entity.MediumVideoStorage; +import de.bitgilde.TIMAAT.storage.entity.SystemSettingStorage; import de.bitgilde.TIMAAT.storage.entity.TagStorage; import de.bitgilde.TIMAAT.storage.entity.actor.ActorStorage; import de.bitgilde.TIMAAT.storage.entity.analysislist.AnalysisListStorage; @@ -83,6 +84,7 @@ protected void configure() { bindAsContract(TaskExecutorFactory.class).in(Singleton.class); bindAsContract(TaskExecutorService.class).in(Singleton.class); bindAsContract(TaskService.class).in(Singleton.class); + bindAsContract(SystemSettingStorage.class).in(Singleton.class); bind(TranscriptionStorage.class).to(TranscriptionStorage.class).to(TaskStorage.class).in(Singleton.class); bind(TranscriptionService.class).to(TranscriptionService.class).to(TaskStateUpdater.class).in(Singleton.class); diff --git a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/SystemSetting.java b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/SystemSetting.java index 04d90b8d..ecbdeeec 100644 --- a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/SystemSetting.java +++ b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/SystemSetting.java @@ -21,6 +21,11 @@ public class SystemSetting { @Column(name = "auto_transcribe_uploads", nullable = false) private Boolean autoTranscribeUploads; + @ManyToOne + @JoinColumn(name = "default_engine_identifier", referencedColumnName = "engine_identifier") + @JoinColumn(name = "default_model_identifier", referencedColumnName = "model_identifier") + private TranscriptionModel defaultTranscriptionModel; + @NotNull @Column(name = "created_at", nullable = false) private Instant createdAt; @@ -48,6 +53,14 @@ public void setAutoTranscribeUploads(Boolean autoTranscribeUploads) { this.autoTranscribeUploads = autoTranscribeUploads; } + public TranscriptionModel getDefaultTranscriptionModel() { + return defaultTranscriptionModel; + } + + public void setDefaultTranscriptionModel(TranscriptionModel defaultTranscriptionModel) { + this.defaultTranscriptionModel = defaultTranscriptionModel; + } + public Instant getCreatedAt() { return createdAt; } diff --git a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionEngine.java b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionEngine.java index b1308188..783d8989 100644 --- a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionEngine.java +++ b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionEngine.java @@ -15,9 +15,6 @@ public class TranscriptionEngine { @Column(name = "engine_name") private String engineName; - @Column(name = "active") - private Boolean active; - public String getEngineIdentifier() { return engineIdentifier; } @@ -34,12 +31,4 @@ public void setEngineName(String engineName) { this.engineName = engineName; } - public Boolean getActive() { - return active; - } - - public void setActive(Boolean active) { - this.active = active; - } - } \ No newline at end of file diff --git a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionModel.java b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionModel.java index 51536b49..db5d6331 100644 --- a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionModel.java +++ b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionModel.java @@ -1,6 +1,5 @@ package de.bitgilde.TIMAAT.model.FIPOP; -import jakarta.persistence.Column; import jakarta.persistence.EmbeddedId; import jakarta.persistence.Entity; import jakarta.persistence.Table; @@ -11,12 +10,6 @@ public class TranscriptionModel { @EmbeddedId private TranscriptionModelId id; - @Column(name = "`default`") - private Boolean defaultTranscriptionModel; - - @Column(name = "active") - private Boolean active; - public TranscriptionModelId getId() { return id; } @@ -25,20 +18,4 @@ public void setId(TranscriptionModelId id) { this.id = id; } - public Boolean getDefaultTranscriptionModel() { - return defaultTranscriptionModel; - } - - public void setDefaultField(Boolean defaultTranscriptionModel) { - this.defaultTranscriptionModel = defaultTranscriptionModel; - } - - public Boolean getActive() { - return active; - } - - public void setActive(Boolean active) { - this.active = active; - } - -} \ No newline at end of file +} diff --git a/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java b/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java index e8cad28c..9fe76f7d 100644 --- a/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java @@ -1,6 +1,7 @@ package de.bitgilde.TIMAAT.service.transcription; import de.bitgilde.TIMAAT.model.FIPOP.Transcription; +import de.bitgilde.TIMAAT.model.FIPOP.TranscriptionModel; import de.bitgilde.TIMAAT.service.task.TaskService; import de.bitgilde.TIMAAT.service.task.api.MediumAudioAnalysisTask.SupportedMediumType; import de.bitgilde.TIMAAT.service.task.api.Task; @@ -9,8 +10,10 @@ import de.bitgilde.TIMAAT.service.task.api.TranscriptionMediumPreparationTask; import de.bitgilde.TIMAAT.service.task.storage.TaskStateUpdater; import de.bitgilde.TIMAAT.service.transcription.api.GenerateTranscriptionConfiguration; +import de.bitgilde.TIMAAT.service.transcription.api.TranscriptionEngineCapabilities; import de.bitgilde.TIMAAT.storage.api.PagingParameter; import de.bitgilde.TIMAAT.storage.api.SortingParameter; +import de.bitgilde.TIMAAT.storage.entity.SystemSettingStorage; import de.bitgilde.TIMAAT.storage.entity.transcription.TranscriptionStorage; import de.bitgilde.TIMAAT.storage.entity.transcription.api.TranscriptionFilterCriteria; import de.bitgilde.TIMAAT.storage.entity.transcription.api.TranscriptionState; @@ -23,12 +26,14 @@ import de.bitgilde.TIMAAT.storage.file.VideoFileStorage; import jakarta.inject.Inject; import studio.nkodev.stt.client.SpeechToTextServiceClient; +import studio.nkodev.stt.client.api.SpeechToTextEngine; import studio.nkodev.stt.client.api.SpeechToTextEngineOutputFormat; import studio.nkodev.stt.client.api.SpeechToTextTaskState; import studio.nkodev.stt.client.api.SpeechToTextTaskStateConsumer; import java.nio.file.Path; import java.util.Collection; +import java.util.List; import java.util.Optional; import java.util.Set; import java.util.logging.Level; @@ -47,6 +52,7 @@ public class TranscriptionService implements TaskStateUpdater, SpeechToTextTaskS private static final SpeechToTextEngineOutputFormat engineOutputFormat = SpeechToTextEngineOutputFormat.SRT; private final TranscriptionStorage transcriptionStorage; + private final SystemSettingStorage systemSettingStorage; private final AudioFileStorage audioFileStorage; private final VideoFileStorage videoFileStorage; private final TaskService taskService; @@ -55,8 +61,9 @@ public class TranscriptionService implements TaskStateUpdater, SpeechToTextTaskS private final TranscriptionFileStorage transcriptionFileStorage; @Inject - public TranscriptionService(TranscriptionStorage transcriptionStorage, AudioFileStorage audioFileStorage, VideoFileStorage videoFileStorage, TaskService taskService, SpeechToTextServiceClient speechToTextServiceClient, TemporaryFileStorage temporaryFileStorage, TranscriptionFileStorage transcriptionFileStorage) { + public TranscriptionService(TranscriptionStorage transcriptionStorage, SystemSettingStorage systemSettingStorage, AudioFileStorage audioFileStorage, VideoFileStorage videoFileStorage, TaskService taskService, SpeechToTextServiceClient speechToTextServiceClient, TemporaryFileStorage temporaryFileStorage, TranscriptionFileStorage transcriptionFileStorage) { this.transcriptionStorage = transcriptionStorage; + this.systemSettingStorage = systemSettingStorage; this.audioFileStorage = audioFileStorage; this.videoFileStorage = videoFileStorage; this.taskService = taskService; @@ -65,13 +72,27 @@ public TranscriptionService(TranscriptionStorage transcriptionStorage, AudioFile this.transcriptionFileStorage = transcriptionFileStorage; resumeMonitoringOfActiveTranscriptions(); + verifyDefaultModelStillAvailable(); + } + + /** + * @return the engines (with their models) currently offered by the connected speech-to-text-service + */ + public Collection<TranscriptionEngineCapabilities> getAvailableEngineCapabilities() { + return speechToTextServiceClient.getAvailableEngines().stream() + .map(engine -> new TranscriptionEngineCapabilities( + engine.engineIdentifier(), + engine.engineName(), + List.copyOf(engine.modelIdentifiers()))) + .toList(); } public void createTranscription(GenerateTranscriptionConfiguration generateTranscriptionConfiguration) { int mediumId = generateTranscriptionConfiguration.mediumId(); String engineIdentifier = generateTranscriptionConfiguration.engineIdentifier(); String modelIdentifier = generateTranscriptionConfiguration.modelIdentifier(); - //TODO: Validate if engine and model is available + + SpeechToTextEngine engine = validateAndUpsertEngineModel(engineIdentifier, modelIdentifier); SupportedMediumType supportedMediumType = transcriptionStorage.determineSupportedMediumType(mediumId); AudioContainingMediumFileStorage fileStorage = getFileStorage(supportedMediumType); @@ -100,8 +121,27 @@ public void createTranscription(GenerateTranscriptionConfiguration generateTrans if (createdTranscription != null) { transcriptionStorage.updateTranscriptionState(createdTranscription.getId(), TranscriptionState.FAILED); } + verifyDefaultModelStillAvailable(); + } + + } + + private SpeechToTextEngine validateAndUpsertEngineModel(String engineIdentifier, String modelIdentifier) { + SpeechToTextEngine engine = speechToTextServiceClient.getAvailableEngines().stream() + .filter(candidate -> candidate.engineIdentifier().equals(engineIdentifier)) + .findFirst() + .orElseThrow(() -> new IllegalArgumentException( + "Engine '" + engineIdentifier + "' is not provided by the connected speech-to-text-service")); + + if (!engine.modelIdentifiers().contains(modelIdentifier)) { + throw new IllegalArgumentException( + "Model '" + modelIdentifier + "' is not provided by engine '" + engineIdentifier + "'"); } + transcriptionStorage.upsertEngine(engineIdentifier, engine.engineName()); + transcriptionStorage.upsertModel(engineIdentifier, modelIdentifier); + + return engine; } private void startTranscriptionTask(int transcriptionId, Path monoFile, String engineIdentifier, String modelIdentifier) { @@ -163,6 +203,31 @@ private AudioContainingMediumFileStorage getFileStorage(SupportedMediumType supp }; } + private void verifyDefaultModelStillAvailable() { + try { + Optional<TranscriptionModel> defaultModel = systemSettingStorage.getDefaultTranscriptionModel(); + if (defaultModel.isEmpty()) { + return; + } + + String engineIdentifier = defaultModel.get().getId().getEngineIdentifier(); + String modelIdentifier = defaultModel.get().getId().getModelIdentifier(); + + boolean stillAvailable = speechToTextServiceClient.getAvailableEngines().stream() + .filter(engine -> engine.engineIdentifier().equals(engineIdentifier)) + .anyMatch(engine -> engine.modelIdentifiers().contains(modelIdentifier)); + + if (!stillAvailable) { + logger.log(Level.WARNING, + "Default transcription model {0}/{1} is no longer provided by the speech-to-text-service. Clearing default.", + new Object[]{engineIdentifier, modelIdentifier}); + systemSettingStorage.clearDefaultTranscriptionModel(); + } + } catch (Exception e) { + logger.log(Level.WARNING, "Could not verify availability of the default transcription model", e); + } + } + private void resumeMonitoringOfActiveTranscriptions() { logger.info("Resuming monitoring of uncompleted speech-to-text tasks"); TranscriptionFilterCriteria transcriptionFilterCriteria = new TranscriptionFilterCriteria.Builder().transcriptionStates( diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/TranscriptionStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/TranscriptionStorage.java index 1927343b..6ccf618f 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/TranscriptionStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/TranscriptionStorage.java @@ -3,6 +3,7 @@ import de.bitgilde.TIMAAT.db.exception.DbTransactionExecutionException; import de.bitgilde.TIMAAT.model.FIPOP.Medium; import de.bitgilde.TIMAAT.model.FIPOP.Transcription; +import de.bitgilde.TIMAAT.model.FIPOP.TranscriptionEngine; import de.bitgilde.TIMAAT.model.FIPOP.TranscriptionModel; import de.bitgilde.TIMAAT.model.FIPOP.TranscriptionModelId; import de.bitgilde.TIMAAT.model.FIPOP.TranscriptionState_; @@ -92,6 +93,40 @@ public void updateTranscriptionTaskId(int transcriptionId, long transcriptionTas }); } + /** + * Inserts a {@link TranscriptionEngine} row for the given identifier if none exists yet. The DB + * tables for engines and models keep a historical record of every engine/model used in a + * transcription; live availability is queried from the speech-to-text-service. + */ + public void upsertEngine(String engineIdentifier, String engineName) { + executeDbTransaction(entityManager -> { + if (entityManager.find(TranscriptionEngine.class, engineIdentifier) == null) { + TranscriptionEngine engine = new TranscriptionEngine(); + engine.setEngineIdentifier(engineIdentifier); + engine.setEngineName(engineName); + entityManager.persist(engine); + } + return Void.TYPE; + }); + } + + /** + * Inserts a {@link TranscriptionModel} row for the given engine/model pair if none exists yet. + */ + public void upsertModel(String engineIdentifier, String modelIdentifier) { + executeDbTransaction(entityManager -> { + TranscriptionModelId modelId = new TranscriptionModelId(); + modelId.setEngineIdentifier(engineIdentifier); + modelId.setModelIdentifier(modelIdentifier); + if (entityManager.find(TranscriptionModel.class, modelId) == null) { + TranscriptionModel model = new TranscriptionModel(); + model.setId(modelId); + entityManager.persist(model); + } + return Void.TYPE; + }); + } + public Transcription createTranscription(int mediumId, String engineIdentifier, String modelIdentifier, TranscriptionState transcriptionState) { return executeDbTransaction(entityManager -> { de.bitgilde.TIMAAT.model.FIPOP.TranscriptionState transcriptionStateEntity = entityManager.getReference( diff --git a/src/main/resources/database/db_update.sql b/src/main/resources/database/db_update.sql index badd6b4a..6582d123 100644 --- a/src/main/resources/database/db_update.sql +++ b/src/main/resources/database/db_update.sql @@ -469,17 +469,15 @@ BEGIN CREATE TABLE `fipop`.`transcription_engine` ( `engine_identifier` VARCHAR(45) primary key, - `engine_name` VARCHAR(45) not null, - `active` BOOL not null default true + `engine_name` VARCHAR(45) not null ) ENGINE = InnoDB; CREATE TABLE `fipop`.`transcription_model` ( - `model_identifier` VARCHAR(45) primary key, `engine_identifier` VARCHAR(45) not null, - `default` bool not null default false, - `active` bool not null default true, + `model_identifier` VARCHAR(45) not null, + PRIMARY KEY (`engine_identifier`, `model_identifier`), CONSTRAINT `fk_transcription_model_transcription_engine` FOREIGN KEY (`engine_identifier`) REFERENCES `fipop`.`transcription_engine` (`engine_identifier`) @@ -487,7 +485,6 @@ BEGIN ON UPDATE NO ACTION ) ENGINE = InnoDB; - CREATE INDEX fk_transcription_model_engine_identifier_idx ON `fipop`.`transcription_model` (engine_identifier ASC); CREATE TABLE `fipop`.`transcription_state` ( @@ -558,13 +555,8 @@ BEGIN `created_by_user_account_id` int, `last_edited_by_user_account_id` int, CONSTRAINT `fk_transcription_transcription_model` - FOREIGN KEY (`model_identifier`) - REFERENCES `fipop`.`transcription_model` (`model_identifier`) - ON DELETE SET NULL - ON UPDATE NO ACTION, - CONSTRAINT `fk_transcription_transcription_engine` - FOREIGN KEY (`engine_identifier`) - REFERENCES `fipop`.`transcription_engine` (`engine_identifier`) + FOREIGN KEY (`engine_identifier`, `model_identifier`) + REFERENCES `fipop`.`transcription_model` (`engine_identifier`, `model_identifier`) ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT `fk_transcription_medium` @@ -590,8 +582,7 @@ BEGIN ON UPDATE NO ACTION ) ENGINE = InnoDB; - CREATE INDEX `fk_transcription_transcription_model_idx` on `fipop`.`transcription` (`model_identifier` ASC); - CREATE INDEX `fk_transcription_transcription_engine_idx` on `fipop`.`transcription` (`engine_identifier` ASC); + CREATE INDEX `fk_transcription_transcription_model_idx` on `fipop`.`transcription` (`engine_identifier` ASC, `model_identifier` ASC); CREATE INDEX `fk_transcription_transcription_medium_idx` on `fipop`.`transcription` (`medium_id` ASC); CREATE INDEX `fk_transcription_transcription_transcription_state_idx` on `fipop`.`transcription` (`transcription_state_id` ASC); CREATE INDEX `fk_transcription_transcription_transcription_type_idx` on `fipop`.`transcription` (`transcription_type_id` ASC); @@ -602,6 +593,8 @@ BEGIN ( `id` smallint primary key default 1, `auto_transcribe_uploads` bool not null default false, + `default_engine_identifier` VARCHAR(45), + `default_model_identifier` VARCHAR(45), `created_at` timestamp not null default CURRENT_TIMESTAMP, `last_edited_at` timestamp, `last_edited_by_user_account_id` int, @@ -610,10 +603,16 @@ BEGIN REFERENCES `fipop`.`user_account` (`id`) ON DELETE SET NULL ON UPDATE NO ACTION, + CONSTRAINT `fk_system_settings_default_transcription_model` + FOREIGN KEY (`default_engine_identifier`, `default_model_identifier`) + REFERENCES `fipop`.`transcription_model` (`engine_identifier`, `model_identifier`) + ON DELETE SET NULL + ON UPDATE NO ACTION, CONSTRAINT system_settings_singleton CHECK (id = 1) ) ENGINE = InnoDB; CREATE INDEX `fk_system_settings_user_idx` on `fipop`.`system_settings` (`last_edited_by_user_account_id` ASC); + CREATE INDEX `fk_system_settings_default_transcription_model_idx` on `fipop`.`system_settings` (`default_engine_identifier` ASC, `default_model_identifier` ASC); ALTER TABLE `fipop`.`medium` ADD COLUMN `default_transcription_id` int; diff --git a/src/main/resources/database/fipop.sql b/src/main/resources/database/fipop.sql index 2526d3ad..73776943 100644 --- a/src/main/resources/database/fipop.sql +++ b/src/main/resources/database/fipop.sql @@ -8783,8 +8783,7 @@ CREATE TABLE `FIPOP`.`annotation_has_music_translation_area` CREATE TABLE `fipop`.`transcription_engine` ( `engine_identifier` VARCHAR(45) primary key, - `engine_name` VARCHAR(45) not null, - `active` BOOL not null default true + `engine_name` VARCHAR(45) not null ) ENGINE = InnoDB; @@ -8793,10 +8792,9 @@ CREATE TABLE `fipop`.`transcription_engine` -- ----------------------------------------------------- CREATE TABLE `fipop`.`transcription_model` ( - `model_identifier` VARCHAR(45) primary key, `engine_identifier` VARCHAR(45) not null, - `default` bool not null default false, - `active` bool not null default true, + `model_identifier` VARCHAR(45) not null, + PRIMARY KEY (`engine_identifier`, `model_identifier`), CONSTRAINT `fk_transcription_model_transcription_engine` FOREIGN KEY (`engine_identifier`) REFERENCES `fipop`.`transcription_engine` (`engine_identifier`) @@ -8885,13 +8883,8 @@ CREATE TABLE `fipop`.`transcription` `created_by_user_account_id` int, `last_edited_by_user_account_id` int, CONSTRAINT `fk_transcription_transcription_model` - FOREIGN KEY (`model_identifier`) - REFERENCES `fipop`.`transcription_model` (`model_identifier`) - ON DELETE SET NULL - ON UPDATE NO ACTION, - CONSTRAINT `fk_transcription_transcription_engine` - FOREIGN KEY (`engine_identifier`) - REFERENCES `fipop`.`transcription_engine` (`engine_identifier`) + FOREIGN KEY (`engine_identifier`, `model_identifier`) + REFERENCES `fipop`.`transcription_model` (`engine_identifier`, `model_identifier`) ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT `fk_transcription_medium` @@ -8925,6 +8918,8 @@ CREATE TABLE `fipop`.`system_settings` ( `id` smallint primary key default 1, `auto_transcribe_uploads` bool not null default false, + `default_engine_identifier` VARCHAR(45), + `default_model_identifier` VARCHAR(45), `created_at` timestamp not null default CURRENT_TIMESTAMP, `last_edited_at` timestamp, `last_edited_by_user_account_id` int, @@ -8933,9 +8928,15 @@ CREATE TABLE `fipop`.`system_settings` REFERENCES `fipop`.`user_account` (`id`) ON DELETE SET NULL ON UPDATE NO ACTION, + CONSTRAINT `fk_system_settings_default_transcription_model` + FOREIGN KEY (`default_engine_identifier`, `default_model_identifier`) + REFERENCES `fipop`.`transcription_model` (`engine_identifier`, `model_identifier`) + ON DELETE SET NULL + ON UPDATE NO ACTION, CONSTRAINT system_settings_singleton CHECK (id = 1) ) ENGINE = InnoDB; +CREATE INDEX `fk_system_settings_default_transcription_model_idx` on `fipop`.`system_settings` (`default_engine_identifier` ASC, `default_model_identifier` ASC); -- ----------------------------------------------------- -- Add foreign key to `FIPOP`.`medium` From 147e95933d1ef8dcc58ae047f9f6cce65eb11663 Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Thu, 21 May 2026 12:54:22 +0200 Subject: [PATCH 56/70] TIMAAT #57 - Dependency Updates * Updated third party dependencies * Set Java version to 25 to be compatible with speech-to-text-service-client library * Some code adjustments because of api changes of third party libraries * Defined new timaat configuration properties --- .gitignore | 1 + pom.xml | 131 +++++++++++------ .../de/bitgilde/TIMAAT/PropertyConstants.java | 40 +++--- .../TIMAAT/model/FIPOP/TranscriptionType.java | 6 +- .../exception/FeatureDisabledException.java | 21 +++ .../notification/NotificationWebSocket.java | 6 +- .../TIMAAT/rest/endpoint/EndpointMedium.java | 5 +- .../rest/filter/AuthenticationFilter.java | 12 +- .../TIMAAT/security/TIMAATKeyGenerator.java | 7 +- .../transcription/TranscriptionService.java | 133 +++++++++++++----- .../api/TranscriptionEngineCapabilities.java | 15 ++ src/main/resources/META-INF/persistence.xml | 8 +- src/main/resources/timaat-default.properties | 56 +++++--- 13 files changed, 303 insertions(+), 138 deletions(-) create mode 100644 src/main/java/de/bitgilde/TIMAAT/model/exception/FeatureDisabledException.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/service/transcription/api/TranscriptionEngineCapabilities.java diff --git a/.gitignore b/.gitignore index 151d0dac..0e410dcc 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ test_output .vscode/ .idea/ .project +CLAUDE.local.md diff --git a/pom.xml b/pom.xml index 3b70cc80..8dceed56 100644 --- a/pom.xml +++ b/pom.xml @@ -1,16 +1,25 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>TIMAATTest</groupId> - <artifactId>TIMAATTest</artifactId> + <groupId>studio.nko-dev</groupId> + <artifactId>TIMAAT</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>war</packaging> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <maven.compiler.release>25</maven.compiler.release> <eclipselink.version>5.0.0</eclipselink.version> - <jersey.version>3.1.10</jersey.version> + <jersey.version>4.0.2</jersey.version> <bytebuddy.version>1.17.5</bytebuddy.version> <mockito.version>5.18.0</mockito.version> + <mysql.version>8.4.0</mysql.version> + <jsonwebtoken.version>0.13.0</jsonwebtoken.version> + <jackson.version>2.19.1</jackson.version> + <jakarta.websocket.version>2.2.0</jakarta.websocket.version> + <!-- Transitive dependency versions --> + <protobuf.version>3.25.8</protobuf.version> + <jakarta.xml.bind.version>4.0.5</jakarta.xml.bind.version> + <jakarta.activation.version>2.1.4</jakarta.activation.version> + <errorprone.version>2.45.0</errorprone.version> </properties> <build> <sourceDirectory>src/main/java</sourceDirectory> @@ -68,8 +77,64 @@ <argLine>-javaagent:${settings.localRepository}/org/mockito/mockito-core/${mockito.version}/mockito-core-${mockito.version}.jar</argLine> </configuration> </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <version>3.6.2</version> + <executions> + <execution> + <id>enforce</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <banDuplicatePomDependencyVersions /> + <dependencyConvergence /> + <requireUpperBoundDeps /> + </rules> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> + + <dependencyManagement> + <!-- Management of transitive dependencies --> + <dependencies> + <dependency> + <groupId>com.google.errorprone</groupId> + <artifactId>error_prone_annotations</artifactId> + <version>${errorprone.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson</groupId> + <artifactId>jackson-bom</artifactId> + <version>${jackson.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + <version>${protobuf.version}</version> + </dependency> + <dependency> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> + <version>${jakarta.xml.bind.version}</version> + </dependency> + <dependency> + <groupId>jakarta.activation</groupId> + <artifactId>jakarta.activation-api</artifactId> + <version>${jakarta.activation.version}</version> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> <!-- https://mvnrepository.com/artifact/org.glassfish.jersey.containers/jersey-container-servlet --> <dependency> @@ -116,13 +181,13 @@ <dependency> <groupId>org.glassfish.jaxb</groupId> <artifactId>jaxb-runtime</artifactId> - <version>3.0.2</version> + <version>4.0.8</version> </dependency> <!-- https://mvnrepository.com/artifact/mysql/mysql-connector-java --> <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>8.0.28</version> + <groupId>com.mysql</groupId> + <artifactId>mysql-connector-j</artifactId> + <version>${mysql.version}</version> </dependency> <!-- https://mvnrepository.com/artifact/org.json/json --> <dependency> @@ -134,51 +199,33 @@ <dependency> <groupId>io.jsonwebtoken</groupId> <artifactId>jjwt-api</artifactId> - <version>0.11.2</version> + <version>${jsonwebtoken.version}</version> </dependency> <!-- https://mvnrepository.com/artifact/io.jsonwebtoken/jjwt-impl --> <dependency> <groupId>io.jsonwebtoken</groupId> <artifactId>jjwt-impl</artifactId> - <version>0.11.2</version> + <version>${jsonwebtoken.version}</version> <scope>runtime</scope> </dependency> <!-- https://mvnrepository.com/artifact/io.jsonwebtoken/jjwt-jackson --> <dependency> <groupId>io.jsonwebtoken</groupId> <artifactId>jjwt-jackson</artifactId> - <version>0.11.2</version> + <version>${jsonwebtoken.version}</version> <scope>runtime</scope> </dependency> - <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core --> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - <version>2.13.0</version> - </dependency> - <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind --> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - <version>2.13.3</version> - </dependency> - <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations --> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-annotations</artifactId> - <version>2.13.0</version> - </dependency> <!-- https://mvnrepository.com/artifact/de.mkammerer/argon2-jvm --> <dependency> <groupId>de.mkammerer</groupId> <artifactId>argon2-jvm</artifactId> - <version>2.10.1</version> + <version>2.12</version> </dependency> <!-- https://mvnrepository.com/artifact/jakarta.persistence/jakarta.persistence-api --> <dependency> <groupId>jakarta.persistence</groupId> <artifactId>jakarta.persistence-api</artifactId> - <version>3.0.0</version> + <version>3.2.0</version> </dependency> <!-- https://mvnrepository.com/artifact/org.eclipse.persistence/eclipselink --> <dependency> @@ -186,30 +233,30 @@ <artifactId>eclipselink</artifactId> <version>${eclipselink.version}</version> </dependency> - <!-- https://mvnrepository.com/artifact/jakarta.xml.bind/jakarta.xml.bind-api --> - <dependency> - <groupId>jakarta.xml.bind</groupId> - <artifactId>jakarta.xml.bind-api</artifactId> - <version>3.0.1</version> - </dependency> <!-- https://mvnrepository.com/artifact/jakarta.activation/jakarta.activation-api --> <dependency> <groupId>jakarta.activation</groupId> <artifactId>jakarta.activation-api</artifactId> - <version>2.0.1</version> + <version>2.1.4</version> </dependency> <!-- https://mvnrepository.com/artifact/jakarta.servlet/jakarta.servlet-api --> <dependency> <groupId>jakarta.servlet</groupId> <artifactId>jakarta.servlet-api</artifactId> - <version>5.0.0</version> + <version>6.1.0</version> <scope>provided</scope> </dependency> <!-- https://mvnrepository.com/artifact/jakarta.websocket/jakarta.websocket-api --> <dependency> <groupId>jakarta.websocket</groupId> <artifactId>jakarta.websocket-api</artifactId> - <version>2.0.0</version> + <version>${jakarta.websocket.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>jakarta.websocket</groupId> + <artifactId>jakarta.websocket-client-api</artifactId> + <version>${jakarta.websocket.version}</version> <scope>provided</scope> </dependency> <!-- https://mvnrepository.com/artifact/org.apache.tomcat/tomcat-catalina --> @@ -222,7 +269,7 @@ <dependency> <groupId>org.mariadb.jdbc</groupId> <artifactId>mariadb-java-client</artifactId> - <version>2.7.4</version> + <version>3.5.8</version> </dependency> <!-- https://mvnrepository.com/artifact/org.im4java/im4java --> <dependency> @@ -240,13 +287,13 @@ <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-engine</artifactId> - <version>5.9.1</version> + <version>6.1.0</version> <scope>test</scope> </dependency> <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>3.27.3</version> + <version>3.27.7</version> <scope>test</scope> </dependency> <dependency> diff --git a/src/main/java/de/bitgilde/TIMAAT/PropertyConstants.java b/src/main/java/de/bitgilde/TIMAAT/PropertyConstants.java index b7444bd5..55d79995 100644 --- a/src/main/java/de/bitgilde/TIMAAT/PropertyConstants.java +++ b/src/main/java/de/bitgilde/TIMAAT/PropertyConstants.java @@ -23,26 +23,28 @@ * @author Mirko Scherf <mscherf@uni-mainz.de> */ public enum PropertyConstants { - STORAGE_LOCATION("storage.location"), - STORAGE_TEMP_LOCATION("storage.temp.location"), - DATABASE_DRIVER("database.driver"), - DATABASE_URL("database.url"), - DATABASE_USER("database.user"), - DATABASE_PASSWORD("database.password"), - FFMPEG_LOCATION("app.ffmpeg.location"), - IMAGEMAGICK_LOCATION("app.imagemagic.location"), - TASK_MAX_PARALLEL_COUNT("app.task.maxParallelCount"), - TASK_CORE_PARALLEL_COUNT("app.task.coreParallelCount"), - TASK_QUEUE_SIZE("app.task.queueSize"), - SERVER_NAME("server.name"); + STORAGE_LOCATION("storage.location"), STORAGE_TEMP_LOCATION("storage.temp.location"), DATABASE_DRIVER( + "database.driver"), DATABASE_URL("database.url"), DATABASE_USER("database.user"), DATABASE_PASSWORD( + "database.password"), FFMPEG_LOCATION("app.ffmpeg.location"), IMAGEMAGICK_LOCATION( + "app.imagemagic.location"), TASK_MAX_PARALLEL_COUNT("app.task.maxParallelCount"), TASK_CORE_PARALLEL_COUNT( + "app.task.coreParallelCount"), TASK_QUEUE_SIZE("app.task.queueSize"), SERVER_NAME( + "server.name"), SPEECH_TO_TEXT_ENABLED("stt.enabled"), SPEECH_TO_TEXT_HOST("stt.host"), SPEECH_TO_TEXT_PORT( + "stt.port"), SPEECH_TO_TEXT_TRANSFER_TYPE( + "stt.transfer.type"), SPEECH_TO_TEXT_TRANSFER_SHARED_AUDIO_STORAGE_PATH( + "stt.transfer.sharedAudioStoragePath"), SPEECH_TO_TEXT_TRANSFER_SHARED_RESULT_STORAGE_PATH( + "stt.transfer.sharedResultStoragePath"), SPEECH_TO_TEXT_TRUSTED_SERVER_CERTIFICATE_PATH( + "stt.trustedServerCertificatePath"), SPEECH_TO_TEXT_AUTH_ENABLED( + "stt.auth.enabled"), SPEECH_TO_TEXT_AUTH_CERTIFICATE_PATH( + "stt.auth.certificatePath"), SPEECH_TO_TEXT_AUTH_PRIVATE_KEY_PATH( + "stt.auth.privateKeyPath"), SPEECH_TO_TEXT_AUTH_PRIVATE_KEY_PASSWORD("stt.auth.privateKeyPassword"); - private final String propertyKey; + private final String propertyKey; - PropertyConstants(String propertyKey) { - this.propertyKey = propertyKey; - } + PropertyConstants(String propertyKey) { + this.propertyKey = propertyKey; + } - public String key() { - return propertyKey; - } + public String key() { + return propertyKey; + } } \ No newline at end of file diff --git a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionType.java b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionType.java index d292fbc7..68f3a6b9 100644 --- a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionType.java +++ b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/TranscriptionType.java @@ -16,7 +16,7 @@ public class TranscriptionType { private Integer id; @OneToMany(mappedBy = "transcriptionType") - private Set<TranscriptionStateTranslation> transcriptionTypeTranslations; + private Set<TranscriptionTypeTranslation> transcriptionTypeTranslations; public Integer getId() { return id; @@ -26,11 +26,11 @@ public void setId(Integer id) { this.id = id; } - public Set<TranscriptionStateTranslation> getTranscriptionTypeTranslations() { + public Set<TranscriptionTypeTranslation> getTranscriptionTypeTranslations() { return transcriptionTypeTranslations; } - public void setTranscriptionTypeTranslations(Set<TranscriptionStateTranslation> transcriptionTypeTranslations) { + public void setTranscriptionTypeTranslations(Set<TranscriptionTypeTranslation> transcriptionTypeTranslations) { this.transcriptionTypeTranslations = transcriptionTypeTranslations; } } \ No newline at end of file diff --git a/src/main/java/de/bitgilde/TIMAAT/model/exception/FeatureDisabledException.java b/src/main/java/de/bitgilde/TIMAAT/model/exception/FeatureDisabledException.java new file mode 100644 index 00000000..c9aa6723 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/model/exception/FeatureDisabledException.java @@ -0,0 +1,21 @@ +package de.bitgilde.TIMAAT.model.exception; + +/** + * This {@link RuntimeException} will be thrown when a feature is triggered which is currently + * disabled. + * + * @author Nico Kotlenga (nico@nko-dev.studio) + * @since 21.05.26 + */ +public class FeatureDisabledException extends RuntimeException { + private final String featureName; + + public FeatureDisabledException(String featureName) { + super("Feature " + featureName + " is not available"); + this.featureName = featureName; + } + + public String getFeatureName() { + return featureName; + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/notification/NotificationWebSocket.java b/src/main/java/de/bitgilde/TIMAAT/notification/NotificationWebSocket.java index ce3a76ba..25a48be2 100644 --- a/src/main/java/de/bitgilde/TIMAAT/notification/NotificationWebSocket.java +++ b/src/main/java/de/bitgilde/TIMAAT/notification/NotificationWebSocket.java @@ -12,7 +12,7 @@ import jakarta.websocket.Session; import jakarta.websocket.server.ServerEndpoint; -import java.security.Key; +import javax.crypto.SecretKey; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -151,8 +151,8 @@ public void onError(Throwable t) { private String validateRequestToken(String token) { String username = null; try { - Key key = TIMAATKeyGenerator.generateKey(); - username = Jwts.parserBuilder().setSigningKey(key).build().parseClaimsJws(token).getBody().getSubject(); + SecretKey key = TIMAATKeyGenerator.generateKey(); + username = Jwts.parser().decryptWith(key).build().parseSignedClaims(token).getPayload().getSubject(); } catch (JwtException e) { e.printStackTrace(); return null; diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java index c369d546..1e509fb2 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java @@ -99,6 +99,7 @@ import org.json.JSONObject; import org.jvnet.hk2.annotations.Service; +import javax.crypto.SecretKey; import javax.imageio.ImageIO; import javax.imageio.ImageReader; import javax.imageio.stream.FileImageInputStream; @@ -4463,8 +4464,8 @@ public static int validateFileToken(String token) throws Exception { // Check if the token was issued by the server and if it's not expired // Throw an Exception if the token is invalid - Key key = TIMAATKeyGenerator.generateKey(); - int mediumID = Jwts.parserBuilder().setSigningKey(key).build().parseClaimsJws(token).getBody() + SecretKey key = TIMAATKeyGenerator.generateKey(); + int mediumID = Jwts.parser().decryptWith(key).build().parseSignedClaims(token).getPayload() .get("file", Integer.class); return mediumID; diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/filter/AuthenticationFilter.java b/src/main/java/de/bitgilde/TIMAAT/rest/filter/AuthenticationFilter.java index ef8b3e87..f7255a90 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/filter/AuthenticationFilter.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/filter/AuthenticationFilter.java @@ -19,8 +19,8 @@ import jakarta.ws.rs.core.Response; import jakarta.ws.rs.ext.Provider; +import javax.crypto.SecretKey; import java.io.IOException; -import java.security.Key; /* Licensed under the Apache License, Version 2.0 (the "License"); @@ -146,10 +146,10 @@ public static String validateToken(String token) { if (token.equals("null") || token == null) return null; // Check if the token was issued by the server and if it's not expired // Throw an Exception if the token is invalid - Key key = TIMAATKeyGenerator.generateKey(); + SecretKey key = TIMAATKeyGenerator.generateKey(); String username = ""; try { - username = Jwts.parserBuilder().setSigningKey(key).build().parseClaimsJws(token).getBody().getSubject(); + username = Jwts.parser().decryptWith(key).build().parseSignedClaims(token).getPayload().getSubject(); } catch (JwtException e) { e.printStackTrace(); } catch (Exception e) { @@ -160,7 +160,7 @@ public static String validateToken(String token) { public static Boolean isTokenValid(String token) { try { - Jws<Claims> jws = Jwts.parserBuilder().setSigningKey(TIMAATKeyGenerator.generateKey()).build().parseClaimsJws(token); + Jws<Claims> jws = Jwts.parser().decryptWith(TIMAATKeyGenerator.generateKey()).build().parseSignedClaims(token); } catch (JwtException e) { e.printStackTrace(); return false; @@ -169,10 +169,10 @@ public static Boolean isTokenValid(String token) { } public static int getTokenClaimUserId(String token) { - Key key = TIMAATKeyGenerator.generateKey(); + SecretKey key = TIMAATKeyGenerator.generateKey(); Claims claims = null; try { - claims = Jwts.parserBuilder().setSigningKey(key).build().parseClaimsJws(token).getBody(); + claims = Jwts.parser().decryptWith(key).build().parseSignedClaims(token).getPayload(); } catch(InvalidClaimException ice) { ice.printStackTrace(); } diff --git a/src/main/java/de/bitgilde/TIMAAT/security/TIMAATKeyGenerator.java b/src/main/java/de/bitgilde/TIMAAT/security/TIMAATKeyGenerator.java index 05b11e3d..ba081f37 100644 --- a/src/main/java/de/bitgilde/TIMAAT/security/TIMAATKeyGenerator.java +++ b/src/main/java/de/bitgilde/TIMAAT/security/TIMAATKeyGenerator.java @@ -1,7 +1,6 @@ package de.bitgilde.TIMAAT.security; -import java.security.Key; - +import javax.crypto.SecretKey; import javax.crypto.spec.SecretKeySpec; /* @@ -26,8 +25,8 @@ public class TIMAATKeyGenerator { static final String keyString = "The secret TIMAAT key only known to us. - Yes, this has to be at least 64 Bytes."; - public static Key generateKey() { - Key key = new SecretKeySpec(keyString.getBytes(), 0, keyString.getBytes().length, "HmacSHA512"); + public static SecretKey generateKey() { + SecretKey key = new SecretKeySpec(keyString.getBytes(), 0, keyString.getBytes().length, "HmacSHA512"); return key; } } diff --git a/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java b/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java index 9fe76f7d..1888f06f 100644 --- a/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java @@ -1,5 +1,7 @@ package de.bitgilde.TIMAAT.service.transcription; +import de.bitgilde.TIMAAT.PropertyConstants; +import de.bitgilde.TIMAAT.PropertyManagement; import de.bitgilde.TIMAAT.model.FIPOP.Transcription; import de.bitgilde.TIMAAT.model.FIPOP.TranscriptionModel; import de.bitgilde.TIMAAT.service.task.TaskService; @@ -30,6 +32,12 @@ import studio.nkodev.stt.client.api.SpeechToTextEngineOutputFormat; import studio.nkodev.stt.client.api.SpeechToTextTaskState; import studio.nkodev.stt.client.api.SpeechToTextTaskStateConsumer; +import studio.nkodev.stt.client.config.SpeechToTextServiceClientAuthenticationConfigurationBuilder; +import studio.nkodev.stt.client.config.SpeechToTextServiceClientConfiguration; +import studio.nkodev.stt.client.config.SpeechToTextServiceClientConfigurationBuilder; +import studio.nkodev.stt.client.config.SpeechToTextTransferConfiguration; +import studio.nkodev.stt.client.config.SpeechToTextTransferConfigurationFactory; +import studio.nkodev.stt.client.config.SpeechToTextTransferType; import java.nio.file.Path; import java.util.Collection; @@ -61,30 +69,84 @@ public class TranscriptionService implements TaskStateUpdater, SpeechToTextTaskS private final TranscriptionFileStorage transcriptionFileStorage; @Inject - public TranscriptionService(TranscriptionStorage transcriptionStorage, SystemSettingStorage systemSettingStorage, AudioFileStorage audioFileStorage, VideoFileStorage videoFileStorage, TaskService taskService, SpeechToTextServiceClient speechToTextServiceClient, TemporaryFileStorage temporaryFileStorage, TranscriptionFileStorage transcriptionFileStorage) { + public TranscriptionService(TranscriptionStorage transcriptionStorage, SystemSettingStorage systemSettingStorage, AudioFileStorage audioFileStorage, VideoFileStorage videoFileStorage, TaskService taskService, TemporaryFileStorage temporaryFileStorage, TranscriptionFileStorage transcriptionFileStorage, PropertyManagement propertyManagement) { this.transcriptionStorage = transcriptionStorage; this.systemSettingStorage = systemSettingStorage; this.audioFileStorage = audioFileStorage; this.videoFileStorage = videoFileStorage; this.taskService = taskService; - this.speechToTextServiceClient = speechToTextServiceClient; this.temporaryFileStorage = temporaryFileStorage; this.transcriptionFileStorage = transcriptionFileStorage; + this.speechToTextServiceClient = initSpeechToTextServiceClient(propertyManagement); resumeMonitoringOfActiveTranscriptions(); verifyDefaultModelStillAvailable(); } + private SpeechToTextServiceClient initSpeechToTextServiceClient(PropertyManagement propertyManagement) { + logger.info("Initializing SpeechToTextServiceClient"); + + String sttHost = propertyManagement.getProp(PropertyConstants.SPEECH_TO_TEXT_HOST); + int sttPort = Integer.parseInt(propertyManagement.getProp(PropertyConstants.SPEECH_TO_TEXT_PORT)); + SpeechToTextTransferType transferType = SpeechToTextTransferType.valueOf( + propertyManagement.getProp(PropertyConstants.SPEECH_TO_TEXT_TRANSFER_TYPE)); + Path trustedServerCertificatePath = Path.of( + propertyManagement.getProp(PropertyConstants.SPEECH_TO_TEXT_TRUSTED_SERVER_CERTIFICATE_PATH)); + boolean authEnabled = Boolean.parseBoolean( + propertyManagement.getProp(PropertyConstants.SPEECH_TO_TEXT_AUTH_ENABLED)); + + + SpeechToTextTransferConfiguration audioFileTransferConfiguration; + SpeechToTextTransferConfiguration resultTransferConfiguration; + + if (SpeechToTextTransferType.STREAMING.equals(transferType)) { + audioFileTransferConfiguration = SpeechToTextTransferConfigurationFactory.streaming(); + resultTransferConfiguration = SpeechToTextTransferConfigurationFactory.streaming(); + } + else { + Path sharedAudio = Path.of( + propertyManagement.getProp(PropertyConstants.SPEECH_TO_TEXT_TRANSFER_SHARED_AUDIO_STORAGE_PATH)); + Path sharedResult = Path.of( + propertyManagement.getProp(PropertyConstants.SPEECH_TO_TEXT_TRANSFER_SHARED_RESULT_STORAGE_PATH)); + + audioFileTransferConfiguration = SpeechToTextTransferConfigurationFactory.sharedStorage(sharedAudio); + resultTransferConfiguration = SpeechToTextTransferConfigurationFactory.sharedStorage(sharedResult); + } + + SpeechToTextServiceClientConfigurationBuilder configurationBuilder = new SpeechToTextServiceClientConfigurationBuilder( + sttHost, sttPort, trustedServerCertificatePath, audioFileTransferConfiguration, + resultTransferConfiguration); + + if (authEnabled) { + logger.log(Level.INFO, "Initialize SpeechToTextServiceClient with authentication"); + + Path authCertificatePath = Path.of( + propertyManagement.getProp(PropertyConstants.SPEECH_TO_TEXT_AUTH_CERTIFICATE_PATH)); + Path authPrivateKeyPath = Path.of( + propertyManagement.getProp(PropertyConstants.SPEECH_TO_TEXT_AUTH_PRIVATE_KEY_PATH)); + + SpeechToTextServiceClientAuthenticationConfigurationBuilder authenticationConfigurationBuilder = new SpeechToTextServiceClientAuthenticationConfigurationBuilder( + authCertificatePath, authPrivateKeyPath); + String authPrivateKeyPassword = propertyManagement.getProp( + PropertyConstants.SPEECH_TO_TEXT_AUTH_PRIVATE_KEY_PASSWORD); + if (authPrivateKeyPassword != null && !authPrivateKeyPassword.isEmpty()) { + authenticationConfigurationBuilder.privateKeyPassword(authPrivateKeyPassword); + } + + configurationBuilder.authenticationConfiguration(authenticationConfigurationBuilder.build()); + } + + SpeechToTextServiceClientConfiguration configuration = configurationBuilder.build(); + return new SpeechToTextServiceClient(configuration); + } + /** * @return the engines (with their models) currently offered by the connected speech-to-text-service */ public Collection<TranscriptionEngineCapabilities> getAvailableEngineCapabilities() { return speechToTextServiceClient.getAvailableEngines().stream() - .map(engine -> new TranscriptionEngineCapabilities( - engine.engineIdentifier(), - engine.engineName(), - List.copyOf(engine.modelIdentifiers()))) - .toList(); + .map(engine -> new TranscriptionEngineCapabilities(engine.engineIdentifier(), + engine.engineName(), List.copyOf(engine.modelIdentifiers()))).toList(); } public void createTranscription(GenerateTranscriptionConfiguration generateTranscriptionConfiguration) { @@ -128,14 +190,14 @@ public void createTranscription(GenerateTranscriptionConfiguration generateTrans private SpeechToTextEngine validateAndUpsertEngineModel(String engineIdentifier, String modelIdentifier) { SpeechToTextEngine engine = speechToTextServiceClient.getAvailableEngines().stream() - .filter(candidate -> candidate.engineIdentifier().equals(engineIdentifier)) - .findFirst() - .orElseThrow(() -> new IllegalArgumentException( - "Engine '" + engineIdentifier + "' is not provided by the connected speech-to-text-service")); + .filter(candidate -> candidate.engineIdentifier() + .equals(engineIdentifier)) + .findFirst().orElseThrow(() -> new IllegalArgumentException( + "Engine '" + engineIdentifier + "' is not provided by the connected speech-to-text-service")); if (!engine.modelIdentifiers().contains(modelIdentifier)) { throw new IllegalArgumentException( - "Model '" + modelIdentifier + "' is not provided by engine '" + engineIdentifier + "'"); + "Model '" + modelIdentifier + "' is not provided by engine '" + engineIdentifier + "'"); } transcriptionStorage.upsertEngine(engineIdentifier, engine.engineName()); @@ -145,7 +207,8 @@ private SpeechToTextEngine validateAndUpsertEngineModel(String engineIdentifier, } private void startTranscriptionTask(int transcriptionId, Path monoFile, String engineIdentifier, String modelIdentifier) { - long sttTaskId = speechToTextServiceClient.startSpeechToTextTask(monoFile, engineIdentifier, modelIdentifier, engineOutputFormat); + long sttTaskId = speechToTextServiceClient.startSpeechToTextTask(monoFile, engineIdentifier, modelIdentifier, + engineOutputFormat); transcriptionStorage.updateTranscriptionTaskId(transcriptionId, sttTaskId); speechToTextServiceClient.observeTask(sttTaskId, this); } @@ -170,27 +233,33 @@ public void updateTranscriptionMediumPreparationTaskState(TranscriptionMediumPre case DONE -> TranscriptionState.PENDING; }; - Collection<Transcription> transcriptions = transcriptionStorage.updateTranscriptionsStateOfPreparationTask(transcriptionMediumPreparationTask.getMediumId(), - transcriptionState); + Collection<Transcription> transcriptions = transcriptionStorage.updateTranscriptionsStateOfPreparationTask( + transcriptionMediumPreparationTask.getMediumId(), transcriptionState); - if(TranscriptionState.PENDING.equals(transcriptionState)) { - SupportedMediumType supportedMediumType = transcriptionStorage.determineSupportedMediumType(transcriptionMediumPreparationTask.getMediumId()); + if (TranscriptionState.PENDING.equals(transcriptionState)) { + SupportedMediumType supportedMediumType = transcriptionStorage.determineSupportedMediumType( + transcriptionMediumPreparationTask.getMediumId()); AudioContainingMediumFileStorage audioContainingMediumFileStorage = getFileStorage(supportedMediumType); - Optional<Path> monoAudioFile = audioContainingMediumFileStorage.getPathToAudioMonoFile(transcriptionMediumPreparationTask.getMediumId()); + Optional<Path> monoAudioFile = audioContainingMediumFileStorage.getPathToAudioMonoFile( + transcriptionMediumPreparationTask.getMediumId()); - if(monoAudioFile.isPresent()){ - for(Transcription transcription : transcriptions){ - try{ + if (monoAudioFile.isPresent()) { + for (Transcription transcription : transcriptions) { + try { String engineIdentifier = transcription.getTranscriptionModel().getId().getEngineIdentifier(); String modelIdentifier = transcription.getTranscriptionModel().getId().getModelIdentifier(); startTranscriptionTask(transcription.getId(), monoAudioFile.get(), engineIdentifier, modelIdentifier); - }catch (Exception e){ - logger.log(Level.SEVERE, "Error while creating transcription task for transcription {0}. Reason: {1}", new Object[]{transcription.getId(), e}); + } catch (Exception e) { + logger.log(Level.SEVERE, "Error while creating transcription task for transcription {0}. Reason: {1}", + new Object[]{transcription.getId(), e}); } } - }else { - logger.log(Level.SEVERE, "No mono audio file found for medium {0}. Cannot start transcription task", transcriptionMediumPreparationTask.getMediumId()); - transcriptions.forEach(transcription -> transcriptionStorage.updateTranscriptionState(transcription.getId(), TranscriptionState.FAILED)); + } + else { + logger.log(Level.SEVERE, "No mono audio file found for medium {0}. Cannot start transcription task", + transcriptionMediumPreparationTask.getMediumId()); + transcriptions.forEach(transcription -> transcriptionStorage.updateTranscriptionState(transcription.getId(), + TranscriptionState.FAILED)); } } } @@ -214,13 +283,14 @@ private void verifyDefaultModelStillAvailable() { String modelIdentifier = defaultModel.get().getId().getModelIdentifier(); boolean stillAvailable = speechToTextServiceClient.getAvailableEngines().stream() - .filter(engine -> engine.engineIdentifier().equals(engineIdentifier)) - .anyMatch(engine -> engine.modelIdentifiers().contains(modelIdentifier)); + .filter(engine -> engine.engineIdentifier() + .equals(engineIdentifier)).anyMatch( + engine -> engine.modelIdentifiers().contains(modelIdentifier)); if (!stillAvailable) { logger.log(Level.WARNING, - "Default transcription model {0}/{1} is no longer provided by the speech-to-text-service. Clearing default.", - new Object[]{engineIdentifier, modelIdentifier}); + "Default transcription model {0}/{1} is no longer provided by the speech-to-text-service. Clearing default.", + new Object[]{engineIdentifier, modelIdentifier}); systemSettingStorage.clearDefaultTranscriptionModel(); } } catch (Exception e) { @@ -240,8 +310,7 @@ private void resumeMonitoringOfActiveTranscriptions() { else { logger.log(Level.WARNING, "Found pending transcription without task id. Transcription id: {0}", transcription.getId()); - transcriptionStorage.updateTranscriptionState(transcription.getId(), - TranscriptionState.FAILED); + transcriptionStorage.updateTranscriptionState(transcription.getId(), TranscriptionState.FAILED); } }); } diff --git a/src/main/java/de/bitgilde/TIMAAT/service/transcription/api/TranscriptionEngineCapabilities.java b/src/main/java/de/bitgilde/TIMAAT/service/transcription/api/TranscriptionEngineCapabilities.java new file mode 100644 index 00000000..e1c43c51 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/service/transcription/api/TranscriptionEngineCapabilities.java @@ -0,0 +1,15 @@ +package de.bitgilde.TIMAAT.service.transcription.api; + +import java.util.Collection; + +/** + * Snapshot of an engine currently offered by the connected speech-to-text-service together with the + * model identifiers it provides. + * + * @author Nico Kotlenga (nico@nko-dev.studio) + * @since 16.05.26 + */ +public record TranscriptionEngineCapabilities( + String engineIdentifier, + String engineName, + Collection<String> modelIdentifiers) {} diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index d6d7b635..4ff9e943 100644 --- a/src/main/resources/META-INF/persistence.xml +++ b/src/main/resources/META-INF/persistence.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE xml> -<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="3.0" - xsi:schemalocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd"> +<persistence xmlns="https://jakarta.ee/xml/ns/persistence" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" + version="3.0"> <persistence-unit name="FIPOP-JPA" transaction-type="RESOURCE_LOCAL"> <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider> <jta-data-source>java:/FIPOP</jta-data-source> diff --git a/src/main/resources/timaat-default.properties b/src/main/resources/timaat-default.properties index bc6aa969..71afa6b0 100644 --- a/src/main/resources/timaat-default.properties +++ b/src/main/resources/timaat-default.properties @@ -11,39 +11,49 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - # This file contains the system-specific properties for your TIMAAT installation. - # Path to directory where binaries are stored. -storage.location = /opt/timaat/files/ # Linux +storage.location=/opt/timaat/files/ # Linux # storage.location = c:\\fipop\\files\\ # Windows - -storage.temp.location = /tmp/timaat - +storage.temp.location=/tmp/timaat #name="jakarta.persistence.jdbc.driver" value="com.mysql.cj.jdbc.Driver" -database.driver = com.mysql.cj.jdbc.Driver - +database.driver=com.mysql.cj.jdbc.Driver # name="jakarta.persistence.jdbc.url" -database.url = jdbc:mysql://localhost:3306/FIPOP?useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&useUnicode=yes&characterEncoding=UTF-8&maxIdleTime=180&useMysqlMetadata=true - +database.url=jdbc:mysql://localhost:3306/FIPOP?useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&useUnicode=yes&characterEncoding=UTF-8&maxIdleTime=180&useMysqlMetadata=true #name="jakarta.persistence.jdbc.user" value="root" -database.user = root - +database.user=root #name="jakarta.persistence.jdbc.password" value="geheim123" -database.password = geheim123 - +database.password=geheim123 # Path to FFMPEG dir -app.ffmpeg.location = /usr/bin/ # Linux +app.ffmpeg.location=/usr/bin/ # Linux # app.ffmpeg.location = c:\\ffmpeg\\bin\\ # Windows - # Path to ImageMagick dir -app.imagemagick.location = /usr/bin/ - +app.imagemagick.location=/usr/bin/ # Maximum amount of threads which will be spanned to run tasks -app.task.coreParallelCount = 2 - +app.task.coreParallelCount=2 # Count of thread which are always ready for task execution -app.task.maxParallelCount = 4 - +app.task.maxParallelCount=4 # Maximum queue size of async tasks -app.task.queueSize = 1000 \ No newline at end of file +app.task.queueSize=1000 +# Switch to activate or deactivate speech to text capabilities +stt.enabled=false +# Host on which the speech-to-text-service is currently running +stt.host=127.0.0.1 +# Host port on which the speech-to-text-service currently binded +stt.port=8080 +# Path to trusted certificate of the connection to the speech-to-text-service +stt.trustedServerCertificatePath=path/to/trusted/server/certificate/path +# Type of transfer to exchange audio and result files. Can be STREAMING or SHARED_STORAGE +stt.transfer.type=STREAMING +# Defines the shared storage location used for audio files on transfer type SHARED_STORAGE +stt.transfer.sharedAudioStoragePath=path/to/shared/audio/storage +# Defines the shared storage location used for results on transfer type SHARED_STORAGE +stt.transfer.sharedResultStoragePath=path/to/shared/result/storage +# Defines whether a certificate authentication is performed when connection to speech-to-text-service +stt.auth.enabled=false +# Path of the certificate used when certificate authentication is enabled +stt.auth.certificatePath=path/to/auth/certificate +# Path of the private key used when certificate authentication is enabled +stt.auth.privateKeyPath=path/to/private/key +# Optional private key pasword +stt.auth.privateKeyPassword=password \ No newline at end of file From 449b1a553bdbdcaa8c9dbce78a271024a8ffe5d7 Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Thu, 21 May 2026 13:21:47 +0200 Subject: [PATCH 57/70] TIMAAT #57 - Fixed circular dependency error --- .../service/transcription/TranscriptionService.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java b/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java index 1888f06f..674468f7 100644 --- a/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java @@ -27,6 +27,7 @@ import de.bitgilde.TIMAAT.storage.file.TranscriptionFileStorage; import de.bitgilde.TIMAAT.storage.file.VideoFileStorage; import jakarta.inject.Inject; +import jakarta.inject.Provider; import studio.nkodev.stt.client.SpeechToTextServiceClient; import studio.nkodev.stt.client.api.SpeechToTextEngine; import studio.nkodev.stt.client.api.SpeechToTextEngineOutputFormat; @@ -63,18 +64,18 @@ public class TranscriptionService implements TaskStateUpdater, SpeechToTextTaskS private final SystemSettingStorage systemSettingStorage; private final AudioFileStorage audioFileStorage; private final VideoFileStorage videoFileStorage; - private final TaskService taskService; + private final Provider<TaskService> taskServiceProvider; private final SpeechToTextServiceClient speechToTextServiceClient; private final TemporaryFileStorage temporaryFileStorage; private final TranscriptionFileStorage transcriptionFileStorage; @Inject - public TranscriptionService(TranscriptionStorage transcriptionStorage, SystemSettingStorage systemSettingStorage, AudioFileStorage audioFileStorage, VideoFileStorage videoFileStorage, TaskService taskService, TemporaryFileStorage temporaryFileStorage, TranscriptionFileStorage transcriptionFileStorage, PropertyManagement propertyManagement) { + public TranscriptionService(TranscriptionStorage transcriptionStorage, SystemSettingStorage systemSettingStorage, AudioFileStorage audioFileStorage, VideoFileStorage videoFileStorage, Provider<TaskService> taskServiceProvider, TemporaryFileStorage temporaryFileStorage, TranscriptionFileStorage transcriptionFileStorage, PropertyManagement propertyManagement) { this.transcriptionStorage = transcriptionStorage; this.systemSettingStorage = systemSettingStorage; this.audioFileStorage = audioFileStorage; this.videoFileStorage = videoFileStorage; - this.taskService = taskService; + this.taskServiceProvider = taskServiceProvider; this.temporaryFileStorage = temporaryFileStorage; this.transcriptionFileStorage = transcriptionFileStorage; @@ -83,6 +84,7 @@ public TranscriptionService(TranscriptionStorage transcriptionStorage, SystemSet verifyDefaultModelStillAvailable(); } + private SpeechToTextServiceClient initSpeechToTextServiceClient(PropertyManagement propertyManagement) { logger.info("Initializing SpeechToTextServiceClient"); @@ -175,7 +177,7 @@ public void createTranscription(GenerateTranscriptionConfiguration generateTrans mediumId); createdTranscription = transcriptionStorage.createTranscription(mediumId, engineIdentifier, modelIdentifier, TranscriptionState.WAITING_FOR_PREPARATION); - taskService.executeTranscriptionMediumPreparationTask(mediumId, supportedMediumType); + taskServiceProvider.get().executeTranscriptionMediumPreparationTask(mediumId, supportedMediumType); } } catch (Exception e) { logger.log(Level.SEVERE, "Error while creating transcription for medium {0}. Reason: {1}", From 1f7acbb70627119c3a53801de9ea7a84f5122b05 Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Thu, 21 May 2026 15:13:58 +0200 Subject: [PATCH 58/70] TIMAAT #57 - Improved transcription creation flow - Introduced TranscriptionServiceException so createTranscription no longer leaks TaskServiceException to its callers - Persist transcription as the medium's default if no default is set yet (new MediumStorage.setDefaultTranscriptionIfAbsent) - Mark transcription as COMPLETED after the speech-to-text task finishes and the result file is persisted --- .../transcription/TranscriptionService.java | 39 +++++++++++++++++-- .../storage/entity/medium/MediumStorage.java | 26 +++++++++++++ 2 files changed, 62 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java b/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java index 674468f7..0782d72e 100644 --- a/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java @@ -13,9 +13,11 @@ import de.bitgilde.TIMAAT.service.task.storage.TaskStateUpdater; import de.bitgilde.TIMAAT.service.transcription.api.GenerateTranscriptionConfiguration; import de.bitgilde.TIMAAT.service.transcription.api.TranscriptionEngineCapabilities; +import de.bitgilde.TIMAAT.service.transcription.exception.TranscriptionServiceException; import de.bitgilde.TIMAAT.storage.api.PagingParameter; import de.bitgilde.TIMAAT.storage.api.SortingParameter; import de.bitgilde.TIMAAT.storage.entity.SystemSettingStorage; +import de.bitgilde.TIMAAT.storage.entity.medium.MediumStorage; import de.bitgilde.TIMAAT.storage.entity.transcription.TranscriptionStorage; import de.bitgilde.TIMAAT.storage.entity.transcription.api.TranscriptionFilterCriteria; import de.bitgilde.TIMAAT.storage.entity.transcription.api.TranscriptionState; @@ -68,9 +70,10 @@ public class TranscriptionService implements TaskStateUpdater, SpeechToTextTaskS private final SpeechToTextServiceClient speechToTextServiceClient; private final TemporaryFileStorage temporaryFileStorage; private final TranscriptionFileStorage transcriptionFileStorage; + private final MediumStorage mediumStorage; @Inject - public TranscriptionService(TranscriptionStorage transcriptionStorage, SystemSettingStorage systemSettingStorage, AudioFileStorage audioFileStorage, VideoFileStorage videoFileStorage, Provider<TaskService> taskServiceProvider, TemporaryFileStorage temporaryFileStorage, TranscriptionFileStorage transcriptionFileStorage, PropertyManagement propertyManagement) { + public TranscriptionService(TranscriptionStorage transcriptionStorage, SystemSettingStorage systemSettingStorage, AudioFileStorage audioFileStorage, VideoFileStorage videoFileStorage, Provider<TaskService> taskServiceProvider, TemporaryFileStorage temporaryFileStorage, TranscriptionFileStorage transcriptionFileStorage, MediumStorage mediumStorage, PropertyManagement propertyManagement) { this.transcriptionStorage = transcriptionStorage; this.systemSettingStorage = systemSettingStorage; this.audioFileStorage = audioFileStorage; @@ -78,6 +81,7 @@ public TranscriptionService(TranscriptionStorage transcriptionStorage, SystemSet this.taskServiceProvider = taskServiceProvider; this.temporaryFileStorage = temporaryFileStorage; this.transcriptionFileStorage = transcriptionFileStorage; + this.mediumStorage = mediumStorage; this.speechToTextServiceClient = initSpeechToTextServiceClient(propertyManagement); resumeMonitoringOfActiveTranscriptions(); @@ -151,12 +155,24 @@ public Collection<TranscriptionEngineCapabilities> getAvailableEngineCapabilitie engine.engineName(), List.copyOf(engine.modelIdentifiers()))).toList(); } - public void createTranscription(GenerateTranscriptionConfiguration generateTranscriptionConfiguration) { + /** + * Creates a new transcription for the medium described by the given configuration. If the medium is already prepared + * (i.e. a mono audio file exists), a speech-to-text task is started immediately. Otherwise the transcription is + * persisted in {@link TranscriptionState#WAITING_FOR_PREPARATION} and a preparation task is scheduled; the + * speech-to-text task is then started once preparation completes. + * + * @param generateTranscriptionConfiguration configuration describing the medium and the engine/model to use + * @throws IllegalArgumentException if the requested engine is not offered by the connected speech-to-text-service + * or the requested model is not provided by that engine + * @throws TranscriptionServiceException if the transcription could not be created (e.g. underlying task scheduling + * or storage access failed) + */ + public void createTranscription(GenerateTranscriptionConfiguration generateTranscriptionConfiguration) throws TranscriptionServiceException { int mediumId = generateTranscriptionConfiguration.mediumId(); String engineIdentifier = generateTranscriptionConfiguration.engineIdentifier(); String modelIdentifier = generateTranscriptionConfiguration.modelIdentifier(); - SpeechToTextEngine engine = validateAndUpsertEngineModel(engineIdentifier, modelIdentifier); + validateAndUpsertEngineModel(engineIdentifier, modelIdentifier); SupportedMediumType supportedMediumType = transcriptionStorage.determineSupportedMediumType(mediumId); AudioContainingMediumFileStorage fileStorage = getFileStorage(supportedMediumType); @@ -186,8 +202,24 @@ public void createTranscription(GenerateTranscriptionConfiguration generateTrans transcriptionStorage.updateTranscriptionState(createdTranscription.getId(), TranscriptionState.FAILED); } verifyDefaultModelStillAvailable(); + throw new TranscriptionServiceException("Failed to create transcription for medium " + mediumId, e); } + trySetTranscriptionAsDefaultOfMedium(mediumId, createdTranscription.getId()); + } + private void trySetTranscriptionAsDefaultOfMedium(int mediumId, int transcriptionId) { + try { + boolean updated = mediumStorage.setDefaultTranscriptionIfAbsent(mediumId, transcriptionId); + if (updated) { + logger.log(Level.FINE, "Set transcription {0} as default for medium {1}", + new Object[]{transcriptionId, mediumId}); + } + } catch (Exception e) { + logger.log(Level.WARNING, + "Could not set transcription {0} as default for medium {1}; transcription creation will not be failed", + new Object[]{transcriptionId, mediumId}); + logger.log(Level.WARNING, "Reason", e); + } } private SpeechToTextEngine validateAndUpsertEngineModel(String engineIdentifier, String modelIdentifier) { @@ -335,6 +367,7 @@ private void handleSpeechToTextTaskCompleted(long taskId) { speechToTextServiceClient.saveResultsOfTask(taskId, temporaryFile.getTemporaryFilePath()); transcriptionFileStorage.persistTranscription(temporaryFile.getTemporaryFilePath(), relatedTranscriptionId.get()); + transcriptionStorage.updateTranscriptionState(relatedTranscriptionId.get(), TranscriptionState.COMPLETED); } catch (Exception e) { logger.log(Level.SEVERE, "Error while handling speech to text task completion", e); transcriptionStorage.updateTranscriptionState(relatedTranscriptionId.get(), TranscriptionState.FAILED); diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/MediumStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/MediumStorage.java index dfd20304..1c236b87 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/MediumStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/MediumStorage.java @@ -12,6 +12,7 @@ import de.bitgilde.TIMAAT.model.FIPOP.Medium_; import de.bitgilde.TIMAAT.model.FIPOP.Music; import de.bitgilde.TIMAAT.model.FIPOP.Title_; +import de.bitgilde.TIMAAT.model.FIPOP.Transcription; import de.bitgilde.TIMAAT.model.FIPOP.UserAccount; import de.bitgilde.TIMAAT.model.TimeRange; import de.bitgilde.TIMAAT.storage.db.DbStorage; @@ -61,6 +62,31 @@ public MediumStorage(EntityManagerFactory emf) { super(Medium.class, MediumSortingField.ID, emf); } + /** + * Sets the given {@link Transcription} as the default transcription of the medium identified by + * {@code mediumId}, but only if the medium currently has no default transcription assigned. The + * update is performed atomically as a single conditional {@code UPDATE} statement. + * + * @param mediumId identifies the {@link Medium} whose default transcription should be set + * @param transcriptionId identifies the {@link Transcription} to set as default + * @return {@code true} if this call set the default transcription, {@code false} if a default + * was already present or no matching medium exists + */ + public boolean setDefaultTranscriptionIfAbsent(int mediumId, int transcriptionId) { + logger.log(Level.FINE, "Setting transcription {0} as default for medium {1} if no default is present", + new Object[]{transcriptionId, mediumId}); + return executeDbTransaction(entityManager -> { + Transcription transcription = entityManager.getReference(Transcription.class, transcriptionId); + int updated = entityManager.createQuery( + "UPDATE Medium m SET m.defaultTranscription = :transcription " + + "WHERE m.id = :mediumId AND m.defaultTranscription IS NULL") + .setParameter("transcription", transcription) + .setParameter("mediumId", mediumId) + .executeUpdate(); + return updated == 1; + }); + } + public List<MediumHasMusic> updateMediumHasMusicList(int mediumId, Map<Integer, Collection<TimeRange>> timeRangesByMusicId) { logger.log(Level.FINE, "Updating medium has music list of medium with id " + mediumId); return executeDbTransaction(entityManager -> { From cd80334b9f26ce96cdbc7ec06398c0820104b3f9 Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Sun, 24 May 2026 10:05:49 +0200 Subject: [PATCH 59/70] TIMAAT #57 - Implemented deletion of transcriptions * Implemented workflow to delete a transcription * If the transcription is used as default transcription of a medium, the default will be changed to the latest created one --- .../transcription/TranscriptionService.java | 50 ++++- .../storage/entity/medium/MediumStorage.java | 29 +++ .../transcription/TranscriptionStorage.java | 42 ++++ .../file/TranscriptionFileStorage.java | 14 ++ .../TranscriptionServiceDeleteTest.java | 198 ++++++++++++++++++ 5 files changed, 331 insertions(+), 2 deletions(-) create mode 100644 src/test/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionServiceDeleteTest.java diff --git a/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java b/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java index 0782d72e..d534ea20 100644 --- a/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java @@ -13,6 +13,7 @@ import de.bitgilde.TIMAAT.service.task.storage.TaskStateUpdater; import de.bitgilde.TIMAAT.service.transcription.api.GenerateTranscriptionConfiguration; import de.bitgilde.TIMAAT.service.transcription.api.TranscriptionEngineCapabilities; +import de.bitgilde.TIMAAT.service.transcription.exception.TranscriptionNotFoundException; import de.bitgilde.TIMAAT.service.transcription.exception.TranscriptionServiceException; import de.bitgilde.TIMAAT.storage.api.PagingParameter; import de.bitgilde.TIMAAT.storage.api.SortingParameter; @@ -74,6 +75,12 @@ public class TranscriptionService implements TaskStateUpdater, SpeechToTextTaskS @Inject public TranscriptionService(TranscriptionStorage transcriptionStorage, SystemSettingStorage systemSettingStorage, AudioFileStorage audioFileStorage, VideoFileStorage videoFileStorage, Provider<TaskService> taskServiceProvider, TemporaryFileStorage temporaryFileStorage, TranscriptionFileStorage transcriptionFileStorage, MediumStorage mediumStorage, PropertyManagement propertyManagement) { + this(transcriptionStorage, systemSettingStorage, audioFileStorage, videoFileStorage, taskServiceProvider, + temporaryFileStorage, transcriptionFileStorage, mediumStorage, + initSpeechToTextServiceClient(propertyManagement)); + } + + TranscriptionService(TranscriptionStorage transcriptionStorage, SystemSettingStorage systemSettingStorage, AudioFileStorage audioFileStorage, VideoFileStorage videoFileStorage, Provider<TaskService> taskServiceProvider, TemporaryFileStorage temporaryFileStorage, TranscriptionFileStorage transcriptionFileStorage, MediumStorage mediumStorage, SpeechToTextServiceClient speechToTextServiceClient) { this.transcriptionStorage = transcriptionStorage; this.systemSettingStorage = systemSettingStorage; this.audioFileStorage = audioFileStorage; @@ -82,14 +89,14 @@ public TranscriptionService(TranscriptionStorage transcriptionStorage, SystemSet this.temporaryFileStorage = temporaryFileStorage; this.transcriptionFileStorage = transcriptionFileStorage; this.mediumStorage = mediumStorage; + this.speechToTextServiceClient = speechToTextServiceClient; - this.speechToTextServiceClient = initSpeechToTextServiceClient(propertyManagement); resumeMonitoringOfActiveTranscriptions(); verifyDefaultModelStillAvailable(); } - private SpeechToTextServiceClient initSpeechToTextServiceClient(PropertyManagement propertyManagement) { + private static SpeechToTextServiceClient initSpeechToTextServiceClient(PropertyManagement propertyManagement) { logger.info("Initializing SpeechToTextServiceClient"); String sttHost = propertyManagement.getProp(PropertyConstants.SPEECH_TO_TEXT_HOST); @@ -207,6 +214,45 @@ public void createTranscription(GenerateTranscriptionConfiguration generateTrans trySetTranscriptionAsDefaultOfMedium(mediumId, createdTranscription.getId()); } + /** + * Removes the transcription identified by {@code transcriptionId}. Before removal, the + * transcription's medium is checked: if it still references this transcription as its default, + * the default is replaced with the most recently created remaining transcription of the same + * medium, or cleared if none remain. The on-disk transcription file is removed only after the + * database row has been deleted successfully. + * + * @param transcriptionId identifies the transcription to remove + * @throws TranscriptionNotFoundException if no transcription with the given id exists + * @throws TranscriptionServiceException if the deletion failed for any other reason + */ + public void deleteTranscription(int transcriptionId) throws TranscriptionServiceException { + Transcription transcription = transcriptionStorage.findById(transcriptionId).orElseThrow( + () -> new TranscriptionNotFoundException(transcriptionId)); + int mediumId = transcription.getMedium().getId(); + + try { + reassignDefaultTranscriptionIfReferenced(mediumId, transcriptionId); + transcriptionStorage.deleteTranscription(transcriptionId); + } catch (Exception e) { + logger.log(Level.SEVERE, "Failed to delete transcription " + transcriptionId + " from database", e); + throw new TranscriptionServiceException("Failed to delete transcription " + transcriptionId, e); + } + + try { + transcriptionFileStorage.deleteTranscription(transcriptionId); + } catch (Exception e) { + logger.log(Level.SEVERE, "Failed to delete transcription file for transcription " + transcriptionId, e); + throw new TranscriptionServiceException( + "Failed to delete transcription file for transcription " + transcriptionId, e); + } + } + + private void reassignDefaultTranscriptionIfReferenced(int mediumId, int transcriptionId) { + Integer newDefaultId = transcriptionStorage.findLatestOtherTranscriptionForMedium(mediumId, transcriptionId) + .map(Transcription::getId).orElse(null); + mediumStorage.replaceDefaultTranscription(mediumId, transcriptionId, newDefaultId); + } + private void trySetTranscriptionAsDefaultOfMedium(int mediumId, int transcriptionId) { try { boolean updated = mediumStorage.setDefaultTranscriptionIfAbsent(mediumId, transcriptionId); diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/MediumStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/MediumStorage.java index 1c236b87..f9d6c0f3 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/MediumStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/MediumStorage.java @@ -18,6 +18,7 @@ import de.bitgilde.TIMAAT.storage.db.DbStorage; import de.bitgilde.TIMAAT.storage.entity.medium.api.MediumFilterCriteria; import de.bitgilde.TIMAAT.storage.entity.medium.api.MediumSortingField; +import jakarta.annotation.Nullable; import jakarta.inject.Inject; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.criteria.CriteriaBuilder; @@ -87,6 +88,34 @@ public boolean setDefaultTranscriptionIfAbsent(int mediumId, int transcriptionId }); } + /** + * Atomically replaces the default transcription of the given medium if its current default + * transcription matches {@code currentDefaultTranscriptionId}. If the medium currently has a + * different (or no) default transcription, the call is a no-op. + * + * @param mediumId identifies the {@link Medium} to update + * @param currentDefaultTranscriptionId identifies the {@link Transcription} the medium is + * expected to currently reference as default + * @param newDefaultTranscriptionId identifies the {@link Transcription} to set as the new + * default; {@code null} clears the default + * @return {@code true} if the default transcription was replaced, {@code false} otherwise + */ + public boolean replaceDefaultTranscription(int mediumId, int currentDefaultTranscriptionId, @Nullable Integer newDefaultTranscriptionId) { + logger.log(Level.FINE, + "Replacing default transcription of medium {0} from transcription {1} to transcription {2}", + new Object[]{mediumId, currentDefaultTranscriptionId, newDefaultTranscriptionId}); + return executeDbTransaction(entityManager -> { + Transcription newDefault = newDefaultTranscriptionId == null ? null : entityManager.getReference( + Transcription.class, newDefaultTranscriptionId); + int updated = entityManager.createQuery( + "UPDATE Medium m SET m.defaultTranscription = :newDefault " + + "WHERE m.id = :mediumId AND m.defaultTranscription.id = :currentDefaultId") + .setParameter("newDefault", newDefault).setParameter("mediumId", mediumId) + .setParameter("currentDefaultId", currentDefaultTranscriptionId).executeUpdate(); + return updated == 1; + }); + } + public List<MediumHasMusic> updateMediumHasMusicList(int mediumId, Map<Integer, Collection<TimeRange>> timeRangesByMusicId) { logger.log(Level.FINE, "Updating medium has music list of medium with id " + mediumId); return executeDbTransaction(entityManager -> { diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/TranscriptionStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/TranscriptionStorage.java index 6ccf618f..69e83bb0 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/TranscriptionStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/TranscriptionStorage.java @@ -154,6 +154,48 @@ public Transcription createTranscription(int mediumId, String engineIdentifier, }); } + /** + * Looks up a single {@link Transcription} by its primary key. + * + * @param transcriptionId identifies the {@link Transcription} to load + * @return the matching {@link Transcription} or {@link Optional#empty()} if none exists + */ + public Optional<Transcription> findById(int transcriptionId) { + return executeDbTransaction(entityManager -> Optional.ofNullable(entityManager.find(Transcription.class, transcriptionId))); + } + + /** + * Removes the {@link Transcription} identified by {@code transcriptionId} from the database. + * + * @param transcriptionId identifies the {@link Transcription} to remove + * @return {@code true} if a row was removed, {@code false} if no row matched + */ + public boolean deleteTranscription(int transcriptionId) { + return executeDbTransaction(entityManager -> { + int affected = entityManager.createQuery("delete from Transcription transcription where transcription.id = :id") + .setParameter("id", transcriptionId).executeUpdate(); + return affected > 0; + }); + } + + /** + * Finds the most recently created {@link Transcription} for the given medium, excluding the + * transcription identified by {@code excludeTranscriptionId}. The "latest" transcription is the + * one with the greatest {@code createdAt} timestamp. + * + * @param mediumId identifies the {@link de.bitgilde.TIMAAT.model.FIPOP.Medium} + * @param excludeTranscriptionId identifies the {@link Transcription} which must not be returned + * @return the latest other {@link Transcription} or {@link Optional#empty()} if none exists + */ + public Optional<Transcription> findLatestOtherTranscriptionForMedium(int mediumId, int excludeTranscriptionId) { + return executeDbTransaction(entityManager -> entityManager.createQuery( + "select transcription from Transcription transcription " + + "where transcription.medium.id = :mediumId and transcription.id <> :excludeId " + + "order by transcription.createdAt desc", Transcription.class) + .setParameter("mediumId", mediumId).setParameter("excludeId", excludeTranscriptionId).setMaxResults(1) + .getResultStream().findFirst()); + } + public Optional<Integer> getTranscriptionIdRelatedToTranscriptionTask(long transcriptionTaskId) { return executeDbTransaction(entityManager -> { try { diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/file/TranscriptionFileStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/file/TranscriptionFileStorage.java index 73cf863c..bc8df0ec 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/file/TranscriptionFileStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/file/TranscriptionFileStorage.java @@ -52,6 +52,20 @@ public Optional<Path> getPathToTranscription(int transcriptionId) { return Optional.empty(); } + /** + * Removes the transcription file backing the given {@code transcriptionId}. Missing files are + * tolerated; only IO-level failures propagate. + * + * @param transcriptionId identifies the transcription whose file should be removed + * @return {@code true} if a file was removed, {@code false} if none existed + * @throws IOException if the file exists but could not be removed + */ + public boolean deleteTranscription(int transcriptionId) throws IOException { + logger.log(Level.FINE, "Deleting transcription file having id {0}", transcriptionId); + Path transcriptionFilePath = createTranscriptionPath(transcriptionId); + return Files.deleteIfExists(transcriptionFilePath); + } + private Path createTranscriptionPath(int transcriptionId) { return transcriptionStoragePath.resolve(transcriptionId + ".srt"); } diff --git a/src/test/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionServiceDeleteTest.java b/src/test/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionServiceDeleteTest.java new file mode 100644 index 00000000..2de1f168 --- /dev/null +++ b/src/test/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionServiceDeleteTest.java @@ -0,0 +1,198 @@ +package de.bitgilde.TIMAAT.service.transcription; + +import de.bitgilde.TIMAAT.model.FIPOP.Medium; +import de.bitgilde.TIMAAT.model.FIPOP.Transcription; +import de.bitgilde.TIMAAT.service.task.TaskService; +import de.bitgilde.TIMAAT.service.transcription.exception.TranscriptionNotFoundException; +import de.bitgilde.TIMAAT.service.transcription.exception.TranscriptionServiceException; +import de.bitgilde.TIMAAT.storage.entity.SystemSettingStorage; +import de.bitgilde.TIMAAT.storage.entity.medium.MediumStorage; +import de.bitgilde.TIMAAT.storage.entity.transcription.TranscriptionStorage; +import de.bitgilde.TIMAAT.storage.file.AudioFileStorage; +import de.bitgilde.TIMAAT.storage.file.TemporaryFileStorage; +import de.bitgilde.TIMAAT.storage.file.TranscriptionFileStorage; +import de.bitgilde.TIMAAT.storage.file.VideoFileStorage; +import jakarta.inject.Provider; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import studio.nkodev.stt.client.SpeechToTextServiceClient; + +import java.io.IOException; +import java.util.Collections; +import java.util.Optional; + +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.isNull; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +/** + * Tests of {@link TranscriptionService#deleteTranscription(int)} covering the full orchestration: + * not-found handling, default-transcription reassignment on the referencing medium, + * DB and file removal ordering, and error wrapping. + * + * @author Nico Kotlenga (nico@nko-dev.studio) + * @since 2026-05-21 + */ +public class TranscriptionServiceDeleteTest { + + private static final int MEDIUM_ID = 42; + private static final int TRANSCRIPTION_ID = 7; + private static final int OTHER_TRANSCRIPTION_ID = 9; + + private TranscriptionStorage transcriptionStorage; + private SystemSettingStorage systemSettingStorage; + private AudioFileStorage audioFileStorage; + private VideoFileStorage videoFileStorage; + private TaskService taskService; + private Provider<TaskService> taskServiceProvider; + private TemporaryFileStorage temporaryFileStorage; + private TranscriptionFileStorage transcriptionFileStorage; + private MediumStorage mediumStorage; + private SpeechToTextServiceClient speechToTextServiceClient; + + private TranscriptionService service; + + @BeforeEach + @SuppressWarnings("unchecked") + void setUp() { + transcriptionStorage = mock(TranscriptionStorage.class); + systemSettingStorage = mock(SystemSettingStorage.class); + audioFileStorage = mock(AudioFileStorage.class); + videoFileStorage = mock(VideoFileStorage.class); + taskService = mock(TaskService.class); + taskServiceProvider = (Provider<TaskService>) mock(Provider.class); + when(taskServiceProvider.get()).thenReturn(taskService); + temporaryFileStorage = mock(TemporaryFileStorage.class); + transcriptionFileStorage = mock(TranscriptionFileStorage.class); + mediumStorage = mock(MediumStorage.class); + speechToTextServiceClient = mock(SpeechToTextServiceClient.class); + + when(speechToTextServiceClient.getAvailableEngines()).thenReturn(Collections.emptyList()); + when(systemSettingStorage.getDefaultTranscriptionModel()).thenReturn(Optional.empty()); + when(transcriptionStorage.getEntriesAsStream(any(), any(), any(), any())).thenReturn(java.util.stream.Stream.empty()); + + service = new TranscriptionService(transcriptionStorage, systemSettingStorage, audioFileStorage, videoFileStorage, + taskServiceProvider, temporaryFileStorage, transcriptionFileStorage, mediumStorage, + speechToTextServiceClient); + } + + @Test + void shouldThrowNotFoundExceptionWhenTranscriptionDoesNotExist() { + when(transcriptionStorage.findById(TRANSCRIPTION_ID)).thenReturn(Optional.empty()); + + assertThatThrownBy(() -> service.deleteTranscription(TRANSCRIPTION_ID)) + .isInstanceOf(TranscriptionNotFoundException.class) + .hasMessageContaining(String.valueOf(TRANSCRIPTION_ID)); + + verify(transcriptionStorage, never()).deleteTranscription(anyInt()); + verifyNoFileDeletion(); + } + + @Test + void shouldDeleteTranscriptionAndFileWhenTranscriptionNotReferencedAsDefault() throws Exception { + Transcription transcription = transcription(TRANSCRIPTION_ID, MEDIUM_ID); + when(transcriptionStorage.findById(TRANSCRIPTION_ID)).thenReturn(Optional.of(transcription)); + when(transcriptionStorage.findLatestOtherTranscriptionForMedium(MEDIUM_ID, TRANSCRIPTION_ID)).thenReturn( + Optional.empty()); + when(transcriptionStorage.deleteTranscription(TRANSCRIPTION_ID)).thenReturn(true); + + service.deleteTranscription(TRANSCRIPTION_ID); + + verify(mediumStorage).replaceDefaultTranscription(MEDIUM_ID, TRANSCRIPTION_ID, null); + verify(transcriptionStorage).deleteTranscription(TRANSCRIPTION_ID); + verify(transcriptionFileStorage).deleteTranscription(TRANSCRIPTION_ID); + } + + @Test + void shouldReassignDefaultTranscriptionToLatestOtherWhenReferenced() throws Exception { + Transcription transcription = transcription(TRANSCRIPTION_ID, MEDIUM_ID); + Transcription latestOther = transcription(OTHER_TRANSCRIPTION_ID, MEDIUM_ID); + + when(transcriptionStorage.findById(TRANSCRIPTION_ID)).thenReturn(Optional.of(transcription)); + when(transcriptionStorage.findLatestOtherTranscriptionForMedium(MEDIUM_ID, TRANSCRIPTION_ID)).thenReturn( + Optional.of(latestOther)); + when(transcriptionStorage.deleteTranscription(TRANSCRIPTION_ID)).thenReturn(true); + + service.deleteTranscription(TRANSCRIPTION_ID); + + verify(mediumStorage).replaceDefaultTranscription(MEDIUM_ID, TRANSCRIPTION_ID, OTHER_TRANSCRIPTION_ID); + verify(transcriptionStorage).deleteTranscription(TRANSCRIPTION_ID); + verify(transcriptionFileStorage).deleteTranscription(TRANSCRIPTION_ID); + } + + @Test + void shouldClearDefaultTranscriptionWhenNoOtherTranscriptionAvailable() throws Exception { + Transcription transcription = transcription(TRANSCRIPTION_ID, MEDIUM_ID); + + when(transcriptionStorage.findById(TRANSCRIPTION_ID)).thenReturn(Optional.of(transcription)); + when(transcriptionStorage.findLatestOtherTranscriptionForMedium(MEDIUM_ID, TRANSCRIPTION_ID)).thenReturn( + Optional.empty()); + when(transcriptionStorage.deleteTranscription(TRANSCRIPTION_ID)).thenReturn(true); + + service.deleteTranscription(TRANSCRIPTION_ID); + + verify(mediumStorage).replaceDefaultTranscription(eq(MEDIUM_ID), eq(TRANSCRIPTION_ID), isNull()); + } + + @Test + void shouldNotDeleteFileWhenDbDeletionFails() { + Transcription transcription = transcription(TRANSCRIPTION_ID, MEDIUM_ID); + when(transcriptionStorage.findById(TRANSCRIPTION_ID)).thenReturn(Optional.of(transcription)); + when(transcriptionStorage.findLatestOtherTranscriptionForMedium(MEDIUM_ID, TRANSCRIPTION_ID)).thenReturn( + Optional.empty()); + when(transcriptionStorage.deleteTranscription(TRANSCRIPTION_ID)).thenThrow(new RuntimeException("DB down")); + + assertThatThrownBy(() -> service.deleteTranscription(TRANSCRIPTION_ID)) + .isInstanceOf(TranscriptionServiceException.class) + .hasCauseInstanceOf(RuntimeException.class); + + verifyNoFileDeletion(); + } + + @Test + void shouldWrapFileDeletionFailureInTranscriptionServiceException() throws IOException { + Transcription transcription = transcription(TRANSCRIPTION_ID, MEDIUM_ID); + when(transcriptionStorage.findById(TRANSCRIPTION_ID)).thenReturn(Optional.of(transcription)); + when(transcriptionStorage.findLatestOtherTranscriptionForMedium(MEDIUM_ID, TRANSCRIPTION_ID)).thenReturn( + Optional.empty()); + when(transcriptionStorage.deleteTranscription(TRANSCRIPTION_ID)).thenReturn(true); + when(transcriptionFileStorage.deleteTranscription(TRANSCRIPTION_ID)).thenThrow(new IOException("disk failure")); + + assertThatThrownBy(() -> service.deleteTranscription(TRANSCRIPTION_ID)) + .isInstanceOf(TranscriptionServiceException.class) + .hasCauseInstanceOf(IOException.class); + } + + @Test + void shouldPropagateNotFoundExceptionWithoutWrapping() { + when(transcriptionStorage.findById(TRANSCRIPTION_ID)).thenReturn(Optional.empty()); + + assertThatThrownBy(() -> service.deleteTranscription(TRANSCRIPTION_ID)) + .isExactlyInstanceOf(TranscriptionNotFoundException.class); + } + + private Transcription transcription(int id, int mediumId) { + Transcription transcription = new Transcription(); + transcription.setId(id); + + Medium medium = new Medium(); + medium.setId(mediumId); + transcription.setMedium(medium); + + return transcription; + } + + private void verifyNoFileDeletion() { + try { + verify(transcriptionFileStorage, never()).deleteTranscription(anyInt()); + } catch (IOException e) { + throw new AssertionError(e); + } + } +} From 21e5d385cf01241c17e4f07b8c7af238e23dac42 Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Sun, 24 May 2026 11:23:28 +0200 Subject: [PATCH 60/70] TIMAAT #57 - Implemented new endpoints to modify transcription settings and gather transcription capabilities * Added EndpointTranscription giving information about current available engines and models * Added EndpointSystemSettings allowing to modify transcription settings like default model or auto creation of transcriptions --- .../notification/NotificationWebSocket.java | 240 ++++++++------- .../TIMAAT/rest/endpoint/EndpointMedium.java | 21 +- .../rest/endpoint/EndpointSystemSettings.java | 130 ++++++++ .../rest/endpoint/EndpointTranscription.java | 45 +++ .../rest/filter/AuthenticationFilter.java | 93 +++--- .../TranscriptionDefaultModelDto.java | 16 + .../TranscriptionSettingsDto.java | 17 ++ .../UpdateTranscriptionSettingsRequest.java | 16 + .../transcription/TranscriptionService.java | 89 +++++- ...TranscriptionFeatureDisabledException.java | 17 ++ .../TranscriptionNotFoundException.java | 24 ++ .../TranscriptionServiceException.java | 20 ++ .../storage/entity/SystemSettingStorage.java | 129 ++++++++ .../api/TranscriptionSystemSettings.java | 16 + .../TranscriptionServiceSettingsTest.java | 247 +++++++++++++++ .../entity/SystemSettingStorageTest.java | 289 ++++++++++++++++++ 16 files changed, 1241 insertions(+), 168 deletions(-) create mode 100644 src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointSystemSettings.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointTranscription.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/rest/model/systemsettings/TranscriptionDefaultModelDto.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/rest/model/systemsettings/TranscriptionSettingsDto.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/rest/model/systemsettings/UpdateTranscriptionSettingsRequest.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/service/transcription/exception/TranscriptionFeatureDisabledException.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/service/transcription/exception/TranscriptionNotFoundException.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/service/transcription/exception/TranscriptionServiceException.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/storage/entity/SystemSettingStorage.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/storage/entity/api/TranscriptionSystemSettings.java create mode 100644 src/test/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionServiceSettingsTest.java create mode 100644 src/test/java/de/bitgilde/TIMAAT/storage/entity/SystemSettingStorageTest.java diff --git a/src/main/java/de/bitgilde/TIMAAT/notification/NotificationWebSocket.java b/src/main/java/de/bitgilde/TIMAAT/notification/NotificationWebSocket.java index 25a48be2..23eefc98 100644 --- a/src/main/java/de/bitgilde/TIMAAT/notification/NotificationWebSocket.java +++ b/src/main/java/de/bitgilde/TIMAAT/notification/NotificationWebSocket.java @@ -39,126 +39,156 @@ @ServerEndpoint("/api/notification") public class NotificationWebSocket { - private static Map<String, UserSubscriptions> userSessions = new HashMap<String, UserSubscriptions>(); - - @OnOpen - public void onOpen(Session session) { - System.out.println("TIMAAT::Notification:new session " + session.getId()+" - "+session.getMaxIdleTimeout()); - } - - @OnClose - public void onClose(Session session) { - System.out.println("TIMAAT::Notification:end session " + session.getId()); - endUserSession(session); + private static Map<String, UserSubscriptions> userSessions = new HashMap<String, UserSubscriptions>(); + + @OnOpen + public void onOpen(Session session) { + System.out.println("TIMAAT::Notification:new session " + session.getId() + " - " + session.getMaxIdleTimeout()); + } + + @OnClose + public void onClose(Session session) { + System.out.println("TIMAAT::Notification:end session " + session.getId()); + endUserSession(session); + } + + @OnMessage + public void onMessage(String message, Session session) { + // System.out.println("onMessage::From=" + session.getId() + " Message=" + message); + + try { + NotificationRequest req = new ObjectMapper().readValue(message, NotificationRequest.class); + String username = validateRequestToken(req.getToken()); + + if (req.getRequest() == null || !req.getRequest().equalsIgnoreCase("subscribe-list")) { + return; + } + + if (username != null) { + // TODO check if user account status has expired or is blocked + if (!userSessions.containsKey(session.getId())) { + createUserSession(username, session); + } + notifyUserSubscription(username, req.dataID, session); + // answer user subscription request + if (req.getDataID() > 0) { + acknowledgeSubscriptionInfo(username, session, req.dataID); + } + } + } catch (Exception e) { + System.out.println("TIMAAT::Notification:client message failed to decode"); } + } + + private void acknowledgeSubscriptionInfo(String subscriber, Session session, int listID) { + List<String> subscribers = new ArrayList<String>(); + for (UserSubscriptions userSub : userSessions.values()) { + if (!userSub.username.equalsIgnoreCase(subscriber) && userSub.getAnalysisList() == listID) { + subscribers.add(userSub.getUsername()); + } + } + if (subscribers.size() > 0) { + sendNotificationTo(session, subscriber, "list-subscribers", listID, subscribers); + } + } - @OnMessage - public void onMessage(String message, Session session) { - // System.out.println("onMessage::From=" + session.getId() + " Message=" + message); - - try { - NotificationRequest req = new ObjectMapper().readValue(message, NotificationRequest.class); - String username = validateRequestToken(req.getToken()); - - if ( req.getRequest() == null || !req.getRequest().equalsIgnoreCase("subscribe-list") ) return; - - if ( username != null ) { - // TODO check if user account status has expired or is blocked - if ( !userSessions.containsKey(session.getId()) ) createUserSession(username, session); - notifyUserSubscription(username, req.dataID, session); - // answer user subscription request - if ( req.getDataID() > 0 ) acknowledgeSubscriptionInfo(username, session, req.dataID); - } - } catch (Exception e) { - System.out.println("TIMAAT::Notification:client message failed to decode"); + private void notifyUserSubscription(String username, int listID, Session session) { + UserSubscriptions userSub = userSessions.get(session.getId()); + if (userSub == null) { + return; + } + int oldListID = userSub.getAnalysisList(); + if (oldListID > 0) { + notifyUserUnsubscribe(username, oldListID); + } + userSub.setAnalysisList(listID); + if (listID > 0) { + for (UserSubscriptions sub : userSessions.values()) { + if (!sub.getUsername().equalsIgnoreCase(username) && sub.getAnalysisList() == listID) { + sendNotificationTo(sub.session, username, "subscribe-list", listID); } + } } + } - private void acknowledgeSubscriptionInfo(String subscriber, Session session, int listID) { - List <String> subscribers = new ArrayList<String>(); - for (UserSubscriptions userSub : userSessions.values()) { - if ( !userSub.username.equalsIgnoreCase(subscriber) && userSub.getAnalysisList() == listID ) subscribers.add(userSub.getUsername()); - } - if ( subscribers.size() > 0 ) sendNotificationTo(session, subscriber, "list-subscribers", listID, subscribers); + public static void notifyUserAction(String username, String action, int listID, Object data) { + if (username == null || action == null) { + return; } - - private void notifyUserSubscription(String username, int listID, Session session) { - UserSubscriptions userSub = userSessions.get(session.getId()); - if ( userSub == null ) return; - int oldListID = userSub.getAnalysisList(); - if ( oldListID > 0 ) notifyUserUnsubscribe(username, oldListID); - userSub.setAnalysisList(listID); - if ( listID > 0 ) { - for (UserSubscriptions sub : userSessions.values()) { - if ( !sub.getUsername().equalsIgnoreCase(username) && sub.getAnalysisList() == listID ) - sendNotificationTo(sub.session, username, "subscribe-list", listID); - } - } - } - - public static void notifyUserAction(String username, String action, int listID, Object data) { - if ( username == null || action == null ) return; - for (UserSubscriptions userSub : userSessions.values()) { - if ( !userSub.getUsername().equalsIgnoreCase(username) && userSub.getAnalysisList() == listID ) - sendNotificationTo(userSub.session, username, action, listID, data); - } + for (UserSubscriptions userSub : userSessions.values()) { + if (!userSub.getUsername().equalsIgnoreCase(username) && userSub.getAnalysisList() == listID) { + sendNotificationTo(userSub.session, username, action, listID, data); + } } + } - private void notifyUserUnsubscribe(String username, int listID) { - if ( listID <= 0 ) return; - for (UserSubscriptions userSub : userSessions.values()) { - if ( !userSub.getUsername().equalsIgnoreCase(username) && userSub.getAnalysisList() == listID ) - sendNotificationTo(userSub.session, username, "unsubscribe-list", listID); - } + private void notifyUserUnsubscribe(String username, int listID) { + if (listID <= 0) { + return; } - - private static void sendNotificationTo(Session session, String username, String message, int dataID) { - sendNotificationTo(session, username, message, dataID, null); + for (UserSubscriptions userSub : userSessions.values()) { + if (!userSub.getUsername().equalsIgnoreCase(username) && userSub.getAnalysisList() == listID) { + sendNotificationTo(userSub.session, username, "unsubscribe-list", listID); + } } - private static void sendNotificationTo(Session session, String username, String message, int dataID, Object data) { - try { - NotificationMessage notification = new NotificationMessage(username, message, dataID); - if ( data != null ) notification.setData(data); - ObjectWriter ow = new ObjectMapper().writer(); - session.getAsyncRemote().sendText(ow.writeValueAsString(notification)); - } catch (Exception e) { - // TODO remove session - } + } + + private static void sendNotificationTo(Session session, String username, String message, int dataID) { + sendNotificationTo(session, username, message, dataID, null); + } + + private static void sendNotificationTo(Session session, String username, String message, int dataID, Object data) { + try { + NotificationMessage notification = new NotificationMessage(username, message, dataID); + if (data != null) { + notification.setData(data); + } + ObjectWriter ow = new ObjectMapper().writer(); + session.getAsyncRemote().sendText(ow.writeValueAsString(notification)); + } catch (Exception e) { + // TODO remove session } + } - private void endUserSession(Session session) { - UserSubscriptions userSub = userSessions.get(session.getId()); - if ( userSub == null ) return; - if ( userSub.getAnalysisList() > 0 ) notifyUserUnsubscribe(userSub.getUsername(), userSub.getAnalysisList()); - try { - if ( session.isOpen() ) session.close(); - userSessions.remove(session.getId()); - } catch (Exception e) { - userSessions.remove(session.getId()); - } + private void endUserSession(Session session) { + UserSubscriptions userSub = userSessions.get(session.getId()); + if (userSub == null) { + return; } - - - private void createUserSession(String username, Session session) { - userSessions.put(session.getId(), new UserSubscriptions(username, session)); + if (userSub.getAnalysisList() > 0) { + notifyUserUnsubscribe(userSub.getUsername(), userSub.getAnalysisList()); } - - @OnError - public void onError(Throwable t) { - // ignore + try { + if (session.isOpen()) { + session.close(); + } + userSessions.remove(session.getId()); + } catch (Exception e) { + userSessions.remove(session.getId()); + } + } + + + private void createUserSession(String username, Session session) { + userSessions.put(session.getId(), new UserSubscriptions(username, session)); + } + + @OnError + public void onError(Throwable t) { + // ignore + } + + private String validateRequestToken(String token) { + String username = null; + try { + SecretKey key = TIMAATKeyGenerator.generateKey(); + username = Jwts.parser().verifyWith(key).build().parseSignedClaims(token).getPayload().getSubject(); + } catch (JwtException e) { + e.printStackTrace(); + return null; } - private String validateRequestToken(String token) { - String username = null; - try { - SecretKey key = TIMAATKeyGenerator.generateKey(); - username = Jwts.parser().decryptWith(key).build().parseSignedClaims(token).getPayload().getSubject(); - } catch (JwtException e) { - e.printStackTrace(); - return null; - } - - return username; + return username; - } + } } diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java index 1e509fb2..b06dce6e 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java @@ -6,9 +6,6 @@ import de.bitgilde.TIMAAT.SelectElement; import de.bitgilde.TIMAAT.SelectElementWithToken; import de.bitgilde.TIMAAT.TIMAATApp; -import de.bitgilde.TIMAAT.processing.audio.api.FrequencyInformation; -import de.bitgilde.TIMAAT.processing.audio.io.FrequencyFileReader; -import de.bitgilde.TIMAAT.processing.audio.io.WaveformBinaryFileReader; import de.bitgilde.TIMAAT.model.DataTableInfo; import de.bitgilde.TIMAAT.model.FIPOP.Actor; import de.bitgilde.TIMAAT.model.FIPOP.AudioPostProduction; @@ -41,6 +38,9 @@ import de.bitgilde.TIMAAT.model.fileInformation.AudioInformation; import de.bitgilde.TIMAAT.model.fileInformation.ImageInformation; import de.bitgilde.TIMAAT.model.fileInformation.VideoInformation; +import de.bitgilde.TIMAAT.processing.audio.api.FrequencyInformation; +import de.bitgilde.TIMAAT.processing.audio.io.FrequencyFileReader; +import de.bitgilde.TIMAAT.processing.audio.io.WaveformBinaryFileReader; import de.bitgilde.TIMAAT.processing.video.FfmpegVideoEngine; import de.bitgilde.TIMAAT.processing.video.exception.VideoEngineException; import de.bitgilde.TIMAAT.rest.RangedStreamingOutput; @@ -52,10 +52,14 @@ import de.bitgilde.TIMAAT.rest.model.medium.UpdateMediumVideoThumbnailPayload; import de.bitgilde.TIMAAT.security.TIMAATKeyGenerator; import de.bitgilde.TIMAAT.security.UserLogManager; +import de.bitgilde.TIMAAT.service.task.TaskService; +import de.bitgilde.TIMAAT.service.task.api.MediumAudioAnalysisTask.SupportedMediumType; +import de.bitgilde.TIMAAT.service.task.api.TaskState; +import de.bitgilde.TIMAAT.service.task.exception.TaskServiceException; import de.bitgilde.TIMAAT.storage.api.PagingParameter; import de.bitgilde.TIMAAT.storage.api.SortingParameter; -import de.bitgilde.TIMAAT.storage.entity.medium.MediumStorage; import de.bitgilde.TIMAAT.storage.entity.MediumVideoStorage; +import de.bitgilde.TIMAAT.storage.entity.medium.MediumStorage; import de.bitgilde.TIMAAT.storage.entity.medium.api.MediumFilterCriteria; import de.bitgilde.TIMAAT.storage.file.AudioFileStorage; import de.bitgilde.TIMAAT.storage.file.ImageFileStorage; @@ -63,10 +67,6 @@ import de.bitgilde.TIMAAT.storage.file.TemporaryFileStorage; import de.bitgilde.TIMAAT.storage.file.TemporaryFileStorage.TemporaryFile; import de.bitgilde.TIMAAT.storage.file.VideoFileStorage; -import de.bitgilde.TIMAAT.service.task.TaskService; -import de.bitgilde.TIMAAT.service.task.api.MediumAudioAnalysisTask.SupportedMediumType; -import de.bitgilde.TIMAAT.service.task.api.TaskState; -import de.bitgilde.TIMAAT.service.task.exception.TaskServiceException; import io.jsonwebtoken.JwtBuilder; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; @@ -185,7 +185,8 @@ public DataTableInfo<Medium> getMediaList(@BeanParam MediumListingQueryParameter List<Medium> matchingMediums = mediumStorage.getEntriesAsStream(queryParameter, queryParameter, queryParameter, userAccount).collect(Collectors.toList()); long totalMediumEntries = mediumStorage.getNumberOfTotalEntriesRespectingAuthorization(userAccount); - long filteredMediumEntries = mediumStorage.getNumberOfMatchingEntriesRespectingAuthorization(queryParameter, userAccount); + long filteredMediumEntries = mediumStorage.getNumberOfMatchingEntriesRespectingAuthorization(queryParameter, + userAccount); return new DataTableInfo<>(draw, totalMediumEntries, filteredMediumEntries, matchingMediums); @@ -4465,7 +4466,7 @@ public static int validateFileToken(String token) throws Exception { // Throw an Exception if the token is invalid SecretKey key = TIMAATKeyGenerator.generateKey(); - int mediumID = Jwts.parser().decryptWith(key).build().parseSignedClaims(token).getPayload() + int mediumID = Jwts.parser().verifyWith(key).build().parseSignedClaims(token).getPayload() .get("file", Integer.class); return mediumID; diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointSystemSettings.java b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointSystemSettings.java new file mode 100644 index 00000000..870658a5 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointSystemSettings.java @@ -0,0 +1,130 @@ +package de.bitgilde.TIMAAT.rest.endpoint; + +import de.bitgilde.TIMAAT.model.FIPOP.TranscriptionModel; +import de.bitgilde.TIMAAT.model.FIPOP.TranscriptionModelId; +import de.bitgilde.TIMAAT.model.FIPOP.UserAccount; +import de.bitgilde.TIMAAT.rest.Secured; +import de.bitgilde.TIMAAT.rest.filter.AuthenticationFilter; +import de.bitgilde.TIMAAT.rest.model.systemsettings.TranscriptionDefaultModelDto; +import de.bitgilde.TIMAAT.rest.model.systemsettings.TranscriptionSettingsDto; +import de.bitgilde.TIMAAT.rest.model.systemsettings.UpdateTranscriptionSettingsRequest; +import de.bitgilde.TIMAAT.service.transcription.TranscriptionService; +import de.bitgilde.TIMAAT.service.transcription.exception.TranscriptionFeatureDisabledException; +import de.bitgilde.TIMAAT.storage.entity.api.TranscriptionSystemSettings; +import jakarta.annotation.Nullable; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import org.jvnet.hk2.annotations.Service; + +/** + * REST resource exposing the singleton system-settings row. Currently every persisted field is + * transcription-related, so all routes live under {@code /system-settings/transcription}. When + * non-transcription settings are added, additional sub-paths can be introduced on the same resource + * without breaking existing URLs. + * + * @author Nico Kotlenga (nico@nko-dev.studio) + * @since 2026-05-24 + */ +@Service +@Path("/system-settings") +public class EndpointSystemSettings { + + @Inject + TranscriptionService transcriptionService; + + @Context + ContainerRequestContext containerRequestContext; + + /** + * Returns the transcription-related system settings, including a {@code featureEnabled} flag that + * tells the client whether the deployment offers speech-to-text at all (driven by the + * {@code stt.enabled} property). When the feature is disabled the persisted preferences are still + * returned but will not take effect until the feature is re-enabled. + * + * @return the current transcription-related system settings as a DTO + */ + @GET + @Produces(MediaType.APPLICATION_JSON) + @Secured + @Path("transcription") + public TranscriptionSettingsDto getTranscriptionSettings() { + TranscriptionSystemSettings settings = transcriptionService.getTranscriptionSystemSettings(); + return toDto(settings); + } + + /** + * Updates the transcription-related system settings. Engine and model identifiers must either both be + * provided (to configure a default model) or both be omitted (to clear the default). When the + * speech-to-text feature is disabled, providing an engine/model identifier is refused with + * {@code 403 Forbidden}; clearing the default and toggling {@code autoTranscribeUploads} are still + * allowed so the preference is preserved across enable/disable cycles. + * + * @param request the new settings to apply + * @return {@code 200 OK} with the updated settings; {@code 400 Bad Request} if the engine/model pair + * is inconsistent or unknown; {@code 403 Forbidden} if a default model is requested while the feature is disabled + */ + @PUT + @Produces(MediaType.APPLICATION_JSON) + @Consumes(MediaType.APPLICATION_JSON) + @Secured + @Path("transcription") + public Response updateTranscriptionSettings(UpdateTranscriptionSettingsRequest request) { + if (request == null) { + return Response.status(Status.BAD_REQUEST).entity("{\"reason\":\"request body is required\"}").build(); + } + + UserAccount editingUser = (UserAccount) containerRequestContext.getProperty( + AuthenticationFilter.USER_ACCOUNT_PROPERTY_NAME); + + try { + transcriptionService.updateTranscriptionSystemSettings(request.autoTranscribeUploads(), + request.defaultEngineIdentifier(), request.defaultModelIdentifier(), editingUser); + } catch (TranscriptionFeatureDisabledException e) { + return Response.status(Status.FORBIDDEN).entity("{\"reason\":\"" + e.getMessage() + "\"}").build(); + } catch (IllegalArgumentException e) { + return Response.status(Status.BAD_REQUEST).entity("{\"reason\":\"" + e.getMessage() + "\"}").build(); + } + + return Response.ok(toDto(transcriptionService.getTranscriptionSystemSettings())).build(); + } + + /** + * Returns just the currently configured default transcription engine/model pair. Both identifier + * fields are {@code null} when no default has been configured. Provided as a separate endpoint so + * clients that only need the default (e.g. when offering "Generate transcription" on a medium) do + * not have to fetch the full settings payload. + * + * @return the default model DTO; identifiers are {@code null} when no default is configured + */ + @GET + @Produces(MediaType.APPLICATION_JSON) + @Secured + @Path("transcription/default-model") + public TranscriptionDefaultModelDto getTranscriptionDefaultModel() { + TranscriptionModel defaultModel = transcriptionService.getTranscriptionSystemSettings().defaultTranscriptionModel(); + return toDefaultModelDto(defaultModel); + } + + private TranscriptionSettingsDto toDto(TranscriptionSystemSettings settings) { + TranscriptionModel defaultModel = settings.defaultTranscriptionModel(); + return new TranscriptionSettingsDto(transcriptionService.isFeatureEnabled(), settings.autoTranscribeUploads(), + toDefaultModelDto(defaultModel)); + } + + private TranscriptionDefaultModelDto toDefaultModelDto(@Nullable TranscriptionModel defaultModel) { + if (defaultModel == null) { + return new TranscriptionDefaultModelDto(null, null); + } + TranscriptionModelId id = defaultModel.getId(); + return new TranscriptionDefaultModelDto(id.getEngineIdentifier(), id.getModelIdentifier()); + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointTranscription.java b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointTranscription.java new file mode 100644 index 00000000..cf926ad8 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointTranscription.java @@ -0,0 +1,45 @@ +package de.bitgilde.TIMAAT.rest.endpoint; + +import de.bitgilde.TIMAAT.rest.Secured; +import de.bitgilde.TIMAAT.service.transcription.TranscriptionService; +import de.bitgilde.TIMAAT.service.transcription.api.TranscriptionEngineCapabilities; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import org.jvnet.hk2.annotations.Service; + +import java.util.Collection; + +/** + * REST resource exposing transcription-related operations such as engine capability discovery. + * Settings persisted in the singleton system-settings row are intentionally handled by + * {@link EndpointSystemSettings} so that this resource only deals with the transcription domain + * itself. + * + * @author Nico Kotlenga (nico@nko-dev.studio) + * @since 2026-05-24 + */ +@Service +@Path("/transcription") +public class EndpointTranscription { + + @Inject + TranscriptionService transcriptionService; + + /** + * Returns the engines (and their models) currently offered by the connected speech-to-text-service. + * When the speech-to-text feature is disabled for this deployment an empty collection is returned + * so callers can render an "unavailable" state without special-casing the response code. + * + * @return the available engine capabilities + */ + @GET + @Produces(MediaType.APPLICATION_JSON) + @Secured + @Path("engines") + public Collection<TranscriptionEngineCapabilities> listAvailableEngines() { + return transcriptionService.getAvailableEngineCapabilities(); + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/filter/AuthenticationFilter.java b/src/main/java/de/bitgilde/TIMAAT/rest/filter/AuthenticationFilter.java index f7255a90..e91bb134 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/filter/AuthenticationFilter.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/filter/AuthenticationFilter.java @@ -54,12 +54,12 @@ public class AuthenticationFilter implements ContainerRequestFilter { public static final String USER_NAME_PROPERTY_NAME = "TIMAAT.userName"; public static final String USER_ACCOUNT_PROPERTY_NAME = "TIMAAT.user"; - private static final String REALM = "TIMAAT"; + private static final String REALM = "TIMAAT"; private static final String AUTHENTICATION_SCHEME = "Bearer"; - @Override - public void filter(ContainerRequestContext requestContext) throws IOException { - // Get the Authorization header from the request + @Override + public void filter(ContainerRequestContext requestContext) throws IOException { + // Get the Authorization header from the request String authorizationHeader = requestContext.getHeaderString(HttpHeaders.AUTHORIZATION); // Validate the Authorization header if (!isTokenBasedAuthentication(authorizationHeader)) { @@ -92,92 +92,89 @@ public void filter(ContainerRequestContext requestContext) throws IOException { } } catch (Exception e) { - abortWithUnauthorized(requestContext); + abortWithUnauthorized(requestContext); } } - private boolean isTokenBasedAuthentication(String authorizationHeader) { + private boolean isTokenBasedAuthentication(String authorizationHeader) { // Check if the Authorization header is valid // It must not be null and must be prefixed with "Bearer" plus a whitespace // The authentication scheme comparison must be case-insensitive return authorizationHeader != null && authorizationHeader.toLowerCase() - .startsWith(AUTHENTICATION_SCHEME.toLowerCase() + " "); + .startsWith(AUTHENTICATION_SCHEME.toLowerCase() + " "); } private void abortWithUnauthorized(ContainerRequestContext requestContext) { // Abort the filter chain with a 401 status code response // The WWW-Authenticate header is sent along with the response - requestContext.abortWith( - Response.status(Response.Status.UNAUTHORIZED) - .header(HttpHeaders.WWW_AUTHENTICATE, - AUTHENTICATION_SCHEME + " realm=\"" + REALM + "\"") - .build()); + requestContext.abortWith(Response.status(Response.Status.UNAUTHORIZED).header(HttpHeaders.WWW_AUTHENTICATE, + AUTHENTICATION_SCHEME + " realm=\"" + REALM + "\"").build()); } private void abortWithForbidden(ContainerRequestContext requestContext, String reason) { // Abort the filter chain with a 403 status code response // The WWW-Authenticate header is sent along with the response - requestContext.abortWith( - Response.status(Response.Status.FORBIDDEN) - .header(HttpHeaders.WWW_AUTHENTICATE, - AUTHENTICATION_SCHEME + " realm=\"" + REALM + "\"") - .entity("{\"reason\":\""+reason+"\"}") - .build()); + requestContext.abortWith(Response.status(Response.Status.FORBIDDEN).header(HttpHeaders.WWW_AUTHENTICATE, + AUTHENTICATION_SCHEME + " realm=\"" + REALM + "\"").entity("{\"reason\":\"" + reason + "\"}").build()); } public static UserAccount validateAccountStatus(String username) throws Exception { // verify user and user status - if ( username == null ) throw new Exception("provided credentials invalid"); + if (username == null) { + throw new Exception("provided credentials invalid"); + } - UserAccount user = (UserAccount) TIMAATApp.emf.createEntityManager() - .createQuery("SELECT ua FROM UserAccount ua WHERE ua.accountName=:username") - .setParameter("username", username) - .getSingleResult(); + UserAccount user = (UserAccount) TIMAATApp.emf.createEntityManager().createQuery( + "SELECT ua FROM UserAccount ua WHERE ua.accountName=:username").setParameter("username", username) + .getSingleResult(); // don't allow suspended accounts - if ( user.getUserAccountStatus() == UserAccountStatus.suspended ) + if (user.getUserAccountStatus() == UserAccountStatus.suspended) { throw new AccountSuspendedException(); + } return user; } public static String validateToken(String token) { - if (token.equals("null") || token == null) return null; + if (token.equals("null") || token == null) { + return null; + } // Check if the token was issued by the server and if it's not expired // Throw an Exception if the token is invalid SecretKey key = TIMAATKeyGenerator.generateKey(); String username = ""; - try { - username = Jwts.parser().decryptWith(key).build().parseSignedClaims(token).getPayload().getSubject(); - } catch (JwtException e) { - e.printStackTrace(); - } catch (Exception e) { - e.printStackTrace(); - } + try { + username = Jwts.parser().verifyWith(key).build().parseSignedClaims(token).getPayload().getSubject(); + } catch (JwtException e) { + e.printStackTrace(); + } catch (Exception e) { + e.printStackTrace(); + } return username; } public static Boolean isTokenValid(String token) { - try { - Jws<Claims> jws = Jwts.parser().decryptWith(TIMAATKeyGenerator.generateKey()).build().parseSignedClaims(token); - } catch (JwtException e) { - e.printStackTrace(); - return false; - } - return true; + try { + Jws<Claims> jws = Jwts.parser().verifyWith(TIMAATKeyGenerator.generateKey()).build().parseSignedClaims(token); + } catch (JwtException e) { + e.printStackTrace(); + return false; + } + return true; } public static int getTokenClaimUserId(String token) { - SecretKey key = TIMAATKeyGenerator.generateKey(); - Claims claims = null; - try { - claims = Jwts.parser().decryptWith(key).build().parseSignedClaims(token).getPayload(); - } catch(InvalidClaimException ice) { - ice.printStackTrace(); - } - int id = claims.get("id", Integer.class); - return id; + SecretKey key = TIMAATKeyGenerator.generateKey(); + Claims claims = null; + try { + claims = Jwts.parser().verifyWith(key).build().parseSignedClaims(token).getPayload(); + } catch (InvalidClaimException ice) { + ice.printStackTrace(); + } + int id = claims.get("id", Integer.class); + return id; } } diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/model/systemsettings/TranscriptionDefaultModelDto.java b/src/main/java/de/bitgilde/TIMAAT/rest/model/systemsettings/TranscriptionDefaultModelDto.java new file mode 100644 index 00000000..09913974 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/rest/model/systemsettings/TranscriptionDefaultModelDto.java @@ -0,0 +1,16 @@ +package de.bitgilde.TIMAAT.rest.model.systemsettings; + +import com.fasterxml.jackson.annotation.JsonInclude; +import jakarta.annotation.Nullable; + +/** + * Wire representation of the currently configured default transcription engine/model pair. Both + * identifier fields are {@code null} when no default has been configured yet. + * + * @author Nico Kotlenga (nico@nko-dev.studio) + * @since 2026-05-24 + */ +@JsonInclude(JsonInclude.Include.ALWAYS) +public record TranscriptionDefaultModelDto(@Nullable String engineIdentifier, + @Nullable String modelIdentifier) { +} diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/model/systemsettings/TranscriptionSettingsDto.java b/src/main/java/de/bitgilde/TIMAAT/rest/model/systemsettings/TranscriptionSettingsDto.java new file mode 100644 index 00000000..835ce94b --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/rest/model/systemsettings/TranscriptionSettingsDto.java @@ -0,0 +1,17 @@ +package de.bitgilde.TIMAAT.rest.model.systemsettings; + +import com.fasterxml.jackson.annotation.JsonInclude; + +/** + * Wire representation of the transcription-related system settings. {@code featureEnabled} signals + * whether the deployment offers speech-to-text at all (driven by the {@code stt.enabled} property); + * when {@code false} the remaining fields still reflect the persisted preferences but will not have + * any effect until the feature is re-enabled. + * + * @author Nico Kotlenga (nico@nko-dev.studio) + * @since 2026-05-24 + */ +@JsonInclude(JsonInclude.Include.ALWAYS) +public record TranscriptionSettingsDto(boolean featureEnabled, boolean autoTranscribeUploads, + TranscriptionDefaultModelDto transcriptionDefaultModelDto) { +} diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/model/systemsettings/UpdateTranscriptionSettingsRequest.java b/src/main/java/de/bitgilde/TIMAAT/rest/model/systemsettings/UpdateTranscriptionSettingsRequest.java new file mode 100644 index 00000000..6c7cc4f6 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/rest/model/systemsettings/UpdateTranscriptionSettingsRequest.java @@ -0,0 +1,16 @@ +package de.bitgilde.TIMAAT.rest.model.systemsettings; + +import jakarta.annotation.Nullable; + +/** + * Request payload for updating the transcription-related system settings. {@code autoTranscribeUploads} + * is required; {@code defaultEngineIdentifier} and {@code defaultModelIdentifier} must either both be + * set (to configure a default model) or both be {@code null} (to clear the default). + * + * @author Nico Kotlenga (nico@nko-dev.studio) + * @since 2026-05-24 + */ +public record UpdateTranscriptionSettingsRequest(boolean autoTranscribeUploads, + @Nullable String defaultEngineIdentifier, + @Nullable String defaultModelIdentifier) { +} diff --git a/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java b/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java index d534ea20..96e4bdfc 100644 --- a/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java @@ -4,6 +4,7 @@ import de.bitgilde.TIMAAT.PropertyManagement; import de.bitgilde.TIMAAT.model.FIPOP.Transcription; import de.bitgilde.TIMAAT.model.FIPOP.TranscriptionModel; +import de.bitgilde.TIMAAT.model.FIPOP.UserAccount; import de.bitgilde.TIMAAT.service.task.TaskService; import de.bitgilde.TIMAAT.service.task.api.MediumAudioAnalysisTask.SupportedMediumType; import de.bitgilde.TIMAAT.service.task.api.Task; @@ -13,11 +14,13 @@ import de.bitgilde.TIMAAT.service.task.storage.TaskStateUpdater; import de.bitgilde.TIMAAT.service.transcription.api.GenerateTranscriptionConfiguration; import de.bitgilde.TIMAAT.service.transcription.api.TranscriptionEngineCapabilities; +import de.bitgilde.TIMAAT.service.transcription.exception.TranscriptionFeatureDisabledException; import de.bitgilde.TIMAAT.service.transcription.exception.TranscriptionNotFoundException; import de.bitgilde.TIMAAT.service.transcription.exception.TranscriptionServiceException; import de.bitgilde.TIMAAT.storage.api.PagingParameter; import de.bitgilde.TIMAAT.storage.api.SortingParameter; import de.bitgilde.TIMAAT.storage.entity.SystemSettingStorage; +import de.bitgilde.TIMAAT.storage.entity.api.TranscriptionSystemSettings; import de.bitgilde.TIMAAT.storage.entity.medium.MediumStorage; import de.bitgilde.TIMAAT.storage.entity.transcription.TranscriptionStorage; import de.bitgilde.TIMAAT.storage.entity.transcription.api.TranscriptionFilterCriteria; @@ -29,6 +32,7 @@ import de.bitgilde.TIMAAT.storage.file.TemporaryFileStorage.TemporaryFile; import de.bitgilde.TIMAAT.storage.file.TranscriptionFileStorage; import de.bitgilde.TIMAAT.storage.file.VideoFileStorage; +import jakarta.annotation.Nullable; import jakarta.inject.Inject; import jakarta.inject.Provider; import studio.nkodev.stt.client.SpeechToTextServiceClient; @@ -72,15 +76,16 @@ public class TranscriptionService implements TaskStateUpdater, SpeechToTextTaskS private final TemporaryFileStorage temporaryFileStorage; private final TranscriptionFileStorage transcriptionFileStorage; private final MediumStorage mediumStorage; + private final boolean featureEnabled; @Inject public TranscriptionService(TranscriptionStorage transcriptionStorage, SystemSettingStorage systemSettingStorage, AudioFileStorage audioFileStorage, VideoFileStorage videoFileStorage, Provider<TaskService> taskServiceProvider, TemporaryFileStorage temporaryFileStorage, TranscriptionFileStorage transcriptionFileStorage, MediumStorage mediumStorage, PropertyManagement propertyManagement) { this(transcriptionStorage, systemSettingStorage, audioFileStorage, videoFileStorage, taskServiceProvider, temporaryFileStorage, transcriptionFileStorage, mediumStorage, - initSpeechToTextServiceClient(propertyManagement)); + isFeatureEnabled(propertyManagement) ? initSpeechToTextServiceClient(propertyManagement) : null); } - TranscriptionService(TranscriptionStorage transcriptionStorage, SystemSettingStorage systemSettingStorage, AudioFileStorage audioFileStorage, VideoFileStorage videoFileStorage, Provider<TaskService> taskServiceProvider, TemporaryFileStorage temporaryFileStorage, TranscriptionFileStorage transcriptionFileStorage, MediumStorage mediumStorage, SpeechToTextServiceClient speechToTextServiceClient) { + TranscriptionService(TranscriptionStorage transcriptionStorage, SystemSettingStorage systemSettingStorage, AudioFileStorage audioFileStorage, VideoFileStorage videoFileStorage, Provider<TaskService> taskServiceProvider, TemporaryFileStorage temporaryFileStorage, TranscriptionFileStorage transcriptionFileStorage, MediumStorage mediumStorage, @jakarta.annotation.Nullable SpeechToTextServiceClient speechToTextServiceClient) { this.transcriptionStorage = transcriptionStorage; this.systemSettingStorage = systemSettingStorage; this.audioFileStorage = audioFileStorage; @@ -90,9 +95,30 @@ public TranscriptionService(TranscriptionStorage transcriptionStorage, SystemSet this.transcriptionFileStorage = transcriptionFileStorage; this.mediumStorage = mediumStorage; this.speechToTextServiceClient = speechToTextServiceClient; + this.featureEnabled = speechToTextServiceClient != null; - resumeMonitoringOfActiveTranscriptions(); - verifyDefaultModelStillAvailable(); + if (featureEnabled) { + resumeMonitoringOfActiveTranscriptions(); + verifyDefaultModelStillAvailable(); + } + else { + logger.info( + "Speech-to-text feature is disabled (" + PropertyConstants.SPEECH_TO_TEXT_ENABLED.key() + "=false). " + "TranscriptionService is running in inactive mode."); + } + } + + private static boolean isFeatureEnabled(PropertyManagement propertyManagement) { + return Boolean.parseBoolean(propertyManagement.getProp(PropertyConstants.SPEECH_TO_TEXT_ENABLED)); + } + + /** + * @return {@code true} if the speech-to-text feature is enabled for this deployment (i.e. property + * {@code stt.enabled} is set to {@code true} in the TIMAAT properties file); {@code false} otherwise. + * When disabled, no connection to a speech-to-text-service is established and operations requiring it + * (engine discovery, transcription creation) become no-ops or throw. + */ + public boolean isFeatureEnabled() { + return featureEnabled; } @@ -154,14 +180,64 @@ private static SpeechToTextServiceClient initSpeechToTextServiceClient(PropertyM } /** - * @return the engines (with their models) currently offered by the connected speech-to-text-service + * Returns the engines (with their models) currently offered by the connected speech-to-text-service. + * If the feature is disabled for this deployment, an empty collection is returned and no connection + * to the speech-to-text-service is attempted. + * + * @return the available engine capabilities, or an empty collection when the feature is disabled */ public Collection<TranscriptionEngineCapabilities> getAvailableEngineCapabilities() { + if (!featureEnabled) { + return List.of(); + } return speechToTextServiceClient.getAvailableEngines().stream() .map(engine -> new TranscriptionEngineCapabilities(engine.engineIdentifier(), engine.engineName(), List.copyOf(engine.modelIdentifiers()))).toList(); } + /** + * Reads the current transcription-related system settings (auto-transcribe-uploads flag and default engine/model). + * + * @return a snapshot of the current settings, never {@code null} + */ + public TranscriptionSystemSettings getTranscriptionSystemSettings() { + return systemSettingStorage.getTranscriptionSystemSettings(); + } + + /** + * Updates the transcription-related system settings. When a default engine/model is requested, the pair is + * validated against the live speech-to-text-service offering and the corresponding {@code TranscriptionEngine} + * and {@code TranscriptionModel} rows are upserted so they can be referenced. Engine and model identifiers + * must either both be {@code null} (clear the default) or both be set. + * + * @param autoTranscribeUploads whether newly uploaded media should be transcribed automatically + * @param defaultEngineIdentifier identifier of the engine to use as default, or {@code null} to clear the default + * @param defaultModelIdentifier identifier of the model to use as default, or {@code null} to clear the default + * @param editingUser the user performing the change, used to stamp {@code lastEditedByUserAccount}, may be {@code null} + * @throws IllegalArgumentException if exactly one of the engine/model identifiers is {@code null}, or if the + * requested engine/model pair is not offered by the connected speech-to-text-service + * @throws TranscriptionFeatureDisabledException if a default engine/model is requested while the feature is disabled + */ + public void updateTranscriptionSystemSettings(boolean autoTranscribeUploads, @Nullable String defaultEngineIdentifier, @Nullable String defaultModelIdentifier, @Nullable UserAccount editingUser) throws TranscriptionFeatureDisabledException { + boolean engineSet = defaultEngineIdentifier != null; + boolean modelSet = defaultModelIdentifier != null; + if (engineSet != modelSet) { + throw new IllegalArgumentException( + "Default engine and model identifiers must either both be set or both be null"); + } + + if (engineSet) { + if (!featureEnabled) { + throw new TranscriptionFeatureDisabledException( + "Cannot configure a default transcription model while the speech-to-text feature is disabled"); + } + validateAndUpsertEngineModel(defaultEngineIdentifier, defaultModelIdentifier); + } + + systemSettingStorage.updateTranscriptionSystemSettings(autoTranscribeUploads, defaultEngineIdentifier, + defaultModelIdentifier, editingUser); + } + /** * Creates a new transcription for the medium described by the given configuration. If the medium is already prepared * (i.e. a mono audio file exists), a speech-to-text task is started immediately. Otherwise the transcription is @@ -175,6 +251,9 @@ public Collection<TranscriptionEngineCapabilities> getAvailableEngineCapabilitie * or storage access failed) */ public void createTranscription(GenerateTranscriptionConfiguration generateTranscriptionConfiguration) throws TranscriptionServiceException { + if (!featureEnabled) { + throw new TranscriptionFeatureDisabledException("Speech-to-text feature is disabled for this deployment"); + } int mediumId = generateTranscriptionConfiguration.mediumId(); String engineIdentifier = generateTranscriptionConfiguration.engineIdentifier(); String modelIdentifier = generateTranscriptionConfiguration.modelIdentifier(); diff --git a/src/main/java/de/bitgilde/TIMAAT/service/transcription/exception/TranscriptionFeatureDisabledException.java b/src/main/java/de/bitgilde/TIMAAT/service/transcription/exception/TranscriptionFeatureDisabledException.java new file mode 100644 index 00000000..d7f8ae01 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/service/transcription/exception/TranscriptionFeatureDisabledException.java @@ -0,0 +1,17 @@ +package de.bitgilde.TIMAAT.service.transcription.exception; + +/** + * Thrown when an operation requires the speech-to-text feature to be enabled for the deployment + * (i.e. {@code stt.enabled=true} in the TIMAAT properties file) but the feature is currently + * disabled. Callers should typically translate this to an HTTP 409 Conflict response. + * + * @author Nico Kotlenga (nico@nko-dev.studio) + * @since 2026-05-24 + */ +public class TranscriptionFeatureDisabledException extends TranscriptionServiceException { + private static final long serialVersionUID = 1L; + + public TranscriptionFeatureDisabledException(String message) { + super(message); + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/service/transcription/exception/TranscriptionNotFoundException.java b/src/main/java/de/bitgilde/TIMAAT/service/transcription/exception/TranscriptionNotFoundException.java new file mode 100644 index 00000000..041101cd --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/service/transcription/exception/TranscriptionNotFoundException.java @@ -0,0 +1,24 @@ +package de.bitgilde.TIMAAT.service.transcription.exception; + +import de.bitgilde.TIMAAT.service.transcription.TranscriptionService; + +/** + * Signals that an operation of the {@link TranscriptionService} targeted a + * {@link de.bitgilde.TIMAAT.model.FIPOP.Transcription} which does not exist (or no longer exists). + * + * @author Nico Kotlenga (nico@nko-dev.studio) + * @since 2026-05-21 + */ +public class TranscriptionNotFoundException extends TranscriptionServiceException { + + private final int transcriptionId; + + public TranscriptionNotFoundException(int transcriptionId) { + super("No transcription with id " + transcriptionId + " found"); + this.transcriptionId = transcriptionId; + } + + public int getTranscriptionId() { + return transcriptionId; + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/service/transcription/exception/TranscriptionServiceException.java b/src/main/java/de/bitgilde/TIMAAT/service/transcription/exception/TranscriptionServiceException.java new file mode 100644 index 00000000..6635a2fe --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/service/transcription/exception/TranscriptionServiceException.java @@ -0,0 +1,20 @@ +package de.bitgilde.TIMAAT.service.transcription.exception; + +import de.bitgilde.TIMAAT.service.transcription.TranscriptionService; + +/** + * This exception will be thrown when an error occurred during using the {@link TranscriptionService}. + * + * @author Nico Kotlenga (nico@nko-dev.studio) + * @since 21.05.26 + */ +public class TranscriptionServiceException extends Exception { + + public TranscriptionServiceException(String message) { + super(message); + } + + public TranscriptionServiceException(String message, Throwable cause) { + super(message, cause); + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/SystemSettingStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/SystemSettingStorage.java new file mode 100644 index 00000000..389e7a3d --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/SystemSettingStorage.java @@ -0,0 +1,129 @@ +package de.bitgilde.TIMAAT.storage.entity; + +import de.bitgilde.TIMAAT.db.DbAccessComponent; +import de.bitgilde.TIMAAT.model.FIPOP.SystemSetting; +import de.bitgilde.TIMAAT.model.FIPOP.TranscriptionModel; +import de.bitgilde.TIMAAT.model.FIPOP.TranscriptionModelId; +import de.bitgilde.TIMAAT.model.FIPOP.UserAccount; +import de.bitgilde.TIMAAT.storage.entity.api.TranscriptionSystemSettings; +import jakarta.annotation.Nullable; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManagerFactory; + +import java.time.Instant; +import java.util.Optional; + +/** + * Storage providing access to the singleton {@link SystemSetting} row. + * + * @author Nico Kotlenga (nico@nko-dev.studio) + * @since 16.05.26 + */ +public class SystemSettingStorage extends DbAccessComponent { + + private static final short SINGLETON_ID = 1; + + @Inject + public SystemSettingStorage(EntityManagerFactory emf) { + super(emf); + } + + /** + * @return the {@link TranscriptionModel} currently configured as the default model for new transcriptions, + * or {@link Optional#empty()} if no default has been configured (or no settings row exists yet) + */ + public Optional<TranscriptionModel> getDefaultTranscriptionModel() { + return executeDbTransaction(entityManager -> { + SystemSetting systemSetting = entityManager.find(SystemSetting.class, SINGLETON_ID); + if (systemSetting == null) { + return Optional.<TranscriptionModel>empty(); + } + return Optional.ofNullable(systemSetting.getDefaultTranscriptionModel()); + }); + } + + /** + * Removes the default transcription model from the singleton settings row. Called when the previously + * configured default model is no longer offered by the connected speech-to-text-service. + * No-op if no settings row exists yet. + */ + public void clearDefaultTranscriptionModel() { + executeDbTransaction(entityManager -> { + SystemSetting systemSetting = entityManager.find(SystemSetting.class, SINGLETON_ID); + if (systemSetting != null) { + systemSetting.setDefaultTranscriptionModel(null); + systemSetting.setLastEditedAt(Instant.now()); + } + return Void.TYPE; + }); + } + + /** + * Reads the transcription-related system settings (default engine/model and the auto-transcribe-uploads + * flag) from the singleton settings row. If no row exists yet, a snapshot reflecting the documented + * defaults (auto-transcribe disabled, no default model) is returned. + * + * @return a snapshot of the current transcription system settings, never {@code null} + */ + public TranscriptionSystemSettings getTranscriptionSystemSettings() { + return executeDbTransaction(entityManager -> { + SystemSetting systemSetting = entityManager.find(SystemSetting.class, SINGLETON_ID); + if (systemSetting == null) { + return new TranscriptionSystemSettings(false, null); + } + return new TranscriptionSystemSettings(Boolean.TRUE.equals(systemSetting.getAutoTranscribeUploads()), + systemSetting.getDefaultTranscriptionModel()); + }); + } + + /** + * Updates the transcription-related system settings in the singleton settings row. If no row exists + * yet, one is created. The {@code lastEditedAt} timestamp is set to now and {@code lastEditedByUserAccount} + * is set to the given user (when non-{@code null}). + * + * @param autoTranscribeUploads whether newly uploaded media should be transcribed automatically + * @param defaultEngineIdentifier identifier of the engine to use as default, or {@code null} to clear the default + * @param defaultModelIdentifier identifier of the model to use as default, or {@code null} to clear the default + * @param editingUser the user performing the change; used to stamp {@code lastEditedByUserAccount}, may be {@code null} + * @throws de.bitgilde.TIMAAT.db.exception.DbTransactionExecutionException if the update fails at the database level + */ + public void updateTranscriptionSystemSettings(boolean autoTranscribeUploads, + @Nullable String defaultEngineIdentifier, + @Nullable String defaultModelIdentifier, + @Nullable UserAccount editingUser) { + executeDbTransaction(entityManager -> { + SystemSetting systemSetting = entityManager.find(SystemSetting.class, SINGLETON_ID); + Instant now = Instant.now(); + + if (systemSetting == null) { + systemSetting = new SystemSetting(); + systemSetting.setId(SINGLETON_ID); + systemSetting.setCreatedAt(now); + entityManager.persist(systemSetting); + } + + systemSetting.setAutoTranscribeUploads(autoTranscribeUploads); + + if (defaultEngineIdentifier == null || defaultModelIdentifier == null) { + systemSetting.setDefaultTranscriptionModel(null); + } + else { + TranscriptionModelId modelId = new TranscriptionModelId(); + modelId.setEngineIdentifier(defaultEngineIdentifier); + modelId.setModelIdentifier(defaultModelIdentifier); + TranscriptionModel model = entityManager.find(TranscriptionModel.class, modelId); + if (model == null) { + throw new IllegalArgumentException( + "Transcription model '" + defaultEngineIdentifier + "/" + defaultModelIdentifier + "' is unknown"); + } + systemSetting.setDefaultTranscriptionModel(model); + } + + systemSetting.setLastEditedAt(now); + if (editingUser != null) { + systemSetting.setLastEditedByUserAccount(editingUser); + } + return Void.TYPE; + }); + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/api/TranscriptionSystemSettings.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/api/TranscriptionSystemSettings.java new file mode 100644 index 00000000..0d3d95fc --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/api/TranscriptionSystemSettings.java @@ -0,0 +1,16 @@ +package de.bitgilde.TIMAAT.storage.entity.api; + +import de.bitgilde.TIMAAT.model.FIPOP.TranscriptionModel; +import jakarta.annotation.Nullable; + +/** + * Snapshot of the transcription-related fields of the singleton system settings row, used as a + * return type by {@link de.bitgilde.TIMAAT.storage.entity.SystemSettingStorage} so callers do not + * have to hold on to a managed JPA entity outside the storage transaction. + * + * @author Nico Kotlenga (nico@nko-dev.studio) + * @since 2026-05-24 + */ +public record TranscriptionSystemSettings(boolean autoTranscribeUploads, + @Nullable TranscriptionModel defaultTranscriptionModel) { +} diff --git a/src/test/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionServiceSettingsTest.java b/src/test/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionServiceSettingsTest.java new file mode 100644 index 00000000..3ac4c277 --- /dev/null +++ b/src/test/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionServiceSettingsTest.java @@ -0,0 +1,247 @@ +package de.bitgilde.TIMAAT.service.transcription; + +import de.bitgilde.TIMAAT.model.FIPOP.UserAccount; +import de.bitgilde.TIMAAT.service.task.TaskService; +import de.bitgilde.TIMAAT.service.transcription.api.TranscriptionEngineCapabilities; +import de.bitgilde.TIMAAT.service.transcription.exception.TranscriptionFeatureDisabledException; +import de.bitgilde.TIMAAT.storage.entity.SystemSettingStorage; +import de.bitgilde.TIMAAT.storage.entity.api.TranscriptionSystemSettings; +import de.bitgilde.TIMAAT.storage.entity.medium.MediumStorage; +import de.bitgilde.TIMAAT.storage.entity.transcription.TranscriptionStorage; +import de.bitgilde.TIMAAT.storage.file.AudioFileStorage; +import de.bitgilde.TIMAAT.storage.file.TemporaryFileStorage; +import de.bitgilde.TIMAAT.storage.file.TranscriptionFileStorage; +import de.bitgilde.TIMAAT.storage.file.VideoFileStorage; +import jakarta.inject.Provider; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; +import studio.nkodev.stt.client.SpeechToTextServiceClient; +import studio.nkodev.stt.client.api.SpeechToTextEngine; +import studio.nkodev.stt.client.api.SpeechToTextEngineOutputFormat; + +import java.util.Collection; +import java.util.List; +import java.util.Optional; +import java.util.stream.Stream; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoInteractions; +import static org.mockito.Mockito.when; + +/** + * Tests of the system-settings related behavior of {@link TranscriptionService} together with the + * feature-gating introduced by the {@code stt.enabled} property. Feature-disabled state is modeled + * by passing a {@code null} {@link SpeechToTextServiceClient} into the package-private constructor + * — the same wiring the production constructor performs when {@code stt.enabled=false}. + * + * @author Nico Kotlenga (nico@nko-dev.studio) + * @since 2026-05-24 + */ +public class TranscriptionServiceSettingsTest { + + private static final String ENGINE_ID = "whisper"; + private static final String ENGINE_NAME = "Whisper"; + private static final String MODEL_ID = "large-v3"; + + private TranscriptionStorage transcriptionStorage; + private SystemSettingStorage systemSettingStorage; + private AudioFileStorage audioFileStorage; + private VideoFileStorage videoFileStorage; + private Provider<TaskService> taskServiceProvider; + private TemporaryFileStorage temporaryFileStorage; + private TranscriptionFileStorage transcriptionFileStorage; + private MediumStorage mediumStorage; + private SpeechToTextServiceClient speechToTextServiceClient; + + @BeforeEach + @SuppressWarnings("unchecked") + void setUp() { + transcriptionStorage = mock(TranscriptionStorage.class); + systemSettingStorage = mock(SystemSettingStorage.class); + audioFileStorage = mock(AudioFileStorage.class); + videoFileStorage = mock(VideoFileStorage.class); + taskServiceProvider = (Provider<TaskService>) mock(Provider.class); + temporaryFileStorage = mock(TemporaryFileStorage.class); + transcriptionFileStorage = mock(TranscriptionFileStorage.class); + mediumStorage = mock(MediumStorage.class); + speechToTextServiceClient = mock(SpeechToTextServiceClient.class); + + when(systemSettingStorage.getDefaultTranscriptionModel()).thenReturn(Optional.empty()); + when(transcriptionStorage.getEntriesAsStream(any(), any(), any(), any())).thenReturn(Stream.empty()); + } + + private TranscriptionService featureEnabledService() { + when(speechToTextServiceClient.getAvailableEngines()).thenReturn(List.of( + new SpeechToTextEngine(ENGINE_ID, ENGINE_NAME, List.of(MODEL_ID), + List.of(SpeechToTextEngineOutputFormat.SRT)))); + return new TranscriptionService(transcriptionStorage, systemSettingStorage, audioFileStorage, videoFileStorage, + taskServiceProvider, temporaryFileStorage, transcriptionFileStorage, mediumStorage, + speechToTextServiceClient); + } + + private TranscriptionService featureDisabledService() { + return new TranscriptionService(transcriptionStorage, systemSettingStorage, audioFileStorage, videoFileStorage, + taskServiceProvider, temporaryFileStorage, transcriptionFileStorage, mediumStorage, + (SpeechToTextServiceClient) null); + } + + @Nested + class FeatureGating { + + @Test + void shouldReportFeatureEnabledWhenSpeechToTextClientIsConfigured() { + TranscriptionService service = featureEnabledService(); + + assertThat(service.isFeatureEnabled()).isTrue(); + } + + @Test + void shouldReportFeatureDisabledWhenNoSpeechToTextClientIsConfigured() { + TranscriptionService service = featureDisabledService(); + + assertThat(service.isFeatureEnabled()).isFalse(); + } + + @Test + void shouldReturnEmptyEngineListWhenFeatureDisabled() { + TranscriptionService service = featureDisabledService(); + + Collection<TranscriptionEngineCapabilities> engines = service.getAvailableEngineCapabilities(); + + assertThat(engines).isEmpty(); + verifyNoInteractions(speechToTextServiceClient); + } + + @Test + void shouldNotResumeMonitoringOrVerifyDefaultModelWhenFeatureDisabled() { + featureDisabledService(); + + verify(transcriptionStorage, never()).getEntriesAsStream(any(), any(), any(), any()); + verify(systemSettingStorage, never()).getDefaultTranscriptionModel(); + } + + @Test + void shouldReturnLiveEngineCapabilitiesWhenFeatureEnabled() { + TranscriptionService service = featureEnabledService(); + + Collection<TranscriptionEngineCapabilities> engines = service.getAvailableEngineCapabilities(); + + assertThat(engines).hasSize(1); + TranscriptionEngineCapabilities capability = engines.iterator().next(); + assertThat(capability.engineIdentifier()).isEqualTo(ENGINE_ID); + assertThat(capability.engineName()).isEqualTo(ENGINE_NAME); + assertThat(capability.modelIdentifiers()).containsExactly(MODEL_ID); + } + } + + @Nested + class UpdateTranscriptionSystemSettings { + + @Test + void shouldRejectWhenOnlyEngineIdentifierIsSet() { + TranscriptionService service = featureEnabledService(); + + assertThatThrownBy(() -> service.updateTranscriptionSystemSettings(true, ENGINE_ID, null, null)) + .isInstanceOf(IllegalArgumentException.class) + .hasMessageContaining("both be set or both be null"); + + verify(systemSettingStorage, never()).updateTranscriptionSystemSettings(anyBoolean(), any(), any(), any()); + } + + @Test + void shouldRejectWhenOnlyModelIdentifierIsSet() { + TranscriptionService service = featureEnabledService(); + + assertThatThrownBy(() -> service.updateTranscriptionSystemSettings(false, null, MODEL_ID, null)) + .isInstanceOf(IllegalArgumentException.class); + + verify(systemSettingStorage, never()).updateTranscriptionSystemSettings(anyBoolean(), any(), any(), any()); + } + + @Test + void shouldRejectSettingDefaultModelWhenFeatureDisabled() { + TranscriptionService service = featureDisabledService(); + + assertThatThrownBy(() -> service.updateTranscriptionSystemSettings(false, ENGINE_ID, MODEL_ID, null)) + .isInstanceOf(TranscriptionFeatureDisabledException.class); + + verifyNoInteractions(systemSettingStorage); + } + + @Test + void shouldAllowClearingDefaultEvenWhenFeatureDisabled() throws TranscriptionFeatureDisabledException { + TranscriptionService service = featureDisabledService(); + + service.updateTranscriptionSystemSettings(true, null, null, null); + + verify(systemSettingStorage).updateTranscriptionSystemSettings(true, null, null, null); + } + + @Test + void shouldRejectUnknownEngineWhenSettingDefault() { + TranscriptionService service = featureEnabledService(); + + assertThatThrownBy(() -> service.updateTranscriptionSystemSettings(true, "unknown-engine", MODEL_ID, null)) + .isInstanceOf(IllegalArgumentException.class) + .hasMessageContaining("unknown-engine"); + + verify(systemSettingStorage, never()).updateTranscriptionSystemSettings(anyBoolean(), any(), any(), any()); + } + + @Test + void shouldRejectUnknownModelOnKnownEngineWhenSettingDefault() { + TranscriptionService service = featureEnabledService(); + + assertThatThrownBy(() -> service.updateTranscriptionSystemSettings(true, ENGINE_ID, "unknown-model", null)) + .isInstanceOf(IllegalArgumentException.class) + .hasMessageContaining("unknown-model"); + + verify(systemSettingStorage, never()).updateTranscriptionSystemSettings(anyBoolean(), any(), any(), any()); + } + + @Test + void shouldUpsertEngineAndModelAndPersistWhenSettingDefault() throws TranscriptionFeatureDisabledException { + TranscriptionService service = featureEnabledService(); + UserAccount editingUser = new UserAccount(); + + service.updateTranscriptionSystemSettings(true, ENGINE_ID, MODEL_ID, editingUser); + + verify(transcriptionStorage).upsertEngine(ENGINE_ID, ENGINE_NAME); + verify(transcriptionStorage).upsertModel(ENGINE_ID, MODEL_ID); + verify(systemSettingStorage).updateTranscriptionSystemSettings(true, ENGINE_ID, MODEL_ID, editingUser); + } + + @Test + void shouldNotTouchTranscriptionStorageWhenJustTogglingAutoTranscribe() throws TranscriptionFeatureDisabledException { + TranscriptionService service = featureEnabledService(); + + service.updateTranscriptionSystemSettings(true, null, null, null); + + verify(transcriptionStorage, never()).upsertEngine(any(), any()); + verify(transcriptionStorage, never()).upsertModel(any(), any()); + verify(systemSettingStorage).updateTranscriptionSystemSettings(true, null, null, null); + } + } + + @Nested + class GetTranscriptionSystemSettings { + + @Test + void shouldDelegateToSystemSettingStorage() { + TranscriptionService service = featureEnabledService(); + TranscriptionSystemSettings expected = new TranscriptionSystemSettings(true, null); + when(systemSettingStorage.getTranscriptionSystemSettings()).thenReturn(expected); + + TranscriptionSystemSettings actual = service.getTranscriptionSystemSettings(); + + assertThat(actual).isSameAs(expected); + } + } +} diff --git a/src/test/java/de/bitgilde/TIMAAT/storage/entity/SystemSettingStorageTest.java b/src/test/java/de/bitgilde/TIMAAT/storage/entity/SystemSettingStorageTest.java new file mode 100644 index 00000000..83273916 --- /dev/null +++ b/src/test/java/de/bitgilde/TIMAAT/storage/entity/SystemSettingStorageTest.java @@ -0,0 +1,289 @@ +package de.bitgilde.TIMAAT.storage.entity; + +import de.bitgilde.TIMAAT.db.exception.DbTransactionExecutionException; +import de.bitgilde.TIMAAT.model.FIPOP.SystemSetting; +import de.bitgilde.TIMAAT.model.FIPOP.TranscriptionModel; +import de.bitgilde.TIMAAT.model.FIPOP.TranscriptionModelId; +import de.bitgilde.TIMAAT.model.FIPOP.UserAccount; +import de.bitgilde.TIMAAT.storage.entity.api.TranscriptionSystemSettings; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; +import org.mockito.ArgumentCaptor; + +import java.time.Instant; +import java.util.Optional; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +/** + * Unit tests for {@link SystemSettingStorage} covering the singleton-row upsert semantics, + * the validation of the default-model reference, and the snapshot mapping returned by + * {@link SystemSettingStorage#getTranscriptionSystemSettings()}. The JPA layer is fully mocked + * — no in-memory database is started — so the tests verify orchestration only (which {@code find}, + * {@code persist} and field-set calls happen, and how exceptions are wrapped by + * {@link de.bitgilde.TIMAAT.db.DbAccessComponent#executeDbTransaction}). + * + * @author Nico Kotlenga (nico@nko-dev.studio) + * @since 2026-05-24 + */ +public class SystemSettingStorageTest { + + private static final short SINGLETON_ID = 1; + private static final String ENGINE_ID = "whisper"; + private static final String MODEL_ID = "large-v3"; + + private EntityManagerFactory entityManagerFactory; + private EntityManager entityManager; + private EntityTransaction entityTransaction; + + private SystemSettingStorage storage; + + @BeforeEach + void setUp() { + entityManagerFactory = mock(EntityManagerFactory.class); + entityManager = mock(EntityManager.class); + entityTransaction = mock(EntityTransaction.class); + + when(entityManagerFactory.createEntityManager()).thenReturn(entityManager); + when(entityManager.getTransaction()).thenReturn(entityTransaction); + + storage = new SystemSettingStorage(entityManagerFactory); + } + + @Nested + class GetTranscriptionSystemSettings { + + @Test + void shouldReturnDefaultSnapshotWhenNoSettingsRowExists() { + when(entityManager.find(SystemSetting.class, SINGLETON_ID)).thenReturn(null); + + TranscriptionSystemSettings settings = storage.getTranscriptionSystemSettings(); + + assertThat(settings.autoTranscribeUploads()).isFalse(); + assertThat(settings.defaultTranscriptionModel()).isNull(); + } + + @Test + void shouldReflectExistingRowWithAutoTranscribeAndNoDefaultModel() { + SystemSetting row = new SystemSetting(); + row.setId(SINGLETON_ID); + row.setAutoTranscribeUploads(true); + row.setDefaultTranscriptionModel(null); + when(entityManager.find(SystemSetting.class, SINGLETON_ID)).thenReturn(row); + + TranscriptionSystemSettings settings = storage.getTranscriptionSystemSettings(); + + assertThat(settings.autoTranscribeUploads()).isTrue(); + assertThat(settings.defaultTranscriptionModel()).isNull(); + } + + @Test + void shouldReflectExistingRowWithConfiguredDefaultModel() { + TranscriptionModel model = transcriptionModel(ENGINE_ID, MODEL_ID); + SystemSetting row = new SystemSetting(); + row.setId(SINGLETON_ID); + row.setAutoTranscribeUploads(false); + row.setDefaultTranscriptionModel(model); + when(entityManager.find(SystemSetting.class, SINGLETON_ID)).thenReturn(row); + + TranscriptionSystemSettings settings = storage.getTranscriptionSystemSettings(); + + assertThat(settings.autoTranscribeUploads()).isFalse(); + assertThat(settings.defaultTranscriptionModel()).isSameAs(model); + } + } + + @Nested + class UpdateTranscriptionSystemSettings { + + @Test + void shouldCreateSingletonRowWhenNoneExists() { + when(entityManager.find(SystemSetting.class, SINGLETON_ID)).thenReturn(null); + + Instant before = Instant.now(); + storage.updateTranscriptionSystemSettings(true, null, null, null); + Instant after = Instant.now(); + + ArgumentCaptor<SystemSetting> persisted = ArgumentCaptor.forClass(SystemSetting.class); + verify(entityManager).persist(persisted.capture()); + SystemSetting row = persisted.getValue(); + assertThat(row.getId()).isEqualTo(SINGLETON_ID); + assertThat(row.getAutoTranscribeUploads()).isTrue(); + assertThat(row.getDefaultTranscriptionModel()).isNull(); + assertThat(row.getCreatedAt()).isBetween(before, after); + assertThat(row.getLastEditedAt()).isBetween(before, after); + verify(entityTransaction).commit(); + } + + @Test + void shouldMutateExistingSingletonRowAndNotPersist() { + SystemSetting existingRow = existingRow(false, null); + when(entityManager.find(SystemSetting.class, SINGLETON_ID)).thenReturn(existingRow); + + Instant before = Instant.now(); + storage.updateTranscriptionSystemSettings(true, null, null, null); + Instant after = Instant.now(); + + assertThat(existingRow.getAutoTranscribeUploads()).isTrue(); + assertThat(existingRow.getDefaultTranscriptionModel()).isNull(); + assertThat(existingRow.getLastEditedAt()).isBetween(before, after); + verify(entityManager, never()).persist(any()); + verify(entityTransaction).commit(); + } + + @Test + void shouldClearDefaultModelWhenBothIdentifiersAreNull() { + SystemSetting existingRow = existingRow(true, transcriptionModel(ENGINE_ID, MODEL_ID)); + when(entityManager.find(SystemSetting.class, SINGLETON_ID)).thenReturn(existingRow); + + storage.updateTranscriptionSystemSettings(true, null, null, null); + + assertThat(existingRow.getDefaultTranscriptionModel()).isNull(); + verify(entityManager, never()).find(eq(TranscriptionModel.class), any()); + } + + @Test + void shouldAttachKnownTranscriptionModelAsDefault() { + SystemSetting existingRow = existingRow(false, null); + TranscriptionModel knownModel = transcriptionModel(ENGINE_ID, MODEL_ID); + when(entityManager.find(SystemSetting.class, SINGLETON_ID)).thenReturn(existingRow); + when(entityManager.find(eq(TranscriptionModel.class), any(TranscriptionModelId.class))).thenReturn(knownModel); + + storage.updateTranscriptionSystemSettings(true, ENGINE_ID, MODEL_ID, null); + + assertThat(existingRow.getDefaultTranscriptionModel()).isSameAs(knownModel); + ArgumentCaptor<TranscriptionModelId> lookupKey = ArgumentCaptor.forClass(TranscriptionModelId.class); + verify(entityManager).find(eq(TranscriptionModel.class), lookupKey.capture()); + assertThat(lookupKey.getValue().getEngineIdentifier()).isEqualTo(ENGINE_ID); + assertThat(lookupKey.getValue().getModelIdentifier()).isEqualTo(MODEL_ID); + } + + @Test + void shouldRollbackAndWrapIllegalArgumentWhenModelIsUnknown() { + SystemSetting existingRow = existingRow(false, null); + when(entityManager.find(SystemSetting.class, SINGLETON_ID)).thenReturn(existingRow); + when(entityManager.find(eq(TranscriptionModel.class), any(TranscriptionModelId.class))).thenReturn(null); + + assertThatThrownBy(() -> storage.updateTranscriptionSystemSettings(true, ENGINE_ID, MODEL_ID, null)) + .isInstanceOf(DbTransactionExecutionException.class) + .hasCauseInstanceOf(IllegalArgumentException.class); + + verify(entityTransaction).rollback(); + verify(entityTransaction, never()).commit(); + } + + @Test + void shouldStampLastEditedByUserAccountWhenUserProvided() { + SystemSetting existingRow = existingRow(false, null); + when(entityManager.find(SystemSetting.class, SINGLETON_ID)).thenReturn(existingRow); + UserAccount editingUser = new UserAccount(); + + storage.updateTranscriptionSystemSettings(false, null, null, editingUser); + + assertThat(existingRow.getLastEditedByUserAccount()).isSameAs(editingUser); + } + + @Test + void shouldLeaveLastEditedByUserAccountAloneWhenNoUserProvided() { + UserAccount previousUser = new UserAccount(); + SystemSetting existingRow = existingRow(false, null); + existingRow.setLastEditedByUserAccount(previousUser); + when(entityManager.find(SystemSetting.class, SINGLETON_ID)).thenReturn(existingRow); + + storage.updateTranscriptionSystemSettings(false, null, null, null); + + assertThat(existingRow.getLastEditedByUserAccount()).isSameAs(previousUser); + } + } + + @Nested + class ClearDefaultTranscriptionModel { + + @Test + void shouldClearDefaultAndStampLastEditedAtWhenRowExists() { + SystemSetting existingRow = existingRow(true, transcriptionModel(ENGINE_ID, MODEL_ID)); + when(entityManager.find(SystemSetting.class, SINGLETON_ID)).thenReturn(existingRow); + + Instant before = Instant.now(); + storage.clearDefaultTranscriptionModel(); + Instant after = Instant.now(); + + assertThat(existingRow.getDefaultTranscriptionModel()).isNull(); + assertThat(existingRow.getLastEditedAt()).isBetween(before, after); + verify(entityTransaction).commit(); + } + + @Test + void shouldBeNoOpWhenNoRowExists() { + when(entityManager.find(SystemSetting.class, SINGLETON_ID)).thenReturn(null); + + storage.clearDefaultTranscriptionModel(); + + verify(entityManager, never()).persist(any()); + verify(entityTransaction).commit(); + } + } + + @Nested + class GetDefaultTranscriptionModel { + + @Test + void shouldReturnEmptyWhenNoRowExists() { + when(entityManager.find(SystemSetting.class, SINGLETON_ID)).thenReturn(null); + + Optional<TranscriptionModel> result = storage.getDefaultTranscriptionModel(); + + assertThat(result).isEmpty(); + } + + @Test + void shouldReturnEmptyWhenRowHasNoDefault() { + SystemSetting row = existingRow(false, null); + when(entityManager.find(SystemSetting.class, SINGLETON_ID)).thenReturn(row); + + Optional<TranscriptionModel> result = storage.getDefaultTranscriptionModel(); + + assertThat(result).isEmpty(); + } + + @Test + void shouldReturnConfiguredDefaultModel() { + TranscriptionModel model = transcriptionModel(ENGINE_ID, MODEL_ID); + SystemSetting row = existingRow(false, model); + when(entityManager.find(SystemSetting.class, SINGLETON_ID)).thenReturn(row); + + Optional<TranscriptionModel> result = storage.getDefaultTranscriptionModel(); + + assertThat(result).contains(model); + } + } + + private SystemSetting existingRow(boolean autoTranscribe, TranscriptionModel defaultModel) { + SystemSetting row = new SystemSetting(); + row.setId(SINGLETON_ID); + row.setAutoTranscribeUploads(autoTranscribe); + row.setDefaultTranscriptionModel(defaultModel); + row.setCreatedAt(Instant.parse("2026-01-01T00:00:00Z")); + return row; + } + + private TranscriptionModel transcriptionModel(String engineIdentifier, String modelIdentifier) { + TranscriptionModelId id = new TranscriptionModelId(); + id.setEngineIdentifier(engineIdentifier); + id.setModelIdentifier(modelIdentifier); + TranscriptionModel model = new TranscriptionModel(); + model.setId(id); + return model; + } +} From b9aee3338285d64bfbace4e08bcb51f78301aaf5 Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Sun, 24 May 2026 13:27:04 +0200 Subject: [PATCH 61/70] TIMAAT #57 - Set first received model as default model (when not set) * If the current default model setting is empty, the first available model will be set as default model --- .../transcription/TranscriptionService.java | 54 +++++++++--- .../storage/entity/SystemSettingStorage.java | 83 ++++++++++--------- .../TranscriptionServiceSettingsTest.java | 39 +++++---- .../entity/SystemSettingStorageTest.java | 33 +------- 4 files changed, 111 insertions(+), 98 deletions(-) diff --git a/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java b/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java index 96e4bdfc..0bc87044 100644 --- a/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java @@ -231,7 +231,9 @@ public void updateTranscriptionSystemSettings(boolean autoTranscribeUploads, @Nu throw new TranscriptionFeatureDisabledException( "Cannot configure a default transcription model while the speech-to-text feature is disabled"); } - validateAndUpsertEngineModel(defaultEngineIdentifier, defaultModelIdentifier); + SpeechToTextEngine speechToTextEngine = getSpeechToTextEngineHavingModel(defaultEngineIdentifier, + defaultModelIdentifier); + upsertEngineModel(speechToTextEngine, defaultModelIdentifier); } systemSettingStorage.updateTranscriptionSystemSettings(autoTranscribeUploads, defaultEngineIdentifier, @@ -258,7 +260,8 @@ public void createTranscription(GenerateTranscriptionConfiguration generateTrans String engineIdentifier = generateTranscriptionConfiguration.engineIdentifier(); String modelIdentifier = generateTranscriptionConfiguration.modelIdentifier(); - validateAndUpsertEngineModel(engineIdentifier, modelIdentifier); + SpeechToTextEngine speechToTextEngine = getSpeechToTextEngineHavingModel(engineIdentifier, modelIdentifier); + upsertEngineModel(speechToTextEngine, modelIdentifier); SupportedMediumType supportedMediumType = transcriptionStorage.determineSupportedMediumType(mediumId); AudioContainingMediumFileStorage fileStorage = getFileStorage(supportedMediumType); @@ -347,7 +350,7 @@ private void trySetTranscriptionAsDefaultOfMedium(int mediumId, int transcriptio } } - private SpeechToTextEngine validateAndUpsertEngineModel(String engineIdentifier, String modelIdentifier) { + private SpeechToTextEngine getSpeechToTextEngineHavingModel(String engineIdentifier, String modelIdentifier) { SpeechToTextEngine engine = speechToTextServiceClient.getAvailableEngines().stream() .filter(candidate -> candidate.engineIdentifier() .equals(engineIdentifier)) @@ -359,12 +362,14 @@ private SpeechToTextEngine validateAndUpsertEngineModel(String engineIdentifier, "Model '" + modelIdentifier + "' is not provided by engine '" + engineIdentifier + "'"); } - transcriptionStorage.upsertEngine(engineIdentifier, engine.engineName()); - transcriptionStorage.upsertModel(engineIdentifier, modelIdentifier); - return engine; } + private void upsertEngineModel(SpeechToTextEngine speechToTextEngine, String modelIdentifier) { + transcriptionStorage.upsertEngine(speechToTextEngine.engineIdentifier(), speechToTextEngine.engineName()); + transcriptionStorage.upsertModel(speechToTextEngine.engineIdentifier(), modelIdentifier); + } + private void startTranscriptionTask(int transcriptionId, Path monoFile, String engineIdentifier, String modelIdentifier) { long sttTaskId = speechToTextServiceClient.startSpeechToTextTask(monoFile, engineIdentifier, modelIdentifier, engineOutputFormat); @@ -434,29 +439,54 @@ private AudioContainingMediumFileStorage getFileStorage(SupportedMediumType supp private void verifyDefaultModelStillAvailable() { try { Optional<TranscriptionModel> defaultModel = systemSettingStorage.getDefaultTranscriptionModel(); + Collection<SpeechToTextEngine> speechToTextEngines = speechToTextServiceClient.getAvailableEngines(); + if (defaultModel.isEmpty()) { + logger.log(Level.WARNING, "No transcription model currently set as default."); + useAnyModelAsDefaultModel(speechToTextEngines); return; } + String engineIdentifier = defaultModel.get().getId().getEngineIdentifier(); String modelIdentifier = defaultModel.get().getId().getModelIdentifier(); - boolean stillAvailable = speechToTextServiceClient.getAvailableEngines().stream() - .filter(engine -> engine.engineIdentifier() - .equals(engineIdentifier)).anyMatch( - engine -> engine.modelIdentifiers().contains(modelIdentifier)); + boolean stillAvailable = speechToTextEngines.stream() + .filter(engine -> engine.engineIdentifier().equals(engineIdentifier)) + .anyMatch(engine -> engine.modelIdentifiers() + .contains(modelIdentifier)); if (!stillAvailable) { logger.log(Level.WARNING, - "Default transcription model {0}/{1} is no longer provided by the speech-to-text-service. Clearing default.", + "Default transcription model {0}/{1} is no longer provided by the speech-to-text-service.", new Object[]{engineIdentifier, modelIdentifier}); - systemSettingStorage.clearDefaultTranscriptionModel(); + useAnyModelAsDefaultModel(speechToTextEngines); } } catch (Exception e) { logger.log(Level.WARNING, "Could not verify availability of the default transcription model", e); } } + private void useAnyModelAsDefaultModel(Collection<SpeechToTextEngine> speechToTextEngines) { + Optional<SpeechToTextEngine> speechToTextEngineWithAtLeastOneModelOptional = speechToTextEngines.stream() + .filter(speechToTextEngine -> !speechToTextEngine.modelIdentifiers() + .isEmpty()) + .findFirst(); + if (speechToTextEngineWithAtLeastOneModelOptional.isPresent()) { + SpeechToTextEngine speechToTextEngineWithAtLeastOneModel = speechToTextEngineWithAtLeastOneModelOptional.get(); + String modelIdentifier = speechToTextEngineWithAtLeastOneModel.modelIdentifiers().stream().findFirst().get(); + upsertEngineModel(speechToTextEngineWithAtLeastOneModel, modelIdentifier); + + logger.log(Level.INFO, "Setting {0}/{1} as new transcription default model.", + new Object[]{speechToTextEngineWithAtLeastOneModel.engineIdentifier(), modelIdentifier}); + systemSettingStorage.updateTranscriptionDefaultModel(speechToTextEngineWithAtLeastOneModel.engineIdentifier(), + modelIdentifier, null); + } + else { + logger.log(Level.WARNING, "No model available which can be used as the default transcription model."); + } + } + private void resumeMonitoringOfActiveTranscriptions() { logger.info("Resuming monitoring of uncompleted speech-to-text tasks"); TranscriptionFilterCriteria transcriptionFilterCriteria = new TranscriptionFilterCriteria.Builder().transcriptionStates( diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/SystemSettingStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/SystemSettingStorage.java index 389e7a3d..3c008886 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/SystemSettingStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/SystemSettingStorage.java @@ -8,6 +8,7 @@ import de.bitgilde.TIMAAT.storage.entity.api.TranscriptionSystemSettings; import jakarta.annotation.Nullable; import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManagerFactory; import java.time.Instant; @@ -42,22 +43,6 @@ public Optional<TranscriptionModel> getDefaultTranscriptionModel() { }); } - /** - * Removes the default transcription model from the singleton settings row. Called when the previously - * configured default model is no longer offered by the connected speech-to-text-service. - * No-op if no settings row exists yet. - */ - public void clearDefaultTranscriptionModel() { - executeDbTransaction(entityManager -> { - SystemSetting systemSetting = entityManager.find(SystemSetting.class, SINGLETON_ID); - if (systemSetting != null) { - systemSetting.setDefaultTranscriptionModel(null); - systemSetting.setLastEditedAt(Instant.now()); - } - return Void.TYPE; - }); - } - /** * Reads the transcription-related system settings (default engine/model and the auto-transcribe-uploads * flag) from the singleton settings row. If no row exists yet, a snapshot reflecting the documented @@ -87,43 +72,67 @@ public TranscriptionSystemSettings getTranscriptionSystemSettings() { * @param editingUser the user performing the change; used to stamp {@code lastEditedByUserAccount}, may be {@code null} * @throws de.bitgilde.TIMAAT.db.exception.DbTransactionExecutionException if the update fails at the database level */ - public void updateTranscriptionSystemSettings(boolean autoTranscribeUploads, - @Nullable String defaultEngineIdentifier, - @Nullable String defaultModelIdentifier, - @Nullable UserAccount editingUser) { + public void updateTranscriptionSystemSettings(boolean autoTranscribeUploads, @Nullable String defaultEngineIdentifier, @Nullable String defaultModelIdentifier, @Nullable UserAccount editingUser) { executeDbTransaction(entityManager -> { SystemSetting systemSetting = entityManager.find(SystemSetting.class, SINGLETON_ID); Instant now = Instant.now(); if (systemSetting == null) { - systemSetting = new SystemSetting(); - systemSetting.setId(SINGLETON_ID); - systemSetting.setCreatedAt(now); - entityManager.persist(systemSetting); + systemSetting = createSystemSetting(entityManager, now); } systemSetting.setAutoTranscribeUploads(autoTranscribeUploads); - - if (defaultEngineIdentifier == null || defaultModelIdentifier == null) { - systemSetting.setDefaultTranscriptionModel(null); + updateTranscriptionDefaultModel(entityManager, systemSetting, defaultEngineIdentifier, defaultModelIdentifier); + systemSetting.setLastEditedAt(now); + if (editingUser != null) { + systemSetting.setLastEditedByUserAccount(editingUser); } - else { - TranscriptionModelId modelId = new TranscriptionModelId(); - modelId.setEngineIdentifier(defaultEngineIdentifier); - modelId.setModelIdentifier(defaultModelIdentifier); - TranscriptionModel model = entityManager.find(TranscriptionModel.class, modelId); - if (model == null) { - throw new IllegalArgumentException( - "Transcription model '" + defaultEngineIdentifier + "/" + defaultModelIdentifier + "' is unknown"); - } - systemSetting.setDefaultTranscriptionModel(model); + return Void.TYPE; + }); + } + + public void updateTranscriptionDefaultModel(@Nullable String defaultEngineIdentifier, @Nullable String defaultModelIdentifier, @Nullable UserAccount editingUser) { + executeDbTransaction(entityManager -> { + SystemSetting systemSetting = entityManager.find(SystemSetting.class, SINGLETON_ID); + Instant now = Instant.now(); + + if (systemSetting == null) { + systemSetting = createSystemSetting(entityManager, now); } + updateTranscriptionDefaultModel(entityManager, systemSetting, defaultEngineIdentifier, defaultModelIdentifier); systemSetting.setLastEditedAt(now); if (editingUser != null) { systemSetting.setLastEditedByUserAccount(editingUser); } + return Void.TYPE; }); } + + private void updateTranscriptionDefaultModel(EntityManager entityManager, SystemSetting systemSetting, @Nullable String defaultEngineIdentifier, @Nullable String defaultModelIdentifier) { + if (defaultEngineIdentifier == null || defaultModelIdentifier == null) { + systemSetting.setDefaultTranscriptionModel(null); + } + else { + TranscriptionModelId modelId = new TranscriptionModelId(); + modelId.setEngineIdentifier(defaultEngineIdentifier); + modelId.setModelIdentifier(defaultModelIdentifier); + TranscriptionModel model = entityManager.find(TranscriptionModel.class, modelId); + if (model == null) { + throw new IllegalArgumentException( + "Transcription model '" + defaultEngineIdentifier + "/" + defaultModelIdentifier + "' is unknown"); + } + systemSetting.setDefaultTranscriptionModel(model); + } + } + + private SystemSetting createSystemSetting(EntityManager entityManager, Instant createdAt) { + SystemSetting systemSetting = new SystemSetting(); + systemSetting.setId(SINGLETON_ID); + systemSetting.setCreatedAt(createdAt); + + entityManager.persist(systemSetting); + return systemSetting; + } } diff --git a/src/test/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionServiceSettingsTest.java b/src/test/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionServiceSettingsTest.java index 3ac4c277..e2485d1b 100644 --- a/src/test/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionServiceSettingsTest.java +++ b/src/test/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionServiceSettingsTest.java @@ -29,6 +29,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.Mockito.clearInvocations; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -78,12 +79,14 @@ void setUp() { } private TranscriptionService featureEnabledService() { - when(speechToTextServiceClient.getAvailableEngines()).thenReturn(List.of( - new SpeechToTextEngine(ENGINE_ID, ENGINE_NAME, List.of(MODEL_ID), + when(speechToTextServiceClient.getAvailableEngines()).thenReturn( + List.of(new SpeechToTextEngine(ENGINE_ID, ENGINE_NAME, List.of(MODEL_ID), List.of(SpeechToTextEngineOutputFormat.SRT)))); - return new TranscriptionService(transcriptionStorage, systemSettingStorage, audioFileStorage, videoFileStorage, - taskServiceProvider, temporaryFileStorage, transcriptionFileStorage, mediumStorage, - speechToTextServiceClient); + TranscriptionService service = new TranscriptionService(transcriptionStorage, systemSettingStorage, + audioFileStorage, videoFileStorage, taskServiceProvider, temporaryFileStorage, transcriptionFileStorage, + mediumStorage, speechToTextServiceClient); + clearInvocations(transcriptionStorage, systemSettingStorage); + return service; } private TranscriptionService featureDisabledService() { @@ -148,9 +151,8 @@ class UpdateTranscriptionSystemSettings { void shouldRejectWhenOnlyEngineIdentifierIsSet() { TranscriptionService service = featureEnabledService(); - assertThatThrownBy(() -> service.updateTranscriptionSystemSettings(true, ENGINE_ID, null, null)) - .isInstanceOf(IllegalArgumentException.class) - .hasMessageContaining("both be set or both be null"); + assertThatThrownBy(() -> service.updateTranscriptionSystemSettings(true, ENGINE_ID, null, null)).isInstanceOf( + IllegalArgumentException.class).hasMessageContaining("both be set or both be null"); verify(systemSettingStorage, never()).updateTranscriptionSystemSettings(anyBoolean(), any(), any(), any()); } @@ -159,8 +161,8 @@ void shouldRejectWhenOnlyEngineIdentifierIsSet() { void shouldRejectWhenOnlyModelIdentifierIsSet() { TranscriptionService service = featureEnabledService(); - assertThatThrownBy(() -> service.updateTranscriptionSystemSettings(false, null, MODEL_ID, null)) - .isInstanceOf(IllegalArgumentException.class); + assertThatThrownBy(() -> service.updateTranscriptionSystemSettings(false, null, MODEL_ID, null)).isInstanceOf( + IllegalArgumentException.class); verify(systemSettingStorage, never()).updateTranscriptionSystemSettings(anyBoolean(), any(), any(), any()); } @@ -169,8 +171,9 @@ void shouldRejectWhenOnlyModelIdentifierIsSet() { void shouldRejectSettingDefaultModelWhenFeatureDisabled() { TranscriptionService service = featureDisabledService(); - assertThatThrownBy(() -> service.updateTranscriptionSystemSettings(false, ENGINE_ID, MODEL_ID, null)) - .isInstanceOf(TranscriptionFeatureDisabledException.class); + assertThatThrownBy( + () -> service.updateTranscriptionSystemSettings(false, ENGINE_ID, MODEL_ID, null)).isInstanceOf( + TranscriptionFeatureDisabledException.class); verifyNoInteractions(systemSettingStorage); } @@ -188,9 +191,9 @@ void shouldAllowClearingDefaultEvenWhenFeatureDisabled() throws TranscriptionFea void shouldRejectUnknownEngineWhenSettingDefault() { TranscriptionService service = featureEnabledService(); - assertThatThrownBy(() -> service.updateTranscriptionSystemSettings(true, "unknown-engine", MODEL_ID, null)) - .isInstanceOf(IllegalArgumentException.class) - .hasMessageContaining("unknown-engine"); + assertThatThrownBy( + () -> service.updateTranscriptionSystemSettings(true, "unknown-engine", MODEL_ID, null)).isInstanceOf( + IllegalArgumentException.class).hasMessageContaining("unknown-engine"); verify(systemSettingStorage, never()).updateTranscriptionSystemSettings(anyBoolean(), any(), any(), any()); } @@ -199,9 +202,9 @@ void shouldRejectUnknownEngineWhenSettingDefault() { void shouldRejectUnknownModelOnKnownEngineWhenSettingDefault() { TranscriptionService service = featureEnabledService(); - assertThatThrownBy(() -> service.updateTranscriptionSystemSettings(true, ENGINE_ID, "unknown-model", null)) - .isInstanceOf(IllegalArgumentException.class) - .hasMessageContaining("unknown-model"); + assertThatThrownBy( + () -> service.updateTranscriptionSystemSettings(true, ENGINE_ID, "unknown-model", null)).isInstanceOf( + IllegalArgumentException.class).hasMessageContaining("unknown-model"); verify(systemSettingStorage, never()).updateTranscriptionSystemSettings(anyBoolean(), any(), any(), any()); } diff --git a/src/test/java/de/bitgilde/TIMAAT/storage/entity/SystemSettingStorageTest.java b/src/test/java/de/bitgilde/TIMAAT/storage/entity/SystemSettingStorageTest.java index 83273916..d6ef8fef 100644 --- a/src/test/java/de/bitgilde/TIMAAT/storage/entity/SystemSettingStorageTest.java +++ b/src/test/java/de/bitgilde/TIMAAT/storage/entity/SystemSettingStorageTest.java @@ -175,9 +175,8 @@ void shouldRollbackAndWrapIllegalArgumentWhenModelIsUnknown() { when(entityManager.find(SystemSetting.class, SINGLETON_ID)).thenReturn(existingRow); when(entityManager.find(eq(TranscriptionModel.class), any(TranscriptionModelId.class))).thenReturn(null); - assertThatThrownBy(() -> storage.updateTranscriptionSystemSettings(true, ENGINE_ID, MODEL_ID, null)) - .isInstanceOf(DbTransactionExecutionException.class) - .hasCauseInstanceOf(IllegalArgumentException.class); + assertThatThrownBy(() -> storage.updateTranscriptionSystemSettings(true, ENGINE_ID, MODEL_ID, null)).isInstanceOf( + DbTransactionExecutionException.class).hasCauseInstanceOf(IllegalArgumentException.class); verify(entityTransaction).rollback(); verify(entityTransaction, never()).commit(); @@ -207,34 +206,6 @@ void shouldLeaveLastEditedByUserAccountAloneWhenNoUserProvided() { } } - @Nested - class ClearDefaultTranscriptionModel { - - @Test - void shouldClearDefaultAndStampLastEditedAtWhenRowExists() { - SystemSetting existingRow = existingRow(true, transcriptionModel(ENGINE_ID, MODEL_ID)); - when(entityManager.find(SystemSetting.class, SINGLETON_ID)).thenReturn(existingRow); - - Instant before = Instant.now(); - storage.clearDefaultTranscriptionModel(); - Instant after = Instant.now(); - - assertThat(existingRow.getDefaultTranscriptionModel()).isNull(); - assertThat(existingRow.getLastEditedAt()).isBetween(before, after); - verify(entityTransaction).commit(); - } - - @Test - void shouldBeNoOpWhenNoRowExists() { - when(entityManager.find(SystemSetting.class, SINGLETON_ID)).thenReturn(null); - - storage.clearDefaultTranscriptionModel(); - - verify(entityManager, never()).persist(any()); - verify(entityTransaction).commit(); - } - } - @Nested class GetDefaultTranscriptionModel { From 0213f57c0fbc8778966a16d7e7d8cf7e34c259f3 Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Sun, 24 May 2026 14:12:32 +0200 Subject: [PATCH 62/70] TIMAAT #57 - Added endpoints to EndpointMedium allowing access and creation of medium transcription * GET medium/{id}/transcriptions * GET medium/{id}/transcriptions/{transcriptionId} * POST medium/{id}/transcriptions --- .../TIMAAT/rest/endpoint/EndpointMedium.java | 121 +++++++++ .../CreateTranscriptionRequest.java | 18 ++ .../model/transcription/TranscriptionDto.java | 27 ++ .../transcription/TranscriptionService.java | 45 +++- .../storage/entity/medium/MediumStorage.java | 10 + .../exception/MediumNotFoundException.java | 25 ++ .../transcription/TranscriptionStorage.java | 5 + .../api/TranscriptionFilterCriteria.java | 15 ++ .../transcription/api/TranscriptionState.java | 16 ++ .../transcription/api/TranscriptionType.java | 16 ++ .../EndpointMediumTranscriptionsTest.java | 236 ++++++++++++++++++ .../endpoint/EndpointSystemSettingsTest.java | 106 ++++++++ .../TranscriptionServiceMediumLookupTest.java | 166 ++++++++++++ 13 files changed, 805 insertions(+), 1 deletion(-) create mode 100644 src/main/java/de/bitgilde/TIMAAT/rest/model/transcription/CreateTranscriptionRequest.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/rest/model/transcription/TranscriptionDto.java create mode 100644 src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/exception/MediumNotFoundException.java create mode 100644 src/test/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMediumTranscriptionsTest.java create mode 100644 src/test/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointSystemSettingsTest.java create mode 100644 src/test/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionServiceMediumLookupTest.java diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java index b06dce6e..dfa26dcd 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java @@ -50,17 +50,25 @@ import de.bitgilde.TIMAAT.rest.model.medium.UpdateMediumHasMusicListPayload; import de.bitgilde.TIMAAT.rest.model.medium.UpdateMediumHasMusicListPayload.MediumHasMusicListEntry; import de.bitgilde.TIMAAT.rest.model.medium.UpdateMediumVideoThumbnailPayload; +import de.bitgilde.TIMAAT.rest.model.transcription.CreateTranscriptionRequest; +import de.bitgilde.TIMAAT.rest.model.transcription.TranscriptionDto; import de.bitgilde.TIMAAT.security.TIMAATKeyGenerator; import de.bitgilde.TIMAAT.security.UserLogManager; import de.bitgilde.TIMAAT.service.task.TaskService; import de.bitgilde.TIMAAT.service.task.api.MediumAudioAnalysisTask.SupportedMediumType; import de.bitgilde.TIMAAT.service.task.api.TaskState; import de.bitgilde.TIMAAT.service.task.exception.TaskServiceException; +import de.bitgilde.TIMAAT.service.transcription.TranscriptionService; +import de.bitgilde.TIMAAT.service.transcription.api.GenerateTranscriptionConfiguration; +import de.bitgilde.TIMAAT.service.transcription.exception.TranscriptionFeatureDisabledException; +import de.bitgilde.TIMAAT.service.transcription.exception.TranscriptionNotFoundException; +import de.bitgilde.TIMAAT.service.transcription.exception.TranscriptionServiceException; import de.bitgilde.TIMAAT.storage.api.PagingParameter; import de.bitgilde.TIMAAT.storage.api.SortingParameter; import de.bitgilde.TIMAAT.storage.entity.MediumVideoStorage; import de.bitgilde.TIMAAT.storage.entity.medium.MediumStorage; import de.bitgilde.TIMAAT.storage.entity.medium.api.MediumFilterCriteria; +import de.bitgilde.TIMAAT.storage.entity.medium.exception.MediumNotFoundException; import de.bitgilde.TIMAAT.storage.file.AudioFileStorage; import de.bitgilde.TIMAAT.storage.file.ImageFileStorage; import de.bitgilde.TIMAAT.storage.file.ImageFileStorage.ImageFileType; @@ -171,6 +179,8 @@ public class EndpointMedium { private MediumVideoStorage mediumVideoStorage; @Inject private FfmpegVideoEngine ffmpegVideoEngine; + @Inject + private TranscriptionService transcriptionService; @GET @@ -4480,4 +4490,115 @@ public static <T> List<T> castList(Class<? extends T> clazz, Collection<?> c) { return r; } + /** + * Returns all transcriptions that belong to the given medium. An empty collection is returned + * when the medium has no transcriptions; if the medium itself does not exist the response is + * {@code 404 Not Found}. + * + * @param mediumId identifies the {@link Medium} whose transcriptions should be returned + * @return {@code 200 OK} with the transcription DTOs, or {@code 404 Not Found} when the + * medium does not exist + */ + @GET + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Secured + @Path("{id}/transcriptions") + public Response getMediumTranscriptions(@PathParam("id") int mediumId) { + try { + Collection<de.bitgilde.TIMAAT.model.FIPOP.Transcription> transcriptions = transcriptionService.getTranscriptionsForMedium( + mediumId); + List<TranscriptionDto> dtos = transcriptions.stream().map(EndpointMedium::toTranscriptionDto) + .collect(Collectors.toList()); + return Response.ok(dtos).build(); + } catch (MediumNotFoundException e) { + return Response.status(Status.NOT_FOUND).entity("{\"reason\":\"" + e.getMessage() + "\"}").build(); + } + } + + /** + * Returns the single transcription identified by {@code transcriptionId}, scoped to the given + * medium so a transcription belonging to a different medium is reported as not found rather + * than returned out of context. + * + * @param mediumId identifies the {@link Medium} the transcription is expected to belong to + * @param transcriptionId identifies the transcription to load + * @return {@code 200 OK} with the transcription DTO, or {@code 404 Not Found} when the + * transcription does not exist or belongs to a different medium + */ + @GET + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Secured + @Path("{id}/transcriptions/{transcriptionId}") + public Response getMediumTranscription(@PathParam("id") int mediumId, @PathParam("transcriptionId") int transcriptionId) { + try { + de.bitgilde.TIMAAT.model.FIPOP.Transcription transcription = transcriptionService.getTranscription(mediumId, + transcriptionId); + return Response.ok(toTranscriptionDto(transcription)).build(); + } catch (TranscriptionNotFoundException e) { + return Response.status(Status.NOT_FOUND).entity("{\"reason\":\"" + e.getMessage() + "\"}").build(); + } + } + + /** + * Creates a new transcription for the given medium using the engine and model identified in + * the payload. Both {@code engineIdentifier} and {@code modelIdentifier} are required; a + * request that omits either field, or that names an engine/model pair the speech-to-text + * service does not provide, is rejected with {@code 400 Bad Request}. When the speech-to-text + * feature is disabled for this deployment the request is refused with {@code 403 Forbidden}. + * + * @param mediumId identifies the {@link Medium} the transcription should be created for + * @param request payload carrying the engine/model identifiers + * @return {@code 201 Created} with the new transcription DTO; {@code 400 Bad Request} when + * the payload is missing or invalid; {@code 403 Forbidden} when the feature is disabled; + * {@code 500 Internal Server Error} when the transcription could not be created + */ + @POST + @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Secured + @Path("{id}/transcriptions") + public Response createMediumTranscription(@PathParam("id") int mediumId, CreateTranscriptionRequest request) { + if (request == null) { + return Response.status(Status.BAD_REQUEST).entity("{\"reason\":\"request body is required\"}").build(); + } + if (isBlank(request.engineIdentifier()) || isBlank(request.modelIdentifier())) { + return Response.status(Status.BAD_REQUEST) + .entity("{\"reason\":\"engineIdentifier and modelIdentifier are required\"}").build(); + } + + GenerateTranscriptionConfiguration configuration = new GenerateTranscriptionConfiguration(mediumId, + request.engineIdentifier(), request.modelIdentifier()); + + try { + de.bitgilde.TIMAAT.model.FIPOP.Transcription created = transcriptionService.createTranscription(configuration); + return Response.status(Status.CREATED).entity(toTranscriptionDto(created)).build(); + } catch (TranscriptionFeatureDisabledException e) { + return Response.status(Status.FORBIDDEN).entity("{\"reason\":\"" + e.getMessage() + "\"}").build(); + } catch (IllegalArgumentException e) { + return Response.status(Status.BAD_REQUEST).entity("{\"reason\":\"" + e.getMessage() + "\"}").build(); + } catch (TranscriptionServiceException e) { + return Response.status(Status.INTERNAL_SERVER_ERROR).entity("{\"reason\":\"" + e.getMessage() + "\"}").build(); + } + } + + private static boolean isBlank(String value) { + return value == null || value.isBlank(); + } + + private static TranscriptionDto toTranscriptionDto(de.bitgilde.TIMAAT.model.FIPOP.Transcription transcription) { + String engineIdentifier = null; + String modelIdentifier = null; + if (transcription.getTranscriptionModel() != null && transcription.getTranscriptionModel().getId() != null) { + engineIdentifier = transcription.getTranscriptionModel().getId().getEngineIdentifier(); + modelIdentifier = transcription.getTranscriptionModel().getId().getModelIdentifier(); + } + + return new TranscriptionDto(transcription.getId(), transcription.getName(), transcription.getMedium().getId(), + engineIdentifier, modelIdentifier, + de.bitgilde.TIMAAT.storage.entity.transcription.api.TranscriptionState.fromDatabaseId( + transcription.getTranscriptionState().getId()), + de.bitgilde.TIMAAT.storage.entity.transcription.api.TranscriptionType.fromDatabaseId( + transcription.getTranscriptionType().getId()), transcription.getCreatedAt()); + } + } diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/model/transcription/CreateTranscriptionRequest.java b/src/main/java/de/bitgilde/TIMAAT/rest/model/transcription/CreateTranscriptionRequest.java new file mode 100644 index 00000000..ee9593af --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/rest/model/transcription/CreateTranscriptionRequest.java @@ -0,0 +1,18 @@ +package de.bitgilde.TIMAAT.rest.model.transcription; + +import jakarta.annotation.Nullable; + +/** + * Request payload accepted by {@code POST /medium/{id}/transcriptions}. Both + * {@code engineIdentifier} and {@code modelIdentifier} are required; the endpoint rejects + * requests where either field is {@code null} or blank with {@code 400 Bad Request}. They are + * declared {@link Nullable} so the JSON binder can populate the record from payloads that omit + * one of the fields and the endpoint can validate them itself with a clearer message than the + * binder would produce. + * + * @author Nico Kotlenga (nico@nko-dev.studio) + * @since 2026-05-24 + */ +public record CreateTranscriptionRequest(@Nullable String engineIdentifier, + @Nullable String modelIdentifier) { +} diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/model/transcription/TranscriptionDto.java b/src/main/java/de/bitgilde/TIMAAT/rest/model/transcription/TranscriptionDto.java new file mode 100644 index 00000000..3e7602dc --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/rest/model/transcription/TranscriptionDto.java @@ -0,0 +1,27 @@ +package de.bitgilde.TIMAAT.rest.model.transcription; + +import de.bitgilde.TIMAAT.storage.entity.transcription.api.TranscriptionState; +import de.bitgilde.TIMAAT.storage.entity.transcription.api.TranscriptionType; +import jakarta.annotation.Nullable; + +import java.time.Instant; + +/** + * Wire representation of a {@link de.bitgilde.TIMAAT.model.FIPOP.Transcription}. Exposes only the + * fields needed by the UI so the persistence model can evolve without breaking clients. The + * {@code engineIdentifier} and {@code modelIdentifier} mirror the persisted model id of the + * underlying {@link de.bitgilde.TIMAAT.model.FIPOP.TranscriptionModel}; both are {@code null} for + * imported transcriptions that were not produced by an engine/model pair. + * + * @author Nico Kotlenga (nico@nko-dev.studio) + * @since 2026-05-24 + */ +public record TranscriptionDto(int id, + String name, + int mediumId, + @Nullable String engineIdentifier, + @Nullable String modelIdentifier, + TranscriptionState state, + TranscriptionType type, + Instant createdAt) { +} diff --git a/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java b/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java index 0bc87044..33edcc7f 100644 --- a/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java @@ -22,6 +22,7 @@ import de.bitgilde.TIMAAT.storage.entity.SystemSettingStorage; import de.bitgilde.TIMAAT.storage.entity.api.TranscriptionSystemSettings; import de.bitgilde.TIMAAT.storage.entity.medium.MediumStorage; +import de.bitgilde.TIMAAT.storage.entity.medium.exception.MediumNotFoundException; import de.bitgilde.TIMAAT.storage.entity.transcription.TranscriptionStorage; import de.bitgilde.TIMAAT.storage.entity.transcription.api.TranscriptionFilterCriteria; import de.bitgilde.TIMAAT.storage.entity.transcription.api.TranscriptionState; @@ -252,7 +253,7 @@ public void updateTranscriptionSystemSettings(boolean autoTranscribeUploads, @Nu * @throws TranscriptionServiceException if the transcription could not be created (e.g. underlying task scheduling * or storage access failed) */ - public void createTranscription(GenerateTranscriptionConfiguration generateTranscriptionConfiguration) throws TranscriptionServiceException { + public Transcription createTranscription(GenerateTranscriptionConfiguration generateTranscriptionConfiguration) throws TranscriptionServiceException { if (!featureEnabled) { throw new TranscriptionFeatureDisabledException("Speech-to-text feature is disabled for this deployment"); } @@ -294,6 +295,48 @@ public void createTranscription(GenerateTranscriptionConfiguration generateTrans throw new TranscriptionServiceException("Failed to create transcription for medium " + mediumId, e); } trySetTranscriptionAsDefaultOfMedium(mediumId, createdTranscription.getId()); + return createdTranscription; + } + + /** + * Returns all transcriptions that belong to the given medium, ordered by the storage's + * default sort order. The medium is checked first so callers can distinguish "medium has no + * transcriptions" (empty collection) from "medium does not exist" ({@link MediumNotFoundException}). + * + * @param mediumId identifies the {@link de.bitgilde.TIMAAT.model.FIPOP.Medium} whose + * transcriptions should be returned + * @return the transcriptions of the given medium, never {@code null} + * @throws MediumNotFoundException if no medium with the given id exists + */ + public Collection<Transcription> getTranscriptionsForMedium(int mediumId) throws MediumNotFoundException { + if (!mediumStorage.existsById(mediumId)) { + throw new MediumNotFoundException(mediumId); + } + TranscriptionFilterCriteria filter = new TranscriptionFilterCriteria.Builder().mediumId(mediumId).build(); + return transcriptionStorage.getEntriesAsStream(filter, PagingParameter.NO_PAGING, + SortingParameter.defaultSortOrder(), null).toList(); + } + + /** + * Loads a single {@link Transcription} belonging to the given medium. The medium id is part of + * the lookup so that the transcription URL path is honoured: a transcription belonging to a + * different medium is reported as {@link TranscriptionNotFoundException} rather than returned + * out of context. + * + * @param mediumId identifies the {@link de.bitgilde.TIMAAT.model.FIPOP.Medium} the + * transcription is expected to belong to + * @param transcriptionId identifies the {@link Transcription} to load + * @return the matching {@link Transcription} + * @throws TranscriptionNotFoundException if no transcription with the given id exists or the + * transcription belongs to a different medium + */ + public Transcription getTranscription(int mediumId, int transcriptionId) throws TranscriptionNotFoundException { + Transcription transcription = transcriptionStorage.findById(transcriptionId) + .orElseThrow(() -> new TranscriptionNotFoundException(transcriptionId)); + if (transcription.getMedium() == null || transcription.getMedium().getId() != mediumId) { + throw new TranscriptionNotFoundException(transcriptionId); + } + return transcription; } /** diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/MediumStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/MediumStorage.java index f9d6c0f3..d8fc0908 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/MediumStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/MediumStorage.java @@ -63,6 +63,16 @@ public MediumStorage(EntityManagerFactory emf) { super(Medium.class, MediumSortingField.ID, emf); } + /** + * Checks whether a {@link Medium} with the given id exists. + * + * @param mediumId identifies the medium whose existence should be checked + * @return {@code true} if a medium with the given id exists, {@code false} otherwise + */ + public boolean existsById(int mediumId) { + return executeDbTransaction(entityManager -> entityManager.find(Medium.class, mediumId) != null); + } + /** * Sets the given {@link Transcription} as the default transcription of the medium identified by * {@code mediumId}, but only if the medium currently has no default transcription assigned. The diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/exception/MediumNotFoundException.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/exception/MediumNotFoundException.java new file mode 100644 index 00000000..191fe6f8 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/exception/MediumNotFoundException.java @@ -0,0 +1,25 @@ +package de.bitgilde.TIMAAT.storage.entity.medium.exception; + +/** + * Signals that an operation targeted a {@link de.bitgilde.TIMAAT.model.FIPOP.Medium} which does + * not exist (or no longer exists). Callers in the REST layer should typically map this to + * {@code 404 Not Found}. + * + * @author Nico Kotlenga (nico@nko-dev.studio) + * @since 2026-05-24 + */ +public class MediumNotFoundException extends Exception { + + private static final long serialVersionUID = 1L; + + private final int mediumId; + + public MediumNotFoundException(int mediumId) { + super("No medium with id " + mediumId + " found"); + this.mediumId = mediumId; + } + + public int getMediumId() { + return mediumId; + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/TranscriptionStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/TranscriptionStorage.java index 69e83bb0..a410f554 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/TranscriptionStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/TranscriptionStorage.java @@ -2,6 +2,7 @@ import de.bitgilde.TIMAAT.db.exception.DbTransactionExecutionException; import de.bitgilde.TIMAAT.model.FIPOP.Medium; +import de.bitgilde.TIMAAT.model.FIPOP.Medium_; import de.bitgilde.TIMAAT.model.FIPOP.Transcription; import de.bitgilde.TIMAAT.model.FIPOP.TranscriptionEngine; import de.bitgilde.TIMAAT.model.FIPOP.TranscriptionModel; @@ -276,6 +277,10 @@ protected List<Predicate> createPredicates(@Nullable TranscriptionFilterCriteria predicates.add(root.get(Transcription_.transcriptionType).get(TranscriptionType_.id).in(transcriptionTypeIds)); } + if (filter.getMediumId().isPresent()) { + predicates.add(criteriaBuilder.equal(root.get(Transcription_.medium).get(Medium_.id), filter.getMediumId().get())); + } + return predicates; } diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/api/TranscriptionFilterCriteria.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/api/TranscriptionFilterCriteria.java index 5e9bb0a8..2ae383d9 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/api/TranscriptionFilterCriteria.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/api/TranscriptionFilterCriteria.java @@ -1,5 +1,7 @@ package de.bitgilde.TIMAAT.storage.entity.transcription.api; +import jakarta.annotation.Nullable; + import java.util.Collection; import java.util.Optional; @@ -29,10 +31,13 @@ public interface TranscriptionFilterCriteria { Optional<Collection<TranscriptionType>> getTranscriptionTypes(); + Optional<Integer> getMediumId(); + class Builder { private Collection<TranscriptionState> transcriptionStates = null; private Collection<TranscriptionType> transcriptionTypes = null; + private Integer mediumId = null; public TranscriptionFilterCriteria.Builder transcriptionStates(Collection<TranscriptionState> transcriptionStates) { this.transcriptionStates = transcriptionStates; @@ -44,6 +49,11 @@ public TranscriptionFilterCriteria.Builder transcriptionTypes(Collection<Transcr return this; } + public TranscriptionFilterCriteria.Builder mediumId(@Nullable Integer mediumId) { + this.mediumId = mediumId; + return this; + } + public TranscriptionFilterCriteria build() { return new TranscriptionFilterCriteria() { @Override @@ -55,6 +65,11 @@ public Optional<Collection<TranscriptionState>> getTranscriptionStates() { public Optional<Collection<TranscriptionType>> getTranscriptionTypes() { return Optional.ofNullable(transcriptionTypes); } + + @Override + public Optional<Integer> getMediumId() { + return Optional.ofNullable(mediumId); + } }; } } diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/api/TranscriptionState.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/api/TranscriptionState.java index cb512118..70dd14a9 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/api/TranscriptionState.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/api/TranscriptionState.java @@ -18,4 +18,20 @@ public enum TranscriptionState { public int getDatabaseId() { return databaseId; } + + /** + * Looks up the enum constant whose {@link #getDatabaseId()} matches the given id. + * + * @param databaseId the {@code transcription_state.id} value persisted in the DB + * @return the matching enum constant + * @throws IllegalArgumentException if no constant has the given database id + */ + public static TranscriptionState fromDatabaseId(int databaseId) { + for (TranscriptionState state : values()) { + if (state.databaseId == databaseId) { + return state; + } + } + throw new IllegalArgumentException("No TranscriptionState with database id " + databaseId); + } } diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/api/TranscriptionType.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/api/TranscriptionType.java index 0141f0fb..56ebfa2b 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/api/TranscriptionType.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/api/TranscriptionType.java @@ -20,4 +20,20 @@ public enum TranscriptionType { public int getDatabaseId() { return databaseId; } + + /** + * Looks up the enum constant whose {@link #getDatabaseId()} matches the given id. + * + * @param databaseId the {@code transcription_type.id} value persisted in the DB + * @return the matching enum constant + * @throws IllegalArgumentException if no constant has the given database id + */ + public static TranscriptionType fromDatabaseId(int databaseId) { + for (TranscriptionType type : values()) { + if (type.databaseId == databaseId) { + return type; + } + } + throw new IllegalArgumentException("No TranscriptionType with database id " + databaseId); + } } diff --git a/src/test/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMediumTranscriptionsTest.java b/src/test/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMediumTranscriptionsTest.java new file mode 100644 index 00000000..5b43ae73 --- /dev/null +++ b/src/test/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMediumTranscriptionsTest.java @@ -0,0 +1,236 @@ +package de.bitgilde.TIMAAT.rest.endpoint; + +import de.bitgilde.TIMAAT.model.FIPOP.Medium; +import de.bitgilde.TIMAAT.model.FIPOP.Transcription; +import de.bitgilde.TIMAAT.model.FIPOP.TranscriptionModel; +import de.bitgilde.TIMAAT.model.FIPOP.TranscriptionModelId; +import de.bitgilde.TIMAAT.rest.model.transcription.CreateTranscriptionRequest; +import de.bitgilde.TIMAAT.rest.model.transcription.TranscriptionDto; +import de.bitgilde.TIMAAT.service.transcription.TranscriptionService; +import de.bitgilde.TIMAAT.service.transcription.api.GenerateTranscriptionConfiguration; +import de.bitgilde.TIMAAT.service.transcription.exception.TranscriptionFeatureDisabledException; +import de.bitgilde.TIMAAT.service.transcription.exception.TranscriptionNotFoundException; +import de.bitgilde.TIMAAT.service.transcription.exception.TranscriptionServiceException; +import de.bitgilde.TIMAAT.storage.entity.medium.exception.MediumNotFoundException; +import de.bitgilde.TIMAAT.storage.entity.transcription.api.TranscriptionState; +import de.bitgilde.TIMAAT.storage.entity.transcription.api.TranscriptionType; +import jakarta.ws.rs.core.Response; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.ArgumentCaptor; + +import java.lang.reflect.Field; +import java.time.Instant; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +/** + * Tests for the transcription-related sub-resources exposed by {@link EndpointMedium} + * ({@code GET /medium/{id}/transcriptions}, {@code GET /medium/{id}/transcriptions/{tid}}, + * {@code POST /medium/{id}/transcriptions}). The endpoint is wired with mocked + * collaborators (no Jersey involved); injected fields are populated via reflection. + * + * @author Nico Kotlenga (nico@nko-dev.studio) + * @since 2026-05-24 + */ +public class EndpointMediumTranscriptionsTest { + + private static final int MEDIUM_ID = 42; + private static final int TRANSCRIPTION_ID = 7; + private static final String ENGINE = "whisper"; + private static final String MODEL = "large-v3"; + + private TranscriptionService transcriptionService; + private EndpointMedium endpoint; + + @BeforeEach + void setUp() throws Exception { + transcriptionService = mock(TranscriptionService.class); + endpoint = new EndpointMedium(); + inject("transcriptionService", transcriptionService); + } + + private void inject(String fieldName, Object value) throws Exception { + Field field = EndpointMedium.class.getDeclaredField(fieldName); + field.setAccessible(true); + field.set(endpoint, value); + } + + @Test + @SuppressWarnings("unchecked") + void shouldReturnTranscriptionsOfMediumAsDtoCollection() throws Exception { + Transcription transcription = transcription(TRANSCRIPTION_ID, MEDIUM_ID, ENGINE, MODEL); + when(transcriptionService.getTranscriptionsForMedium(MEDIUM_ID)).thenReturn(List.of(transcription)); + + Response response = endpoint.getMediumTranscriptions(MEDIUM_ID); + + assertThat(response.getStatus()).isEqualTo(Response.Status.OK.getStatusCode()); + Iterable<TranscriptionDto> result = (Iterable<TranscriptionDto>) response.getEntity(); + assertThat(result).hasSize(1); + TranscriptionDto dto = result.iterator().next(); + assertThat(dto.id()).isEqualTo(TRANSCRIPTION_ID); + assertThat(dto.mediumId()).isEqualTo(MEDIUM_ID); + assertThat(dto.engineIdentifier()).isEqualTo(ENGINE); + assertThat(dto.modelIdentifier()).isEqualTo(MODEL); + } + + @Test + @SuppressWarnings("unchecked") + void shouldReturnEmptyCollectionWhenMediumHasNoTranscriptions() throws Exception { + when(transcriptionService.getTranscriptionsForMedium(MEDIUM_ID)).thenReturn(List.of()); + + Response response = endpoint.getMediumTranscriptions(MEDIUM_ID); + + assertThat(response.getStatus()).isEqualTo(Response.Status.OK.getStatusCode()); + assertThat((Iterable<TranscriptionDto>) response.getEntity()).isEmpty(); + } + + @Test + void shouldReturnNotFoundWhenMediumDoesNotExistForList() throws Exception { + when(transcriptionService.getTranscriptionsForMedium(MEDIUM_ID)).thenThrow( + new MediumNotFoundException(MEDIUM_ID)); + + Response response = endpoint.getMediumTranscriptions(MEDIUM_ID); + + assertThat(response.getStatus()).isEqualTo(Response.Status.NOT_FOUND.getStatusCode()); + } + + @Test + void shouldReturnSingleTranscriptionDtoWhenFound() throws Exception { + Transcription transcription = transcription(TRANSCRIPTION_ID, MEDIUM_ID, ENGINE, MODEL); + when(transcriptionService.getTranscription(MEDIUM_ID, TRANSCRIPTION_ID)).thenReturn(transcription); + + Response response = endpoint.getMediumTranscription(MEDIUM_ID, TRANSCRIPTION_ID); + + assertThat(response.getStatus()).isEqualTo(Response.Status.OK.getStatusCode()); + assertThat(response.getEntity()).isInstanceOf(TranscriptionDto.class); + TranscriptionDto dto = (TranscriptionDto) response.getEntity(); + assertThat(dto.id()).isEqualTo(TRANSCRIPTION_ID); + assertThat(dto.mediumId()).isEqualTo(MEDIUM_ID); + } + + @Test + void shouldReturnNotFoundWhenTranscriptionDoesNotExist() throws Exception { + when(transcriptionService.getTranscription(MEDIUM_ID, TRANSCRIPTION_ID)).thenThrow( + new TranscriptionNotFoundException(TRANSCRIPTION_ID)); + + Response response = endpoint.getMediumTranscription(MEDIUM_ID, TRANSCRIPTION_ID); + + assertThat(response.getStatus()).isEqualTo(Response.Status.NOT_FOUND.getStatusCode()); + } + + @Test + void shouldCreateTranscriptionAndReturnCreatedWithDto() throws Exception { + Transcription created = transcription(TRANSCRIPTION_ID, MEDIUM_ID, ENGINE, MODEL); + when(transcriptionService.createTranscription(any(GenerateTranscriptionConfiguration.class))).thenReturn(created); + CreateTranscriptionRequest request = new CreateTranscriptionRequest(ENGINE, MODEL); + + Response response = endpoint.createMediumTranscription(MEDIUM_ID, request); + + assertThat(response.getStatus()).isEqualTo(Response.Status.CREATED.getStatusCode()); + assertThat(response.getEntity()).isInstanceOf(TranscriptionDto.class); + TranscriptionDto dto = (TranscriptionDto) response.getEntity(); + assertThat(dto.id()).isEqualTo(TRANSCRIPTION_ID); + assertThat(dto.engineIdentifier()).isEqualTo(ENGINE); + assertThat(dto.modelIdentifier()).isEqualTo(MODEL); + + ArgumentCaptor<GenerateTranscriptionConfiguration> captor = ArgumentCaptor.forClass( + GenerateTranscriptionConfiguration.class); + verify(transcriptionService).createTranscription(captor.capture()); + assertThat(captor.getValue().mediumId()).isEqualTo(MEDIUM_ID); + assertThat(captor.getValue().engineIdentifier()).isEqualTo(ENGINE); + assertThat(captor.getValue().modelIdentifier()).isEqualTo(MODEL); + } + + @Test + void shouldReturnBadRequestWhenCreateRequestBodyIsNull() { + Response response = endpoint.createMediumTranscription(MEDIUM_ID, null); + + assertThat(response.getStatus()).isEqualTo(Response.Status.BAD_REQUEST.getStatusCode()); + } + + @Test + void shouldReturnBadRequestWhenEngineIdentifierIsMissing() { + CreateTranscriptionRequest request = new CreateTranscriptionRequest(null, MODEL); + + Response response = endpoint.createMediumTranscription(MEDIUM_ID, request); + + assertThat(response.getStatus()).isEqualTo(Response.Status.BAD_REQUEST.getStatusCode()); + } + + @Test + void shouldReturnBadRequestWhenModelIdentifierIsMissing() { + CreateTranscriptionRequest request = new CreateTranscriptionRequest(ENGINE, null); + + Response response = endpoint.createMediumTranscription(MEDIUM_ID, request); + + assertThat(response.getStatus()).isEqualTo(Response.Status.BAD_REQUEST.getStatusCode()); + } + + @Test + void shouldReturnBadRequestWhenEngineModelPairIsUnknown() throws Exception { + doThrow(new IllegalArgumentException("Model 'large-v3' is not provided by engine 'whisper'")) + .when(transcriptionService).createTranscription(any(GenerateTranscriptionConfiguration.class)); + CreateTranscriptionRequest request = new CreateTranscriptionRequest(ENGINE, MODEL); + + Response response = endpoint.createMediumTranscription(MEDIUM_ID, request); + + assertThat(response.getStatus()).isEqualTo(Response.Status.BAD_REQUEST.getStatusCode()); + } + + @Test + void shouldReturnForbiddenWhenSpeechToTextFeatureIsDisabled() throws Exception { + doThrow(new TranscriptionFeatureDisabledException("speech-to-text feature is disabled")) + .when(transcriptionService).createTranscription(any(GenerateTranscriptionConfiguration.class)); + CreateTranscriptionRequest request = new CreateTranscriptionRequest(ENGINE, MODEL); + + Response response = endpoint.createMediumTranscription(MEDIUM_ID, request); + + assertThat(response.getStatus()).isEqualTo(Response.Status.FORBIDDEN.getStatusCode()); + } + + @Test + void shouldReturnInternalServerErrorWhenServiceFails() throws Exception { + doThrow(new TranscriptionServiceException("backend exploded")) + .when(transcriptionService).createTranscription(any(GenerateTranscriptionConfiguration.class)); + CreateTranscriptionRequest request = new CreateTranscriptionRequest(ENGINE, MODEL); + + Response response = endpoint.createMediumTranscription(MEDIUM_ID, request); + + assertThat(response.getStatus()).isEqualTo(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode()); + } + + private Transcription transcription(int id, int mediumId, String engineIdentifier, String modelIdentifier) { + Transcription transcription = new Transcription(); + transcription.setId(id); + transcription.setName(engineIdentifier + " / " + modelIdentifier); + transcription.setCreatedAt(Instant.parse("2026-05-24T10:00:00Z")); + + Medium medium = new Medium(); + medium.setId(mediumId); + transcription.setMedium(medium); + + TranscriptionModelId modelId = new TranscriptionModelId(); + modelId.setEngineIdentifier(engineIdentifier); + modelId.setModelIdentifier(modelIdentifier); + TranscriptionModel model = new TranscriptionModel(); + model.setId(modelId); + transcription.setTranscriptionModel(model); + + de.bitgilde.TIMAAT.model.FIPOP.TranscriptionState stateEntity = new de.bitgilde.TIMAAT.model.FIPOP.TranscriptionState(); + stateEntity.setId(TranscriptionState.PENDING.getDatabaseId()); + transcription.setTranscriptionState(stateEntity); + + de.bitgilde.TIMAAT.model.FIPOP.TranscriptionType typeEntity = new de.bitgilde.TIMAAT.model.FIPOP.TranscriptionType(); + typeEntity.setId(TranscriptionType.GENERATED.getDatabaseId()); + transcription.setTranscriptionType(typeEntity); + + return transcription; + } +} diff --git a/src/test/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointSystemSettingsTest.java b/src/test/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointSystemSettingsTest.java new file mode 100644 index 00000000..139bfc75 --- /dev/null +++ b/src/test/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointSystemSettingsTest.java @@ -0,0 +1,106 @@ +package de.bitgilde.TIMAAT.rest.endpoint; + +import de.bitgilde.TIMAAT.model.FIPOP.UserAccount; +import de.bitgilde.TIMAAT.rest.filter.AuthenticationFilter; +import de.bitgilde.TIMAAT.rest.model.systemsettings.TranscriptionSettingsDto; +import de.bitgilde.TIMAAT.rest.model.systemsettings.UpdateTranscriptionSettingsRequest; +import de.bitgilde.TIMAAT.service.transcription.TranscriptionService; +import de.bitgilde.TIMAAT.service.transcription.exception.TranscriptionFeatureDisabledException; +import de.bitgilde.TIMAAT.storage.entity.api.TranscriptionSystemSettings; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.Response; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import java.lang.reflect.Field; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +/** + * Tests covering the HTTP status-code mapping of {@link EndpointSystemSettings#updateTranscriptionSettings}. + * The endpoint is wired directly with mocked collaborators (Jersey is not involved); fields are populated + * via reflection because they are HK2 injection targets without setters. + * + * @author Nico Kotlenga (nico@nko-dev.studio) + * @since 2026-05-24 + */ +public class EndpointSystemSettingsTest { + + private TranscriptionService transcriptionService; + private ContainerRequestContext containerRequestContext; + private EndpointSystemSettings endpoint; + + @BeforeEach + void setUp() throws Exception { + transcriptionService = mock(TranscriptionService.class); + containerRequestContext = mock(ContainerRequestContext.class); + endpoint = new EndpointSystemSettings(); + + inject("transcriptionService", transcriptionService); + inject("containerRequestContext", containerRequestContext); + + when(transcriptionService.isFeatureEnabled()).thenReturn(true); + when(transcriptionService.getTranscriptionSystemSettings()).thenReturn( + new TranscriptionSystemSettings(false, null)); + } + + private void inject(String fieldName, Object value) throws Exception { + Field field = EndpointSystemSettings.class.getDeclaredField(fieldName); + field.setAccessible(true); + field.set(endpoint, value); + } + + @Test + void shouldRespondWithForbiddenWhenFeatureIsDisabled() throws Exception { + doThrow(new TranscriptionFeatureDisabledException("speech-to-text feature is disabled")) + .when(transcriptionService).updateTranscriptionSystemSettings(anyBoolean(), any(), any(), any()); + UpdateTranscriptionSettingsRequest request = new UpdateTranscriptionSettingsRequest(false, "whisper", "large-v3"); + + Response response = endpoint.updateTranscriptionSettings(request); + + assertThat(response.getStatus()).isEqualTo(Response.Status.FORBIDDEN.getStatusCode()); + } + + @Test + void shouldRespondWithBadRequestOnIllegalArgument() throws Exception { + doThrow(new IllegalArgumentException("engine and model must both be set or both be null")) + .when(transcriptionService).updateTranscriptionSystemSettings(anyBoolean(), any(), any(), any()); + UpdateTranscriptionSettingsRequest request = new UpdateTranscriptionSettingsRequest(true, "whisper", null); + + Response response = endpoint.updateTranscriptionSettings(request); + + assertThat(response.getStatus()).isEqualTo(Response.Status.BAD_REQUEST.getStatusCode()); + } + + @Test + void shouldRespondWithBadRequestWhenRequestBodyIsNull() { + Response response = endpoint.updateTranscriptionSettings(null); + + assertThat(response.getStatus()).isEqualTo(Response.Status.BAD_REQUEST.getStatusCode()); + } + + @Test + void shouldRespondWithOkAndUpdatedDtoOnSuccess() throws Exception { + UserAccount editingUser = new UserAccount(); + when(containerRequestContext.getProperty(eq(AuthenticationFilter.USER_ACCOUNT_PROPERTY_NAME))).thenReturn( + editingUser); + when(transcriptionService.getTranscriptionSystemSettings()).thenReturn( + new TranscriptionSystemSettings(true, null)); + UpdateTranscriptionSettingsRequest request = new UpdateTranscriptionSettingsRequest(true, null, null); + + Response response = endpoint.updateTranscriptionSettings(request); + + assertThat(response.getStatus()).isEqualTo(Response.Status.OK.getStatusCode()); + assertThat(response.getEntity()).isInstanceOf(TranscriptionSettingsDto.class); + TranscriptionSettingsDto dto = (TranscriptionSettingsDto) response.getEntity(); + assertThat(dto.autoTranscribeUploads()).isTrue(); + verify(transcriptionService).updateTranscriptionSystemSettings(true, null, null, editingUser); + } +} diff --git a/src/test/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionServiceMediumLookupTest.java b/src/test/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionServiceMediumLookupTest.java new file mode 100644 index 00000000..c09cbd3f --- /dev/null +++ b/src/test/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionServiceMediumLookupTest.java @@ -0,0 +1,166 @@ +package de.bitgilde.TIMAAT.service.transcription; + +import de.bitgilde.TIMAAT.model.FIPOP.Medium; +import de.bitgilde.TIMAAT.model.FIPOP.Transcription; +import de.bitgilde.TIMAAT.service.task.TaskService; +import de.bitgilde.TIMAAT.service.transcription.exception.TranscriptionNotFoundException; +import de.bitgilde.TIMAAT.storage.entity.SystemSettingStorage; +import de.bitgilde.TIMAAT.storage.entity.medium.MediumStorage; +import de.bitgilde.TIMAAT.storage.entity.medium.exception.MediumNotFoundException; +import de.bitgilde.TIMAAT.storage.entity.transcription.TranscriptionStorage; +import de.bitgilde.TIMAAT.storage.entity.transcription.api.TranscriptionFilterCriteria; +import de.bitgilde.TIMAAT.storage.file.AudioFileStorage; +import de.bitgilde.TIMAAT.storage.file.TemporaryFileStorage; +import de.bitgilde.TIMAAT.storage.file.TranscriptionFileStorage; +import de.bitgilde.TIMAAT.storage.file.VideoFileStorage; +import jakarta.inject.Provider; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.ArgumentCaptor; +import studio.nkodev.stt.client.SpeechToTextServiceClient; + +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Optional; +import java.util.stream.Stream; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.clearInvocations; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +/** + * Tests of {@link TranscriptionService#getTranscriptionsForMedium(int)} and + * {@link TranscriptionService#getTranscription(int, int)}, covering the medium-scoped + * lookup behaviour and the medium/transcription mismatch handling. + * + * @author Nico Kotlenga (nico@nko-dev.studio) + * @since 2026-05-24 + */ +public class TranscriptionServiceMediumLookupTest { + + private static final int MEDIUM_ID = 42; + private static final int OTHER_MEDIUM_ID = 99; + private static final int TRANSCRIPTION_ID = 7; + + private TranscriptionStorage transcriptionStorage; + private SystemSettingStorage systemSettingStorage; + private AudioFileStorage audioFileStorage; + private VideoFileStorage videoFileStorage; + private TaskService taskService; + private Provider<TaskService> taskServiceProvider; + private TemporaryFileStorage temporaryFileStorage; + private TranscriptionFileStorage transcriptionFileStorage; + private MediumStorage mediumStorage; + private SpeechToTextServiceClient speechToTextServiceClient; + + private TranscriptionService service; + + @BeforeEach + @SuppressWarnings("unchecked") + void setUp() { + transcriptionStorage = mock(TranscriptionStorage.class); + systemSettingStorage = mock(SystemSettingStorage.class); + audioFileStorage = mock(AudioFileStorage.class); + videoFileStorage = mock(VideoFileStorage.class); + taskService = mock(TaskService.class); + taskServiceProvider = (Provider<TaskService>) mock(Provider.class); + when(taskServiceProvider.get()).thenReturn(taskService); + temporaryFileStorage = mock(TemporaryFileStorage.class); + transcriptionFileStorage = mock(TranscriptionFileStorage.class); + mediumStorage = mock(MediumStorage.class); + speechToTextServiceClient = mock(SpeechToTextServiceClient.class); + + when(speechToTextServiceClient.getAvailableEngines()).thenReturn(Collections.emptyList()); + when(systemSettingStorage.getDefaultTranscriptionModel()).thenReturn(Optional.empty()); + when(transcriptionStorage.getEntriesAsStream(any(), any(), any(), any())).thenReturn(Stream.empty()); + + service = new TranscriptionService(transcriptionStorage, systemSettingStorage, audioFileStorage, videoFileStorage, + taskServiceProvider, temporaryFileStorage, transcriptionFileStorage, mediumStorage, + speechToTextServiceClient); + + // The constructor triggers resumeMonitoringOfActiveTranscriptions which calls + // getEntriesAsStream once; clear that so per-test verify counts start from zero. + clearInvocations(transcriptionStorage); + } + + @Test + void shouldReturnTranscriptionsFilteredByMedium() throws Exception { + when(mediumStorage.existsById(MEDIUM_ID)).thenReturn(true); + Transcription transcription = transcription(TRANSCRIPTION_ID, MEDIUM_ID); + when(transcriptionStorage.getEntriesAsStream(any(TranscriptionFilterCriteria.class), any(), any(), any())) + .thenReturn(Stream.of(transcription)); + + Collection<Transcription> result = service.getTranscriptionsForMedium(MEDIUM_ID); + + assertThat(result).containsExactly(transcription); + + ArgumentCaptor<TranscriptionFilterCriteria> captor = ArgumentCaptor.forClass(TranscriptionFilterCriteria.class); + verify(transcriptionStorage).getEntriesAsStream(captor.capture(), any(), any(), any()); + assertThat(captor.getValue().getMediumId()).contains(MEDIUM_ID); + } + + @Test + void shouldReturnEmptyCollectionWhenMediumHasNoTranscriptions() throws Exception { + when(mediumStorage.existsById(MEDIUM_ID)).thenReturn(true); + when(transcriptionStorage.getEntriesAsStream(any(TranscriptionFilterCriteria.class), any(), any(), any())) + .thenReturn(Stream.empty()); + + Collection<Transcription> result = service.getTranscriptionsForMedium(MEDIUM_ID); + + assertThat(result).isEmpty(); + } + + @Test + void shouldThrowMediumNotFoundExceptionWhenListingTranscriptionsForMissingMedium() { + when(mediumStorage.existsById(MEDIUM_ID)).thenReturn(false); + + assertThatThrownBy(() -> service.getTranscriptionsForMedium(MEDIUM_ID)) + .isInstanceOf(MediumNotFoundException.class); + + verify(transcriptionStorage, never()).getEntriesAsStream(any(TranscriptionFilterCriteria.class), any(), any(), any()); + } + + @Test + void shouldReturnTranscriptionWhenIdAndMediumMatch() throws Exception { + Transcription transcription = transcription(TRANSCRIPTION_ID, MEDIUM_ID); + when(transcriptionStorage.findById(TRANSCRIPTION_ID)).thenReturn(Optional.of(transcription)); + + Transcription result = service.getTranscription(MEDIUM_ID, TRANSCRIPTION_ID); + + assertThat(result).isSameAs(transcription); + } + + @Test + void shouldThrowNotFoundExceptionWhenTranscriptionDoesNotExist() { + when(transcriptionStorage.findById(TRANSCRIPTION_ID)).thenReturn(Optional.empty()); + + assertThatThrownBy(() -> service.getTranscription(MEDIUM_ID, TRANSCRIPTION_ID)) + .isInstanceOf(TranscriptionNotFoundException.class); + } + + @Test + void shouldThrowNotFoundExceptionWhenTranscriptionBelongsToDifferentMedium() { + Transcription transcription = transcription(TRANSCRIPTION_ID, OTHER_MEDIUM_ID); + when(transcriptionStorage.findById(TRANSCRIPTION_ID)).thenReturn(Optional.of(transcription)); + + assertThatThrownBy(() -> service.getTranscription(MEDIUM_ID, TRANSCRIPTION_ID)) + .isInstanceOf(TranscriptionNotFoundException.class); + } + + private Transcription transcription(int id, int mediumId) { + Transcription transcription = new Transcription(); + transcription.setId(id); + + Medium medium = new Medium(); + medium.setId(mediumId); + transcription.setMedium(medium); + + return transcription; + } +} From e685487100d16b65d3d6a4d655ec1b6b2954aa9f Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Sun, 24 May 2026 17:07:27 +0200 Subject: [PATCH 63/70] TIMAAT #57 - Fixed some error occurred during first transcription task * Added auto_increment to id column of transcription table * Setting of createdBy column when creating a transcription * Auto creation of transcriptions when enabled --- .../bitgilde/TIMAAT/model/FIPOP/Medium.java | 1263 ++++++++--------- .../processing/audio/FfmpegAudioEngine.java | 18 +- .../TIMAAT/rest/endpoint/EndpointMedium.java | 34 +- .../MediumAudioAnalysisTaskExecutor.java | 2 +- ...criptionMediumPreparationTaskExecutor.java | 13 +- .../transcription/TranscriptionService.java | 29 +- .../storage/entity/SystemSettingStorage.java | 15 +- .../transcription/TranscriptionStorage.java | 18 +- src/main/resources/database/db_update.sql | 4 +- src/main/resources/database/fipop.sql | 21 +- .../TIMAAT/audio/FfmpegAudioEngineTest.java | 94 ++ .../EndpointMediumTranscriptionsTest.java | 41 +- 12 files changed, 852 insertions(+), 700 deletions(-) diff --git a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/Medium.java b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/Medium.java index 459d4e64..4b08cb1c 100644 --- a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/Medium.java +++ b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/Medium.java @@ -51,273 +51,241 @@ * @author Mirko Scherf <mscherf@uni-mainz.de> */ @Entity -@NamedQuery(name="Medium.findAll", query="SELECT m FROM Medium m") +@NamedQuery(name = "Medium.findAll", query = "SELECT m FROM Medium m") @JsonIgnoreProperties(ignoreUnknown = true) public class Medium implements Serializable { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - @Id - @GeneratedValue(strategy=GenerationType.IDENTITY) - private int id; + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private int id; - private String copyright; + private String copyright; - @Column(name="created_at") - private Timestamp createdAt; + @Column(name = "created_at") + private Timestamp createdAt; - //bi-directional many-to-one association to UserAccount - @ManyToOne - @JoinColumn(name="created_by_user_account_id") - @JsonBackReference(value = "Medium-CreatedByUserAccount") - private UserAccount createdByUserAccount; + //bi-directional many-to-one association to UserAccount + @ManyToOne + @JoinColumn(name = "created_by_user_account_id") + @JsonBackReference(value = "Medium-CreatedByUserAccount") + private UserAccount createdByUserAccount; - @Transient - @JsonProperty("createdByUserAccountId") - private int createdByUserAccountId; + @Transient + @JsonProperty("createdByUserAccountId") + private int createdByUserAccountId; - //bi-directional many-to-one association to UserAccount - @ManyToOne - @JoinColumn(name="last_edited_by_user_account_id") - @JsonBackReference(value = "Medium-LastEditedByUserAccount") - private UserAccount lastEditedByUserAccount; + //bi-directional many-to-one association to UserAccount + @ManyToOne + @JoinColumn(name = "last_edited_by_user_account_id") + @JsonBackReference(value = "Medium-LastEditedByUserAccount") + private UserAccount lastEditedByUserAccount; - @Transient - @JsonProperty("lastEditedByUserAccountId") - private int lastEditedByUserAccountId; + @Transient + @JsonProperty("lastEditedByUserAccountId") + private int lastEditedByUserAccountId; - @Column(name="file_hash") - private String fileHash; + @Column(name = "file_hash") + private String fileHash; - @Column(name="file_path") - @JsonIgnore - private String filePath; + @Column(name = "file_path") + @JsonIgnore + private String filePath; - @Column(name="last_edited_at") - private Timestamp lastEditedAt; + @Column(name = "last_edited_at") + private Timestamp lastEditedAt; - @Column(name="release_date", columnDefinition = "DATE") - private Date releaseDate; + @Column(name = "release_date", columnDefinition = "DATE") + private Date releaseDate; - @Column(name="recording_start_date", columnDefinition = "DATE") - private Date recordingStartDate; + @Column(name = "recording_start_date", columnDefinition = "DATE") + private Date recordingStartDate; - @Column(name="recording_end_date", columnDefinition = "DATE") - private Date recordingEndDate; + @Column(name = "recording_end_date", columnDefinition = "DATE") + private Date recordingEndDate; - private String remark; + private String remark; - //bi-directional many-to-many association to Annotation - // @ManyToMany(mappedBy = "mediums") - // @JsonIgnore - // private List<Annotation> annotations; + //bi-directional many-to-many association to Annotation + // @ManyToMany(mappedBy = "mediums") + // @JsonIgnore + // private List<Annotation> annotations; - //bi-directional many-to-one association to MediaCollectionHasMedium - @OneToMany(mappedBy="medium") - @JsonIgnore - private List<MediaCollectionHasMedium> mediaCollectionHasMediums; + //bi-directional many-to-one association to MediaCollectionHasMedium + @OneToMany(mappedBy = "medium") + @JsonIgnore + private List<MediaCollectionHasMedium> mediaCollectionHasMediums; - //bi-directional many-to-one association to MediaType - @ManyToOne - @JoinColumn(name="media_type_id") - private MediaType mediaType; + //bi-directional many-to-one association to MediaType + @ManyToOne + @JoinColumn(name = "media_type_id") + private MediaType mediaType; - //bi-directional many-to-one association to PropagandaType - @ManyToOne - @JoinColumn(name="propaganda_type_id") - @JsonBackReference(value = "PropagandaType-Medium") - private PropagandaType propagandaType; + //bi-directional many-to-one association to PropagandaType + @ManyToOne + @JoinColumn(name = "propaganda_type_id") + @JsonBackReference(value = "PropagandaType-Medium") + private PropagandaType propagandaType; - //bi-directional many-to-one association to Reference - @ManyToOne - @JsonBackReference(value = "Reference-Medium") - private Reference reference; + //bi-directional many-to-one association to Reference + @ManyToOne + @JsonBackReference(value = "Reference-Medium") + private Reference reference; - //bi-directional many-to-one association to Title - @ManyToOne(cascade = CascadeType.PERSIST) - @JoinColumn(name="display_title_title_id") - private Title displayTitle; + //bi-directional many-to-one association to Title + @ManyToOne(cascade = CascadeType.PERSIST) + @JoinColumn(name = "display_title_title_id") + private Title displayTitle; - //bi-directional many-to-one association to Title - @ManyToOne(cascade = CascadeType.PERSIST) - @JoinColumn(name="original_title_title_id") - private Title originalTitle; + //bi-directional many-to-one association to Title + @ManyToOne(cascade = CascadeType.PERSIST) + @JoinColumn(name = "original_title_title_id") + private Title originalTitle; - //bi-directional many-to-one association to Work - // @ManyToOne - // @JoinColumn(name="work_id") - // private Work work; + //bi-directional many-to-one association to Work + // @ManyToOne + // @JoinColumn(name="work_id") + // private Work work; - //bi-directional many-to-one association to MediumAnalysisList - @OneToMany(mappedBy="medium") + //bi-directional many-to-one association to MediumAnalysisList + @OneToMany(mappedBy = "medium") @JsonManagedReference(value = "Medium-MediumAnalysisList") - private List<MediumAnalysisList> mediumAnalysisLists; - - //bi-directional one-to-one association to MediumAudio - @OneToOne(mappedBy="medium") - private MediumAudio mediumAudio; - - //bi-directional one-to-one association to MediumDocument - @OneToOne(mappedBy="medium") - private MediumDocument mediumDocument; - - //bi-directional one-to-one association to MediumVideo - @OneToOne(mappedBy="medium") - private MediumVideo mediumVideo; - - //bi-directional one-to-one association to MediumVideogame - @OneToOne(mappedBy="medium") - private MediumVideogame mediumVideogame; - - //bi-directional many-to-many association to ActorHasRole - @ManyToMany - @JoinTable( - name="medium_has_actor_with_role" - , joinColumns={ - @JoinColumn(name="medium_id") - } - , inverseJoinColumns={ - @JoinColumn(name="actor_has_role_actor_id", referencedColumnName="actor_id"), - @JoinColumn(name="actor_has_role_role_id", referencedColumnName="role_id") - } - ) - @JsonIgnore - private List<ActorHasRole> actorHasRoles; - - //bi-directional many-to-many association to CategorySet - @ManyToMany - @JoinTable( - name="medium_has_category_set" - , joinColumns={ - @JoinColumn(name="medium_id") - } - , inverseJoinColumns={ - @JoinColumn(name="category_set_id") - } - ) - private List<CategorySet> categorySets; - - //bi-directional many-to-many association to Category - @ManyToMany - @JoinTable( - name="medium_has_category" - , joinColumns={ - @JoinColumn(name="medium_id") - } - , inverseJoinColumns={ - @JoinColumn(name="category_id") - } - ) - private List<Category> categories; - - //bi-directional many-to-many association to Genre - // @ManyToMany - // @JoinTable( - // name="medium_has_genre" - // , joinColumns={ - // @JoinColumn(name="medium_id") - // } - // , inverseJoinColumns={ - // @JoinColumn(name="genre_id") - // } - // ) - // private List<Genre> genres; - - //bi-directional many-to-one association to MediumHasLanguage - @OneToMany(mappedBy="medium") - private List<MediumHasLanguage> mediumHasLanguages; - - - //bi-directional many-to-one association to MediumHasActorWithRole - @OneToMany(mappedBy="medium") - private List<MediumHasActorWithRole> mediumHasActorWithRoles; - - //bi-directional many-to-many association to RatingCategory - // @ManyToMany(mappedBy="mediums") - // private List<RatingCategory> ratingCategories; - - //bi-directional many-to-many association to Tag - @ManyToMany - @JoinTable( - name="medium_has_tag" - , inverseJoinColumns={ - @JoinColumn(name="tag_id") - } - , joinColumns={ - @JoinColumn(name="medium_id") - } - ) - private List<Tag> tags; - - //bi-directional many-to-many association to TargetAudience - // @ManyToMany(mappedBy="mediums") - // private List<TargetAudience> targetAudiences; - - //bi-directional many-to-many association to Title - @ManyToMany(mappedBy="mediums3") - private List<Title> titles; - - //bi-directional one-to-one association to MediumImage - @OneToOne(mappedBy="medium") - private MediumImage mediumImage; - - //bi-directional many-to-one association to MediumRelatesToEvent - @OneToMany(mappedBy="medium") - @JsonIgnore - // @JsonManagedReference(value = "Medium-MediumRelatesToEvent") - private List<MediumRelatesToEvent> mediumRelatesToEvents; - - //bi-directional many-to-one association to MediumRelatesToMedium - // @OneToMany(mappedBy="medium1") - // private List<MediumRelatesToMedium> mediumRelatesToMediums1; - - //bi-directional many-to-one association to MediumRelatesToMedium - // @OneToMany(mappedBy="medium2") - // private List<MediumRelatesToMedium> mediumRelatesToMediums2; - - //bi-directional one-to-one association to MediumSoftware - @OneToOne(mappedBy="medium") - private MediumSoftware mediumSoftware; - - //bi-directional one-to-one association to MediumText - @OneToOne(mappedBy="medium") - private MediumText mediumText; - - // bi-directional many-to-one association to MusicalNotation - @OneToMany(mappedBy="medium") - @JsonIgnore - private List<MusicalNotation> musicalNotations; - - //bi-directional many-to-one association to Source - @OneToMany(mappedBy="medium") - @JsonManagedReference(value = "Medium-Source") - private List<Source> sources; - - // bi-directional one-to-one association to Music - @OneToOne - @JoinColumn(name="music_id") - // @JsonBackReference(value="Medium-Music") - private Music music; - - //bi-directional many-to-one association to MediumHasMusic - @OneToMany(mappedBy="medium") - // @JsonIgnore - @JsonManagedReference(value="Medium-MediumHasMusic") - private List<MediumHasMusic> mediumHasMusicList; + private List<MediumAnalysisList> mediumAnalysisLists; + + //bi-directional one-to-one association to MediumAudio + @OneToOne(mappedBy = "medium") + private MediumAudio mediumAudio; + + //bi-directional one-to-one association to MediumDocument + @OneToOne(mappedBy = "medium") + private MediumDocument mediumDocument; + + //bi-directional one-to-one association to MediumVideo + @OneToOne(mappedBy = "medium") + private MediumVideo mediumVideo; + + //bi-directional one-to-one association to MediumVideogame + @OneToOne(mappedBy = "medium") + private MediumVideogame mediumVideogame; + + //bi-directional many-to-many association to ActorHasRole + @ManyToMany + @JoinTable(name = "medium_has_actor_with_role", joinColumns = {@JoinColumn(name = "medium_id")}, inverseJoinColumns = {@JoinColumn(name = "actor_has_role_actor_id", referencedColumnName = "actor_id"), @JoinColumn(name = "actor_has_role_role_id", referencedColumnName = "role_id")}) + @JsonIgnore + private List<ActorHasRole> actorHasRoles; + + //bi-directional many-to-many association to CategorySet + @ManyToMany + @JoinTable(name = "medium_has_category_set", joinColumns = {@JoinColumn(name = "medium_id")}, inverseJoinColumns = {@JoinColumn(name = "category_set_id")}) + private List<CategorySet> categorySets; + + //bi-directional many-to-many association to Category + @ManyToMany + @JoinTable(name = "medium_has_category", joinColumns = {@JoinColumn(name = "medium_id")}, inverseJoinColumns = {@JoinColumn(name = "category_id")}) + private List<Category> categories; + + //bi-directional many-to-many association to Genre + // @ManyToMany + // @JoinTable( + // name="medium_has_genre" + // , joinColumns={ + // @JoinColumn(name="medium_id") + // } + // , inverseJoinColumns={ + // @JoinColumn(name="genre_id") + // } + // ) + // private List<Genre> genres; + + //bi-directional many-to-one association to MediumHasLanguage + @OneToMany(mappedBy = "medium") + private List<MediumHasLanguage> mediumHasLanguages; + + + //bi-directional many-to-one association to MediumHasActorWithRole + @OneToMany(mappedBy = "medium") + private List<MediumHasActorWithRole> mediumHasActorWithRoles; + + //bi-directional many-to-many association to RatingCategory + // @ManyToMany(mappedBy="mediums") + // private List<RatingCategory> ratingCategories; + + //bi-directional many-to-many association to Tag + @ManyToMany + @JoinTable(name = "medium_has_tag", inverseJoinColumns = {@JoinColumn(name = "tag_id")}, joinColumns = {@JoinColumn(name = "medium_id")}) + private List<Tag> tags; + + //bi-directional many-to-many association to TargetAudience + // @ManyToMany(mappedBy="mediums") + // private List<TargetAudience> targetAudiences; + + //bi-directional many-to-many association to Title + @ManyToMany(mappedBy = "mediums3") + private List<Title> titles; + + //bi-directional one-to-one association to MediumImage + @OneToOne(mappedBy = "medium") + private MediumImage mediumImage; + + //bi-directional many-to-one association to MediumRelatesToEvent + @OneToMany(mappedBy = "medium") + @JsonIgnore + // @JsonManagedReference(value = "Medium-MediumRelatesToEvent") + private List<MediumRelatesToEvent> mediumRelatesToEvents; + + //bi-directional many-to-one association to MediumRelatesToMedium + // @OneToMany(mappedBy="medium1") + // private List<MediumRelatesToMedium> mediumRelatesToMediums1; + + //bi-directional many-to-one association to MediumRelatesToMedium + // @OneToMany(mappedBy="medium2") + // private List<MediumRelatesToMedium> mediumRelatesToMediums2; + + //bi-directional one-to-one association to MediumSoftware + @OneToOne(mappedBy = "medium") + private MediumSoftware mediumSoftware; + + //bi-directional one-to-one association to MediumText + @OneToOne(mappedBy = "medium") + private MediumText mediumText; + + // bi-directional many-to-one association to MusicalNotation + @OneToMany(mappedBy = "medium") + @JsonIgnore + private List<MusicalNotation> musicalNotations; + + //bi-directional many-to-one association to Source + @OneToMany(mappedBy = "medium") + @JsonManagedReference(value = "Medium-Source") + private List<Source> sources; + + // bi-directional one-to-one association to Music + @OneToOne + @JoinColumn(name = "music_id") + // @JsonBackReference(value="Medium-Music") + private Music music; + + //bi-directional many-to-one association to MediumHasMusic + @OneToMany(mappedBy = "medium") + // @JsonIgnore + @JsonManagedReference(value = "Medium-MediumHasMusic") + private List<MediumHasMusic> mediumHasMusicList; @OneToOne(mappedBy = "medium") private MediumAudioAnalysis mediumAudioAnalysis; - @Transient - private String fileStatus; + @Transient + private String fileStatus; - @Transient - private String fileExtension; + @Transient + private String fileExtension; - @Transient - private String viewToken; + @Transient + private String viewToken; @ManyToOne @JoinColumn(name = "default_transcription_id") + @JsonIgnore private Transcription defaultTranscription; @OneToMany(mappedBy = "medium") @@ -326,532 +294,534 @@ public class Medium implements Serializable { public Medium() { - } + } - public int getId() { - return this.id; - } + public int getId() { + return this.id; + } - public void setId(int id) { - this.id = id; - } + public void setId(int id) { + this.id = id; + } - public String getCopyright() { - return this.copyright; - } + public String getCopyright() { + return this.copyright; + } - public void setCopyright(String copyright) { - this.copyright = copyright; - } + public void setCopyright(String copyright) { + this.copyright = copyright; + } - public Timestamp getCreatedAt() { - return this.createdAt; - } + public Timestamp getCreatedAt() { + return this.createdAt; + } - public void setCreatedAt(Timestamp createdAt) { - this.createdAt = createdAt; - } + public void setCreatedAt(Timestamp createdAt) { + this.createdAt = createdAt; + } - public UserAccount getCreatedByUserAccount() { - return this.createdByUserAccount; - } + public UserAccount getCreatedByUserAccount() { + return this.createdByUserAccount; + } - public void setCreatedByUserAccount(UserAccount createdByUserAccount) { - this.createdByUserAccount = createdByUserAccount; - } + public void setCreatedByUserAccount(UserAccount createdByUserAccount) { + this.createdByUserAccount = createdByUserAccount; + } - public String getFileHash() { - return this.fileHash; - } + public String getFileHash() { + return this.fileHash; + } - public void setFileHash(String fileHash) { - this.fileHash = fileHash; - } + public void setFileHash(String fileHash) { + this.fileHash = fileHash; + } - public String getFilePath() { - return this.filePath; - } + public String getFilePath() { + return this.filePath; + } - public void setFilePath(String filePath) { - this.filePath = filePath; - } + public void setFilePath(String filePath) { + this.filePath = filePath; + } - public Timestamp getLastEditedAt() { - return this.lastEditedAt; - } + public Timestamp getLastEditedAt() { + return this.lastEditedAt; + } - public void setLastEditedAt(Timestamp lastEditedAt) { - this.lastEditedAt = lastEditedAt; - } + public void setLastEditedAt(Timestamp lastEditedAt) { + this.lastEditedAt = lastEditedAt; + } - public int getCreatedByUserAccountId() { - return this.getCreatedByUserAccount().getId(); - } + public int getCreatedByUserAccountId() { + return this.getCreatedByUserAccount().getId(); + } - public UserAccount getLastEditedByUserAccount() { - return this.lastEditedByUserAccount; - } + public UserAccount getLastEditedByUserAccount() { + return this.lastEditedByUserAccount; + } - public void setLastEditedByUserAccount(UserAccount lastEditedByUserAccount) { - this.lastEditedByUserAccount = lastEditedByUserAccount; - } + public void setLastEditedByUserAccount(UserAccount lastEditedByUserAccount) { + this.lastEditedByUserAccount = lastEditedByUserAccount; + } - public int getLastEditedByUserAccountId() { - if (Objects.isNull(this.getLastEditedByUserAccount())) return 0; - return this.getLastEditedByUserAccount().getId(); - } + public int getLastEditedByUserAccountId() { + if (Objects.isNull(this.getLastEditedByUserAccount())) { + return 0; + } + return this.getLastEditedByUserAccount().getId(); + } - public Date getReleaseDate() { - return this.releaseDate; - } + public Date getReleaseDate() { + return this.releaseDate; + } - public void setReleaseDate(Date releaseDate) { - this.releaseDate = releaseDate; - } + public void setReleaseDate(Date releaseDate) { + this.releaseDate = releaseDate; + } - public Date getRecordingStartDate() { - return this.recordingStartDate; - } + public Date getRecordingStartDate() { + return this.recordingStartDate; + } - public void setRecordingStartDate(Date recordingStartDate) { - this.recordingStartDate = recordingStartDate; - } + public void setRecordingStartDate(Date recordingStartDate) { + this.recordingStartDate = recordingStartDate; + } - public Date getRecordingEndDate() { - return this.recordingEndDate; - } + public Date getRecordingEndDate() { + return this.recordingEndDate; + } - public void setRecordingEndDate(Date recordingEndDate) { - this.recordingEndDate = recordingEndDate; - } + public void setRecordingEndDate(Date recordingEndDate) { + this.recordingEndDate = recordingEndDate; + } - public String getRemark() { - return this.remark; - } + public String getRemark() { + return this.remark; + } - public void setRemark(String remark) { - this.remark = remark; - } + public void setRemark(String remark) { + this.remark = remark; + } - public List<MediaCollectionHasMedium> getMediaCollectionHasMediums() { - return this.mediaCollectionHasMediums; - } + public List<MediaCollectionHasMedium> getMediaCollectionHasMediums() { + return this.mediaCollectionHasMediums; + } - public void setMediaCollectionHasMediums(List<MediaCollectionHasMedium> mediaCollectionHasMediums) { - this.mediaCollectionHasMediums = mediaCollectionHasMediums; - } + public void setMediaCollectionHasMediums(List<MediaCollectionHasMedium> mediaCollectionHasMediums) { + this.mediaCollectionHasMediums = mediaCollectionHasMediums; + } - public MediaCollectionHasMedium addMediaCollectionHasMedium(MediaCollectionHasMedium mediaCollectionHasMedium) { - getMediaCollectionHasMediums().add(mediaCollectionHasMedium); - mediaCollectionHasMedium.setMedium(this); + public MediaCollectionHasMedium addMediaCollectionHasMedium(MediaCollectionHasMedium mediaCollectionHasMedium) { + getMediaCollectionHasMediums().add(mediaCollectionHasMedium); + mediaCollectionHasMedium.setMedium(this); - return mediaCollectionHasMedium; - } + return mediaCollectionHasMedium; + } - public MediaCollectionHasMedium removeMediaCollectionHasMedium(MediaCollectionHasMedium mediaCollectionHasMedium) { - getMediaCollectionHasMediums().remove(mediaCollectionHasMedium); - mediaCollectionHasMedium.setMedium(null); + public MediaCollectionHasMedium removeMediaCollectionHasMedium(MediaCollectionHasMedium mediaCollectionHasMedium) { + getMediaCollectionHasMediums().remove(mediaCollectionHasMedium); + mediaCollectionHasMedium.setMedium(null); - return mediaCollectionHasMedium; - } + return mediaCollectionHasMedium; + } - public MediaType getMediaType() { - return this.mediaType; - } + public MediaType getMediaType() { + return this.mediaType; + } - public void setMediaType(MediaType mediaType) { - this.mediaType = mediaType; - } + public void setMediaType(MediaType mediaType) { + this.mediaType = mediaType; + } - public PropagandaType getPropagandaType() { - return this.propagandaType; - } + public PropagandaType getPropagandaType() { + return this.propagandaType; + } - public void setPropagandaType(PropagandaType propagandaType) { - this.propagandaType = propagandaType; - } + public void setPropagandaType(PropagandaType propagandaType) { + this.propagandaType = propagandaType; + } - public Reference getReference() { - return this.reference; - } + public Reference getReference() { + return this.reference; + } - public void setReference(Reference reference) { - this.reference = reference; - } + public void setReference(Reference reference) { + this.reference = reference; + } - public Title getDisplayTitle() { - return this.displayTitle; - } + public Title getDisplayTitle() { + return this.displayTitle; + } - public void setDisplayTitle(Title displayTitle) { - this.displayTitle = displayTitle; - } + public void setDisplayTitle(Title displayTitle) { + this.displayTitle = displayTitle; + } - public Title getOriginalTitle() { - return this.originalTitle; - } + public Title getOriginalTitle() { + return this.originalTitle; + } - public void setOriginalTitle(Title title) { - this.originalTitle = title; - } + public void setOriginalTitle(Title title) { + this.originalTitle = title; + } - // public Work getWork() { - // return this.work; - // } + // public Work getWork() { + // return this.work; + // } - // public void setWork(Work work) { - // this.work = work; - // } + // public void setWork(Work work) { + // this.work = work; + // } - public List<MediumAnalysisList> getMediumAnalysisLists() { - return this.mediumAnalysisLists; - } + public List<MediumAnalysisList> getMediumAnalysisLists() { + return this.mediumAnalysisLists; + } - public void setMediumAnalysisLists(List<MediumAnalysisList> mediumAnalysisLists) { - this.mediumAnalysisLists = mediumAnalysisLists; - } + public void setMediumAnalysisLists(List<MediumAnalysisList> mediumAnalysisLists) { + this.mediumAnalysisLists = mediumAnalysisLists; + } - public MediumAnalysisList addMediumAnalysisList(MediumAnalysisList mediumAnalysisList) { - getMediumAnalysisLists().add(mediumAnalysisList); - mediumAnalysisList.setMedium(this); + public MediumAnalysisList addMediumAnalysisList(MediumAnalysisList mediumAnalysisList) { + getMediumAnalysisLists().add(mediumAnalysisList); + mediumAnalysisList.setMedium(this); - return mediumAnalysisList; - } + return mediumAnalysisList; + } - public MediumAnalysisList removeMediumAnalysisList(MediumAnalysisList mediumAnalysisList) { - getMediumAnalysisLists().remove(mediumAnalysisList); - mediumAnalysisList.setMedium(null); + public MediumAnalysisList removeMediumAnalysisList(MediumAnalysisList mediumAnalysisList) { + getMediumAnalysisLists().remove(mediumAnalysisList); + mediumAnalysisList.setMedium(null); - return mediumAnalysisList; - } + return mediumAnalysisList; + } - public MediumAudio getMediumAudio() { - return this.mediumAudio; - } + public MediumAudio getMediumAudio() { + return this.mediumAudio; + } - public void setMediumAudio(MediumAudio mediumAudio) { - this.mediumAudio = mediumAudio; - } + public void setMediumAudio(MediumAudio mediumAudio) { + this.mediumAudio = mediumAudio; + } - public MediumDocument getMediumDocument() { - return this.mediumDocument; - } + public MediumDocument getMediumDocument() { + return this.mediumDocument; + } - public void setMediumDocument(MediumDocument mediumDocument) { - this.mediumDocument = mediumDocument; - } + public void setMediumDocument(MediumDocument mediumDocument) { + this.mediumDocument = mediumDocument; + } - public List<ActorHasRole> getActorHasRoles() { - return this.actorHasRoles; - } + public List<ActorHasRole> getActorHasRoles() { + return this.actorHasRoles; + } - public void setActorHasRoles(List<ActorHasRole> actorHasRoles) { - this.actorHasRoles = actorHasRoles; - } + public void setActorHasRoles(List<ActorHasRole> actorHasRoles) { + this.actorHasRoles = actorHasRoles; + } - public List<CategorySet> getCategorySets() { - return this.categorySets; - } + public List<CategorySet> getCategorySets() { + return this.categorySets; + } - public void setCategorySets(List<CategorySet> categorySets) { - this.categorySets = categorySets; - } + public void setCategorySets(List<CategorySet> categorySets) { + this.categorySets = categorySets; + } - public List<Category> getCategories() { - return this.categories; - } + public List<Category> getCategories() { + return this.categories; + } - public void setCategories(List<Category> categories) { - this.categories = categories; - } + public void setCategories(List<Category> categories) { + this.categories = categories; + } - // public List<Genre> getGenres() { - // return this.genres; - // } + // public List<Genre> getGenres() { + // return this.genres; + // } - // public void setGenres(List<Genre> genres) { - // this.genres = genres; - // } + // public void setGenres(List<Genre> genres) { + // this.genres = genres; + // } - public List<MediumHasLanguage> getMediumHasLanguages() { - return this.mediumHasLanguages; - } + public List<MediumHasLanguage> getMediumHasLanguages() { + return this.mediumHasLanguages; + } - public void setMediumHasLanguages(List<MediumHasLanguage> mediumHasLanguages) { - this.mediumHasLanguages = mediumHasLanguages; - } + public void setMediumHasLanguages(List<MediumHasLanguage> mediumHasLanguages) { + this.mediumHasLanguages = mediumHasLanguages; + } - public MediumHasLanguage addMediumHasLanguage(MediumHasLanguage mediumHasLanguage) { - getMediumHasLanguages().add(mediumHasLanguage); - mediumHasLanguage.setMedium(this); + public MediumHasLanguage addMediumHasLanguage(MediumHasLanguage mediumHasLanguage) { + getMediumHasLanguages().add(mediumHasLanguage); + mediumHasLanguage.setMedium(this); - return mediumHasLanguage; - } + return mediumHasLanguage; + } - public MediumHasLanguage removeMediumHasLanguage(MediumHasLanguage mediumHasLanguage) { - getMediumHasLanguages().remove(mediumHasLanguage); - mediumHasLanguage.setMedium(null); + public MediumHasLanguage removeMediumHasLanguage(MediumHasLanguage mediumHasLanguage) { + getMediumHasLanguages().remove(mediumHasLanguage); + mediumHasLanguage.setMedium(null); - return mediumHasLanguage; - } + return mediumHasLanguage; + } - // public List<RatingCategory> getRatingCategories() { - // return this.ratingCategories; - // } + // public List<RatingCategory> getRatingCategories() { + // return this.ratingCategories; + // } - // public void setRatingCategories(List<RatingCategory> ratingCategories) { - // this.ratingCategories = ratingCategories; - // } + // public void setRatingCategories(List<RatingCategory> ratingCategories) { + // this.ratingCategories = ratingCategories; + // } - public List<Tag> getTags() { - return this.tags; - } + public List<Tag> getTags() { + return this.tags; + } - public void setTags(List<Tag> tags) { - this.tags = tags; - } + public void setTags(List<Tag> tags) { + this.tags = tags; + } - // public List<TargetAudience> getTargetAudiences() { - // return this.targetAudiences; - // } + // public List<TargetAudience> getTargetAudiences() { + // return this.targetAudiences; + // } - // public void setTargetAudiences(List<TargetAudience> targetAudiences) { - // this.targetAudiences = targetAudiences; - // } + // public void setTargetAudiences(List<TargetAudience> targetAudiences) { + // this.targetAudiences = targetAudiences; + // } - public List<Title> getTitles() { - return this.titles; - } + public List<Title> getTitles() { + return this.titles; + } - public void setTitles(List<Title> titles) { - this.titles = titles; - } + public void setTitles(List<Title> titles) { + this.titles = titles; + } - public MediumImage getMediumImage() { - return this.mediumImage; - } + public MediumImage getMediumImage() { + return this.mediumImage; + } - public void setMediumImage(MediumImage mediumImage) { - this.mediumImage = mediumImage; - } + public void setMediumImage(MediumImage mediumImage) { + this.mediumImage = mediumImage; + } - public List<MediumRelatesToEvent> getMediumRelatesToEvents() { - return this.mediumRelatesToEvents; - } + public List<MediumRelatesToEvent> getMediumRelatesToEvents() { + return this.mediumRelatesToEvents; + } - public void setMediumRelatesToEvents(List<MediumRelatesToEvent> mediumRelatesToEvents) { - this.mediumRelatesToEvents = mediumRelatesToEvents; - } + public void setMediumRelatesToEvents(List<MediumRelatesToEvent> mediumRelatesToEvents) { + this.mediumRelatesToEvents = mediumRelatesToEvents; + } - public MediumRelatesToEvent addMediumRelatesToEvent(MediumRelatesToEvent mediumRelatesToEvent) { - getMediumRelatesToEvents().add(mediumRelatesToEvent); - mediumRelatesToEvent.setMedium(this); + public MediumRelatesToEvent addMediumRelatesToEvent(MediumRelatesToEvent mediumRelatesToEvent) { + getMediumRelatesToEvents().add(mediumRelatesToEvent); + mediumRelatesToEvent.setMedium(this); - return mediumRelatesToEvent; - } + return mediumRelatesToEvent; + } - public MediumRelatesToEvent removeMediumRelatesToEvent(MediumRelatesToEvent mediumRelatesToEvent) { - getMediumRelatesToEvents().remove(mediumRelatesToEvent); - mediumRelatesToEvent.setMedium(null); + public MediumRelatesToEvent removeMediumRelatesToEvent(MediumRelatesToEvent mediumRelatesToEvent) { + getMediumRelatesToEvents().remove(mediumRelatesToEvent); + mediumRelatesToEvent.setMedium(null); - return mediumRelatesToEvent; - } + return mediumRelatesToEvent; + } - // public List<MediumRelatesToMedium> getMediumRelatesToMediums1() { - // return this.mediumRelatesToMediums1; - // } + // public List<MediumRelatesToMedium> getMediumRelatesToMediums1() { + // return this.mediumRelatesToMediums1; + // } - // public void setMediumRelatesToMediums1(List<MediumRelatesToMedium> mediumRelatesToMediums1) { - // this.mediumRelatesToMediums1 = mediumRelatesToMediums1; - // } + // public void setMediumRelatesToMediums1(List<MediumRelatesToMedium> mediumRelatesToMediums1) { + // this.mediumRelatesToMediums1 = mediumRelatesToMediums1; + // } - // public MediumRelatesToMedium addMediumRelatesToMediums1(MediumRelatesToMedium mediumRelatesToMediums1) { - // getMediumRelatesToMediums1().add(mediumRelatesToMediums1); - // mediumRelatesToMediums1.setMedium1(this); + // public MediumRelatesToMedium addMediumRelatesToMediums1(MediumRelatesToMedium mediumRelatesToMediums1) { + // getMediumRelatesToMediums1().add(mediumRelatesToMediums1); + // mediumRelatesToMediums1.setMedium1(this); - // return mediumRelatesToMediums1; - // } + // return mediumRelatesToMediums1; + // } - // public MediumRelatesToMedium removeMediumRelatesToMediums1(MediumRelatesToMedium mediumRelatesToMediums1) { - // getMediumRelatesToMediums1().remove(mediumRelatesToMediums1); - // mediumRelatesToMediums1.setMedium1(null); + // public MediumRelatesToMedium removeMediumRelatesToMediums1(MediumRelatesToMedium mediumRelatesToMediums1) { + // getMediumRelatesToMediums1().remove(mediumRelatesToMediums1); + // mediumRelatesToMediums1.setMedium1(null); - // return mediumRelatesToMediums1; - // } + // return mediumRelatesToMediums1; + // } - // public List<MediumRelatesToMedium> getMediumRelatesToMediums2() { - // return this.mediumRelatesToMediums2; - // } + // public List<MediumRelatesToMedium> getMediumRelatesToMediums2() { + // return this.mediumRelatesToMediums2; + // } - // public void setMediumRelatesToMediums2(List<MediumRelatesToMedium> mediumRelatesToMediums2) { - // this.mediumRelatesToMediums2 = mediumRelatesToMediums2; - // } + // public void setMediumRelatesToMediums2(List<MediumRelatesToMedium> mediumRelatesToMediums2) { + // this.mediumRelatesToMediums2 = mediumRelatesToMediums2; + // } - // public MediumRelatesToMedium addMediumRelatesToMediums2(MediumRelatesToMedium mediumRelatesToMediums2) { - // getMediumRelatesToMediums2().add(mediumRelatesToMediums2); - // mediumRelatesToMediums2.setMedium2(this); + // public MediumRelatesToMedium addMediumRelatesToMediums2(MediumRelatesToMedium mediumRelatesToMediums2) { + // getMediumRelatesToMediums2().add(mediumRelatesToMediums2); + // mediumRelatesToMediums2.setMedium2(this); - // return mediumRelatesToMediums2; - // } + // return mediumRelatesToMediums2; + // } - // public MediumRelatesToMedium removeMediumRelatesToMediums2(MediumRelatesToMedium mediumRelatesToMediums2) { - // getMediumRelatesToMediums2().remove(mediumRelatesToMediums2); - // mediumRelatesToMediums2.setMedium2(null); + // public MediumRelatesToMedium removeMediumRelatesToMediums2(MediumRelatesToMedium mediumRelatesToMediums2) { + // getMediumRelatesToMediums2().remove(mediumRelatesToMediums2); + // mediumRelatesToMediums2.setMedium2(null); - // return mediumRelatesToMediums2; - // } + // return mediumRelatesToMediums2; + // } - public MediumSoftware getMediumSoftware() { - return this.mediumSoftware; - } + public MediumSoftware getMediumSoftware() { + return this.mediumSoftware; + } - public void setMediumSoftware(MediumSoftware mediumSoftware) { - this.mediumSoftware = mediumSoftware; - } + public void setMediumSoftware(MediumSoftware mediumSoftware) { + this.mediumSoftware = mediumSoftware; + } - public MediumText getMediumText() { - return this.mediumText; - } + public MediumText getMediumText() { + return this.mediumText; + } - public void setMediumText(MediumText mediumText) { - this.mediumText = mediumText; - } + public void setMediumText(MediumText mediumText) { + this.mediumText = mediumText; + } - public List<MusicalNotation> getMusicalNotations() { - return this.musicalNotations; - } + public List<MusicalNotation> getMusicalNotations() { + return this.musicalNotations; + } - public void setMusicalNotations(List<MusicalNotation> musicalNotations) { - this.musicalNotations = musicalNotations; - } + public void setMusicalNotations(List<MusicalNotation> musicalNotations) { + this.musicalNotations = musicalNotations; + } - public MusicalNotation addMusicalNotation(MusicalNotation musicalNotation) { - getMusicalNotations().add(musicalNotation); - musicalNotation.setMedium(this); + public MusicalNotation addMusicalNotation(MusicalNotation musicalNotation) { + getMusicalNotations().add(musicalNotation); + musicalNotation.setMedium(this); - return musicalNotation; - } + return musicalNotation; + } - public MusicalNotation removeMusicalNotation(MusicalNotation musicalNotation) { - getMusicalNotations().remove(musicalNotation); - musicalNotation.setMedium(null); + public MusicalNotation removeMusicalNotation(MusicalNotation musicalNotation) { + getMusicalNotations().remove(musicalNotation); + musicalNotation.setMedium(null); - return musicalNotation; - } + return musicalNotation; + } - public List<Source> getSources() { - return this.sources; - } + public List<Source> getSources() { + return this.sources; + } - public void setSources(List<Source> sources) { - this.sources = sources; - } + public void setSources(List<Source> sources) { + this.sources = sources; + } - public Source addSource(Source source) { - getSources().add(source); - source.setMedium(this); + public Source addSource(Source source) { + getSources().add(source); + source.setMedium(this); - return source; - } + return source; + } - public Source removeSource(Source source) { - getSources().remove(source); - source.setMedium(null); + public Source removeSource(Source source) { + getSources().remove(source); + source.setMedium(null); - return source; - } + return source; + } - public MediumVideo getMediumVideo() { - return this.mediumVideo; - } + public MediumVideo getMediumVideo() { + return this.mediumVideo; + } - public void setMediumVideo(MediumVideo mediumVideo) { - this.mediumVideo = mediumVideo; - } + public void setMediumVideo(MediumVideo mediumVideo) { + this.mediumVideo = mediumVideo; + } - public MediumVideogame getMediumVideogame() { - return mediumVideogame; - } + public MediumVideogame getMediumVideogame() { + return mediumVideogame; + } - public void setMediumVideogame(MediumVideogame mediumVideogame) { - this.mediumVideogame = mediumVideogame; - } + public void setMediumVideogame(MediumVideogame mediumVideogame) { + this.mediumVideogame = mediumVideogame; + } - public List<MediumHasActorWithRole> getMediumHasActorWithRoles() { - return this.mediumHasActorWithRoles; - } + public List<MediumHasActorWithRole> getMediumHasActorWithRoles() { + return this.mediumHasActorWithRoles; + } - public void setMediumHasActorWithRoles(List<MediumHasActorWithRole> mediumHasActorWithRoles) { - this.mediumHasActorWithRoles = mediumHasActorWithRoles; - } + public void setMediumHasActorWithRoles(List<MediumHasActorWithRole> mediumHasActorWithRoles) { + this.mediumHasActorWithRoles = mediumHasActorWithRoles; + } - public MediumHasActorWithRole addMediumHasActorWithRole(MediumHasActorWithRole mediumHasActorWithRole) { - getMediumHasActorWithRoles().add(mediumHasActorWithRole); - mediumHasActorWithRole.setMedium(this); + public MediumHasActorWithRole addMediumHasActorWithRole(MediumHasActorWithRole mediumHasActorWithRole) { + getMediumHasActorWithRoles().add(mediumHasActorWithRole); + mediumHasActorWithRole.setMedium(this); - return mediumHasActorWithRole; - } + return mediumHasActorWithRole; + } - public MediumHasActorWithRole removeMediumHasActorWithRole(MediumHasActorWithRole mediumHasActorWithRole) { - getMediumHasActorWithRoles().remove(mediumHasActorWithRole); - mediumHasActorWithRole.setMedium(null); + public MediumHasActorWithRole removeMediumHasActorWithRole(MediumHasActorWithRole mediumHasActorWithRole) { + getMediumHasActorWithRoles().remove(mediumHasActorWithRole); + mediumHasActorWithRole.setMedium(null); - return mediumHasActorWithRole; - } + return mediumHasActorWithRole; + } - public Music getMusic() { - return this.music; - } + public Music getMusic() { + return this.music; + } - public void setMusic(Music music) { - this.music = music; - } + public void setMusic(Music music) { + this.music = music; + } - public List<MediumHasMusic> getMediumHasMusicList() { - return this.mediumHasMusicList; - } + public List<MediumHasMusic> getMediumHasMusicList() { + return this.mediumHasMusicList; + } - public void setMediumHasMusicList(List<MediumHasMusic> mediumHasMusicList) { - this.mediumHasMusicList = mediumHasMusicList; - } + public void setMediumHasMusicList(List<MediumHasMusic> mediumHasMusicList) { + this.mediumHasMusicList = mediumHasMusicList; + } - public MediumHasMusic addMediumHasMusic(MediumHasMusic mediumHasMusic) { - getMediumHasMusicList().add(mediumHasMusic); - mediumHasMusic.setMedium(this); + public MediumHasMusic addMediumHasMusic(MediumHasMusic mediumHasMusic) { + getMediumHasMusicList().add(mediumHasMusic); + mediumHasMusic.setMedium(this); - return mediumHasMusic; - } + return mediumHasMusic; + } - public MediumHasMusic removeMediumHasMusic(MediumHasMusic mediumHasMusic) { - getMediumHasMusicList().remove(mediumHasMusic); - mediumHasMusic.setMedium(null); + public MediumHasMusic removeMediumHasMusic(MediumHasMusic mediumHasMusic) { + getMediumHasMusicList().remove(mediumHasMusic); + mediumHasMusic.setMedium(null); - return mediumHasMusic; - } + return mediumHasMusic; + } - public String getFileStatus() { - return fileStatus; - } + public String getFileStatus() { + return fileStatus; + } - public void setFileStatus(String fileStatus) { - this.fileStatus = fileStatus; - } + public void setFileStatus(String fileStatus) { + this.fileStatus = fileStatus; + } - public String getFileExtension() { - return fileExtension; - } + public String getFileExtension() { + return fileExtension; + } - public void setFileExtension(String fileExtension) { - this.fileExtension = fileExtension; - } + public void setFileExtension(String fileExtension) { + this.fileExtension = fileExtension; + } - public String getViewToken() { - return viewToken; - } + public String getViewToken() { + return viewToken; + } - public void setViewToken(String viewToken) { - this.viewToken = viewToken; - } + public void setViewToken(String viewToken) { + this.viewToken = viewToken; + } public Transcription getDefaultTranscription() { return defaultTranscription; @@ -870,29 +840,30 @@ public void setTranscriptions(Set<Transcription> transcriptions) { } public MediumAudioAnalysis getMediumAudioAnalysis() { - return mediumAudioAnalysis; - } - - public void setMediumAudioAnalysis(MediumAudioAnalysis mediumAudioAnalysis) { - this.mediumAudioAnalysis = mediumAudioAnalysis; - } - - public void setLastEditedByUserAccountId(int lastEditedByUserAccountId) { - this.lastEditedByUserAccountId = lastEditedByUserAccountId; - } - - public void setCreatedByUserAccountId(int createdByUserAccountId) { - this.createdByUserAccountId = createdByUserAccountId; - } - - @PostLoad - public void setFileStatusAndViewTokenAfterLoad() { - if (this.fileStatus == null) { - this.fileStatus = EndpointMedium.mediumFileStatus(this.id, this.getMediaType().getMediaTypeTranslations().get(0).getType()); - } - if (this.viewToken == null) { - this.viewToken = EndpointMedium.issueFileToken(this.id); - } - } + return mediumAudioAnalysis; + } + + public void setMediumAudioAnalysis(MediumAudioAnalysis mediumAudioAnalysis) { + this.mediumAudioAnalysis = mediumAudioAnalysis; + } + + public void setLastEditedByUserAccountId(int lastEditedByUserAccountId) { + this.lastEditedByUserAccountId = lastEditedByUserAccountId; + } + + public void setCreatedByUserAccountId(int createdByUserAccountId) { + this.createdByUserAccountId = createdByUserAccountId; + } + + @PostLoad + public void setFileStatusAndViewTokenAfterLoad() { + if (this.fileStatus == null) { + this.fileStatus = EndpointMedium.mediumFileStatus(this.id, + this.getMediaType().getMediaTypeTranslations().get(0).getType()); + } + if (this.viewToken == null) { + this.viewToken = EndpointMedium.issueFileToken(this.id); + } + } } \ No newline at end of file diff --git a/src/main/java/de/bitgilde/TIMAAT/processing/audio/FfmpegAudioEngine.java b/src/main/java/de/bitgilde/TIMAAT/processing/audio/FfmpegAudioEngine.java index 8a100911..d4dbb84d 100644 --- a/src/main/java/de/bitgilde/TIMAAT/processing/audio/FfmpegAudioEngine.java +++ b/src/main/java/de/bitgilde/TIMAAT/processing/audio/FfmpegAudioEngine.java @@ -89,11 +89,25 @@ public AudioMetaInformation extractAudioMetaInformation(Path pathToAudioFile) th } } - public PcmMono16BitLittleEndian convertAudioChannelsTo16BitLittleEndian(Path pathToAudioFile) throws AudioEngineException { + /** + * Converts the audio of the given file to a single mono channel of 16 bit little endian PCM samples + * at the engine's sample rate by invoking ffmpeg. Depending on {@code persistInContainerFormat} the + * resulting samples are either written as a raw PCM stream ({@code -f s16le}) or wrapped inside a + * WAV container ({@code -f wav}). + * + * @param pathToAudioFile path to the source audio file + * @param persistInContainerFormat when {@code true} the converted audio is wrapped inside a WAV + * container; when {@code false} the samples are persisted as raw + * 16 bit little endian PCM without container metadata + * @return a handle to the converted audio file; the caller is responsible for closing it + * @throws AudioEngineException if creating the temporary output file or executing ffmpeg fails + */ + public PcmMono16BitLittleEndian convertAudioChannelsTo16BitLittleEndian(Path pathToAudioFile, boolean persistInContainerFormat) throws AudioEngineException { logger.log(Level.FINE, "Converting file {0} to mono", pathToAudioFile); try { TemporaryFile temporaryFile = temporaryFileStorage.createTemporaryFile(); - String[] commandLine = {pathToFfmpeg.toString(), "-i", pathToAudioFile.toString(), "-ac", "1", "-ar", String.valueOf(SAMPLE_RATE), "-f", "s16le", temporaryFile.getTemporaryFilePath().toString()}; + String outputFormat = persistInContainerFormat ? "wav" : "s16le"; + String[] commandLine = {pathToFfmpeg.toString(), "-i", pathToAudioFile.toString(), "-ac", "1", "-ar", String.valueOf(SAMPLE_RATE), "-f", outputFormat, temporaryFile.getTemporaryFilePath().toString()}; syncExecuteProcess(commandLine); return new PcmMono16BitLittleEndian(temporaryFile); diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java index dfa26dcd..7edf3edc 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java @@ -66,6 +66,7 @@ import de.bitgilde.TIMAAT.storage.api.PagingParameter; import de.bitgilde.TIMAAT.storage.api.SortingParameter; import de.bitgilde.TIMAAT.storage.entity.MediumVideoStorage; +import de.bitgilde.TIMAAT.storage.entity.SystemSettingStorage; import de.bitgilde.TIMAAT.storage.entity.medium.MediumStorage; import de.bitgilde.TIMAAT.storage.entity.medium.api.MediumFilterCriteria; import de.bitgilde.TIMAAT.storage.entity.medium.exception.MediumNotFoundException; @@ -133,6 +134,8 @@ import java.util.Map; import java.util.Optional; import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; import java.util.stream.Collectors; /* @@ -156,7 +159,7 @@ @Service @Path("/medium") public class EndpointMedium { - + private static final Logger logger = Logger.getLogger(EndpointMedium.class.getName()); private static final int DEFAULT_THUMBNAIL_TIMESTAMP_MS = 1000; @Context @@ -181,6 +184,8 @@ public class EndpointMedium { private FfmpegVideoEngine ffmpegVideoEngine; @Inject private TranscriptionService transcriptionService; + @Inject + private SystemSettingStorage systemSettingStorage; @GET @@ -3137,7 +3142,7 @@ public Response updateAudioPostProductionTranslation(@PathParam("id") int id, St @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) @Secured public Response uploadAudio(@PathParam("id") int id, @FormDataParam("file") InputStream uploadedInputStream) throws TaskServiceException { - + int userId = (int) containerRequestContext.getProperty("TIMAAT.userID"); EntityManager entityManager = TIMAATApp.emf.createEntityManager(); MediumAudio mediumAudio = entityManager.find(MediumAudio.class, id); if (mediumAudio == null) { @@ -3183,9 +3188,8 @@ public Response uploadAudio(@PathParam("id") int id, @FormDataParam("file") Inpu taskService.executeMediumAudioAnalysisTask(id, SupportedMediumType.AUDIO); // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.MEDIUMCREATED); - + UserLogManager.getLogger().addLogEntry(userId, UserLogManager.LogEvents.MEDIUMCREATED); + executeDefaultTranscriptionCreation(id, userId); } catch (IOException e) { e.printStackTrace(); } @@ -3399,6 +3403,7 @@ else if (mediumTypeId == 6) { @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) @Secured public Response uploadVideo(@PathParam("id") int id, @FormDataParam("file") InputStream uploadedInputStream, @FormDataParam("file") FormDataContentDisposition fileDetail) throws Exception { + int userId = (int) containerRequestContext.getProperty("TIMAAT.userID"); EntityManager entityManager = TIMAATApp.emf.createEntityManager(); MediumVideo mediumVideo = entityManager.find(MediumVideo.class, id); @@ -3450,8 +3455,8 @@ public Response uploadVideo(@PathParam("id") int id, @FormDataParam("file") Inpu createVideoThumbnail(mediumId, DEFAULT_THUMBNAIL_TIMESTAMP_MS); taskService.executeMediumAudioAnalysisTask(mediumId, SupportedMediumType.VIDEO); // add log entry - UserLogManager.getLogger().addLogEntry((int) containerRequestContext.getProperty("TIMAAT.userID"), - UserLogManager.LogEvents.MEDIUMCREATED); + UserLogManager.getLogger().addLogEntry(userId, UserLogManager.LogEvents.MEDIUMCREATED); + executeDefaultTranscriptionCreation(mediumId, userId); } catch (IOException e) { e.printStackTrace(); @@ -3460,6 +3465,16 @@ public Response uploadVideo(@PathParam("id") int id, @FormDataParam("file") Inpu return Response.ok().entity(mediumVideo).build(); } + private void executeDefaultTranscriptionCreation(int mediumId, int createdByUserAccountId) { + if (transcriptionService.isFeatureEnabled() && systemSettingStorage.isAutoTranscribeUploadsEnabled()) { + try { + transcriptionService.createTranscriptionWithDefaultModel(mediumId, createdByUserAccountId); + } catch (Exception e) { + logger.log(Level.WARNING, "Error during executing default transcription creation of medium " + mediumId, e); + } + } + } + @HEAD @Path("audio/{id}/download") @Produces("audio/mpeg") @@ -4558,6 +4573,8 @@ public Response getMediumTranscription(@PathParam("id") int mediumId, @PathParam @Secured @Path("{id}/transcriptions") public Response createMediumTranscription(@PathParam("id") int mediumId, CreateTranscriptionRequest request) { + int userId = (int) containerRequestContext.getProperty("TIMAAT.userID"); + if (request == null) { return Response.status(Status.BAD_REQUEST).entity("{\"reason\":\"request body is required\"}").build(); } @@ -4570,7 +4587,8 @@ public Response createMediumTranscription(@PathParam("id") int mediumId, CreateT request.engineIdentifier(), request.modelIdentifier()); try { - de.bitgilde.TIMAAT.model.FIPOP.Transcription created = transcriptionService.createTranscription(configuration); + de.bitgilde.TIMAAT.model.FIPOP.Transcription created = transcriptionService.createTranscription(configuration, + userId); return Response.status(Status.CREATED).entity(toTranscriptionDto(created)).build(); } catch (TranscriptionFeatureDisabledException e) { return Response.status(Status.FORBIDDEN).entity("{\"reason\":\"" + e.getMessage() + "\"}").build(); diff --git a/src/main/java/de/bitgilde/TIMAAT/service/task/execution/MediumAudioAnalysisTaskExecutor.java b/src/main/java/de/bitgilde/TIMAAT/service/task/execution/MediumAudioAnalysisTaskExecutor.java index 1da24c63..11de990b 100644 --- a/src/main/java/de/bitgilde/TIMAAT/service/task/execution/MediumAudioAnalysisTaskExecutor.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/task/execution/MediumAudioAnalysisTaskExecutor.java @@ -67,7 +67,7 @@ public void execute() throws TaskExecutionException { if (pathToOriginalMediumFile.isPresent()) { AudioMetaInformation audioMetaInformation = executeAudioFileMetaInformationExtraction(pathToOriginalMediumFile.get()); - try(PcmMono16BitLittleEndian pcmAudioFile = audioEngine.convertAudioChannelsTo16BitLittleEndian(pathToOriginalMediumFile.get())){ + try(PcmMono16BitLittleEndian pcmAudioFile = audioEngine.convertAudioChannelsTo16BitLittleEndian(pathToOriginalMediumFile.get(), false)){ Path waveformPath = executeWaveformFileGeneration(pcmAudioFile); Path frequencyPath = executeFrequencyFileGeneration(pcmAudioFile); diff --git a/src/main/java/de/bitgilde/TIMAAT/service/task/execution/TranscriptionMediumPreparationTaskExecutor.java b/src/main/java/de/bitgilde/TIMAAT/service/task/execution/TranscriptionMediumPreparationTaskExecutor.java index b97fc2b9..14e8a747 100644 --- a/src/main/java/de/bitgilde/TIMAAT/service/task/execution/TranscriptionMediumPreparationTaskExecutor.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/task/execution/TranscriptionMediumPreparationTaskExecutor.java @@ -28,11 +28,10 @@ public class TranscriptionMediumPreparationTaskExecutor extends TaskExecutor<Tra private final AudioContainingMediumFileStorage audioContainingMediumFileStorage; private final FfmpegAudioEngine audioEngine; - public TranscriptionMediumPreparationTaskExecutor(TranscriptionMediumPreparationTask task, - Map<SupportedMediumType, AudioContainingMediumFileStorage> audioContainingMediumFileStorageBySupportedMediumType, - FfmpegAudioEngine audioEngine) { + public TranscriptionMediumPreparationTaskExecutor(TranscriptionMediumPreparationTask task, Map<SupportedMediumType, AudioContainingMediumFileStorage> audioContainingMediumFileStorageBySupportedMediumType, FfmpegAudioEngine audioEngine) { super(task); - this.audioContainingMediumFileStorage = audioContainingMediumFileStorageBySupportedMediumType.get(task.getMediumType()); + this.audioContainingMediumFileStorage = audioContainingMediumFileStorageBySupportedMediumType.get( + task.getMediumType()); this.audioEngine = audioEngine; } @@ -51,10 +50,10 @@ public void execute() throws TaskExecutionException { throw new TaskExecutionException("Medium with id " + mediumId + " has no original file"); } - try (PcmMono16BitLittleEndian pcmAudioFile = audioEngine.convertAudioChannelsTo16BitLittleEndian(pathToOriginalMediumFile.get())) { + try (PcmMono16BitLittleEndian pcmAudioFile = audioEngine.convertAudioChannelsTo16BitLittleEndian( + pathToOriginalMediumFile.get(), true)) { audioContainingMediumFileStorage.persistAudioMonoFile(pcmAudioFile.getAudioFilePath(), mediumId); - } - catch (AudioEngineException | IOException e) { + } catch (AudioEngineException | IOException e) { throw new TaskExecutionException("Error while preparing transcription medium file", e); } diff --git a/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java b/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java index 33edcc7f..5634aa19 100644 --- a/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java @@ -241,6 +241,24 @@ public void updateTranscriptionSystemSettings(boolean autoTranscribeUploads, @Nu defaultModelIdentifier, editingUser); } + public Transcription createTranscriptionWithDefaultModel(int mediumId, int createdByUserAccountIdUserAccountId) throws TranscriptionServiceException { + if (!featureEnabled) { + throw new TranscriptionFeatureDisabledException("Speech-to-text feature is disabled for this deployment"); + } + + Optional<TranscriptionModel> transcriptionModel = systemSettingStorage.getDefaultTranscriptionModel(); + if (transcriptionModel.isPresent()) { + GenerateTranscriptionConfiguration generateTranscriptionConfiguration = new GenerateTranscriptionConfiguration( + mediumId, transcriptionModel.get().getId().getEngineIdentifier(), + transcriptionModel.get().getId().getModelIdentifier()); + return createTranscription(generateTranscriptionConfiguration, createdByUserAccountIdUserAccountId); + } + else { + throw new TranscriptionServiceException( + "Cannot create transcription with default model. No default model defined."); + } + } + /** * Creates a new transcription for the medium described by the given configuration. If the medium is already prepared * (i.e. a mono audio file exists), a speech-to-text task is started immediately. Otherwise the transcription is @@ -248,12 +266,13 @@ public void updateTranscriptionSystemSettings(boolean autoTranscribeUploads, @Nu * speech-to-text task is then started once preparation completes. * * @param generateTranscriptionConfiguration configuration describing the medium and the engine/model to use + * @param createdByUserAccountId id of the {@link UserAccount} created this transcription * @throws IllegalArgumentException if the requested engine is not offered by the connected speech-to-text-service * or the requested model is not provided by that engine * @throws TranscriptionServiceException if the transcription could not be created (e.g. underlying task scheduling * or storage access failed) */ - public Transcription createTranscription(GenerateTranscriptionConfiguration generateTranscriptionConfiguration) throws TranscriptionServiceException { + public Transcription createTranscription(GenerateTranscriptionConfiguration generateTranscriptionConfiguration, int createdByUserAccountId) throws TranscriptionServiceException { if (!featureEnabled) { throw new TranscriptionFeatureDisabledException("Speech-to-text feature is disabled for this deployment"); } @@ -275,14 +294,14 @@ public Transcription createTranscription(GenerateTranscriptionConfiguration gene logger.log(Level.INFO, "Mono file available for medium {0}. Creating transcription in PENDING state.", mediumId); createdTranscription = transcriptionStorage.createTranscription(mediumId, engineIdentifier, modelIdentifier, - TranscriptionState.PENDING); + TranscriptionState.PENDING, createdByUserAccountId); startTranscriptionTask(createdTranscription.getId(), monoFile.get(), engineIdentifier, modelIdentifier); } else { logger.log(Level.INFO, "No mono file for medium {0}. Creating transcription in WAITING_FOR_PREPARATION state.", mediumId); createdTranscription = transcriptionStorage.createTranscription(mediumId, engineIdentifier, modelIdentifier, - TranscriptionState.WAITING_FOR_PREPARATION); + TranscriptionState.WAITING_FOR_PREPARATION, createdByUserAccountId); taskServiceProvider.get().executeTranscriptionMediumPreparationTask(mediumId, supportedMediumType); } } catch (Exception e) { @@ -331,8 +350,8 @@ public Collection<Transcription> getTranscriptionsForMedium(int mediumId) throws * transcription belongs to a different medium */ public Transcription getTranscription(int mediumId, int transcriptionId) throws TranscriptionNotFoundException { - Transcription transcription = transcriptionStorage.findById(transcriptionId) - .orElseThrow(() -> new TranscriptionNotFoundException(transcriptionId)); + Transcription transcription = transcriptionStorage.findById(transcriptionId).orElseThrow( + () -> new TranscriptionNotFoundException(transcriptionId)); if (transcription.getMedium() == null || transcription.getMedium().getId() != mediumId) { throw new TranscriptionNotFoundException(transcriptionId); } diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/SystemSettingStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/SystemSettingStorage.java index 3c008886..6937ed83 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/SystemSettingStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/SystemSettingStorage.java @@ -23,12 +23,14 @@ public class SystemSettingStorage extends DbAccessComponent { private static final short SINGLETON_ID = 1; + private static final boolean DEFAULT_AUTO_TRANSCRIBE_UPLOADS = false; @Inject public SystemSettingStorage(EntityManagerFactory emf) { super(emf); } + /** * @return the {@link TranscriptionModel} currently configured as the default model for new transcriptions, * or {@link Optional#empty()} if no default has been configured (or no settings row exists yet) @@ -43,6 +45,17 @@ public Optional<TranscriptionModel> getDefaultTranscriptionModel() { }); } + public boolean isAutoTranscribeUploadsEnabled() { + return executeDbTransaction(entityManager -> { + SystemSetting systemSetting = entityManager.find(SystemSetting.class, SINGLETON_ID); + if (systemSetting == null) { + return DEFAULT_AUTO_TRANSCRIBE_UPLOADS; + } + + return systemSetting.getAutoTranscribeUploads(); + }); + } + /** * Reads the transcription-related system settings (default engine/model and the auto-transcribe-uploads * flag) from the singleton settings row. If no row exists yet, a snapshot reflecting the documented @@ -54,7 +67,7 @@ public TranscriptionSystemSettings getTranscriptionSystemSettings() { return executeDbTransaction(entityManager -> { SystemSetting systemSetting = entityManager.find(SystemSetting.class, SINGLETON_ID); if (systemSetting == null) { - return new TranscriptionSystemSettings(false, null); + return new TranscriptionSystemSettings(DEFAULT_AUTO_TRANSCRIBE_UPLOADS, null); } return new TranscriptionSystemSettings(Boolean.TRUE.equals(systemSetting.getAutoTranscribeUploads()), systemSetting.getDefaultTranscriptionModel()); diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/TranscriptionStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/TranscriptionStorage.java index a410f554..09ec5144 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/TranscriptionStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/TranscriptionStorage.java @@ -128,13 +128,14 @@ public void upsertModel(String engineIdentifier, String modelIdentifier) { }); } - public Transcription createTranscription(int mediumId, String engineIdentifier, String modelIdentifier, TranscriptionState transcriptionState) { + public Transcription createTranscription(int mediumId, String engineIdentifier, String modelIdentifier, TranscriptionState transcriptionState, int createdByUserAccountId) { return executeDbTransaction(entityManager -> { de.bitgilde.TIMAAT.model.FIPOP.TranscriptionState transcriptionStateEntity = entityManager.getReference( de.bitgilde.TIMAAT.model.FIPOP.TranscriptionState.class, transcriptionState.getDatabaseId()); de.bitgilde.TIMAAT.model.FIPOP.TranscriptionType transcriptionTypeEntity = entityManager.getReference( de.bitgilde.TIMAAT.model.FIPOP.TranscriptionType.class, TranscriptionType.GENERATED.getDatabaseId()); Medium medium = entityManager.getReference(Medium.class, mediumId); + UserAccount createdBy = entityManager.getReference(UserAccount.class, createdByUserAccountId); TranscriptionModelId transcriptionModelId = new TranscriptionModelId(); transcriptionModelId.setEngineIdentifier(engineIdentifier); transcriptionModelId.setModelIdentifier(modelIdentifier); @@ -148,6 +149,7 @@ public Transcription createTranscription(int mediumId, String engineIdentifier, transcription.setTranscriptionType(transcriptionTypeEntity); transcription.setTranscriptionModel(transcriptionModel); transcription.setCreatedAt(Instant.now()); + transcription.setCreatedByUserAccount(createdBy); entityManager.persist(transcription); @@ -162,7 +164,8 @@ public Transcription createTranscription(int mediumId, String engineIdentifier, * @return the matching {@link Transcription} or {@link Optional#empty()} if none exists */ public Optional<Transcription> findById(int transcriptionId) { - return executeDbTransaction(entityManager -> Optional.ofNullable(entityManager.find(Transcription.class, transcriptionId))); + return executeDbTransaction( + entityManager -> Optional.ofNullable(entityManager.find(Transcription.class, transcriptionId))); } /** @@ -190,11 +193,9 @@ public boolean deleteTranscription(int transcriptionId) { */ public Optional<Transcription> findLatestOtherTranscriptionForMedium(int mediumId, int excludeTranscriptionId) { return executeDbTransaction(entityManager -> entityManager.createQuery( - "select transcription from Transcription transcription " + - "where transcription.medium.id = :mediumId and transcription.id <> :excludeId " + - "order by transcription.createdAt desc", Transcription.class) - .setParameter("mediumId", mediumId).setParameter("excludeId", excludeTranscriptionId).setMaxResults(1) - .getResultStream().findFirst()); + "select transcription from Transcription transcription " + "where transcription.medium.id = :mediumId and transcription.id <> :excludeId " + "order by transcription.createdAt desc", + Transcription.class).setParameter("mediumId", mediumId).setParameter("excludeId", excludeTranscriptionId) + .setMaxResults(1).getResultStream().findFirst()); } public Optional<Integer> getTranscriptionIdRelatedToTranscriptionTask(long transcriptionTaskId) { @@ -278,7 +279,8 @@ protected List<Predicate> createPredicates(@Nullable TranscriptionFilterCriteria } if (filter.getMediumId().isPresent()) { - predicates.add(criteriaBuilder.equal(root.get(Transcription_.medium).get(Medium_.id), filter.getMediumId().get())); + predicates.add( + criteriaBuilder.equal(root.get(Transcription_.medium).get(Medium_.id), filter.getMediumId().get())); } return predicates; diff --git a/src/main/resources/database/db_update.sql b/src/main/resources/database/db_update.sql index 6582d123..0713e916 100644 --- a/src/main/resources/database/db_update.sql +++ b/src/main/resources/database/db_update.sql @@ -542,13 +542,13 @@ BEGIN CREATE TABLE `fipop`.`transcription` ( - `id` int primary key, + `id` int primary key auto_increment, `name` varchar(150) not null, `model_identifier` varchar(45), `engine_identifier` varchar(45), `medium_id` int not null, `transcription_state_id` int not null, - `transcription_type_id` int not null , + `transcription_type_id` int not null, `transcription_task_id` bigint, `created_at` timestamp not null default CURRENT_TIMESTAMP, `last_edited_at` timestamp, diff --git a/src/main/resources/database/fipop.sql b/src/main/resources/database/fipop.sql index 73776943..37dbf983 100644 --- a/src/main/resources/database/fipop.sql +++ b/src/main/resources/database/fipop.sql @@ -2679,7 +2679,7 @@ CREATE INDEX fk_actor_has_category_set_category_set1_idx ON `fipop`.`actor_has_c -- ----------------------------------------------------- CREATE TABLE `fipop`.`actor_has_category` ( - `actor_id` INT NOT NULL, + `actor_id` INT NOT NULL, `category_id` INT NOT NULL, CONSTRAINT `fk_actor_has_category_actor` FOREIGN KEY (`actor_id`) @@ -8870,12 +8870,12 @@ CREATE TABLE `fipop`.`transcription_type_translation` -- ----------------------------------------------------- CREATE TABLE `fipop`.`transcription` ( - `id` int primary key, + `id` int primary key auto_increment, `name` varchar(150) not null, `model_identifier` varchar(45), `engine_identifier` varchar(45), `medium_id` int not null, - `transcription_type_id` int not null , + `transcription_type_id` int not null, `transcription_state_id` int not null, `transcription_task_id` bigint, `created_at` timestamp not null default CURRENT_TIMESTAMP, @@ -8954,18 +8954,27 @@ CREATE INDEX `fk_medium_transcription_idx` on `fipop`.`medium` (`default_transcr -- ----------------------------------------------------- -- Data for table `FIPOP`.`transcription_state` -- ----------------------------------------------------- -INSERT INTO transcription_state VALUES (1), (2), (3), (4), (5), (6); +INSERT INTO transcription_state +VALUES (1), + (2), + (3), + (4), + (5), + (6); -- ----------------------------------------------------- -- Data for table `FIPOP`.`transcription_type` -- ----------------------------------------------------- -INSERT INTO transcription_type VALUES (1), (2); +INSERT INTO transcription_type +VALUES (1), + (2); -- ----------------------------------------------------- -- Data for table `FIPOP`.`system_settings` -- ----------------------------------------------------- -INSERT INTO system_settings(id, auto_transcribe_uploads) VALUES (1, TRUE); +INSERT INTO system_settings(id, auto_transcribe_uploads) +VALUES (1, TRUE); -- ----------------------------------------------------- -- Data for table `FIPOP`.`db_version` diff --git a/src/test/java/de/bitgilde/TIMAAT/audio/FfmpegAudioEngineTest.java b/src/test/java/de/bitgilde/TIMAAT/audio/FfmpegAudioEngineTest.java index 7d6c62e2..ce82c10a 100644 --- a/src/test/java/de/bitgilde/TIMAAT/audio/FfmpegAudioEngineTest.java +++ b/src/test/java/de/bitgilde/TIMAAT/audio/FfmpegAudioEngineTest.java @@ -9,10 +9,19 @@ import de.bitgilde.TIMAAT.processing.audio.io.FrequencyFileReader; import de.bitgilde.TIMAAT.storage.file.TemporaryFileStorage; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import javax.sound.sampled.AudioFileFormat; +import javax.sound.sampled.AudioFormat; +import javax.sound.sampled.AudioInputStream; +import javax.sound.sampled.AudioSystem; +import java.io.ByteArrayInputStream; +import java.io.File; import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; @@ -98,4 +107,89 @@ public void shouldReadFrequencyInformationCorrectly() throws InstantiationExcept Assertions.assertEquals(100, secondAndThirdInterval.get().getMinimumFrequency(), 1); Assertions.assertEquals(150, secondAndThirdInterval.get().getMaximumFrequency(), 1); } + + /** + * Verifies that the engine writes the converted mono PCM data as a raw stream (no container) + * when {@code persistInContainerFormat} is {@code false}. + * + * @throws Exception if test setup or ffmpeg invocation fails + */ + @Test + public void shouldPersistOutputAsRawPcmWhenNotUsingContainerFormat() throws Exception { + Path ffmpegDirectory = findFfmpegDirectory(); + Assumptions.assumeTrue(ffmpegDirectory != null, "ffmpeg not available on PATH"); + + PropertyManagement propertyManagement = mock(PropertyManagement.class); + when(propertyManagement.getProp(eq(PropertyConstants.STORAGE_TEMP_LOCATION))).thenReturn(TEST_OUTPUT_DIRECTORY.toString()); + when(propertyManagement.getProp(eq(PropertyConstants.FFMPEG_LOCATION))).thenReturn(ffmpegDirectory.toString()); + + TemporaryFileStorage temporaryFileStorage = new TemporaryFileStorage(propertyManagement); + FfmpegAudioEngine ffmpegAudioEngine = new FfmpegAudioEngine(propertyManagement, temporaryFileStorage); + + Path inputPath = TEST_OUTPUT_DIRECTORY.resolve("convert_input_raw.wav"); + writeSilentWav(inputPath); + + try (PcmMono16BitLittleEndian result = ffmpegAudioEngine.convertAudioChannelsTo16BitLittleEndian(inputPath, false)) { + byte[] header = readFirstBytes(result.getAudioFilePath(), 4); + Assertions.assertNotEquals("RIFF", new String(header, StandardCharsets.US_ASCII), + "Expected raw PCM output without RIFF container header"); + } + } + + /** + * Verifies that the engine wraps the converted mono PCM data inside a WAV container + * when {@code persistInContainerFormat} is {@code true}. + * + * @throws Exception if test setup or ffmpeg invocation fails + */ + @Test + public void shouldPersistOutputInsideWavContainerWhenUsingContainerFormat() throws Exception { + Path ffmpegDirectory = findFfmpegDirectory(); + Assumptions.assumeTrue(ffmpegDirectory != null, "ffmpeg not available on PATH"); + + PropertyManagement propertyManagement = mock(PropertyManagement.class); + when(propertyManagement.getProp(eq(PropertyConstants.STORAGE_TEMP_LOCATION))).thenReturn(TEST_OUTPUT_DIRECTORY.toString()); + when(propertyManagement.getProp(eq(PropertyConstants.FFMPEG_LOCATION))).thenReturn(ffmpegDirectory.toString()); + + TemporaryFileStorage temporaryFileStorage = new TemporaryFileStorage(propertyManagement); + FfmpegAudioEngine ffmpegAudioEngine = new FfmpegAudioEngine(propertyManagement, temporaryFileStorage); + + Path inputPath = TEST_OUTPUT_DIRECTORY.resolve("convert_input_wav.wav"); + writeSilentWav(inputPath); + + try (PcmMono16BitLittleEndian result = ffmpegAudioEngine.convertAudioChannelsTo16BitLittleEndian(inputPath, true)) { + byte[] header = readFirstBytes(result.getAudioFilePath(), 12); + Assertions.assertEquals("RIFF", new String(header, 0, 4, StandardCharsets.US_ASCII)); + Assertions.assertEquals("WAVE", new String(header, 8, 4, StandardCharsets.US_ASCII)); + } + } + + private static Path findFfmpegDirectory() { + String pathEnvironmentVariable = System.getenv("PATH"); + if (pathEnvironmentVariable == null) { + return null; + } + for (String pathEntry : pathEnvironmentVariable.split(File.pathSeparator)) { + Path candidate = Paths.get(pathEntry, "ffmpeg"); + if (Files.isExecutable(candidate)) { + return candidate.getParent(); + } + } + return null; + } + + private static void writeSilentWav(Path outputPath) throws IOException { + AudioFormat format = new AudioFormat(44100.0f, 16, 1, true, false); + int sampleCount = 4410; + byte[] silentSamples = new byte[sampleCount * 2]; + try (AudioInputStream audioInputStream = new AudioInputStream(new ByteArrayInputStream(silentSamples), format, sampleCount)) { + AudioSystem.write(audioInputStream, AudioFileFormat.Type.WAVE, outputPath.toFile()); + } + } + + private static byte[] readFirstBytes(Path path, int byteCount) throws IOException { + try (InputStream inputStream = Files.newInputStream(path)) { + return inputStream.readNBytes(byteCount); + } + } } diff --git a/src/test/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMediumTranscriptionsTest.java b/src/test/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMediumTranscriptionsTest.java index 5b43ae73..6f3b3c91 100644 --- a/src/test/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMediumTranscriptionsTest.java +++ b/src/test/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMediumTranscriptionsTest.java @@ -4,6 +4,7 @@ import de.bitgilde.TIMAAT.model.FIPOP.Transcription; import de.bitgilde.TIMAAT.model.FIPOP.TranscriptionModel; import de.bitgilde.TIMAAT.model.FIPOP.TranscriptionModelId; +import de.bitgilde.TIMAAT.rest.filter.AuthenticationFilter; import de.bitgilde.TIMAAT.rest.model.transcription.CreateTranscriptionRequest; import de.bitgilde.TIMAAT.rest.model.transcription.TranscriptionDto; import de.bitgilde.TIMAAT.service.transcription.TranscriptionService; @@ -14,6 +15,7 @@ import de.bitgilde.TIMAAT.storage.entity.medium.exception.MediumNotFoundException; import de.bitgilde.TIMAAT.storage.entity.transcription.api.TranscriptionState; import de.bitgilde.TIMAAT.storage.entity.transcription.api.TranscriptionType; +import jakarta.ws.rs.container.ContainerRequestContext; import jakarta.ws.rs.core.Response; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -25,6 +27,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -43,17 +47,22 @@ public class EndpointMediumTranscriptionsTest { private static final int MEDIUM_ID = 42; private static final int TRANSCRIPTION_ID = 7; + private static final int USER_ID = 5; private static final String ENGINE = "whisper"; private static final String MODEL = "large-v3"; private TranscriptionService transcriptionService; + private ContainerRequestContext containerRequestContext; private EndpointMedium endpoint; @BeforeEach void setUp() throws Exception { transcriptionService = mock(TranscriptionService.class); + containerRequestContext = mock(ContainerRequestContext.class); + when(containerRequestContext.getProperty(AuthenticationFilter.USER_ID_PROPERTY_NAME)).thenReturn(USER_ID); endpoint = new EndpointMedium(); inject("transcriptionService", transcriptionService); + inject("containerRequestContext", containerRequestContext); } private void inject(String fieldName, Object value) throws Exception { @@ -93,8 +102,7 @@ void shouldReturnEmptyCollectionWhenMediumHasNoTranscriptions() throws Exception @Test void shouldReturnNotFoundWhenMediumDoesNotExistForList() throws Exception { - when(transcriptionService.getTranscriptionsForMedium(MEDIUM_ID)).thenThrow( - new MediumNotFoundException(MEDIUM_ID)); + when(transcriptionService.getTranscriptionsForMedium(MEDIUM_ID)).thenThrow(new MediumNotFoundException(MEDIUM_ID)); Response response = endpoint.getMediumTranscriptions(MEDIUM_ID); @@ -128,7 +136,8 @@ void shouldReturnNotFoundWhenTranscriptionDoesNotExist() throws Exception { @Test void shouldCreateTranscriptionAndReturnCreatedWithDto() throws Exception { Transcription created = transcription(TRANSCRIPTION_ID, MEDIUM_ID, ENGINE, MODEL); - when(transcriptionService.createTranscription(any(GenerateTranscriptionConfiguration.class))).thenReturn(created); + when(transcriptionService.createTranscription(any(GenerateTranscriptionConfiguration.class), eq(USER_ID))).thenReturn( + created); CreateTranscriptionRequest request = new CreateTranscriptionRequest(ENGINE, MODEL); Response response = endpoint.createMediumTranscription(MEDIUM_ID, request); @@ -140,12 +149,14 @@ void shouldCreateTranscriptionAndReturnCreatedWithDto() throws Exception { assertThat(dto.engineIdentifier()).isEqualTo(ENGINE); assertThat(dto.modelIdentifier()).isEqualTo(MODEL); - ArgumentCaptor<GenerateTranscriptionConfiguration> captor = ArgumentCaptor.forClass( + ArgumentCaptor<GenerateTranscriptionConfiguration> configurationCaptor = ArgumentCaptor.forClass( GenerateTranscriptionConfiguration.class); - verify(transcriptionService).createTranscription(captor.capture()); - assertThat(captor.getValue().mediumId()).isEqualTo(MEDIUM_ID); - assertThat(captor.getValue().engineIdentifier()).isEqualTo(ENGINE); - assertThat(captor.getValue().modelIdentifier()).isEqualTo(MODEL); + ArgumentCaptor<Integer> userIdCaptor = ArgumentCaptor.forClass(Integer.class); + verify(transcriptionService).createTranscription(configurationCaptor.capture(), userIdCaptor.capture()); + assertThat(configurationCaptor.getValue().mediumId()).isEqualTo(MEDIUM_ID); + assertThat(configurationCaptor.getValue().engineIdentifier()).isEqualTo(ENGINE); + assertThat(configurationCaptor.getValue().modelIdentifier()).isEqualTo(MODEL); + assertThat(userIdCaptor.getValue()).isEqualTo(USER_ID); } @Test @@ -175,8 +186,8 @@ void shouldReturnBadRequestWhenModelIdentifierIsMissing() { @Test void shouldReturnBadRequestWhenEngineModelPairIsUnknown() throws Exception { - doThrow(new IllegalArgumentException("Model 'large-v3' is not provided by engine 'whisper'")) - .when(transcriptionService).createTranscription(any(GenerateTranscriptionConfiguration.class)); + doThrow(new IllegalArgumentException("Model 'large-v3' is not provided by engine 'whisper'")).when( + transcriptionService).createTranscription(any(GenerateTranscriptionConfiguration.class), anyInt()); CreateTranscriptionRequest request = new CreateTranscriptionRequest(ENGINE, MODEL); Response response = endpoint.createMediumTranscription(MEDIUM_ID, request); @@ -186,8 +197,10 @@ void shouldReturnBadRequestWhenEngineModelPairIsUnknown() throws Exception { @Test void shouldReturnForbiddenWhenSpeechToTextFeatureIsDisabled() throws Exception { - doThrow(new TranscriptionFeatureDisabledException("speech-to-text feature is disabled")) - .when(transcriptionService).createTranscription(any(GenerateTranscriptionConfiguration.class)); + doThrow(new TranscriptionFeatureDisabledException("speech-to-text feature is disabled")).when(transcriptionService) + .createTranscription( + any(GenerateTranscriptionConfiguration.class), + anyInt()); CreateTranscriptionRequest request = new CreateTranscriptionRequest(ENGINE, MODEL); Response response = endpoint.createMediumTranscription(MEDIUM_ID, request); @@ -197,8 +210,8 @@ void shouldReturnForbiddenWhenSpeechToTextFeatureIsDisabled() throws Exception { @Test void shouldReturnInternalServerErrorWhenServiceFails() throws Exception { - doThrow(new TranscriptionServiceException("backend exploded")) - .when(transcriptionService).createTranscription(any(GenerateTranscriptionConfiguration.class)); + doThrow(new TranscriptionServiceException("backend exploded")).when(transcriptionService).createTranscription( + any(GenerateTranscriptionConfiguration.class), anyInt()); CreateTranscriptionRequest request = new CreateTranscriptionRequest(ENGINE, MODEL); Response response = endpoint.createMediumTranscription(MEDIUM_ID, request); From e89e45484e8fbd68e5007a2678042b7054e7efdf Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Sun, 24 May 2026 17:23:16 +0200 Subject: [PATCH 64/70] TIMAAT #57 - Added transcription deletion endpoint * Added endpoint allowing the deletion of a transcription * Added check to TranscriptionStorage allowing to determine their existence --- .../TIMAAT/rest/endpoint/EndpointMedium.java | 36 ++++++++++++++++ .../transcription/TranscriptionService.java | 17 ++++++++ .../transcription/TranscriptionStorage.java | 22 ++++++++++ .../EndpointMediumTranscriptionsTest.java | 41 +++++++++++++++++-- .../TranscriptionServiceMediumLookupTest.java | 23 ++++++++++- 5 files changed, 133 insertions(+), 6 deletions(-) diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java index 7edf3edc..d9d4ae7d 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java @@ -4599,6 +4599,42 @@ public Response createMediumTranscription(@PathParam("id") int mediumId, CreateT } } + /** + * Deletes the transcription identified by {@code transcriptionId}, scoped to the given medium + * so that a transcription belonging to a different medium is reported as not found rather than + * silently removed. The deletion itself is delegated to + * {@link TranscriptionService#deleteTranscription(int)}, which takes care of reassigning the + * medium's default transcription and removing the on-disk transcription file. + * + * @param mediumId identifies the {@link Medium} the transcription is expected to belong + * to + * @param transcriptionId identifies the transcription to remove + * @return {@code 204 No Content} on success; {@code 404 Not Found} when the transcription does + * not exist or belongs to a different medium; {@code 500 Internal Server Error} when the + * deletion failed for any other reason + */ + @DELETE + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Secured + @Path("{id}/transcriptions/{transcriptionId}") + public Response deleteMediumTranscription(@PathParam("id") int mediumId, + @PathParam("transcriptionId") int transcriptionId) { + if (!transcriptionService.existsForMedium(mediumId, transcriptionId)) { + return Response.status(Status.NOT_FOUND) + .entity("{\"reason\":\"Transcription " + transcriptionId + " does not exist for medium " + mediumId + + "\"}").build(); + } + + try { + transcriptionService.deleteTranscription(transcriptionId); + return Response.noContent().build(); + } catch (TranscriptionNotFoundException e) { + return Response.status(Status.NOT_FOUND).entity("{\"reason\":\"" + e.getMessage() + "\"}").build(); + } catch (TranscriptionServiceException e) { + return Response.status(Status.INTERNAL_SERVER_ERROR).entity("{\"reason\":\"" + e.getMessage() + "\"}").build(); + } + } + private static boolean isBlank(String value) { return value == null || value.isBlank(); } diff --git a/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java b/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java index 5634aa19..a57cb3c7 100644 --- a/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java +++ b/src/main/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionService.java @@ -358,6 +358,23 @@ public Transcription getTranscription(int mediumId, int transcriptionId) throws return transcription; } + /** + * Checks whether a transcription identified by {@code transcriptionId} exists and belongs to the + * medium identified by {@code mediumId}. Unlike {@link #getTranscription(int, int)} this does + * not load the full {@link Transcription} entity, so it is the cheaper option when callers only + * need an existence / scope check (e.g. validating a URL path before deletion). + * + * @param mediumId identifies the {@link de.bitgilde.TIMAAT.model.FIPOP.Medium} the + * transcription is expected to belong to + * @param transcriptionId identifies the {@link Transcription} to look up + * @return {@code true} if a transcription with the given id exists and is bound to the given + * medium; {@code false} otherwise (no transcription with that id, or it belongs to a different + * medium) + */ + public boolean existsForMedium(int mediumId, int transcriptionId) { + return transcriptionStorage.existsForMedium(mediumId, transcriptionId); + } + /** * Removes the transcription identified by {@code transcriptionId}. Before removal, the * transcription's medium is checked: if it still references this transcription as its default, diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/TranscriptionStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/TranscriptionStorage.java index 09ec5144..697d217d 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/TranscriptionStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/transcription/TranscriptionStorage.java @@ -168,6 +168,28 @@ public Optional<Transcription> findById(int transcriptionId) { entityManager -> Optional.ofNullable(entityManager.find(Transcription.class, transcriptionId))); } + /** + * Checks whether a {@link Transcription} with the given id exists and is associated with the + * given medium. The lookup runs as a {@code select count(...)} query so the entity itself is not + * materialised — preferable to {@link #findById(int)} followed by a medium check when callers + * only need a yes/no answer. + * + * @param mediumId identifies the + * {@link de.bitgilde.TIMAAT.model.FIPOP.Medium} the transcription is + * expected to belong to + * @param transcriptionId identifies the {@link Transcription} to look up + * @return {@code true} when a row matches both ids; {@code false} otherwise + */ + public boolean existsForMedium(int mediumId, int transcriptionId) { + return executeDbTransaction(entityManager -> { + Long count = entityManager.createQuery( + "select count(transcription) from Transcription transcription " + "where transcription.id = :id and transcription.medium.id = :mediumId", + Long.class).setParameter("id", transcriptionId).setParameter("mediumId", mediumId) + .getSingleResult(); + return count != null && count > 0L; + }); + } + /** * Removes the {@link Transcription} identified by {@code transcriptionId} from the database. * diff --git a/src/test/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMediumTranscriptionsTest.java b/src/test/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMediumTranscriptionsTest.java index 6f3b3c91..44678be6 100644 --- a/src/test/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMediumTranscriptionsTest.java +++ b/src/test/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMediumTranscriptionsTest.java @@ -31,14 +31,16 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; /** * Tests for the transcription-related sub-resources exposed by {@link EndpointMedium} * ({@code GET /medium/{id}/transcriptions}, {@code GET /medium/{id}/transcriptions/{tid}}, - * {@code POST /medium/{id}/transcriptions}). The endpoint is wired with mocked - * collaborators (no Jersey involved); injected fields are populated via reflection. + * {@code POST /medium/{id}/transcriptions}, {@code DELETE /medium/{id}/transcriptions/{tid}}). + * The endpoint is wired with mocked collaborators (no Jersey involved); injected fields are + * populated via reflection. * * @author Nico Kotlenga (nico@nko-dev.studio) * @since 2026-05-24 @@ -136,8 +138,8 @@ void shouldReturnNotFoundWhenTranscriptionDoesNotExist() throws Exception { @Test void shouldCreateTranscriptionAndReturnCreatedWithDto() throws Exception { Transcription created = transcription(TRANSCRIPTION_ID, MEDIUM_ID, ENGINE, MODEL); - when(transcriptionService.createTranscription(any(GenerateTranscriptionConfiguration.class), eq(USER_ID))).thenReturn( - created); + when(transcriptionService.createTranscription(any(GenerateTranscriptionConfiguration.class), + eq(USER_ID))).thenReturn(created); CreateTranscriptionRequest request = new CreateTranscriptionRequest(ENGINE, MODEL); Response response = endpoint.createMediumTranscription(MEDIUM_ID, request); @@ -219,6 +221,37 @@ void shouldReturnInternalServerErrorWhenServiceFails() throws Exception { assertThat(response.getStatus()).isEqualTo(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode()); } + @Test + void shouldReturnNoContentWhenDeletingTranscription() throws Exception { + when(transcriptionService.existsForMedium(MEDIUM_ID, TRANSCRIPTION_ID)).thenReturn(true); + + Response response = endpoint.deleteMediumTranscription(MEDIUM_ID, TRANSCRIPTION_ID); + + assertThat(response.getStatus()).isEqualTo(Response.Status.NO_CONTENT.getStatusCode()); + verify(transcriptionService).deleteTranscription(TRANSCRIPTION_ID); + } + + @Test + void shouldReturnNotFoundWhenDeletingMissingTranscription() throws Exception { + when(transcriptionService.existsForMedium(MEDIUM_ID, TRANSCRIPTION_ID)).thenReturn(false); + + Response response = endpoint.deleteMediumTranscription(MEDIUM_ID, TRANSCRIPTION_ID); + + assertThat(response.getStatus()).isEqualTo(Response.Status.NOT_FOUND.getStatusCode()); + verify(transcriptionService, never()).deleteTranscription(anyInt()); + } + + @Test + void shouldReturnInternalServerErrorWhenDeleteFails() throws Exception { + when(transcriptionService.existsForMedium(MEDIUM_ID, TRANSCRIPTION_ID)).thenReturn(true); + doThrow(new TranscriptionServiceException("backend exploded")).when(transcriptionService) + .deleteTranscription(TRANSCRIPTION_ID); + + Response response = endpoint.deleteMediumTranscription(MEDIUM_ID, TRANSCRIPTION_ID); + + assertThat(response.getStatus()).isEqualTo(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode()); + } + private Transcription transcription(int id, int mediumId, String engineIdentifier, String modelIdentifier) { Transcription transcription = new Transcription(); transcription.setId(id); diff --git a/src/test/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionServiceMediumLookupTest.java b/src/test/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionServiceMediumLookupTest.java index c09cbd3f..07a4dc02 100644 --- a/src/test/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionServiceMediumLookupTest.java +++ b/src/test/java/de/bitgilde/TIMAAT/service/transcription/TranscriptionServiceMediumLookupTest.java @@ -35,8 +35,9 @@ import static org.mockito.Mockito.when; /** - * Tests of {@link TranscriptionService#getTranscriptionsForMedium(int)} and - * {@link TranscriptionService#getTranscription(int, int)}, covering the medium-scoped + * Tests of {@link TranscriptionService#getTranscriptionsForMedium(int)}, + * {@link TranscriptionService#getTranscription(int, int)} and + * {@link TranscriptionService#existsForMedium(int, int)}, covering the medium-scoped * lookup behaviour and the medium/transcription mismatch handling. * * @author Nico Kotlenga (nico@nko-dev.studio) @@ -153,6 +154,24 @@ void shouldThrowNotFoundExceptionWhenTranscriptionBelongsToDifferentMedium() { .isInstanceOf(TranscriptionNotFoundException.class); } + @Test + void shouldReturnTrueWhenTranscriptionExistsForMedium() { + when(transcriptionStorage.existsForMedium(MEDIUM_ID, TRANSCRIPTION_ID)).thenReturn(true); + + boolean result = service.existsForMedium(MEDIUM_ID, TRANSCRIPTION_ID); + + assertThat(result).isTrue(); + } + + @Test + void shouldReturnFalseWhenTranscriptionDoesNotExistForMedium() { + when(transcriptionStorage.existsForMedium(MEDIUM_ID, TRANSCRIPTION_ID)).thenReturn(false); + + boolean result = service.existsForMedium(MEDIUM_ID, TRANSCRIPTION_ID); + + assertThat(result).isFalse(); + } + private Transcription transcription(int id, int mediumId) { Transcription transcription = new Transcription(); transcription.setId(id); From ac4ab2b0d7b3996a234117fcfa2bdf153b5315b7 Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Thu, 28 May 2026 10:14:19 +0200 Subject: [PATCH 65/70] TIMAAT #57 - Defined endpoint to update the default transcription of a medium * Defined new endpoint in EndpointMedium * Added method to MediumStorage allowing to update the default transcription of a medium --- .../bitgilde/TIMAAT/model/FIPOP/Medium.java | 4 +++ .../TIMAAT/rest/endpoint/EndpointMedium.java | 21 ++++++++--- ...dateMediumDefaultTranscriptionPayload.java | 28 +++++++++++++++ .../storage/entity/medium/MediumStorage.java | 35 +++++++++++++------ 4 files changed, 74 insertions(+), 14 deletions(-) create mode 100644 src/main/java/de/bitgilde/TIMAAT/rest/model/medium/UpdateMediumDefaultTranscriptionPayload.java diff --git a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/Medium.java b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/Medium.java index 4b08cb1c..21cc79e8 100644 --- a/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/Medium.java +++ b/src/main/java/de/bitgilde/TIMAAT/model/FIPOP/Medium.java @@ -855,6 +855,10 @@ public void setCreatedByUserAccountId(int createdByUserAccountId) { this.createdByUserAccountId = createdByUserAccountId; } + public Integer getDefaultTranscriptionId() { + return defaultTranscription != null ? defaultTranscription.getId() : null; + } + @PostLoad public void setFileStatusAndViewTokenAfterLoad() { if (this.fileStatus == null) { diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java index d9d4ae7d..777c8b04 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java @@ -47,6 +47,7 @@ import de.bitgilde.TIMAAT.rest.Secured; import de.bitgilde.TIMAAT.rest.filter.AuthenticationFilter; import de.bitgilde.TIMAAT.rest.model.medium.MediumListingQueryParameter; +import de.bitgilde.TIMAAT.rest.model.medium.UpdateMediumDefaultTranscriptionPayload; import de.bitgilde.TIMAAT.rest.model.medium.UpdateMediumHasMusicListPayload; import de.bitgilde.TIMAAT.rest.model.medium.UpdateMediumHasMusicListPayload.MediumHasMusicListEntry; import de.bitgilde.TIMAAT.rest.model.medium.UpdateMediumVideoThumbnailPayload; @@ -4617,12 +4618,11 @@ public Response createMediumTranscription(@PathParam("id") int mediumId, CreateT @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) @Secured @Path("{id}/transcriptions/{transcriptionId}") - public Response deleteMediumTranscription(@PathParam("id") int mediumId, - @PathParam("transcriptionId") int transcriptionId) { + public Response deleteMediumTranscription(@PathParam("id") int mediumId, @PathParam("transcriptionId") int transcriptionId) { if (!transcriptionService.existsForMedium(mediumId, transcriptionId)) { return Response.status(Status.NOT_FOUND) - .entity("{\"reason\":\"Transcription " + transcriptionId + " does not exist for medium " + mediumId - + "\"}").build(); + .entity("{\"reason\":\"Transcription " + transcriptionId + " does not exist for medium " + mediumId + "\"}") + .build(); } try { @@ -4635,6 +4635,19 @@ public Response deleteMediumTranscription(@PathParam("id") int mediumId, } } + @POST + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Secured + @Path("{id}/transcriptions/default") + public Response updateDefaultTranscription(@PathParam("id") int mediumId, UpdateMediumDefaultTranscriptionPayload updateMediumDefaultTranscriptionPayload) { + try { + mediumStorage.updateDefaultTranscription(mediumId, updateMediumDefaultTranscriptionPayload.getTranscriptionId()); + return Response.noContent().build(); + } catch (Exception e) { + return Response.status(Status.INTERNAL_SERVER_ERROR).entity("{\"reason\":\"" + e.getMessage() + "\"}").build(); + } + } + private static boolean isBlank(String value) { return value == null || value.isBlank(); } diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/model/medium/UpdateMediumDefaultTranscriptionPayload.java b/src/main/java/de/bitgilde/TIMAAT/rest/model/medium/UpdateMediumDefaultTranscriptionPayload.java new file mode 100644 index 00000000..2a0dec77 --- /dev/null +++ b/src/main/java/de/bitgilde/TIMAAT/rest/model/medium/UpdateMediumDefaultTranscriptionPayload.java @@ -0,0 +1,28 @@ +package de.bitgilde.TIMAAT.rest.model.medium; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.ws.rs.PathParam; + +/** + * This payload can be used to update the default transcription of a {@link de.bitgilde.TIMAAT.model.FIPOP.Medium} + * + * @author Nico Kotlenga (nico@nko-dev.studio) + * @since 28.05.26 + */ +public class UpdateMediumDefaultTranscriptionPayload { + + private static final String TRANSCRIPTION_ID_FIELD_NAME = "transcriptionId"; + + @JsonProperty(TRANSCRIPTION_ID_FIELD_NAME) + private final int transcriptionId; + + @JsonCreator + public UpdateMediumDefaultTranscriptionPayload(@PathParam(TRANSCRIPTION_ID_FIELD_NAME) int transcriptionId) { + this.transcriptionId = transcriptionId; + } + + public int getTranscriptionId() { + return transcriptionId; + } +} diff --git a/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/MediumStorage.java b/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/MediumStorage.java index d8fc0908..09fcf23e 100644 --- a/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/MediumStorage.java +++ b/src/main/java/de/bitgilde/TIMAAT/storage/entity/medium/MediumStorage.java @@ -89,15 +89,32 @@ public boolean setDefaultTranscriptionIfAbsent(int mediumId, int transcriptionId return executeDbTransaction(entityManager -> { Transcription transcription = entityManager.getReference(Transcription.class, transcriptionId); int updated = entityManager.createQuery( - "UPDATE Medium m SET m.defaultTranscription = :transcription " + - "WHERE m.id = :mediumId AND m.defaultTranscription IS NULL") - .setParameter("transcription", transcription) - .setParameter("mediumId", mediumId) - .executeUpdate(); + "UPDATE Medium m SET m.defaultTranscription = :transcription " + "WHERE m.id = :mediumId AND m.defaultTranscription IS NULL") + .setParameter("transcription", transcription).setParameter("mediumId", mediumId) + .executeUpdate(); return updated == 1; }); } + public void updateDefaultTranscription(int mediumId, int transcriptionId) { + logger.log(Level.FINE, "Setting transcription {0} as default for medium {1}", + new Object[]{transcriptionId, mediumId}); + executeDbTransaction(entityManagert -> { + Medium medium = entityManagert.getReference(Medium.class, mediumId); + Transcription transcription = entityManagert.getReference(Transcription.class, transcriptionId); + + if (transcription.getMedium().getId() == mediumId) { + medium.setDefaultTranscription(transcription); + } + else { + throw new IllegalArgumentException( + "Transcription with id " + transcription + " is not a transcription of medium with id " + mediumId); + } + + return Void.TYPE; + }); + } + /** * Atomically replaces the default transcription of the given medium if its current default * transcription matches {@code currentDefaultTranscriptionId}. If the medium currently has a @@ -111,15 +128,13 @@ public boolean setDefaultTranscriptionIfAbsent(int mediumId, int transcriptionId * @return {@code true} if the default transcription was replaced, {@code false} otherwise */ public boolean replaceDefaultTranscription(int mediumId, int currentDefaultTranscriptionId, @Nullable Integer newDefaultTranscriptionId) { - logger.log(Level.FINE, - "Replacing default transcription of medium {0} from transcription {1} to transcription {2}", + logger.log(Level.FINE, "Replacing default transcription of medium {0} from transcription {1} to transcription {2}", new Object[]{mediumId, currentDefaultTranscriptionId, newDefaultTranscriptionId}); return executeDbTransaction(entityManager -> { Transcription newDefault = newDefaultTranscriptionId == null ? null : entityManager.getReference( Transcription.class, newDefaultTranscriptionId); int updated = entityManager.createQuery( - "UPDATE Medium m SET m.defaultTranscription = :newDefault " + - "WHERE m.id = :mediumId AND m.defaultTranscription.id = :currentDefaultId") + "UPDATE Medium m SET m.defaultTranscription = :newDefault " + "WHERE m.id = :mediumId AND m.defaultTranscription.id = :currentDefaultId") .setParameter("newDefault", newDefault).setParameter("mediumId", mediumId) .setParameter("currentDefaultId", currentDefaultTranscriptionId).executeUpdate(); return updated == 1; @@ -165,7 +180,7 @@ public List<MediumHasMusic> updateMediumHasMusicList(int mediumId, Map<Integer, protected List<Predicate> createPredicates(MediumFilterCriteria filter, Root<Medium> root, CriteriaBuilder criteriaBuilder, CriteriaQuery<?> criteriaQuery, UserAccount userAccount) { List<Predicate> predicates = new ArrayList<>(); - if(filter != null) { + if (filter != null) { if (filter.getMediumNameSearch().isPresent()) { String searchText = filter.getMediumNameSearch().get(); predicates.add(criteriaBuilder.like(root.get(Medium_.displayTitle).get(Title_.name), "%" + searchText + "%")); From e011e32aabef794e7a854c2ec8665bbf9ad3bd33 Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Thu, 28 May 2026 10:42:36 +0200 Subject: [PATCH 66/70] TIMAAT #57 - Defined endpoint to download transcription srt content * Added endpoint to EndpointMedium allowing to download the SRT-file as stream --- .../TIMAAT/rest/endpoint/EndpointMedium.java | 48 +++++++++++++ .../EndpointMediumTranscriptionsTest.java | 71 +++++++++++++++++++ 2 files changed, 119 insertions(+) diff --git a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java index 777c8b04..e9e01efb 100644 --- a/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java +++ b/src/main/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMedium.java @@ -104,6 +104,7 @@ import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.ResponseBuilder; import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.StreamingOutput; import org.glassfish.jersey.media.multipart.FormDataContentDisposition; import org.glassfish.jersey.media.multipart.FormDataParam; import org.json.JSONObject; @@ -186,6 +187,8 @@ public class EndpointMedium { @Inject private TranscriptionService transcriptionService; @Inject + private de.bitgilde.TIMAAT.storage.file.TranscriptionFileStorage transcriptionFileStorage; + @Inject private SystemSettingStorage systemSettingStorage; @@ -4635,6 +4638,51 @@ public Response deleteMediumTranscription(@PathParam("id") int mediumId, @PathPa } } + /** + * Streams the SRT file backing the transcription identified by {@code transcriptionId} to the + * client. The transcription is scoped to the given medium so that a transcription belonging to + * a different medium is reported as not found rather than being delivered out of context. The + * response is sent as {@code text/plain} with a {@code Content-Disposition: attachment} header + * so that browsers trigger a download dialog instead of inlining the subtitles. + * + * @param mediumId identifies the {@link Medium} the transcription is expected to belong to + * @param transcriptionId identifies the transcription whose SRT file should be downloaded + * @return {@code 200 OK} streaming the SRT file; {@code 404 Not Found} when the transcription + * does not exist for the medium or its SRT file is missing on disk; {@code 500 Internal Server + * Error} when the file could not be streamed because of an IO failure + */ + @GET + @Produces("text/plain") + @Secured + @Path("{id}/transcriptions/{transcriptionId}/file") + public Response downloadTranscriptionFile(@PathParam("id") int mediumId, @PathParam("transcriptionId") int transcriptionId) { + if (!transcriptionService.existsForMedium(mediumId, transcriptionId)) { + return Response.status(Status.NOT_FOUND) + .entity("{\"reason\":\"Transcription " + transcriptionId + " does not exist for medium " + mediumId + "\"}") + .build(); + } + + Optional<java.nio.file.Path> srtPath = transcriptionFileStorage.getPathToTranscription(transcriptionId); + if (srtPath.isEmpty()) { + return Response.status(Status.NOT_FOUND) + .entity("{\"reason\":\"Transcription file for " + transcriptionId + " is missing\"}").build(); + } + + java.nio.file.Path file = srtPath.get(); + StreamingOutput stream = output -> { + try { + java.nio.file.Files.copy(file, output); + } catch (IOException e) { + throw new jakarta.ws.rs.WebApplicationException(e, + Response.status(Status.INTERNAL_SERVER_ERROR).entity("{\"reason\":\"" + e.getMessage() + "\"}") + .build()); + } + }; + + return Response.ok(stream, "text/plain") + .header("Content-Disposition", "attachment; filename=\"" + transcriptionId + ".srt\"").build(); + } + @POST @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) @Secured diff --git a/src/test/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMediumTranscriptionsTest.java b/src/test/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMediumTranscriptionsTest.java index 44678be6..844c3fc5 100644 --- a/src/test/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMediumTranscriptionsTest.java +++ b/src/test/java/de/bitgilde/TIMAAT/rest/endpoint/EndpointMediumTranscriptionsTest.java @@ -15,17 +15,27 @@ import de.bitgilde.TIMAAT.storage.entity.medium.exception.MediumNotFoundException; import de.bitgilde.TIMAAT.storage.entity.transcription.api.TranscriptionState; import de.bitgilde.TIMAAT.storage.entity.transcription.api.TranscriptionType; +import de.bitgilde.TIMAAT.storage.file.TranscriptionFileStorage; +import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.container.ContainerRequestContext; import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.StreamingOutput; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; import org.mockito.ArgumentCaptor; +import java.io.ByteArrayOutputStream; import java.lang.reflect.Field; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; import java.time.Instant; import java.util.List; +import java.util.Optional; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.catchThrowableOfType; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; @@ -54,16 +64,19 @@ public class EndpointMediumTranscriptionsTest { private static final String MODEL = "large-v3"; private TranscriptionService transcriptionService; + private TranscriptionFileStorage transcriptionFileStorage; private ContainerRequestContext containerRequestContext; private EndpointMedium endpoint; @BeforeEach void setUp() throws Exception { transcriptionService = mock(TranscriptionService.class); + transcriptionFileStorage = mock(TranscriptionFileStorage.class); containerRequestContext = mock(ContainerRequestContext.class); when(containerRequestContext.getProperty(AuthenticationFilter.USER_ID_PROPERTY_NAME)).thenReturn(USER_ID); endpoint = new EndpointMedium(); inject("transcriptionService", transcriptionService); + inject("transcriptionFileStorage", transcriptionFileStorage); inject("containerRequestContext", containerRequestContext); } @@ -252,6 +265,64 @@ void shouldReturnInternalServerErrorWhenDeleteFails() throws Exception { assertThat(response.getStatus()).isEqualTo(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode()); } + @Test + void shouldStreamSrtFileWhenTranscriptionExistsForMedium(@TempDir Path tempDir) throws Exception { + Path srtFile = tempDir.resolve(TRANSCRIPTION_ID + ".srt"); + String srtContent = "1\n00:00:01,000 --> 00:00:02,000\nHello World\n"; + Files.writeString(srtFile, srtContent, StandardCharsets.UTF_8); + when(transcriptionService.existsForMedium(MEDIUM_ID, TRANSCRIPTION_ID)).thenReturn(true); + when(transcriptionFileStorage.getPathToTranscription(TRANSCRIPTION_ID)).thenReturn(Optional.of(srtFile)); + + Response response = endpoint.downloadTranscriptionFile(MEDIUM_ID, TRANSCRIPTION_ID); + + assertThat(response.getStatus()).isEqualTo(Response.Status.OK.getStatusCode()); + assertThat(response.getHeaderString("Content-Disposition")).contains(TRANSCRIPTION_ID + ".srt"); + assertThat(response.getMediaType().toString()).isEqualTo("text/plain"); + assertThat(response.getEntity()).isInstanceOf(StreamingOutput.class); + + StreamingOutput stream = (StreamingOutput) response.getEntity(); + ByteArrayOutputStream sink = new ByteArrayOutputStream(); + stream.write(sink); + assertThat(sink.toString(StandardCharsets.UTF_8)).isEqualTo(srtContent); + } + + @Test + void shouldReturnNotFoundWhenTranscriptionDoesNotExistForMediumOnDownload() { + when(transcriptionService.existsForMedium(MEDIUM_ID, TRANSCRIPTION_ID)).thenReturn(false); + + Response response = endpoint.downloadTranscriptionFile(MEDIUM_ID, TRANSCRIPTION_ID); + + assertThat(response.getStatus()).isEqualTo(Response.Status.NOT_FOUND.getStatusCode()); + verify(transcriptionFileStorage, never()).getPathToTranscription(anyInt()); + } + + @Test + void shouldReturnNotFoundWhenSrtFileIsMissingOnDisk() { + when(transcriptionService.existsForMedium(MEDIUM_ID, TRANSCRIPTION_ID)).thenReturn(true); + when(transcriptionFileStorage.getPathToTranscription(TRANSCRIPTION_ID)).thenReturn(Optional.empty()); + + Response response = endpoint.downloadTranscriptionFile(MEDIUM_ID, TRANSCRIPTION_ID); + + assertThat(response.getStatus()).isEqualTo(Response.Status.NOT_FOUND.getStatusCode()); + } + + @Test + void shouldReturnInternalServerErrorWhenStreamingFails(@TempDir Path tempDir) throws Exception { + Path missingFile = tempDir.resolve("does-not-exist.srt"); + when(transcriptionService.existsForMedium(MEDIUM_ID, TRANSCRIPTION_ID)).thenReturn(true); + when(transcriptionFileStorage.getPathToTranscription(TRANSCRIPTION_ID)).thenReturn(Optional.of(missingFile)); + + Response response = endpoint.downloadTranscriptionFile(MEDIUM_ID, TRANSCRIPTION_ID); + + assertThat(response.getStatus()).isEqualTo(Response.Status.OK.getStatusCode()); + StreamingOutput stream = (StreamingOutput) response.getEntity(); + + WebApplicationException thrown = catchThrowableOfType(() -> stream.write(new ByteArrayOutputStream()), + WebApplicationException.class); + assertThat(thrown).isNotNull(); + assertThat(thrown.getResponse().getStatus()).isEqualTo(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode()); + } + private Transcription transcription(int id, int mediumId, String engineIdentifier, String modelIdentifier) { Transcription transcription = new Transcription(); transcription.setId(id); From a730763b8f8c7773846cdce4cf619280ad6c0304 Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Thu, 28 May 2026 10:52:21 +0200 Subject: [PATCH 67/70] TIMAAT #57 - Updated build and docker image to Java 25 --- .github/workflows/docker-image-build.yml | 6 +++--- .github/workflows/maven.yml | 8 ++++---- Dockerfile | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/docker-image-build.yml b/.github/workflows/docker-image-build.yml index 7b7e0063..76d95a5f 100644 --- a/.github/workflows/docker-image-build.yml +++ b/.github/workflows/docker-image-build.yml @@ -1,7 +1,7 @@ name: Build & Push Multi-Arch Docker Image on: - workflow_dispatch: + workflow_dispatch: push: branches: - master @@ -21,10 +21,10 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Set up JDK 11 + - name: Set up JDK 25 uses: actions/setup-java@v4 with: - java-version: '11' + java-version: '25' distribution: 'temurin' cache: maven - name: Build with Maven diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index d0a00f1f..b6d28709 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -12,10 +12,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Set up JDK 11 + - name: Set up JDK 25 uses: actions/setup-java@v4 with: - java-version: '11' + java-version: '25' distribution: 'temurin' cache: maven - name: Build with Maven @@ -28,10 +28,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Set up JDK 11 + - name: Set up JDK 25 uses: actions/setup-java@v4 with: - java-version: '11' + java-version: '25' distribution: 'temurin' cache: maven - name: Run Maven tests diff --git a/Dockerfile b/Dockerfile index 1f71c965..c88b30f1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM tomcat:10.1.47-jre11-temurin-noble +FROM tomcat:10.1.47-jre25-temurin-noble LABEL org.opencontainers.image.title="TIMAAT Web Application" LABEL org.opencontainers.image.description="Java-based web application running on Tomcat, providing TIMAAT services." LABEL org.opencontainers.image.version="${TIMAAT_VERSION}" From 061e9aa6cae19c49a7c7e756658eb1d6db0f20aa Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Fri, 29 May 2026 10:39:57 +0200 Subject: [PATCH 68/70] TIMAAT - Added docker compose which can be used for production deployment * Added Traefic container providing TIMAAT over HTTPS and adding OWASP recommended security headers * Added configuration file which can be used to specifiy the public timaat domain and certificate containing directory. The definition of docker_socket is also possible, when running docker on macos or as rootles docker --- .gitignore | 2 +- docker/compose/.env.example | 18 +++ docker/compose/docker-compose-prod.yaml | 104 ++++++++++++++++++ .../compose/traefik/dynamic/middlewares.yaml | 37 +++++++ docker/compose/traefik/dynamic/tls.yaml | 15 +++ 5 files changed, 175 insertions(+), 1 deletion(-) create mode 100644 docker/compose/.env.example create mode 100644 docker/compose/docker-compose-prod.yaml create mode 100644 docker/compose/traefik/dynamic/middlewares.yaml create mode 100644 docker/compose/traefik/dynamic/tls.yaml diff --git a/.gitignore b/.gitignore index 0e410dcc..bde3e57c 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,4 @@ test_output .vscode/ .idea/ .project -CLAUDE.local.md +CLAUDE.local.md \ No newline at end of file diff --git a/docker/compose/.env.example b/docker/compose/.env.example new file mode 100644 index 00000000..cfd8e788 --- /dev/null +++ b/docker/compose/.env.example @@ -0,0 +1,18 @@ +# Copy this file to ".env" (same directory as docker-compose-prod.yaml) and adjust. +# docker compose interpolates these values when constructing the stack. + +# Public hostname the reverse proxy serves (used in the Traefik router rule). +TIMAAT_DOMAIN=timaat.example.org + +# Host path of the Docker socket Traefik reads container labels from. +# Native Linux daemon: leave unset (defaults to /var/run/docker.sock). +# Docker Desktop (macOS/Windows): point to the per-user socket, e.g. +# DOCKER_SOCKET=/Users/<you>/.docker/run/docker.sock +DOCKER_SOCKET=/var/run/docker.sock + +# Host directory that contains the externally provided TLS certificate + key. +# It is bind-mounted read-only into the reverse-proxy container at /certs. +# Expected files inside this directory (rename in traefik/dynamic/tls.yaml if different): +# - timaat.crt (full certificate chain, PEM) +# - timaat.key (private key, PEM) +TIMAAT_TLS_CERT_DIR=/etc/ssl/timaat \ No newline at end of file diff --git a/docker/compose/docker-compose-prod.yaml b/docker/compose/docker-compose-prod.yaml new file mode 100644 index 00000000..5b02600c --- /dev/null +++ b/docker/compose/docker-compose-prod.yaml @@ -0,0 +1,104 @@ +name: timaat +services: + db: + image: mariadb:11.4 + ports: + - "3306:3306" + networks: + - timaat-backend + command: --lower_case_table_names=1 + environment: + MYSQL_ROOT_PASSWORD_FILE: /run/secrets/database-root-password + volumes: + - db-data:/var/lib/mysql + secrets: + - database-root-password + healthcheck: + test: [ "CMD-SHELL", "mariadb-admin ping -u root --password=$(cat /run/secrets/database-root-password)" ] + interval: 5s + timeout: 3s + retries: 10 + start_period: 10s + webservice: + image: christophguentherunierfurt/timaat:0.15.0 + pull_policy: always + networks: + - timaat-backend + # No host port binding anymore - the webservice is only reachable through the + # Traefik reverse proxy on the internal timaat-backend network. + expose: + - "8080" + environment: + DATABASE_USER: root + DATABASE_PASSWORD_FILE: /run/secrets/database-root-password + DATABASE_HOST: db + DATABASE_PORT: 3306 + volumes: + - file-storage:/var/lib/timaat/storage + secrets: + - database-root-password + depends_on: + db: + condition: service_healthy + labels: + - "traefik.enable=true" + # Route incoming HTTPS traffic for the configured host to this service. + - "traefik.http.routers.timaat.rule=Host(`${TIMAAT_DOMAIN}`)" + - "traefik.http.routers.timaat.entrypoints=websecure" + - "traefik.http.routers.timaat.tls=true" + # Forward to the container's internal HTTP port 8080. + - "traefik.http.services.timaat.loadbalancer.server.port=8080" + - "traefik.http.routers.timaat.middlewares=owasp-secure-headers@file" + # Redirect requests to the host root ("/") to the application context + # path ("/TIMAAT/"). The more specific Path(`/`) rule wins over the bare + # Host rule above by Traefik's automatic priority (longer rule = higher). + - "traefik.http.routers.timaat-root.rule=Host(`${TIMAAT_DOMAIN}`) && Path(`/`)" + - "traefik.http.routers.timaat-root.entrypoints=websecure" + - "traefik.http.routers.timaat-root.tls=true" + - "traefik.http.routers.timaat-root.service=timaat" + - "traefik.http.routers.timaat-root.middlewares=redirect-root-to-timaat@file" + reverse-proxy: + image: traefik:v3.7.1 + networks: + - timaat-backend + ports: + # Only HTTPS is exposed to the host; the proxy listens on 443 internally + # and is published on the host's port 443. + - "443:443" + command: + # Do NOT expose the API/dashboard. + - "--api.dashboard=false" + - "--api.insecure=false" + # Single HTTPS entrypoint on port 443. + - "--entrypoints.websecure.address=:443" + # Docker provider: read router/service/middleware definitions from labels, + # but only for containers that explicitly opt in (traefik.enable=true). + - "--providers.docker=true" + - "--providers.docker.exposedbydefault=false" + - "--providers.docker.network=timaat-backend" + # File provider: TLS certificate material is configured via a mounted + # dynamic configuration file. + - "--providers.file.directory=/etc/traefik/dynamic" + - "--providers.file.watch=true" + # Keep logs lean and do not advertise version information anywhere. + - "--log.level=INFO" + - "--accesslog=false" + volumes: + - "${DOCKER_SOCKET:-/var/run/docker.sock}:/var/run/docker.sock:ro" + # Dynamic TLS configuration (references the certificate paths inside the container). + - ./traefik/dynamic:/etc/traefik/dynamic:ro + # Externally provided certificate + key, mounted from a host path supplied + # via the TIMAAT_TLS_CERT_DIR variable (see .env.example). + - "${TIMAAT_TLS_CERT_DIR}:/certs:ro" + depends_on: + - webservice +networks: + timaat-backend: + driver: bridge + attachable: false +volumes: + db-data: + file-storage: +secrets: + database-root-password: + file: passwords/database-root-password.txt diff --git a/docker/compose/traefik/dynamic/middlewares.yaml b/docker/compose/traefik/dynamic/middlewares.yaml new file mode 100644 index 00000000..ff7603f0 --- /dev/null +++ b/docker/compose/traefik/dynamic/middlewares.yaml @@ -0,0 +1,37 @@ +# Traefik dynamic configuration: HTTP middlewares. +# +# OWASP recommended secure response headers. +# https://github.com/OWASP/www-project-secure-headers/blob/master/ci/headers_add.json +# +# Referenced from the webservice router as "owasp-secure-headers@file". +http: + middlewares: + owasp-secure-headers: + headers: + customResponseHeaders: + Cache-Control: "no-store, max-age=0" + Clear-Site-Data: "\"cache\",\"cookies\",\"storage\"" + # 'unsafe-inline' on script-src/style-src is required because the app + # ships inline <script>/<style> blocks and style="..." attributes. + # Prefer migrating to nonces/hashes later to drop 'unsafe-inline'. + Content-Security-Policy: "default-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; form-action 'self'; base-uri 'self'; object-src 'none'; frame-ancestors 'none'; upgrade-insecure-requests" + Cross-Origin-Embedder-Policy: "require-corp" + Cross-Origin-Opener-Policy: "same-origin" + Cross-Origin-Resource-Policy: "same-origin" + Permissions-Policy: "accelerometer=(), autoplay=(), camera=(), cross-origin-isolated=(), display-capture=(), encrypted-media=(), fullscreen=(), geolocation=(), gyroscope=(), keyboard-map=(), magnetometer=(), microphone=(), midi=(), payment=(), picture-in-picture=(), publickey-credentials-get=(), screen-wake-lock=(), sync-xhr=(self), usb=(), web-share=(), xr-spatial-tracking=(), clipboard-read=(), clipboard-write=(), gamepad=(), hid=(), idle-detection=(), interest-cohort=(), serial=(), unload=()" + Referrer-Policy: "no-referrer" + Strict-Transport-Security: "max-age=63072000; includeSubDomains" + X-Content-Type-Options: "nosniff" + X-DNS-Prefetch-Control: "off" + X-Frame-Options: "deny" + X-Permitted-Cross-Domain-Policies: "none" + # Strip server-identifying headers (empty value removes the header). + Server: "" + X-Powered-By: "" + # Redirect the host root ("/") to the application context path ("/TIMAAT/"). + # Referenced from the timaat-root router as "redirect-root-to-timaat@file". + redirect-root-to-timaat: + redirectRegex: + regex: "^https?://([^/]+)/?$" + replacement: "https://${1}/TIMAAT/" + permanent: true \ No newline at end of file diff --git a/docker/compose/traefik/dynamic/tls.yaml b/docker/compose/traefik/dynamic/tls.yaml new file mode 100644 index 00000000..93e59e63 --- /dev/null +++ b/docker/compose/traefik/dynamic/tls.yaml @@ -0,0 +1,15 @@ +# Traefik dynamic configuration: TLS certificate material. +# +# The certificate and key are provided EXTERNALLY. The host directory that +# contains them is mounted into the reverse-proxy container at /certs via the +# TIMAAT_TLS_CERT_DIR variable (see docker-compose-prod.yaml / .env.example). +# Adjust the file names below if your certificate/key are named differently. +tls: + stores: + default: + defaultCertificate: + certFile: /certs/timaat.crt + keyFile: /certs/timaat.key + certificates: + - certFile: /certs/timaat.crt + keyFile: /certs/timaat.key \ No newline at end of file From da5bceca9f32f2d4cf7f7c404de99a04ab2be573 Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Fri, 29 May 2026 10:41:34 +0200 Subject: [PATCH 69/70] TIMAAT - Updated gitignore --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index bde3e57c..29321624 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,6 @@ test_output .vscode/ .idea/ .project -CLAUDE.local.md \ No newline at end of file +CLAUDE.local.md +/docker/compose/.env +/docker/compose/certs/ From d19c7f843c6a1e6977cc04b2e4fa836db80f714d Mon Sep 17 00:00:00 2001 From: NKO <NicoKotlenga@live.de> Date: Fri, 29 May 2026 11:04:43 +0200 Subject: [PATCH 70/70] TIMAAT - Updated webservice container to latest on prod deployment --- docker/compose/docker-compose-prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/compose/docker-compose-prod.yaml b/docker/compose/docker-compose-prod.yaml index 5b02600c..2102f482 100644 --- a/docker/compose/docker-compose-prod.yaml +++ b/docker/compose/docker-compose-prod.yaml @@ -20,7 +20,7 @@ services: retries: 10 start_period: 10s webservice: - image: christophguentherunierfurt/timaat:0.15.0 + image: christophguentherunierfurt/timaat:latest pull_policy: always networks: - timaat-backend