From 1af656a24e71d1641f908fa1b2f94c76eb52cce2 Mon Sep 17 00:00:00 2001 From: anhefti Date: Tue, 23 Aug 2022 15:24:34 +0200 Subject: [PATCH] SEBSERV-163 back-end implementation mostly done --- .../ch/ethz/seb/sebserver/gbl/Constants.java | 1 + .../ch/ethz/seb/sebserver/gbl/api/API.java | 2 + .../seb/sebserver/gbl/api/EntityType.java | 2 +- .../ethz/seb/sebserver/gbl/model/Domain.java | 3 +- .../sebserver/gbl/model/exam/ClientGroup.java | 148 ++++++++ .../gbl/model/exam/ClientGroupTemplate.java | 183 ++++++++++ .../gbl/model/exam/ExamTemplate.java | 25 +- .../model/session/ClientConnectionData.java | 2 + .../ClientGroupConnectionMatcher.java | 23 ++ .../monitoring/ClientGroupMatcherService.java | 45 +++ .../IPv4RangeClientGroupMatcher.java | 50 +++ .../IndicatorValue.java | 2 +- .../IndicatorValueHolder.java | 2 +- .../MonitoringFullPageData.java | 3 +- .../MonitoringSEBConnectionData.java | 3 +- .../SimpleIndicatorValue.java | 2 +- .../ch/ethz/seb/sebserver/gbl/util/Utils.java | 22 ++ .../gui/content/exam/ExamFormIndicators.java | 4 +- .../gui/content/exam/ExamTemplateForm.java | 4 +- .../gui/content/exam/IndicatorForm.java | 6 +- .../content/exam/IndicatorTemplateForm.java | 6 +- .../gui/content/monitoring/FinishedExam.java | 2 +- .../FinishedExamClientConnection.java | 4 +- .../MonitoringClientConnection.java | 2 +- .../monitoring/MonitoringRunningExam.java | 2 +- .../exam/clientgroup/DeleteClientGroup.java | 40 ++ .../api/exam/clientgroup/GetClientGroup.java | 40 ++ .../exam/clientgroup/GetClientGroupPage.java | 41 +++ .../api/exam/clientgroup/GetClientGroups.java | 37 ++ .../api/exam/clientgroup/NewClientGroup.java | 40 ++ .../api/exam/clientgroup/SaveClientGroup.java | 40 ++ .../exam/{ => indicator}/DeleteIndicator.java | 2 +- .../DeleteIndicatorTemplate.java | 2 +- .../exam/{ => indicator}/GetIndicator.java | 2 +- .../{ => indicator}/GetIndicatorPage.java | 2 +- .../{ => indicator}/GetIndicatorTemplate.java | 2 +- .../GetIndicatorTemplatePage.java | 2 +- .../exam/{ => indicator}/GetIndicators.java | 2 +- .../exam/{ => indicator}/NewIndicator.java | 2 +- .../{ => indicator}/NewIndicatorTemplate.java | 2 +- .../exam/{ => indicator}/SaveIndicator.java | 2 +- .../SaveIndicatorTemplate.java | 2 +- .../session/GetMonitoringFullPageData.java | 2 +- .../session/ClientConnectionDetails.java | 2 +- .../session/ClientConnectionTable.java | 2 +- .../session/FullPageMonitoringUpdate.java | 2 +- .../gui/service/session/MonitoringStatus.java | 4 +- ...ionalAttributeRecordDynamicSqlSupport.java | 14 +- .../AdditionalAttributeRecordMapper.java | 36 +- .../BatchActionRecordDynamicSqlSupport.java | 22 +- .../batis/mapper/BatchActionRecordMapper.java | 36 +- .../CertificateRecordDynamicSqlSupport.java | 12 +- .../batis/mapper/CertificateRecordMapper.java | 36 +- ...ientConnectionRecordDynamicSqlSupport.java | 38 +- .../mapper/ClientConnectionRecordMapper.java | 36 +- .../ClientEventRecordDynamicSqlSupport.java | 18 +- .../batis/mapper/ClientEventRecordMapper.java | 36 +- .../ClientGroupRecordDynamicSqlSupport.java | 21 +- .../batis/mapper/ClientGroupRecordMapper.java | 50 +-- ...lientIndicatorRecordDynamicSqlSupport.java | 12 +- .../mapper/ClientIndicatorRecordMapper.java | 36 +- ...entInstructionRecordDynamicSqlSupport.java | 18 +- .../mapper/ClientInstructionRecordMapper.java | 36 +- ...ntNotificationRecordDynamicSqlSupport.java | 16 +- .../ClientNotificationRecordMapper.java | 36 +- ...ationAttributeRecordDynamicSqlSupport.java | 20 +- .../ConfigurationAttributeRecordMapper.java | 36 +- ...figurationNodeRecordDynamicSqlSupport.java | 24 +- .../mapper/ConfigurationNodeRecordMapper.java | 36 +- .../ConfigurationRecordDynamicSqlSupport.java | 16 +- .../mapper/ConfigurationRecordMapper.java | 36 +- ...igurationValueRecordDynamicSqlSupport.java | 16 +- .../ConfigurationValueRecordMapper.java | 36 +- ...nfigurationMapRecordDynamicSqlSupport.java | 16 +- .../ExamConfigurationMapRecordMapper.java | 36 +- .../mapper/ExamRecordDynamicSqlSupport.java | 44 +-- .../batis/mapper/ExamRecordMapper.java | 36 +- .../ExamTemplateRecordDynamicSqlSupport.java | 22 +- .../mapper/ExamTemplateRecordMapper.java | 36 +- .../IndicatorRecordDynamicSqlSupport.java | 18 +- .../batis/mapper/IndicatorRecordMapper.java | 36 +- .../InstitutionRecordDynamicSqlSupport.java | 16 +- .../batis/mapper/InstitutionRecordMapper.java | 36 +- .../LmsSetupRecordDynamicSqlSupport.java | 32 +- .../batis/mapper/LmsSetupRecordMapper.java | 36 +- .../OrientationRecordDynamicSqlSupport.java | 24 +- .../batis/mapper/OrientationRecordMapper.java | 36 +- ...ProctoringRoomRecordDynamicSqlSupport.java | 22 +- .../RemoteProctoringRoomRecordMapper.java | 36 +- .../mapper/RoleRecordDynamicSqlSupport.java | 10 +- .../batis/mapper/RoleRecordMapper.java | 36 +- ...ebClientConfigRecordDynamicSqlSupport.java | 24 +- .../mapper/SebClientConfigRecordMapper.java | 36 +- .../ThresholdRecordDynamicSqlSupport.java | 14 +- .../batis/mapper/ThresholdRecordMapper.java | 36 +- ...serActivityLogRecordDynamicSqlSupport.java | 18 +- .../mapper/UserActivityLogRecordMapper.java | 36 +- .../mapper/UserRecordDynamicSqlSupport.java | 28 +- .../batis/mapper/UserRecordMapper.java | 36 +- .../mapper/ViewRecordDynamicSqlSupport.java | 14 +- .../batis/mapper/ViewRecordMapper.java | 36 +- ...viceServerInfoRecordDynamicSqlSupport.java | 14 +- .../WebserviceServerInfoRecordMapper.java | 36 +- .../model/AdditionalAttributeRecord.java | 28 +- .../batis/model/BatchActionRecord.java | 44 +-- .../batis/model/CertificateRecord.java | 24 +- .../batis/model/ClientConnectionRecord.java | 76 ++-- .../batis/model/ClientEventRecord.java | 52 +-- .../batis/model/ClientGroupRecord.java | 46 ++- .../batis/model/ClientIndicatorRecord.java | 34 +- .../batis/model/ClientInstructionRecord.java | 36 +- .../batis/model/ClientNotificationRecord.java | 32 +- .../model/ConfigurationAttributeRecord.java | 40 +- .../batis/model/ConfigurationNodeRecord.java | 48 +-- .../batis/model/ConfigurationRecord.java | 32 +- .../batis/model/ConfigurationValueRecord.java | 32 +- .../model/ExamConfigurationMapRecord.java | 32 +- .../datalayer/batis/model/ExamRecord.java | 88 ++--- .../batis/model/ExamTemplateRecord.java | 44 +-- .../batis/model/IndicatorRecord.java | 36 +- .../batis/model/InstitutionRecord.java | 32 +- .../datalayer/batis/model/LmsSetupRecord.java | 64 ++-- .../batis/model/OrientationRecord.java | 48 +-- .../model/RemoteProctoringRoomRecord.java | 44 +-- .../datalayer/batis/model/RoleRecord.java | 20 +- .../batis/model/SebClientConfigRecord.java | 48 +-- .../batis/model/ThresholdRecord.java | 28 +- .../batis/model/UserActivityLogRecord.java | 36 +- .../datalayer/batis/model/UserRecord.java | 56 +-- .../datalayer/batis/model/ViewRecord.java | 28 +- .../model/WebserviceServerInfoRecord.java | 28 +- .../impl/BulkActionServiceImpl.java | 5 + .../servicelayer/dao/ClientGroupDAO.java | 26 ++ .../servicelayer/dao/ExamTemplateDAO.java | 23 +- .../dao/impl/ClientGroupDAOImpl.java | 344 ++++++++++++++++++ .../dao/impl/ExamTemplateDAOImpl.java | 243 ++++++++++--- .../dao/impl/IndicatorDAOImpl.java | 5 +- .../exam/ExamTemplateService.java | 6 + .../exam/impl/ExamTemplateServiceImpl.java | 85 ++++- .../servicelayer/session/ClientIndicator.java | 2 +- .../session/ExamSessionService.java | 2 +- .../session/impl/ClientIndicatorFactory.java | 2 +- .../session/impl/ExamSessionServiceImpl.java | 2 +- .../weblayer/api/ClientGroupController.java | 144 ++++++++ .../api/ExamMonitoringController.java | 4 +- .../weblayer/api/ExamTemplateController.java | 175 ++++++++- .../base/V16__clientGroupMigration_v1_5.sql | 1 + .../gbl/model/ModelObjectJSONGenerator.java | 2 +- .../integration/UseCasesIntegrationTest.java | 121 +++++- .../api/exam/SebConnectionTest.java | 2 +- .../services/ClientEventServiceTest.java | 2 +- src/test/resources/schema-test.sql | 1 + 152 files changed, 3252 insertions(+), 1506 deletions(-) create mode 100644 src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/ClientGroup.java create mode 100644 src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/ClientGroupTemplate.java create mode 100644 src/main/java/ch/ethz/seb/sebserver/gbl/monitoring/ClientGroupConnectionMatcher.java create mode 100644 src/main/java/ch/ethz/seb/sebserver/gbl/monitoring/ClientGroupMatcherService.java create mode 100644 src/main/java/ch/ethz/seb/sebserver/gbl/monitoring/IPv4RangeClientGroupMatcher.java rename src/main/java/ch/ethz/seb/sebserver/gbl/{model/session => monitoring}/IndicatorValue.java (97%) rename src/main/java/ch/ethz/seb/sebserver/gbl/{model/session => monitoring}/IndicatorValueHolder.java (87%) rename src/main/java/ch/ethz/seb/sebserver/gbl/{model/session => monitoring}/MonitoringFullPageData.java (93%) rename src/main/java/ch/ethz/seb/sebserver/gbl/{model/session => monitoring}/MonitoringSEBConnectionData.java (93%) rename src/main/java/ch/ethz/seb/sebserver/gbl/{model/session => monitoring}/SimpleIndicatorValue.java (93%) create mode 100644 src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/clientgroup/DeleteClientGroup.java create mode 100644 src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/clientgroup/GetClientGroup.java create mode 100644 src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/clientgroup/GetClientGroupPage.java create mode 100644 src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/clientgroup/GetClientGroups.java create mode 100644 src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/clientgroup/NewClientGroup.java create mode 100644 src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/clientgroup/SaveClientGroup.java rename src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/{ => indicator}/DeleteIndicator.java (96%) rename src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/{ => indicator}/DeleteIndicatorTemplate.java (96%) rename src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/{ => indicator}/GetIndicator.java (95%) rename src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/{ => indicator}/GetIndicatorPage.java (95%) rename src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/{ => indicator}/GetIndicatorTemplate.java (96%) rename src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/{ => indicator}/GetIndicatorTemplatePage.java (96%) rename src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/{ => indicator}/GetIndicators.java (95%) rename src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/{ => indicator}/NewIndicator.java (95%) rename src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/{ => indicator}/NewIndicatorTemplate.java (96%) rename src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/{ => indicator}/SaveIndicator.java (95%) rename src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/{ => indicator}/SaveIndicatorTemplate.java (96%) create mode 100644 src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/ClientGroupDAO.java create mode 100644 src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ClientGroupDAOImpl.java create mode 100644 src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ClientGroupController.java diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/Constants.java b/src/main/java/ch/ethz/seb/sebserver/gbl/Constants.java index b6116cdb..82117ed8 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/Constants.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/Constants.java @@ -172,6 +172,7 @@ public final class Constants { EntityType.EXAM_TEMPLATE, EntityType.EXAM, EntityType.INDICATOR, + EntityType.CLIENT_GROUP, EntityType.EXAM_CONFIGURATION_MAP, EntityType.CONFIGURATION_NODE, EntityType.CLIENT_CONNECTION, diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/api/API.java b/src/main/java/ch/ethz/seb/sebserver/gbl/api/API.java index 87d85745..c41c76d3 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/api/API.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/api/API.java @@ -155,6 +155,7 @@ public final class API { public static final String EXAM_ADMINISTRATION_PROCTORING_PATH_SEGMENT = "/proctoring"; public static final String EXAM_INDICATOR_ENDPOINT = "/indicator"; + public static final String EXAM_CLIENT_GROUP_ENDPOINT = "/client-group"; public static final String SEB_CLIENT_CONFIG_ENDPOINT = "/client_configuration"; public static final String SEB_CLIENT_CONFIG_CREDENTIALS_PATH_SEGMENT = "/credentials"; @@ -233,6 +234,7 @@ public final class API { public static final String EXAM_TEMPLATE_ENDPOINT = "/exam-template"; public static final String EXAM_TEMPLATE_INDICATOR_PATH_SEGMENT = "/indicator"; + public static final String EXAM_TEMPLATE_CLIENT_GROUP_PATH_SEGMENT = "/client-group"; public static final String EXAM_TEMPLATE_DEFAULT_PATH_SEGMENT = "/default"; public static final String BATCH_ACTION_ENDPOINT = "/batch-action"; diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/api/EntityType.java b/src/main/java/ch/ethz/seb/sebserver/gbl/api/EntityType.java index 893ae488..1fa24277 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/api/EntityType.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/api/EntityType.java @@ -2,7 +2,7 @@ package ch.ethz.seb.sebserver.gbl.api; import javax.annotation.Generated; -@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2022-08-17T15:54:59.989+02:00") +@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2022-08-18T13:41:40.650+02:00") public enum EntityType { CONFIGURATION_ATTRIBUTE, CONFIGURATION_VALUE, diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/Domain.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/Domain.java index 3e8d5a62..3f564346 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/Domain.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/Domain.java @@ -5,7 +5,7 @@ import javax.annotation.Generated; /** Defines the global names of the domain model and domain model fields. * This shall be used as a static overall domain model names reference within SEB Server Web-Service as well as within the integrated GUI * This file is generated by the org.eth.demo.sebserver.gen.DomainModelNameReferencePlugin and must not be edited manually.**/ -@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2022-08-17T15:54:59.933+02:00") +@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2022-08-18T13:41:40.609+02:00") public interface Domain { interface CONFIGURATION_ATTRIBUTE { @@ -368,6 +368,7 @@ public interface Domain { String ATTR_NAME = "name"; String ATTR_TYPE = "type"; String ATTR_COLOR = "color"; + String ATTR_ICON = "icon"; String ATTR_DATA = "data"; } } \ No newline at end of file diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/ClientGroup.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/ClientGroup.java new file mode 100644 index 00000000..f7ed5eb8 --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/ClientGroup.java @@ -0,0 +1,148 @@ +/* + * Copyright (c) 2022 ETH Zürich, Educational Development and Technology (LET) + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +package ch.ethz.seb.sebserver.gbl.model.exam; + +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; + +import ch.ethz.seb.sebserver.gbl.api.EntityType; +import ch.ethz.seb.sebserver.gbl.api.POSTMapper; +import ch.ethz.seb.sebserver.gbl.model.Domain.CLIENT_GROUP; +import ch.ethz.seb.sebserver.gbl.model.Entity; + +@JsonIgnoreProperties(ignoreUnknown = true) +public class ClientGroup implements Entity { + + public static final String FILTER_ATTR_EXAM_ID = "examId"; + + public enum ClientGroupType { + IP_V4_RANGE, + CLIENT_OS + } + + @JsonProperty(CLIENT_GROUP.ATTR_ID) + public final Long id; + + @JsonProperty(CLIENT_GROUP.ATTR_EXAM_ID) + @NotNull + public final Long examId; + + @JsonProperty(CLIENT_GROUP.ATTR_NAME) + @NotNull(message = "clientGroup:name:notNull") + @Size(min = 3, max = 255, message = "clientGroup:name:size:{min}:{max}:${validatedValue}") + public final String name; + + @JsonProperty(CLIENT_GROUP.ATTR_TYPE) + @NotNull(message = "clientGroup:type:notNull") + public final ClientGroupType type; + + @JsonProperty(CLIENT_GROUP.ATTR_COLOR) + public final String color; + + @JsonProperty(CLIENT_GROUP.ATTR_ICON) + public final String icon; + + @JsonProperty(CLIENT_GROUP.ATTR_DATA) + public final String data; + + @JsonCreator + public ClientGroup( + @JsonProperty(CLIENT_GROUP.ATTR_ID) final Long id, + @JsonProperty(CLIENT_GROUP.ATTR_EXAM_ID) final Long examId, + @JsonProperty(CLIENT_GROUP.ATTR_NAME) final String name, + @JsonProperty(CLIENT_GROUP.ATTR_TYPE) final ClientGroupType type, + @JsonProperty(CLIENT_GROUP.ATTR_COLOR) final String color, + @JsonProperty(CLIENT_GROUP.ATTR_ICON) final String icon, + @JsonProperty(CLIENT_GROUP.ATTR_DATA) final String data) { + + super(); + this.id = id; + this.examId = examId; + this.name = name; + this.type = type; + this.color = color; + this.icon = icon; + this.data = data; + } + + public ClientGroup(final Long examId, final POSTMapper postParams) { + this.id = null; + this.examId = examId; + this.name = postParams.getString(CLIENT_GROUP.ATTR_NAME); + this.type = postParams.getEnum(CLIENT_GROUP.ATTR_TYPE, ClientGroupType.class); + this.color = postParams.getString(CLIENT_GROUP.ATTR_COLOR); + this.icon = postParams.getString(CLIENT_GROUP.ATTR_ICON); + this.data = postParams.getString(CLIENT_GROUP.ATTR_DATA); + } + + @Override + public String getModelId() { + return (this.id == null) ? null : String.valueOf(this.id); + } + + @Override + public EntityType entityType() { + return EntityType.CLIENT_GROUP; + } + + @Override + public String getName() { + return this.name; + } + + public Long getId() { + return this.id; + } + + public Long getExamId() { + return this.examId; + } + + public ClientGroupType getType() { + return this.type; + } + + public String getColor() { + return this.color; + } + + public String getIcon() { + return this.icon; + } + + public String getData() { + return this.data; + } + + @Override + public String toString() { + final StringBuilder builder = new StringBuilder(); + builder.append("ClientGroup [id="); + builder.append(this.id); + builder.append(", examId="); + builder.append(this.examId); + builder.append(", name="); + builder.append(this.name); + builder.append(", type="); + builder.append(this.type); + builder.append(", color="); + builder.append(this.color); + builder.append(", icon="); + builder.append(this.icon); + builder.append(", data="); + builder.append(this.data); + builder.append("]"); + return builder.toString(); + } + +} diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/ClientGroupTemplate.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/ClientGroupTemplate.java new file mode 100644 index 00000000..468d5265 --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/ClientGroupTemplate.java @@ -0,0 +1,183 @@ +/* + * Copyright (c) 2022 ETH Zürich, Educational Development and Technology (LET) + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +package ch.ethz.seb.sebserver.gbl.model.exam; + +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; + +import ch.ethz.seb.sebserver.gbl.api.EntityType; +import ch.ethz.seb.sebserver.gbl.api.POSTMapper; +import ch.ethz.seb.sebserver.gbl.model.Domain.CLIENT_GROUP; +import ch.ethz.seb.sebserver.gbl.model.Entity; +import ch.ethz.seb.sebserver.gbl.model.exam.ClientGroup.ClientGroupType; + +@JsonIgnoreProperties(ignoreUnknown = true) +public class ClientGroupTemplate implements Entity { + + public static final String ATTR_EXAM_TEMPLATE_ID = "examTemplateId"; + + @JsonProperty(CLIENT_GROUP.ATTR_ID) + public final Long id; + + @JsonProperty(ATTR_EXAM_TEMPLATE_ID) + public final Long examTemplateId; + + @JsonProperty(CLIENT_GROUP.ATTR_NAME) + @NotNull(message = "clientGroup:name:notNull") + @Size(min = 3, max = 255, message = "clientGroup:name:size:{min}:{max}:${validatedValue}") + public final String name; + + @JsonProperty(CLIENT_GROUP.ATTR_TYPE) + @NotNull(message = "clientGroup:type:notNull") + public final ClientGroupType type; + + @JsonProperty(CLIENT_GROUP.ATTR_COLOR) + public final String color; + + @JsonProperty(CLIENT_GROUP.ATTR_ICON) + public final String icon; + + @JsonProperty(CLIENT_GROUP.ATTR_DATA) + public final String data; + + @JsonCreator + public ClientGroupTemplate( + @JsonProperty(CLIENT_GROUP.ATTR_ID) final Long id, + @JsonProperty(CLIENT_GROUP.ATTR_EXAM_ID) final Long examTemplateId, + @JsonProperty(CLIENT_GROUP.ATTR_NAME) final String name, + @JsonProperty(CLIENT_GROUP.ATTR_TYPE) final ClientGroupType type, + @JsonProperty(CLIENT_GROUP.ATTR_COLOR) final String color, + @JsonProperty(CLIENT_GROUP.ATTR_ICON) final String icon, + @JsonProperty(CLIENT_GROUP.ATTR_DATA) final String data) { + + super(); + this.id = id; + this.examTemplateId = examTemplateId; + this.name = name; + this.type = type; + this.color = color; + this.icon = icon; + this.data = data; + } + + public ClientGroupTemplate(final Long id, final Long examTemplateId, final POSTMapper postParams) { + super(); + this.id = id; + this.examTemplateId = examTemplateId; + this.name = postParams.getString(CLIENT_GROUP.ATTR_NAME); + this.type = postParams.getEnum(CLIENT_GROUP.ATTR_TYPE, ClientGroupType.class); + this.color = postParams.getString(CLIENT_GROUP.ATTR_COLOR); + this.icon = postParams.getString(CLIENT_GROUP.ATTR_ICON); + this.data = postParams.getString(CLIENT_GROUP.ATTR_DATA); + } + + public ClientGroupTemplate(final Long id, final ClientGroupTemplate other) { + super(); + this.id = id; + this.examTemplateId = other.examTemplateId; + this.name = other.name; + this.type = other.type; + this.color = other.color; + this.icon = other.icon; + this.data = other.data; + } + + @Override + public String getModelId() { + return (this.id == null) ? null : String.valueOf(this.id); + } + + @Override + public EntityType entityType() { + return EntityType.CLIENT_GROUP; + } + + @Override + public String getName() { + return this.name; + } + + public Long getId() { + return this.id; + } + + public Long getExamTempateId() { + return this.examTemplateId; + } + + public ClientGroupType getType() { + return this.type; + } + + public String getColor() { + return this.color; + } + + public String getIcon() { + return this.icon; + } + + public String getData() { + return this.data; + } + + @Override + public String toString() { + final StringBuilder builder = new StringBuilder(); + builder.append("ClientGroup [id="); + builder.append(this.id); + builder.append(", examTemplateId="); + builder.append(this.examTemplateId); + builder.append(", name="); + builder.append(this.name); + builder.append(", type="); + builder.append(this.type); + builder.append(", color="); + builder.append(this.color); + builder.append(", icon="); + builder.append(this.icon); + builder.append(", data="); + builder.append(this.data); + builder.append("]"); + return builder.toString(); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((this.id == null) ? 0 : this.id.hashCode()); + result = prime * result + ((this.type == null) ? 0 : this.type.hashCode()); + return result; + } + + @Override + public boolean equals(final Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + final ClientGroupTemplate other = (ClientGroupTemplate) obj; + if (this.id == null) { + if (other.id != null) + return false; + } else if (!this.id.equals(other.id)) + return false; + if (this.type != other.type) + return false; + return true; + } + +} diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/ExamTemplate.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/ExamTemplate.java index 43765211..ef049bb1 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/ExamTemplate.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/ExamTemplate.java @@ -10,6 +10,7 @@ package ch.ethz.seb.sebserver.gbl.model.exam; import java.util.Collection; import java.util.Collections; +import java.util.HashMap; import java.util.Map; import javax.validation.constraints.NotNull; @@ -33,6 +34,7 @@ import ch.ethz.seb.sebserver.gbl.util.Utils; public class ExamTemplate implements GrantEntity { public static final String FILTER_ATTR_EXAM_TYPE = EXAM_TEMPLATE.ATTR_EXAM_TYPE; + public static final String ATTR_CLIENT_GROUP_TEMPLATES = "CLIENT_GROUP_TEMPLATES"; public static final String ATTR_EXAM_ATTRIBUTES = "EXAM_ATTRIBUTES"; @JsonProperty(EXAM_TEMPLATE.ATTR_ID) @@ -63,6 +65,9 @@ public class ExamTemplate implements GrantEntity { @JsonProperty(EXAM_TEMPLATE.ATTR_INDICATOR_TEMPLATES) public final Collection indicatorTemplates; + @JsonProperty(ATTR_CLIENT_GROUP_TEMPLATES) + public final Collection clientGroupTemplates; + @JsonProperty(ATTR_EXAM_ATTRIBUTES) public final Map examAttributes; @@ -80,6 +85,7 @@ public class ExamTemplate implements GrantEntity { @JsonProperty(EXAM_TEMPLATE.ATTR_CONFIGURATION_TEMPLATE_ID) final Long configTemplateId, @JsonProperty(EXAM_TEMPLATE.ATTR_INSTITUTIONAL_DEFAULT) final Boolean institutionalDefault, @JsonProperty(EXAM_TEMPLATE.ATTR_INDICATOR_TEMPLATES) final Collection indicatorTemplates, + @JsonProperty(ATTR_CLIENT_GROUP_TEMPLATES) final Collection clientGroupTemplates, @JsonProperty(ATTR_EXAM_ATTRIBUTES) final Map examAttributes) { this.id = id; @@ -90,8 +96,15 @@ public class ExamTemplate implements GrantEntity { this.supporter = supporter; this.configTemplateId = configTemplateId; this.indicatorTemplates = Utils.immutableCollectionOf(indicatorTemplates); + this.clientGroupTemplates = Utils.immutableCollectionOf(clientGroupTemplates); this.institutionalDefault = BooleanUtils.toBoolean(institutionalDefault); - this.examAttributes = Utils.immutableMapOf(examAttributes); + if (examAttributes != null && examAttributes.containsKey(ATTR_CLIENT_GROUP_TEMPLATES)) { + final HashMap attrs = new HashMap<>(examAttributes); + attrs.remove(ATTR_CLIENT_GROUP_TEMPLATES); + this.examAttributes = Utils.immutableMapOf(attrs); + } else { + this.examAttributes = Utils.immutableMapOf(examAttributes); + } } public ExamTemplate( @@ -107,6 +120,7 @@ public class ExamTemplate implements GrantEntity { this.configTemplateId = mapper.getLong(Domain.EXAM_TEMPLATE.ATTR_CONFIGURATION_TEMPLATE_ID); this.institutionalDefault = mapper.getBooleanObject(Domain.EXAM_TEMPLATE.ATTR_INSTITUTIONAL_DEFAULT); this.indicatorTemplates = Collections.emptyList(); + this.clientGroupTemplates = Collections.emptyList(); this.examAttributes = Utils.immutableMapOf(null); } @@ -152,6 +166,10 @@ public class ExamTemplate implements GrantEntity { return this.indicatorTemplates; } + public Collection getClientGroupTemplates() { + return this.clientGroupTemplates; + } + public Map getExamAttributes() { return this.examAttributes; } @@ -214,6 +232,8 @@ public class ExamTemplate implements GrantEntity { builder.append(this.configTemplateId); builder.append(", indicatorTemplates="); builder.append(this.indicatorTemplates); + builder.append(", clientGroupTemplates="); + builder.append(this.clientGroupTemplates); builder.append(", examAttributes="); builder.append(this.examAttributes); builder.append(", institutionalDefault="); @@ -223,7 +243,8 @@ public class ExamTemplate implements GrantEntity { } public static ExamTemplate createNew(final Long institutionId) { - return new ExamTemplate(null, institutionId, null, null, ExamType.UNDEFINED, null, null, false, null, null); + return new ExamTemplate(null, institutionId, null, null, ExamType.UNDEFINED, null, null, false, null, null, + null); } } diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/session/ClientConnectionData.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/session/ClientConnectionData.java index a610f4c5..1e4756de 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/session/ClientConnectionData.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/session/ClientConnectionData.java @@ -21,6 +21,8 @@ import ch.ethz.seb.sebserver.gbl.Constants; import ch.ethz.seb.sebserver.gbl.api.EntityType; import ch.ethz.seb.sebserver.gbl.model.GrantEntity; import ch.ethz.seb.sebserver.gbl.model.exam.Indicator; +import ch.ethz.seb.sebserver.gbl.monitoring.IndicatorValue; +import ch.ethz.seb.sebserver.gbl.monitoring.SimpleIndicatorValue; import ch.ethz.seb.sebserver.gbl.util.Utils; @JsonIgnoreProperties(ignoreUnknown = true) diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/monitoring/ClientGroupConnectionMatcher.java b/src/main/java/ch/ethz/seb/sebserver/gbl/monitoring/ClientGroupConnectionMatcher.java new file mode 100644 index 00000000..ea322603 --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/monitoring/ClientGroupConnectionMatcher.java @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2022 ETH Zürich, Educational Development and Technology (LET) + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +package ch.ethz.seb.sebserver.gbl.monitoring; + +import ch.ethz.seb.sebserver.gbl.model.exam.ClientGroup; +import ch.ethz.seb.sebserver.gbl.model.exam.ClientGroup.ClientGroupType; +import ch.ethz.seb.sebserver.gbl.model.session.ClientConnection; + +/** Defines a client connection to client group matcher for a specific client group type. + * Use this to check whether a specific client connection is in a defined client group of specified type. */ +public interface ClientGroupConnectionMatcher { + + ClientGroupType matcherType(); + + boolean isInGroup(ClientConnection clientConnection, ClientGroup group); + +} diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/monitoring/ClientGroupMatcherService.java b/src/main/java/ch/ethz/seb/sebserver/gbl/monitoring/ClientGroupMatcherService.java new file mode 100644 index 00000000..550e919e --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/monitoring/ClientGroupMatcherService.java @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2022 ETH Zürich, Educational Development and Technology (LET) + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +package ch.ethz.seb.sebserver.gbl.monitoring; + +import java.util.Collection; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Service; + +import ch.ethz.seb.sebserver.gbl.model.exam.ClientGroup; +import ch.ethz.seb.sebserver.gbl.model.exam.ClientGroup.ClientGroupType; +import ch.ethz.seb.sebserver.gbl.model.session.ClientConnection; + +@Lazy +@Service +public class ClientGroupMatcherService { + + private final Map matcher; + + public ClientGroupMatcherService(final Collection matcher) { + this.matcher = matcher + .stream() + .collect(Collectors.toMap( + k -> k.matcherType(), + Function.identity())); + } + + public boolean isInGroup(final ClientConnection clientConnection, final ClientGroup group) { + if (!this.matcher.containsKey(group.type)) { + return false; + } + + return this.matcher.get(group.type).isInGroup(clientConnection, group); + } + +} diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/monitoring/IPv4RangeClientGroupMatcher.java b/src/main/java/ch/ethz/seb/sebserver/gbl/monitoring/IPv4RangeClientGroupMatcher.java new file mode 100644 index 00000000..784396c7 --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/monitoring/IPv4RangeClientGroupMatcher.java @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2022 ETH Zürich, Educational Development and Technology (LET) + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +package ch.ethz.seb.sebserver.gbl.monitoring; + +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Component; + +import ch.ethz.seb.sebserver.gbl.Constants; +import ch.ethz.seb.sebserver.gbl.model.exam.ClientGroup; +import ch.ethz.seb.sebserver.gbl.model.exam.ClientGroup.ClientGroupType; +import ch.ethz.seb.sebserver.gbl.model.session.ClientConnection; +import ch.ethz.seb.sebserver.gbl.util.Utils; + +@Lazy +@Component +public class IPv4RangeClientGroupMatcher implements ClientGroupConnectionMatcher { + + private static final Logger log = LoggerFactory.getLogger(IPv4RangeClientGroupMatcher.class); + + @Override + public ClientGroupType matcherType() { + return ClientGroupType.IP_V4_RANGE; + } + + @Override + public boolean isInGroup(final ClientConnection clientConnection, final ClientGroup group) { + try { + final String[] split = StringUtils.split(group.data, Constants.LIST_SEPARATOR); + + final long startIPAddress = Utils.ipToLong(split[0]); + final long endIPAddress = Utils.ipToLong(split[1]); + final long inputIPAddress = Utils.ipToLong(clientConnection.clientAddress); + + return (inputIPAddress >= startIPAddress && inputIPAddress <= endIPAddress); + } catch (final Exception e) { + log.error("Failed to verify ip range for group: {} connection: {}", group, clientConnection, e); + return false; + } + } + +} diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/session/IndicatorValue.java b/src/main/java/ch/ethz/seb/sebserver/gbl/monitoring/IndicatorValue.java similarity index 97% rename from src/main/java/ch/ethz/seb/sebserver/gbl/model/session/IndicatorValue.java rename to src/main/java/ch/ethz/seb/sebserver/gbl/monitoring/IndicatorValue.java index 3569e254..b06881d6 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/session/IndicatorValue.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/monitoring/IndicatorValue.java @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package ch.ethz.seb.sebserver.gbl.model.session; +package ch.ethz.seb.sebserver.gbl.monitoring; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/session/IndicatorValueHolder.java b/src/main/java/ch/ethz/seb/sebserver/gbl/monitoring/IndicatorValueHolder.java similarity index 87% rename from src/main/java/ch/ethz/seb/sebserver/gbl/model/session/IndicatorValueHolder.java rename to src/main/java/ch/ethz/seb/sebserver/gbl/monitoring/IndicatorValueHolder.java index b520ce93..4d1451d5 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/session/IndicatorValueHolder.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/monitoring/IndicatorValueHolder.java @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package ch.ethz.seb.sebserver.gbl.model.session; +package ch.ethz.seb.sebserver.gbl.monitoring; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/session/MonitoringFullPageData.java b/src/main/java/ch/ethz/seb/sebserver/gbl/monitoring/MonitoringFullPageData.java similarity index 93% rename from src/main/java/ch/ethz/seb/sebserver/gbl/model/session/MonitoringFullPageData.java rename to src/main/java/ch/ethz/seb/sebserver/gbl/monitoring/MonitoringFullPageData.java index 046990ee..0cec3599 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/session/MonitoringFullPageData.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/monitoring/MonitoringFullPageData.java @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package ch.ethz.seb.sebserver.gbl.model.session; +package ch.ethz.seb.sebserver.gbl.monitoring; import java.util.Collection; @@ -14,6 +14,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import ch.ethz.seb.sebserver.gbl.model.Domain; +import ch.ethz.seb.sebserver.gbl.model.session.RemoteProctoringRoom; @JsonIgnoreProperties(ignoreUnknown = true) public class MonitoringFullPageData { diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/session/MonitoringSEBConnectionData.java b/src/main/java/ch/ethz/seb/sebserver/gbl/monitoring/MonitoringSEBConnectionData.java similarity index 93% rename from src/main/java/ch/ethz/seb/sebserver/gbl/model/session/MonitoringSEBConnectionData.java rename to src/main/java/ch/ethz/seb/sebserver/gbl/monitoring/MonitoringSEBConnectionData.java index 639b78e4..c8714be4 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/session/MonitoringSEBConnectionData.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/monitoring/MonitoringSEBConnectionData.java @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package ch.ethz.seb.sebserver.gbl.model.session; +package ch.ethz.seb.sebserver.gbl.monitoring; import java.util.Arrays; import java.util.Collection; @@ -18,6 +18,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import ch.ethz.seb.sebserver.gbl.model.Domain; import ch.ethz.seb.sebserver.gbl.model.session.ClientConnection.ConnectionStatus; +import ch.ethz.seb.sebserver.gbl.model.session.ClientConnectionData; @JsonIgnoreProperties(ignoreUnknown = true) public class MonitoringSEBConnectionData { diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/session/SimpleIndicatorValue.java b/src/main/java/ch/ethz/seb/sebserver/gbl/monitoring/SimpleIndicatorValue.java similarity index 93% rename from src/main/java/ch/ethz/seb/sebserver/gbl/model/session/SimpleIndicatorValue.java rename to src/main/java/ch/ethz/seb/sebserver/gbl/monitoring/SimpleIndicatorValue.java index 7474824d..24abdd00 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/session/SimpleIndicatorValue.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/monitoring/SimpleIndicatorValue.java @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package ch.ethz.seb.sebserver.gbl.model.session; +package ch.ethz.seb.sebserver.gbl.monitoring; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/util/Utils.java b/src/main/java/ch/ethz/seb/sebserver/gbl/util/Utils.java index 18f1ed69..07b2585c 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/util/Utils.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/util/Utils.java @@ -10,11 +10,13 @@ package ch.ethz.seb.sebserver.gbl.util; import java.io.IOException; import java.io.UnsupportedEncodingException; +import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.Socket; import java.net.URL; import java.net.URLDecoder; import java.net.URLEncoder; +import java.net.UnknownHostException; import java.nio.ByteBuffer; import java.nio.CharBuffer; import java.nio.charset.StandardCharsets; @@ -757,4 +759,24 @@ public final class Utils { } } + public static long ipToLong(final String ipV4Address) { + try { + return ipToLong(InetAddress.getByName(ipV4Address)); + } catch (final UnknownHostException e) { + log.error("Failed to convert IPv4 address: {}", ipV4Address, e); + return -1L; + } + } + + public static long ipToLong(final InetAddress ipAddress) { + long result = 0; + final byte[] ipAddressOctets = ipAddress.getAddress(); + + for (final byte octet : ipAddressOctets) { + result <<= 8; + result |= octet & 0xFF; + } + return result; + } + } diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/exam/ExamFormIndicators.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/exam/ExamFormIndicators.java index 34915995..82c23e39 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/exam/ExamFormIndicators.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/exam/ExamFormIndicators.java @@ -34,8 +34,8 @@ import ch.ethz.seb.sebserver.gui.service.page.PageService.PageActionBuilder; import ch.ethz.seb.sebserver.gui.service.page.TemplateComposer; import ch.ethz.seb.sebserver.gui.service.page.impl.PageAction; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestService; -import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.DeleteIndicator; -import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetIndicatorPage; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.indicator.DeleteIndicator; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.indicator.GetIndicatorPage; import ch.ethz.seb.sebserver.gui.table.ColumnDefinition; import ch.ethz.seb.sebserver.gui.table.EntityTable; import ch.ethz.seb.sebserver.gui.widget.WidgetFactory; diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/exam/ExamTemplateForm.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/exam/ExamTemplateForm.java index c8980166..1515c4e1 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/exam/ExamTemplateForm.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/exam/ExamTemplateForm.java @@ -38,12 +38,12 @@ import ch.ethz.seb.sebserver.gui.service.page.TemplateComposer; import ch.ethz.seb.sebserver.gui.service.page.impl.PageAction; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestService; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.DeleteExamTemplate; -import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.DeleteIndicatorTemplate; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetExamTemplate; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetExamTemplateProctoringSettings; -import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetIndicatorTemplatePage; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.NewExamTemplate; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.SaveExamTemplate; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.indicator.DeleteIndicatorTemplate; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.indicator.GetIndicatorTemplatePage; import ch.ethz.seb.sebserver.gui.service.remote.webservice.auth.CurrentUser; import ch.ethz.seb.sebserver.gui.service.remote.webservice.auth.CurrentUser.EntityGrantCheck; import ch.ethz.seb.sebserver.gui.table.ColumnDefinition; diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/exam/IndicatorForm.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/exam/IndicatorForm.java index 5b12e846..95656e48 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/exam/IndicatorForm.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/exam/IndicatorForm.java @@ -36,9 +36,9 @@ import ch.ethz.seb.sebserver.gui.service.page.PageService; import ch.ethz.seb.sebserver.gui.service.page.TemplateComposer; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestService; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetExam; -import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetIndicator; -import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.NewIndicator; -import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.SaveIndicator; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.indicator.GetIndicator; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.indicator.NewIndicator; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.indicator.SaveIndicator; import ch.ethz.seb.sebserver.gui.widget.WidgetFactory; @Lazy diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/exam/IndicatorTemplateForm.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/exam/IndicatorTemplateForm.java index 70e8aed4..4ee154a8 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/exam/IndicatorTemplateForm.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/exam/IndicatorTemplateForm.java @@ -35,9 +35,9 @@ import ch.ethz.seb.sebserver.gui.service.page.PageService; import ch.ethz.seb.sebserver.gui.service.page.TemplateComposer; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestService; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetExamTemplate; -import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetIndicatorTemplate; -import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.NewIndicatorTemplate; -import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.SaveIndicatorTemplate; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.indicator.GetIndicatorTemplate; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.indicator.NewIndicatorTemplate; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.indicator.SaveIndicatorTemplate; import ch.ethz.seb.sebserver.gui.widget.WidgetFactory; @Lazy diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/FinishedExam.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/FinishedExam.java index 5abc050a..228571c3 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/FinishedExam.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/FinishedExam.java @@ -38,7 +38,7 @@ import ch.ethz.seb.sebserver.gui.service.page.impl.PageAction; import ch.ethz.seb.sebserver.gui.service.push.ServerPushService; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestService; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetExam; -import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetIndicators; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.indicator.GetIndicators; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.session.GetFinishedExamClientConnectionPage; import ch.ethz.seb.sebserver.gui.service.remote.webservice.auth.CurrentUser; import ch.ethz.seb.sebserver.gui.table.ColumnDefinition; diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/FinishedExamClientConnection.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/FinishedExamClientConnection.java index 03a042e4..dcec8ea7 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/FinishedExamClientConnection.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/FinishedExamClientConnection.java @@ -29,9 +29,9 @@ import ch.ethz.seb.sebserver.gbl.model.session.ClientConnection; import ch.ethz.seb.sebserver.gbl.model.session.ClientConnectionData; import ch.ethz.seb.sebserver.gbl.model.session.ClientEvent; import ch.ethz.seb.sebserver.gbl.model.session.ExtendedClientEvent; -import ch.ethz.seb.sebserver.gbl.model.session.IndicatorValue; import ch.ethz.seb.sebserver.gbl.model.user.UserInfo; import ch.ethz.seb.sebserver.gbl.model.user.UserRole; +import ch.ethz.seb.sebserver.gbl.monitoring.IndicatorValue; import ch.ethz.seb.sebserver.gbl.profile.GuiProfile; import ch.ethz.seb.sebserver.gbl.util.Utils; import ch.ethz.seb.sebserver.gui.content.action.ActionDefinition; @@ -44,7 +44,7 @@ import ch.ethz.seb.sebserver.gui.service.page.PageService; import ch.ethz.seb.sebserver.gui.service.page.TemplateComposer; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestService; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetExam; -import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetIndicators; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.indicator.GetIndicators; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.logs.GetExtendedClientEventPage; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.session.GetFinishedExamClientConnection; import ch.ethz.seb.sebserver.gui.service.remote.webservice.auth.CurrentUser; diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/MonitoringClientConnection.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/MonitoringClientConnection.java index b0ab27d3..49bf3c4f 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/MonitoringClientConnection.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/MonitoringClientConnection.java @@ -55,7 +55,7 @@ import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestCall; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestService; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetExam; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetExamProctoringSettings; -import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetIndicators; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.indicator.GetIndicators; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.logs.GetExtendedClientEventPage; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.session.ConfirmPendingClientNotification; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.session.GetClientConnectionData; diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/MonitoringRunningExam.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/MonitoringRunningExam.java index 01d02f2d..c7cbc9ba 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/MonitoringRunningExam.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/MonitoringRunningExam.java @@ -56,7 +56,7 @@ import ch.ethz.seb.sebserver.gui.service.push.ServerPushService; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestService; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetExam; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetExamProctoringSettings; -import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetIndicators; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.indicator.GetIndicators; import ch.ethz.seb.sebserver.gui.service.remote.webservice.auth.CurrentUser; import ch.ethz.seb.sebserver.gui.service.session.ClientConnectionTable; import ch.ethz.seb.sebserver.gui.service.session.FullPageMonitoringGUIUpdate; diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/clientgroup/DeleteClientGroup.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/clientgroup/DeleteClientGroup.java new file mode 100644 index 00000000..8ddbec9d --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/clientgroup/DeleteClientGroup.java @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2019 ETH Zürich, Educational Development and Technology (LET) + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +package ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.clientgroup; + +import org.springframework.context.annotation.Lazy; +import org.springframework.http.HttpMethod; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Component; + +import com.fasterxml.jackson.core.type.TypeReference; + +import ch.ethz.seb.sebserver.gbl.api.API; +import ch.ethz.seb.sebserver.gbl.api.EntityType; +import ch.ethz.seb.sebserver.gbl.model.EntityProcessingReport; +import ch.ethz.seb.sebserver.gbl.profile.GuiProfile; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestCall; + +@Lazy +@Component +@GuiProfile +public class DeleteClientGroup extends RestCall { + + public DeleteClientGroup() { + super(new TypeKey<>( + CallType.DELETE, + EntityType.CLIENT_GROUP, + new TypeReference() { + }), + HttpMethod.DELETE, + MediaType.APPLICATION_JSON, + API.EXAM_CLIENT_GROUP_ENDPOINT + API.MODEL_ID_VAR_PATH_SEGMENT); + } + +} diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/clientgroup/GetClientGroup.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/clientgroup/GetClientGroup.java new file mode 100644 index 00000000..f335321c --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/clientgroup/GetClientGroup.java @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2019 ETH Zürich, Educational Development and Technology (LET) + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +package ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.clientgroup; + +import org.springframework.context.annotation.Lazy; +import org.springframework.http.HttpMethod; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Component; + +import com.fasterxml.jackson.core.type.TypeReference; + +import ch.ethz.seb.sebserver.gbl.api.API; +import ch.ethz.seb.sebserver.gbl.api.EntityType; +import ch.ethz.seb.sebserver.gbl.model.exam.ClientGroup; +import ch.ethz.seb.sebserver.gbl.profile.GuiProfile; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestCall; + +@Lazy +@Component +@GuiProfile +public class GetClientGroup extends RestCall { + + public GetClientGroup() { + super(new TypeKey<>( + CallType.GET_SINGLE, + EntityType.CLIENT_GROUP, + new TypeReference() { + }), + HttpMethod.GET, + MediaType.APPLICATION_FORM_URLENCODED, + API.EXAM_CLIENT_GROUP_ENDPOINT + API.MODEL_ID_VAR_PATH_SEGMENT); + } + +} diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/clientgroup/GetClientGroupPage.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/clientgroup/GetClientGroupPage.java new file mode 100644 index 00000000..05cea7ba --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/clientgroup/GetClientGroupPage.java @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2019 ETH Zürich, Educational Development and Technology (LET) + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +package ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.clientgroup; + +import org.springframework.context.annotation.Lazy; +import org.springframework.http.HttpMethod; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Component; + +import com.fasterxml.jackson.core.type.TypeReference; + +import ch.ethz.seb.sebserver.gbl.api.API; +import ch.ethz.seb.sebserver.gbl.api.EntityType; +import ch.ethz.seb.sebserver.gbl.model.Page; +import ch.ethz.seb.sebserver.gbl.model.exam.ClientGroup; +import ch.ethz.seb.sebserver.gbl.profile.GuiProfile; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestCall; + +@Lazy +@Component +@GuiProfile +public class GetClientGroupPage extends RestCall> { + + public GetClientGroupPage() { + super(new TypeKey<>( + CallType.GET_PAGE, + EntityType.CLIENT_GROUP, + new TypeReference>() { + }), + HttpMethod.GET, + MediaType.APPLICATION_FORM_URLENCODED, + API.EXAM_CLIENT_GROUP_ENDPOINT); + } + +} diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/clientgroup/GetClientGroups.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/clientgroup/GetClientGroups.java new file mode 100644 index 00000000..63becfef --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/clientgroup/GetClientGroups.java @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2019 ETH Zürich, Educational Development and Technology (LET) + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +package ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.clientgroup; + +import java.util.List; + +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Component; + +import com.fasterxml.jackson.core.type.TypeReference; + +import ch.ethz.seb.sebserver.gbl.api.API; +import ch.ethz.seb.sebserver.gbl.api.EntityType; +import ch.ethz.seb.sebserver.gbl.model.exam.ClientGroup; +import ch.ethz.seb.sebserver.gbl.profile.GuiProfile; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.PageToListCallAdapter; + +@Lazy +@Component +@GuiProfile +public class GetClientGroups extends PageToListCallAdapter { + + public GetClientGroups() { + super( + GetClientGroupPage.class, + EntityType.CLIENT_GROUP, + new TypeReference>() { + }, + API.EXAM_CLIENT_GROUP_ENDPOINT); + } +} diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/clientgroup/NewClientGroup.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/clientgroup/NewClientGroup.java new file mode 100644 index 00000000..96636834 --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/clientgroup/NewClientGroup.java @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2019 ETH Zürich, Educational Development and Technology (LET) + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +package ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.clientgroup; + +import org.springframework.context.annotation.Lazy; +import org.springframework.http.HttpMethod; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Component; + +import com.fasterxml.jackson.core.type.TypeReference; + +import ch.ethz.seb.sebserver.gbl.api.API; +import ch.ethz.seb.sebserver.gbl.api.EntityType; +import ch.ethz.seb.sebserver.gbl.model.exam.ClientGroup; +import ch.ethz.seb.sebserver.gbl.profile.GuiProfile; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestCall; + +@Lazy +@Component +@GuiProfile +public class NewClientGroup extends RestCall { + + public NewClientGroup() { + super(new TypeKey<>( + CallType.NEW, + EntityType.CLIENT_GROUP, + new TypeReference() { + }), + HttpMethod.POST, + MediaType.APPLICATION_FORM_URLENCODED, + API.EXAM_CLIENT_GROUP_ENDPOINT); + } + +} diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/clientgroup/SaveClientGroup.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/clientgroup/SaveClientGroup.java new file mode 100644 index 00000000..20cefd3c --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/clientgroup/SaveClientGroup.java @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2019 ETH Zürich, Educational Development and Technology (LET) + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +package ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.clientgroup; + +import org.springframework.context.annotation.Lazy; +import org.springframework.http.HttpMethod; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Component; + +import com.fasterxml.jackson.core.type.TypeReference; + +import ch.ethz.seb.sebserver.gbl.api.API; +import ch.ethz.seb.sebserver.gbl.api.EntityType; +import ch.ethz.seb.sebserver.gbl.model.exam.ClientGroup; +import ch.ethz.seb.sebserver.gbl.profile.GuiProfile; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestCall; + +@Lazy +@Component +@GuiProfile +public class SaveClientGroup extends RestCall { + + public SaveClientGroup() { + super(new TypeKey<>( + CallType.SAVE, + EntityType.CLIENT_GROUP, + new TypeReference() { + }), + HttpMethod.PUT, + MediaType.APPLICATION_JSON, + API.EXAM_CLIENT_GROUP_ENDPOINT); + } + +} diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/DeleteIndicator.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/indicator/DeleteIndicator.java similarity index 96% rename from src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/DeleteIndicator.java rename to src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/indicator/DeleteIndicator.java index 0bcfd39b..b22bd9f5 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/DeleteIndicator.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/indicator/DeleteIndicator.java @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam; +package ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.indicator; import org.springframework.context.annotation.Lazy; import org.springframework.http.HttpMethod; diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/DeleteIndicatorTemplate.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/indicator/DeleteIndicatorTemplate.java similarity index 96% rename from src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/DeleteIndicatorTemplate.java rename to src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/indicator/DeleteIndicatorTemplate.java index 91a14195..054e6c8a 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/DeleteIndicatorTemplate.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/indicator/DeleteIndicatorTemplate.java @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam; +package ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.indicator; import org.springframework.context.annotation.Lazy; import org.springframework.http.HttpMethod; diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/GetIndicator.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/indicator/GetIndicator.java similarity index 95% rename from src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/GetIndicator.java rename to src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/indicator/GetIndicator.java index 8cb8481d..b86c5d90 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/GetIndicator.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/indicator/GetIndicator.java @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam; +package ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.indicator; import org.springframework.context.annotation.Lazy; import org.springframework.http.HttpMethod; diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/GetIndicatorPage.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/indicator/GetIndicatorPage.java similarity index 95% rename from src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/GetIndicatorPage.java rename to src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/indicator/GetIndicatorPage.java index a36f2294..3209a805 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/GetIndicatorPage.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/indicator/GetIndicatorPage.java @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam; +package ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.indicator; import org.springframework.context.annotation.Lazy; import org.springframework.http.HttpMethod; diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/GetIndicatorTemplate.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/indicator/GetIndicatorTemplate.java similarity index 96% rename from src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/GetIndicatorTemplate.java rename to src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/indicator/GetIndicatorTemplate.java index 71760038..0a32cd45 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/GetIndicatorTemplate.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/indicator/GetIndicatorTemplate.java @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam; +package ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.indicator; import org.springframework.context.annotation.Lazy; import org.springframework.http.HttpMethod; diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/GetIndicatorTemplatePage.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/indicator/GetIndicatorTemplatePage.java similarity index 96% rename from src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/GetIndicatorTemplatePage.java rename to src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/indicator/GetIndicatorTemplatePage.java index 1658c141..5e71727e 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/GetIndicatorTemplatePage.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/indicator/GetIndicatorTemplatePage.java @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam; +package ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.indicator; import org.springframework.context.annotation.Lazy; import org.springframework.http.HttpMethod; diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/GetIndicators.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/indicator/GetIndicators.java similarity index 95% rename from src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/GetIndicators.java rename to src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/indicator/GetIndicators.java index b194f437..ff8af9e9 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/GetIndicators.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/indicator/GetIndicators.java @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam; +package ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.indicator; import java.util.List; diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/NewIndicator.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/indicator/NewIndicator.java similarity index 95% rename from src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/NewIndicator.java rename to src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/indicator/NewIndicator.java index 0260e922..f8bdd814 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/NewIndicator.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/indicator/NewIndicator.java @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam; +package ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.indicator; import org.springframework.context.annotation.Lazy; import org.springframework.http.HttpMethod; diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/NewIndicatorTemplate.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/indicator/NewIndicatorTemplate.java similarity index 96% rename from src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/NewIndicatorTemplate.java rename to src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/indicator/NewIndicatorTemplate.java index 40ad32b4..95f89fd5 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/NewIndicatorTemplate.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/indicator/NewIndicatorTemplate.java @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam; +package ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.indicator; import org.springframework.context.annotation.Lazy; import org.springframework.http.HttpMethod; diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/SaveIndicator.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/indicator/SaveIndicator.java similarity index 95% rename from src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/SaveIndicator.java rename to src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/indicator/SaveIndicator.java index 96529032..0414bef4 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/SaveIndicator.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/indicator/SaveIndicator.java @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam; +package ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.indicator; import org.springframework.context.annotation.Lazy; import org.springframework.http.HttpMethod; diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/SaveIndicatorTemplate.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/indicator/SaveIndicatorTemplate.java similarity index 96% rename from src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/SaveIndicatorTemplate.java rename to src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/indicator/SaveIndicatorTemplate.java index 83694f8c..714b515d 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/SaveIndicatorTemplate.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/indicator/SaveIndicatorTemplate.java @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam; +package ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.indicator; import org.springframework.context.annotation.Lazy; import org.springframework.http.HttpMethod; diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/session/GetMonitoringFullPageData.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/session/GetMonitoringFullPageData.java index 4265f185..17a12a58 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/session/GetMonitoringFullPageData.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/session/GetMonitoringFullPageData.java @@ -16,7 +16,7 @@ import org.springframework.stereotype.Component; import com.fasterxml.jackson.core.type.TypeReference; import ch.ethz.seb.sebserver.gbl.api.API; -import ch.ethz.seb.sebserver.gbl.model.session.MonitoringFullPageData; +import ch.ethz.seb.sebserver.gbl.monitoring.MonitoringFullPageData; import ch.ethz.seb.sebserver.gbl.profile.GuiProfile; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestCall; diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/session/ClientConnectionDetails.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/session/ClientConnectionDetails.java index 86686141..9b83c269 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/session/ClientConnectionDetails.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/session/ClientConnectionDetails.java @@ -28,7 +28,7 @@ import ch.ethz.seb.sebserver.gbl.model.exam.QuizData; import ch.ethz.seb.sebserver.gbl.model.session.ClientConnection; import ch.ethz.seb.sebserver.gbl.model.session.ClientConnectionData; import ch.ethz.seb.sebserver.gbl.model.session.ClientNotification; -import ch.ethz.seb.sebserver.gbl.model.session.IndicatorValue; +import ch.ethz.seb.sebserver.gbl.monitoring.IndicatorValue; import ch.ethz.seb.sebserver.gui.content.action.ActionDefinition; import ch.ethz.seb.sebserver.gui.form.Form; import ch.ethz.seb.sebserver.gui.form.FormBuilder; diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/session/ClientConnectionTable.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/session/ClientConnectionTable.java index cf19890d..79caa3c5 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/session/ClientConnectionTable.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/session/ClientConnectionTable.java @@ -48,8 +48,8 @@ import ch.ethz.seb.sebserver.gbl.model.exam.Exam; import ch.ethz.seb.sebserver.gbl.model.exam.Indicator; import ch.ethz.seb.sebserver.gbl.model.session.ClientConnection; import ch.ethz.seb.sebserver.gbl.model.session.ClientConnection.ConnectionStatus; +import ch.ethz.seb.sebserver.gbl.monitoring.IndicatorValue; import ch.ethz.seb.sebserver.gbl.model.session.ClientConnectionData; -import ch.ethz.seb.sebserver.gbl.model.session.IndicatorValue; import ch.ethz.seb.sebserver.gbl.util.Tuple; import ch.ethz.seb.sebserver.gui.service.ResourceService; import ch.ethz.seb.sebserver.gui.service.i18n.LocTextKey; diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/session/FullPageMonitoringUpdate.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/session/FullPageMonitoringUpdate.java index 1cda3e54..6cf7f546 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/session/FullPageMonitoringUpdate.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/session/FullPageMonitoringUpdate.java @@ -21,7 +21,7 @@ import ch.ethz.seb.sebserver.gbl.Constants; import ch.ethz.seb.sebserver.gbl.api.API; import ch.ethz.seb.sebserver.gbl.async.AsyncRunner; import ch.ethz.seb.sebserver.gbl.model.session.ClientConnection.ConnectionStatus; -import ch.ethz.seb.sebserver.gbl.model.session.MonitoringFullPageData; +import ch.ethz.seb.sebserver.gbl.monitoring.MonitoringFullPageData; import ch.ethz.seb.sebserver.gbl.util.Utils; import ch.ethz.seb.sebserver.gui.service.page.PageContext; import ch.ethz.seb.sebserver.gui.service.page.PageService; diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/session/MonitoringStatus.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/session/MonitoringStatus.java index 624f7112..4443431d 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/session/MonitoringStatus.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/session/MonitoringStatus.java @@ -13,9 +13,9 @@ import java.util.Collections; import java.util.EnumSet; import ch.ethz.seb.sebserver.gbl.model.session.ClientConnection.ConnectionStatus; +import ch.ethz.seb.sebserver.gbl.monitoring.MonitoringFullPageData; +import ch.ethz.seb.sebserver.gbl.monitoring.MonitoringSEBConnectionData; import ch.ethz.seb.sebserver.gbl.model.session.ClientConnectionData; -import ch.ethz.seb.sebserver.gbl.model.session.MonitoringFullPageData; -import ch.ethz.seb.sebserver.gbl.model.session.MonitoringSEBConnectionData; import ch.ethz.seb.sebserver.gbl.model.session.RemoteProctoringRoom; public interface MonitoringStatus { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributeRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributeRecordDynamicSqlSupport.java index abf1f9b9..f9502cbe 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributeRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributeRecordDynamicSqlSupport.java @@ -6,25 +6,25 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class AdditionalAttributeRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.131+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.789+02:00", comments="Source Table: additional_attributes") public static final AdditionalAttributeRecord additionalAttributeRecord = new AdditionalAttributeRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.132+02:00", comments="Source field: additional_attributes.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.790+02:00", comments="Source field: additional_attributes.id") public static final SqlColumn id = additionalAttributeRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.132+02:00", comments="Source field: additional_attributes.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.790+02:00", comments="Source field: additional_attributes.entity_type") public static final SqlColumn entityType = additionalAttributeRecord.entityType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.132+02:00", comments="Source field: additional_attributes.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.790+02:00", comments="Source field: additional_attributes.entity_id") public static final SqlColumn entityId = additionalAttributeRecord.entityId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.132+02:00", comments="Source field: additional_attributes.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.790+02:00", comments="Source field: additional_attributes.name") public static final SqlColumn name = additionalAttributeRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.132+02:00", comments="Source field: additional_attributes.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.790+02:00", comments="Source field: additional_attributes.value") public static final SqlColumn value = additionalAttributeRecord.value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.131+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.790+02:00", comments="Source Table: additional_attributes") public static final class AdditionalAttributeRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributeRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributeRecordMapper.java index 113bc639..003345e0 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributeRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributeRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface AdditionalAttributeRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.132+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.790+02:00", comments="Source Table: additional_attributes") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.133+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.790+02:00", comments="Source Table: additional_attributes") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.133+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.790+02:00", comments="Source Table: additional_attributes") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.133+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.790+02:00", comments="Source Table: additional_attributes") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -56,7 +56,7 @@ public interface AdditionalAttributeRecordMapper { }) AdditionalAttributeRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.133+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.790+02:00", comments="Source Table: additional_attributes") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -67,22 +67,22 @@ public interface AdditionalAttributeRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.133+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.790+02:00", comments="Source Table: additional_attributes") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.133+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.790+02:00", comments="Source Table: additional_attributes") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(additionalAttributeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.133+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.790+02:00", comments="Source Table: additional_attributes") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, additionalAttributeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.133+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.790+02:00", comments="Source Table: additional_attributes") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, additionalAttributeRecord) .where(id, isEqualTo(id_)) @@ -90,7 +90,7 @@ public interface AdditionalAttributeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.133+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.790+02:00", comments="Source Table: additional_attributes") default int insert(AdditionalAttributeRecord record) { return insert(SqlBuilder.insert(record) .into(additionalAttributeRecord) @@ -102,7 +102,7 @@ public interface AdditionalAttributeRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.133+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.790+02:00", comments="Source Table: additional_attributes") default int insertSelective(AdditionalAttributeRecord record) { return insert(SqlBuilder.insert(record) .into(additionalAttributeRecord) @@ -114,19 +114,19 @@ public interface AdditionalAttributeRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.133+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.790+02:00", comments="Source Table: additional_attributes") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, entityType, entityId, name, value) .from(additionalAttributeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.133+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.793+02:00", comments="Source Table: additional_attributes") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, entityType, entityId, name, value) .from(additionalAttributeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.133+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.793+02:00", comments="Source Table: additional_attributes") default AdditionalAttributeRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, entityType, entityId, name, value) .from(additionalAttributeRecord) @@ -135,7 +135,7 @@ public interface AdditionalAttributeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.133+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.793+02:00", comments="Source Table: additional_attributes") default UpdateDSL> updateByExample(AdditionalAttributeRecord record) { return UpdateDSL.updateWithMapper(this::update, additionalAttributeRecord) .set(entityType).equalTo(record::getEntityType) @@ -144,7 +144,7 @@ public interface AdditionalAttributeRecordMapper { .set(value).equalTo(record::getValue); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.133+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.793+02:00", comments="Source Table: additional_attributes") default UpdateDSL> updateByExampleSelective(AdditionalAttributeRecord record) { return UpdateDSL.updateWithMapper(this::update, additionalAttributeRecord) .set(entityType).equalToWhenPresent(record::getEntityType) @@ -153,7 +153,7 @@ public interface AdditionalAttributeRecordMapper { .set(value).equalToWhenPresent(record::getValue); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.134+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.793+02:00", comments="Source Table: additional_attributes") default int updateByPrimaryKey(AdditionalAttributeRecord record) { return UpdateDSL.updateWithMapper(this::update, additionalAttributeRecord) .set(entityType).equalTo(record::getEntityType) @@ -165,7 +165,7 @@ public interface AdditionalAttributeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.134+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.793+02:00", comments="Source Table: additional_attributes") default int updateByPrimaryKeySelective(AdditionalAttributeRecord record) { return UpdateDSL.updateWithMapper(this::update, additionalAttributeRecord) .set(entityType).equalToWhenPresent(record::getEntityType) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/BatchActionRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/BatchActionRecordDynamicSqlSupport.java index d7e49235..2b75c43e 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/BatchActionRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/BatchActionRecordDynamicSqlSupport.java @@ -6,37 +6,37 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class BatchActionRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.142+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.803+02:00", comments="Source Table: batch_action") public static final BatchActionRecord batchActionRecord = new BatchActionRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.142+02:00", comments="Source field: batch_action.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.803+02:00", comments="Source field: batch_action.id") public static final SqlColumn id = batchActionRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.142+02:00", comments="Source field: batch_action.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.803+02:00", comments="Source field: batch_action.institution_id") public static final SqlColumn institutionId = batchActionRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.142+02:00", comments="Source field: batch_action.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.803+02:00", comments="Source field: batch_action.owner") public static final SqlColumn owner = batchActionRecord.owner; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.142+02:00", comments="Source field: batch_action.action_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.803+02:00", comments="Source field: batch_action.action_type") public static final SqlColumn actionType = batchActionRecord.actionType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.143+02:00", comments="Source field: batch_action.attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.803+02:00", comments="Source field: batch_action.attributes") public static final SqlColumn attributes = batchActionRecord.attributes; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.143+02:00", comments="Source field: batch_action.source_ids") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.803+02:00", comments="Source field: batch_action.source_ids") public static final SqlColumn sourceIds = batchActionRecord.sourceIds; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.143+02:00", comments="Source field: batch_action.successful") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.803+02:00", comments="Source field: batch_action.successful") public static final SqlColumn successful = batchActionRecord.successful; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.143+02:00", comments="Source field: batch_action.last_update") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.803+02:00", comments="Source field: batch_action.last_update") public static final SqlColumn lastUpdate = batchActionRecord.lastUpdate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.143+02:00", comments="Source field: batch_action.processor_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.803+02:00", comments="Source field: batch_action.processor_id") public static final SqlColumn processorId = batchActionRecord.processorId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.142+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.803+02:00", comments="Source Table: batch_action") public static final class BatchActionRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/BatchActionRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/BatchActionRecordMapper.java index c37d2d50..753aaa5f 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/BatchActionRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/BatchActionRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface BatchActionRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.143+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.803+02:00", comments="Source Table: batch_action") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.143+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.803+02:00", comments="Source Table: batch_action") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.143+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.803+02:00", comments="Source Table: batch_action") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.143+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.803+02:00", comments="Source Table: batch_action") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -60,7 +60,7 @@ public interface BatchActionRecordMapper { }) BatchActionRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.143+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.803+02:00", comments="Source Table: batch_action") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -75,22 +75,22 @@ public interface BatchActionRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.143+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.803+02:00", comments="Source Table: batch_action") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.143+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.803+02:00", comments="Source Table: batch_action") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(batchActionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.143+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.803+02:00", comments="Source Table: batch_action") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, batchActionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.143+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.803+02:00", comments="Source Table: batch_action") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, batchActionRecord) .where(id, isEqualTo(id_)) @@ -98,7 +98,7 @@ public interface BatchActionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.143+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.803+02:00", comments="Source Table: batch_action") default int insert(BatchActionRecord record) { return insert(SqlBuilder.insert(record) .into(batchActionRecord) @@ -114,7 +114,7 @@ public interface BatchActionRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.143+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.804+02:00", comments="Source Table: batch_action") default int insertSelective(BatchActionRecord record) { return insert(SqlBuilder.insert(record) .into(batchActionRecord) @@ -130,19 +130,19 @@ public interface BatchActionRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.143+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.804+02:00", comments="Source Table: batch_action") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, owner, actionType, attributes, sourceIds, successful, lastUpdate, processorId) .from(batchActionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.143+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.804+02:00", comments="Source Table: batch_action") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, owner, actionType, attributes, sourceIds, successful, lastUpdate, processorId) .from(batchActionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.143+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.804+02:00", comments="Source Table: batch_action") default BatchActionRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, owner, actionType, attributes, sourceIds, successful, lastUpdate, processorId) .from(batchActionRecord) @@ -151,7 +151,7 @@ public interface BatchActionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.143+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.804+02:00", comments="Source Table: batch_action") default UpdateDSL> updateByExample(BatchActionRecord record) { return UpdateDSL.updateWithMapper(this::update, batchActionRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -164,7 +164,7 @@ public interface BatchActionRecordMapper { .set(processorId).equalTo(record::getProcessorId); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.143+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.804+02:00", comments="Source Table: batch_action") default UpdateDSL> updateByExampleSelective(BatchActionRecord record) { return UpdateDSL.updateWithMapper(this::update, batchActionRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -177,7 +177,7 @@ public interface BatchActionRecordMapper { .set(processorId).equalToWhenPresent(record::getProcessorId); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.143+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.804+02:00", comments="Source Table: batch_action") default int updateByPrimaryKey(BatchActionRecord record) { return UpdateDSL.updateWithMapper(this::update, batchActionRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -193,7 +193,7 @@ public interface BatchActionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.143+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.804+02:00", comments="Source Table: batch_action") default int updateByPrimaryKeySelective(BatchActionRecord record) { return UpdateDSL.updateWithMapper(this::update, batchActionRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/CertificateRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/CertificateRecordDynamicSqlSupport.java index 0cf385a2..b388ef04 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/CertificateRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/CertificateRecordDynamicSqlSupport.java @@ -6,22 +6,22 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class CertificateRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.137+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.797+02:00", comments="Source Table: certificate") public static final CertificateRecord certificateRecord = new CertificateRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.138+02:00", comments="Source field: certificate.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.798+02:00", comments="Source field: certificate.id") public static final SqlColumn id = certificateRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.138+02:00", comments="Source field: certificate.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.798+02:00", comments="Source field: certificate.institution_id") public static final SqlColumn institutionId = certificateRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.138+02:00", comments="Source field: certificate.aliases") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.798+02:00", comments="Source field: certificate.aliases") public static final SqlColumn aliases = certificateRecord.aliases; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.138+02:00", comments="Source field: certificate.cert_store") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.798+02:00", comments="Source field: certificate.cert_store") public static final SqlColumn certStore = certificateRecord.certStore; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.138+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.797+02:00", comments="Source Table: certificate") public static final class CertificateRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/CertificateRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/CertificateRecordMapper.java index dd78c4c2..49b65059 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/CertificateRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/CertificateRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface CertificateRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.138+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.798+02:00", comments="Source Table: certificate") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.138+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.798+02:00", comments="Source Table: certificate") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.138+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.798+02:00", comments="Source Table: certificate") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.138+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.798+02:00", comments="Source Table: certificate") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -55,7 +55,7 @@ public interface CertificateRecordMapper { }) CertificateRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.138+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.798+02:00", comments="Source Table: certificate") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -65,22 +65,22 @@ public interface CertificateRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.138+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.798+02:00", comments="Source Table: certificate") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.138+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.798+02:00", comments="Source Table: certificate") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(certificateRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.138+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.798+02:00", comments="Source Table: certificate") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, certificateRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.138+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.798+02:00", comments="Source Table: certificate") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, certificateRecord) .where(id, isEqualTo(id_)) @@ -88,7 +88,7 @@ public interface CertificateRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.138+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.798+02:00", comments="Source Table: certificate") default int insert(CertificateRecord record) { return insert(SqlBuilder.insert(record) .into(certificateRecord) @@ -99,7 +99,7 @@ public interface CertificateRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.138+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.798+02:00", comments="Source Table: certificate") default int insertSelective(CertificateRecord record) { return insert(SqlBuilder.insert(record) .into(certificateRecord) @@ -110,19 +110,19 @@ public interface CertificateRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.138+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.798+02:00", comments="Source Table: certificate") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, aliases, certStore) .from(certificateRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.138+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.798+02:00", comments="Source Table: certificate") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, aliases, certStore) .from(certificateRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.138+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.798+02:00", comments="Source Table: certificate") default CertificateRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, aliases, certStore) .from(certificateRecord) @@ -131,7 +131,7 @@ public interface CertificateRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.138+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.798+02:00", comments="Source Table: certificate") default UpdateDSL> updateByExample(CertificateRecord record) { return UpdateDSL.updateWithMapper(this::update, certificateRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -139,7 +139,7 @@ public interface CertificateRecordMapper { .set(certStore).equalTo(record::getCertStore); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.138+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.798+02:00", comments="Source Table: certificate") default UpdateDSL> updateByExampleSelective(CertificateRecord record) { return UpdateDSL.updateWithMapper(this::update, certificateRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -147,7 +147,7 @@ public interface CertificateRecordMapper { .set(certStore).equalToWhenPresent(record::getCertStore); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.138+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.798+02:00", comments="Source Table: certificate") default int updateByPrimaryKey(CertificateRecord record) { return UpdateDSL.updateWithMapper(this::update, certificateRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -158,7 +158,7 @@ public interface CertificateRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.138+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.798+02:00", comments="Source Table: certificate") default int updateByPrimaryKeySelective(CertificateRecord record) { return UpdateDSL.updateWithMapper(this::update, certificateRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordDynamicSqlSupport.java index 63000b09..f0a8471b 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordDynamicSqlSupport.java @@ -6,61 +6,61 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ClientConnectionRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.089+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.741+02:00", comments="Source Table: client_connection") public static final ClientConnectionRecord clientConnectionRecord = new ClientConnectionRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.089+02:00", comments="Source field: client_connection.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.742+02:00", comments="Source field: client_connection.id") public static final SqlColumn id = clientConnectionRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.089+02:00", comments="Source field: client_connection.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.742+02:00", comments="Source field: client_connection.institution_id") public static final SqlColumn institutionId = clientConnectionRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.089+02:00", comments="Source field: client_connection.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.742+02:00", comments="Source field: client_connection.exam_id") public static final SqlColumn examId = clientConnectionRecord.examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.089+02:00", comments="Source field: client_connection.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.742+02:00", comments="Source field: client_connection.status") public static final SqlColumn status = clientConnectionRecord.status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.089+02:00", comments="Source field: client_connection.connection_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.742+02:00", comments="Source field: client_connection.connection_token") public static final SqlColumn connectionToken = clientConnectionRecord.connectionToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.089+02:00", comments="Source field: client_connection.exam_user_session_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.742+02:00", comments="Source field: client_connection.exam_user_session_id") public static final SqlColumn examUserSessionId = clientConnectionRecord.examUserSessionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.089+02:00", comments="Source field: client_connection.client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.742+02:00", comments="Source field: client_connection.client_address") public static final SqlColumn clientAddress = clientConnectionRecord.clientAddress; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.089+02:00", comments="Source field: client_connection.virtual_client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.742+02:00", comments="Source field: client_connection.virtual_client_address") public static final SqlColumn virtualClientAddress = clientConnectionRecord.virtualClientAddress; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.090+02:00", comments="Source field: client_connection.vdi") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.742+02:00", comments="Source field: client_connection.vdi") public static final SqlColumn vdi = clientConnectionRecord.vdi; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.091+02:00", comments="Source field: client_connection.vdi_pair_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.742+02:00", comments="Source field: client_connection.vdi_pair_token") public static final SqlColumn vdiPairToken = clientConnectionRecord.vdiPairToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.091+02:00", comments="Source field: client_connection.creation_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.743+02:00", comments="Source field: client_connection.creation_time") public static final SqlColumn creationTime = clientConnectionRecord.creationTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.091+02:00", comments="Source field: client_connection.update_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.743+02:00", comments="Source field: client_connection.update_time") public static final SqlColumn updateTime = clientConnectionRecord.updateTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.091+02:00", comments="Source field: client_connection.remote_proctoring_room_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.743+02:00", comments="Source field: client_connection.remote_proctoring_room_id") public static final SqlColumn remoteProctoringRoomId = clientConnectionRecord.remoteProctoringRoomId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.091+02:00", comments="Source field: client_connection.remote_proctoring_room_update") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.743+02:00", comments="Source field: client_connection.remote_proctoring_room_update") public static final SqlColumn remoteProctoringRoomUpdate = clientConnectionRecord.remoteProctoringRoomUpdate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.091+02:00", comments="Source field: client_connection.client_machine_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.743+02:00", comments="Source field: client_connection.client_machine_name") public static final SqlColumn clientMachineName = clientConnectionRecord.clientMachineName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.091+02:00", comments="Source field: client_connection.client_os_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.743+02:00", comments="Source field: client_connection.client_os_name") public static final SqlColumn clientOsName = clientConnectionRecord.clientOsName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.091+02:00", comments="Source field: client_connection.client_version") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.743+02:00", comments="Source field: client_connection.client_version") public static final SqlColumn clientVersion = clientConnectionRecord.clientVersion; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.089+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.741+02:00", comments="Source Table: client_connection") public static final class ClientConnectionRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordMapper.java index e7bf5ffc..b264e196 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ClientConnectionRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.092+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.743+02:00", comments="Source Table: client_connection") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.092+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.743+02:00", comments="Source Table: client_connection") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.092+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.743+02:00", comments="Source Table: client_connection") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.092+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.743+02:00", comments="Source Table: client_connection") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -68,7 +68,7 @@ public interface ClientConnectionRecordMapper { }) ClientConnectionRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.092+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.743+02:00", comments="Source Table: client_connection") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -91,22 +91,22 @@ public interface ClientConnectionRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.092+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.744+02:00", comments="Source Table: client_connection") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.092+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.744+02:00", comments="Source Table: client_connection") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(clientConnectionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.092+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.744+02:00", comments="Source Table: client_connection") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, clientConnectionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.092+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.744+02:00", comments="Source Table: client_connection") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, clientConnectionRecord) .where(id, isEqualTo(id_)) @@ -114,7 +114,7 @@ public interface ClientConnectionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.092+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.744+02:00", comments="Source Table: client_connection") default int insert(ClientConnectionRecord record) { return insert(SqlBuilder.insert(record) .into(clientConnectionRecord) @@ -138,7 +138,7 @@ public interface ClientConnectionRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.092+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.744+02:00", comments="Source Table: client_connection") default int insertSelective(ClientConnectionRecord record) { return insert(SqlBuilder.insert(record) .into(clientConnectionRecord) @@ -162,19 +162,19 @@ public interface ClientConnectionRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.092+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.744+02:00", comments="Source Table: client_connection") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, examId, status, connectionToken, examUserSessionId, clientAddress, virtualClientAddress, vdi, vdiPairToken, creationTime, updateTime, remoteProctoringRoomId, remoteProctoringRoomUpdate, clientMachineName, clientOsName, clientVersion) .from(clientConnectionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.093+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.744+02:00", comments="Source Table: client_connection") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, examId, status, connectionToken, examUserSessionId, clientAddress, virtualClientAddress, vdi, vdiPairToken, creationTime, updateTime, remoteProctoringRoomId, remoteProctoringRoomUpdate, clientMachineName, clientOsName, clientVersion) .from(clientConnectionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.093+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.744+02:00", comments="Source Table: client_connection") default ClientConnectionRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, examId, status, connectionToken, examUserSessionId, clientAddress, virtualClientAddress, vdi, vdiPairToken, creationTime, updateTime, remoteProctoringRoomId, remoteProctoringRoomUpdate, clientMachineName, clientOsName, clientVersion) .from(clientConnectionRecord) @@ -183,7 +183,7 @@ public interface ClientConnectionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.093+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.744+02:00", comments="Source Table: client_connection") default UpdateDSL> updateByExample(ClientConnectionRecord record) { return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -204,7 +204,7 @@ public interface ClientConnectionRecordMapper { .set(clientVersion).equalTo(record::getClientVersion); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.093+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.744+02:00", comments="Source Table: client_connection") default UpdateDSL> updateByExampleSelective(ClientConnectionRecord record) { return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -225,7 +225,7 @@ public interface ClientConnectionRecordMapper { .set(clientVersion).equalToWhenPresent(record::getClientVersion); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.093+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.744+02:00", comments="Source Table: client_connection") default int updateByPrimaryKey(ClientConnectionRecord record) { return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -249,7 +249,7 @@ public interface ClientConnectionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.093+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.744+02:00", comments="Source Table: client_connection") default int updateByPrimaryKeySelective(ClientConnectionRecord record) { return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordDynamicSqlSupport.java index 4457c1d8..da68f395 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordDynamicSqlSupport.java @@ -7,31 +7,31 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ClientEventRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.100+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.750+02:00", comments="Source Table: client_event") public static final ClientEventRecord clientEventRecord = new ClientEventRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.100+02:00", comments="Source field: client_event.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.750+02:00", comments="Source field: client_event.id") public static final SqlColumn id = clientEventRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.100+02:00", comments="Source field: client_event.client_connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.750+02:00", comments="Source field: client_event.client_connection_id") public static final SqlColumn clientConnectionId = clientEventRecord.clientConnectionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.100+02:00", comments="Source field: client_event.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.750+02:00", comments="Source field: client_event.type") public static final SqlColumn type = clientEventRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.101+02:00", comments="Source field: client_event.client_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.750+02:00", comments="Source field: client_event.client_time") public static final SqlColumn clientTime = clientEventRecord.clientTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.101+02:00", comments="Source field: client_event.server_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.750+02:00", comments="Source field: client_event.server_time") public static final SqlColumn serverTime = clientEventRecord.serverTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.101+02:00", comments="Source field: client_event.numeric_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.751+02:00", comments="Source field: client_event.numeric_value") public static final SqlColumn numericValue = clientEventRecord.numericValue; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.101+02:00", comments="Source field: client_event.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.751+02:00", comments="Source field: client_event.text") public static final SqlColumn text = clientEventRecord.text; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.100+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.750+02:00", comments="Source Table: client_event") public static final class ClientEventRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordMapper.java index 5ae2fdd2..771d2c8e 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordMapper.java @@ -32,19 +32,19 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ClientEventRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.101+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.751+02:00", comments="Source Table: client_event") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.101+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.751+02:00", comments="Source Table: client_event") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.101+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.751+02:00", comments="Source Table: client_event") @InsertProvider(type=SqlProviderAdapter.class, method="insert") int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.101+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.751+02:00", comments="Source Table: client_event") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -57,7 +57,7 @@ public interface ClientEventRecordMapper { }) ClientEventRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.101+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.751+02:00", comments="Source Table: client_event") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -70,22 +70,22 @@ public interface ClientEventRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.101+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.751+02:00", comments="Source Table: client_event") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.101+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.751+02:00", comments="Source Table: client_event") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(clientEventRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.101+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.751+02:00", comments="Source Table: client_event") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, clientEventRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.101+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.751+02:00", comments="Source Table: client_event") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, clientEventRecord) .where(id, isEqualTo(id_)) @@ -93,7 +93,7 @@ public interface ClientEventRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.101+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.751+02:00", comments="Source Table: client_event") default int insert(ClientEventRecord record) { return insert(SqlBuilder.insert(record) .into(clientEventRecord) @@ -108,7 +108,7 @@ public interface ClientEventRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.101+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.751+02:00", comments="Source Table: client_event") default int insertSelective(ClientEventRecord record) { return insert(SqlBuilder.insert(record) .into(clientEventRecord) @@ -123,19 +123,19 @@ public interface ClientEventRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.101+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.751+02:00", comments="Source Table: client_event") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, clientConnectionId, type, clientTime, serverTime, numericValue, text) .from(clientEventRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.101+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.751+02:00", comments="Source Table: client_event") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, clientConnectionId, type, clientTime, serverTime, numericValue, text) .from(clientEventRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.101+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.751+02:00", comments="Source Table: client_event") default ClientEventRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, clientConnectionId, type, clientTime, serverTime, numericValue, text) .from(clientEventRecord) @@ -144,7 +144,7 @@ public interface ClientEventRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.102+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.751+02:00", comments="Source Table: client_event") default UpdateDSL> updateByExample(ClientEventRecord record) { return UpdateDSL.updateWithMapper(this::update, clientEventRecord) .set(id).equalTo(record::getId) @@ -156,7 +156,7 @@ public interface ClientEventRecordMapper { .set(text).equalTo(record::getText); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.102+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.751+02:00", comments="Source Table: client_event") default UpdateDSL> updateByExampleSelective(ClientEventRecord record) { return UpdateDSL.updateWithMapper(this::update, clientEventRecord) .set(id).equalToWhenPresent(record::getId) @@ -168,7 +168,7 @@ public interface ClientEventRecordMapper { .set(text).equalToWhenPresent(record::getText); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.102+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.751+02:00", comments="Source Table: client_event") default int updateByPrimaryKey(ClientEventRecord record) { return UpdateDSL.updateWithMapper(this::update, clientEventRecord) .set(clientConnectionId).equalTo(record::getClientConnectionId) @@ -182,7 +182,7 @@ public interface ClientEventRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.102+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.752+02:00", comments="Source Table: client_event") default int updateByPrimaryKeySelective(ClientEventRecord record) { return UpdateDSL.updateWithMapper(this::update, clientEventRecord) .set(clientConnectionId).equalToWhenPresent(record::getClientConnectionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientGroupRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientGroupRecordDynamicSqlSupport.java index df8ee04f..0731abb6 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientGroupRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientGroupRecordDynamicSqlSupport.java @@ -6,28 +6,31 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ClientGroupRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.148+02:00", comments="Source Table: client_group") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.810+02:00", comments="Source Table: client_group") public static final ClientGroupRecord clientGroupRecord = new ClientGroupRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.148+02:00", comments="Source field: client_group.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.810+02:00", comments="Source field: client_group.id") public static final SqlColumn id = clientGroupRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.148+02:00", comments="Source field: client_group.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.810+02:00", comments="Source field: client_group.exam_id") public static final SqlColumn examId = clientGroupRecord.examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.148+02:00", comments="Source field: client_group.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.810+02:00", comments="Source field: client_group.name") public static final SqlColumn name = clientGroupRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.148+02:00", comments="Source field: client_group.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.810+02:00", comments="Source field: client_group.type") public static final SqlColumn type = clientGroupRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.148+02:00", comments="Source field: client_group.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.810+02:00", comments="Source field: client_group.color") public static final SqlColumn color = clientGroupRecord.color; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.148+02:00", comments="Source field: client_group.data") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.810+02:00", comments="Source field: client_group.icon") + public static final SqlColumn icon = clientGroupRecord.icon; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.810+02:00", comments="Source field: client_group.data") public static final SqlColumn data = clientGroupRecord.data; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.148+02:00", comments="Source Table: client_group") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.810+02:00", comments="Source Table: client_group") public static final class ClientGroupRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); @@ -39,6 +42,8 @@ public final class ClientGroupRecordDynamicSqlSupport { public final SqlColumn color = column("color", JDBCType.VARCHAR); + public final SqlColumn icon = column("icon", JDBCType.VARCHAR); + public final SqlColumn data = column("data", JDBCType.VARCHAR); public ClientGroupRecord() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientGroupRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientGroupRecordMapper.java index 6bd9f3b3..10a1009f 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientGroupRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientGroupRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ClientGroupRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.148+02:00", comments="Source Table: client_group") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.810+02:00", comments="Source Table: client_group") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.148+02:00", comments="Source Table: client_group") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.810+02:00", comments="Source Table: client_group") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.148+02:00", comments="Source Table: client_group") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.810+02:00", comments="Source Table: client_group") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.148+02:00", comments="Source Table: client_group") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.810+02:00", comments="Source Table: client_group") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -53,11 +53,12 @@ public interface ClientGroupRecordMapper { @Arg(column="name", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="type", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="color", javaType=String.class, jdbcType=JdbcType.VARCHAR), + @Arg(column="icon", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="data", javaType=String.class, jdbcType=JdbcType.VARCHAR) }) ClientGroupRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.148+02:00", comments="Source Table: client_group") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.811+02:00", comments="Source Table: client_group") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -65,26 +66,27 @@ public interface ClientGroupRecordMapper { @Arg(column="name", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="type", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="color", javaType=String.class, jdbcType=JdbcType.VARCHAR), + @Arg(column="icon", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="data", javaType=String.class, jdbcType=JdbcType.VARCHAR) }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.148+02:00", comments="Source Table: client_group") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.811+02:00", comments="Source Table: client_group") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.148+02:00", comments="Source Table: client_group") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.811+02:00", comments="Source Table: client_group") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(clientGroupRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.148+02:00", comments="Source Table: client_group") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.811+02:00", comments="Source Table: client_group") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, clientGroupRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.148+02:00", comments="Source Table: client_group") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.811+02:00", comments="Source Table: client_group") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, clientGroupRecord) .where(id, isEqualTo(id_)) @@ -92,7 +94,7 @@ public interface ClientGroupRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.148+02:00", comments="Source Table: client_group") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.811+02:00", comments="Source Table: client_group") default int insert(ClientGroupRecord record) { return insert(SqlBuilder.insert(record) .into(clientGroupRecord) @@ -100,12 +102,13 @@ public interface ClientGroupRecordMapper { .map(name).toProperty("name") .map(type).toProperty("type") .map(color).toProperty("color") + .map(icon).toProperty("icon") .map(data).toProperty("data") .build() .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.148+02:00", comments="Source Table: client_group") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.811+02:00", comments="Source Table: client_group") default int insertSelective(ClientGroupRecord record) { return insert(SqlBuilder.insert(record) .into(clientGroupRecord) @@ -113,72 +116,77 @@ public interface ClientGroupRecordMapper { .map(name).toPropertyWhenPresent("name", record::getName) .map(type).toPropertyWhenPresent("type", record::getType) .map(color).toPropertyWhenPresent("color", record::getColor) + .map(icon).toPropertyWhenPresent("icon", record::getIcon) .map(data).toPropertyWhenPresent("data", record::getData) .build() .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.148+02:00", comments="Source Table: client_group") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.811+02:00", comments="Source Table: client_group") default QueryExpressionDSL>> selectByExample() { - return SelectDSL.selectWithMapper(this::selectMany, id, examId, name, type, color, data) + return SelectDSL.selectWithMapper(this::selectMany, id, examId, name, type, color, icon, data) .from(clientGroupRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.148+02:00", comments="Source Table: client_group") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.811+02:00", comments="Source Table: client_group") default QueryExpressionDSL>> selectDistinctByExample() { - return SelectDSL.selectDistinctWithMapper(this::selectMany, id, examId, name, type, color, data) + return SelectDSL.selectDistinctWithMapper(this::selectMany, id, examId, name, type, color, icon, data) .from(clientGroupRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.148+02:00", comments="Source Table: client_group") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.811+02:00", comments="Source Table: client_group") default ClientGroupRecord selectByPrimaryKey(Long id_) { - return SelectDSL.selectWithMapper(this::selectOne, id, examId, name, type, color, data) + return SelectDSL.selectWithMapper(this::selectOne, id, examId, name, type, color, icon, data) .from(clientGroupRecord) .where(id, isEqualTo(id_)) .build() .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.148+02:00", comments="Source Table: client_group") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.811+02:00", comments="Source Table: client_group") default UpdateDSL> updateByExample(ClientGroupRecord record) { return UpdateDSL.updateWithMapper(this::update, clientGroupRecord) .set(examId).equalTo(record::getExamId) .set(name).equalTo(record::getName) .set(type).equalTo(record::getType) .set(color).equalTo(record::getColor) + .set(icon).equalTo(record::getIcon) .set(data).equalTo(record::getData); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.148+02:00", comments="Source Table: client_group") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.811+02:00", comments="Source Table: client_group") default UpdateDSL> updateByExampleSelective(ClientGroupRecord record) { return UpdateDSL.updateWithMapper(this::update, clientGroupRecord) .set(examId).equalToWhenPresent(record::getExamId) .set(name).equalToWhenPresent(record::getName) .set(type).equalToWhenPresent(record::getType) .set(color).equalToWhenPresent(record::getColor) + .set(icon).equalToWhenPresent(record::getIcon) .set(data).equalToWhenPresent(record::getData); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.148+02:00", comments="Source Table: client_group") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.811+02:00", comments="Source Table: client_group") default int updateByPrimaryKey(ClientGroupRecord record) { return UpdateDSL.updateWithMapper(this::update, clientGroupRecord) .set(examId).equalTo(record::getExamId) .set(name).equalTo(record::getName) .set(type).equalTo(record::getType) .set(color).equalTo(record::getColor) + .set(icon).equalTo(record::getIcon) .set(data).equalTo(record::getData) .where(id, isEqualTo(record::getId)) .build() .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.148+02:00", comments="Source Table: client_group") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.811+02:00", comments="Source Table: client_group") default int updateByPrimaryKeySelective(ClientGroupRecord record) { return UpdateDSL.updateWithMapper(this::update, clientGroupRecord) .set(examId).equalToWhenPresent(record::getExamId) .set(name).equalToWhenPresent(record::getName) .set(type).equalToWhenPresent(record::getType) .set(color).equalToWhenPresent(record::getColor) + .set(icon).equalToWhenPresent(record::getIcon) .set(data).equalToWhenPresent(record::getData) .where(id, isEqualTo(record::getId)) .build() diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientIndicatorRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientIndicatorRecordDynamicSqlSupport.java index 8d9c0079..34177529 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientIndicatorRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientIndicatorRecordDynamicSqlSupport.java @@ -6,22 +6,22 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ClientIndicatorRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.144+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.805+02:00", comments="Source Table: client_indicator") public static final ClientIndicatorRecord clientIndicatorRecord = new ClientIndicatorRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.144+02:00", comments="Source field: client_indicator.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.805+02:00", comments="Source field: client_indicator.id") public static final SqlColumn id = clientIndicatorRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.144+02:00", comments="Source field: client_indicator.client_connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.805+02:00", comments="Source field: client_indicator.client_connection_id") public static final SqlColumn clientConnectionId = clientIndicatorRecord.clientConnectionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.144+02:00", comments="Source field: client_indicator.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.805+02:00", comments="Source field: client_indicator.type") public static final SqlColumn type = clientIndicatorRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.144+02:00", comments="Source field: client_indicator.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.805+02:00", comments="Source field: client_indicator.value") public static final SqlColumn value = clientIndicatorRecord.value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.144+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.805+02:00", comments="Source Table: client_indicator") public static final class ClientIndicatorRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientIndicatorRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientIndicatorRecordMapper.java index 4a3a74c4..fe1b6691 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientIndicatorRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientIndicatorRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ClientIndicatorRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.144+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.805+02:00", comments="Source Table: client_indicator") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.144+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.805+02:00", comments="Source Table: client_indicator") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.144+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.805+02:00", comments="Source Table: client_indicator") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.145+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.805+02:00", comments="Source Table: client_indicator") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -55,7 +55,7 @@ public interface ClientIndicatorRecordMapper { }) ClientIndicatorRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.145+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.806+02:00", comments="Source Table: client_indicator") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -65,22 +65,22 @@ public interface ClientIndicatorRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.145+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.806+02:00", comments="Source Table: client_indicator") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.145+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.806+02:00", comments="Source Table: client_indicator") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(clientIndicatorRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.145+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.806+02:00", comments="Source Table: client_indicator") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, clientIndicatorRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.145+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.806+02:00", comments="Source Table: client_indicator") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, clientIndicatorRecord) .where(id, isEqualTo(id_)) @@ -88,7 +88,7 @@ public interface ClientIndicatorRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.145+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.806+02:00", comments="Source Table: client_indicator") default int insert(ClientIndicatorRecord record) { return insert(SqlBuilder.insert(record) .into(clientIndicatorRecord) @@ -99,7 +99,7 @@ public interface ClientIndicatorRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.145+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.806+02:00", comments="Source Table: client_indicator") default int insertSelective(ClientIndicatorRecord record) { return insert(SqlBuilder.insert(record) .into(clientIndicatorRecord) @@ -110,19 +110,19 @@ public interface ClientIndicatorRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.145+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.806+02:00", comments="Source Table: client_indicator") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, clientConnectionId, type, value) .from(clientIndicatorRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.145+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.806+02:00", comments="Source Table: client_indicator") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, clientConnectionId, type, value) .from(clientIndicatorRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.145+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.806+02:00", comments="Source Table: client_indicator") default ClientIndicatorRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, clientConnectionId, type, value) .from(clientIndicatorRecord) @@ -131,7 +131,7 @@ public interface ClientIndicatorRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.145+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.807+02:00", comments="Source Table: client_indicator") default UpdateDSL> updateByExample(ClientIndicatorRecord record) { return UpdateDSL.updateWithMapper(this::update, clientIndicatorRecord) .set(clientConnectionId).equalTo(record::getClientConnectionId) @@ -139,7 +139,7 @@ public interface ClientIndicatorRecordMapper { .set(value).equalTo(record::getValue); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.145+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.807+02:00", comments="Source Table: client_indicator") default UpdateDSL> updateByExampleSelective(ClientIndicatorRecord record) { return UpdateDSL.updateWithMapper(this::update, clientIndicatorRecord) .set(clientConnectionId).equalToWhenPresent(record::getClientConnectionId) @@ -147,7 +147,7 @@ public interface ClientIndicatorRecordMapper { .set(value).equalToWhenPresent(record::getValue); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.145+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.807+02:00", comments="Source Table: client_indicator") default int updateByPrimaryKey(ClientIndicatorRecord record) { return UpdateDSL.updateWithMapper(this::update, clientIndicatorRecord) .set(clientConnectionId).equalTo(record::getClientConnectionId) @@ -158,7 +158,7 @@ public interface ClientIndicatorRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.145+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.807+02:00", comments="Source Table: client_indicator") default int updateByPrimaryKeySelective(ClientIndicatorRecord record) { return UpdateDSL.updateWithMapper(this::update, clientIndicatorRecord) .set(clientConnectionId).equalToWhenPresent(record::getClientConnectionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientInstructionRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientInstructionRecordDynamicSqlSupport.java index b9c4036d..c9665d9d 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientInstructionRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientInstructionRecordDynamicSqlSupport.java @@ -6,31 +6,31 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ClientInstructionRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.106+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.752+02:00", comments="Source Table: client_instruction") public static final ClientInstructionRecord clientInstructionRecord = new ClientInstructionRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.106+02:00", comments="Source field: client_instruction.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.753+02:00", comments="Source field: client_instruction.id") public static final SqlColumn id = clientInstructionRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.106+02:00", comments="Source field: client_instruction.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.753+02:00", comments="Source field: client_instruction.exam_id") public static final SqlColumn examId = clientInstructionRecord.examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.106+02:00", comments="Source field: client_instruction.connection_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.753+02:00", comments="Source field: client_instruction.connection_token") public static final SqlColumn connectionToken = clientInstructionRecord.connectionToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.106+02:00", comments="Source field: client_instruction.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.753+02:00", comments="Source field: client_instruction.type") public static final SqlColumn type = clientInstructionRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.106+02:00", comments="Source field: client_instruction.attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.753+02:00", comments="Source field: client_instruction.attributes") public static final SqlColumn attributes = clientInstructionRecord.attributes; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.106+02:00", comments="Source field: client_instruction.needs_confirmation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.753+02:00", comments="Source field: client_instruction.needs_confirmation") public static final SqlColumn needsConfirmation = clientInstructionRecord.needsConfirmation; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.106+02:00", comments="Source field: client_instruction.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.753+02:00", comments="Source field: client_instruction.timestamp") public static final SqlColumn timestamp = clientInstructionRecord.timestamp; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.106+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.753+02:00", comments="Source Table: client_instruction") public static final class ClientInstructionRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientInstructionRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientInstructionRecordMapper.java index a2f32dc5..e86f01ef 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientInstructionRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientInstructionRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ClientInstructionRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.106+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.753+02:00", comments="Source Table: client_instruction") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.106+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.753+02:00", comments="Source Table: client_instruction") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.106+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.753+02:00", comments="Source Table: client_instruction") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.106+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.753+02:00", comments="Source Table: client_instruction") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -58,7 +58,7 @@ public interface ClientInstructionRecordMapper { }) ClientInstructionRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.106+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.753+02:00", comments="Source Table: client_instruction") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -71,22 +71,22 @@ public interface ClientInstructionRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.106+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.753+02:00", comments="Source Table: client_instruction") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.106+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.753+02:00", comments="Source Table: client_instruction") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(clientInstructionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.106+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.753+02:00", comments="Source Table: client_instruction") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, clientInstructionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.107+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.753+02:00", comments="Source Table: client_instruction") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, clientInstructionRecord) .where(id, isEqualTo(id_)) @@ -94,7 +94,7 @@ public interface ClientInstructionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.107+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.753+02:00", comments="Source Table: client_instruction") default int insert(ClientInstructionRecord record) { return insert(SqlBuilder.insert(record) .into(clientInstructionRecord) @@ -108,7 +108,7 @@ public interface ClientInstructionRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.107+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.753+02:00", comments="Source Table: client_instruction") default int insertSelective(ClientInstructionRecord record) { return insert(SqlBuilder.insert(record) .into(clientInstructionRecord) @@ -122,19 +122,19 @@ public interface ClientInstructionRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.107+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.753+02:00", comments="Source Table: client_instruction") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, examId, connectionToken, type, attributes, needsConfirmation, timestamp) .from(clientInstructionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.107+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.753+02:00", comments="Source Table: client_instruction") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, examId, connectionToken, type, attributes, needsConfirmation, timestamp) .from(clientInstructionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.107+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.754+02:00", comments="Source Table: client_instruction") default ClientInstructionRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, examId, connectionToken, type, attributes, needsConfirmation, timestamp) .from(clientInstructionRecord) @@ -143,7 +143,7 @@ public interface ClientInstructionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.107+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.754+02:00", comments="Source Table: client_instruction") default UpdateDSL> updateByExample(ClientInstructionRecord record) { return UpdateDSL.updateWithMapper(this::update, clientInstructionRecord) .set(examId).equalTo(record::getExamId) @@ -154,7 +154,7 @@ public interface ClientInstructionRecordMapper { .set(timestamp).equalTo(record::getTimestamp); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.107+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.754+02:00", comments="Source Table: client_instruction") default UpdateDSL> updateByExampleSelective(ClientInstructionRecord record) { return UpdateDSL.updateWithMapper(this::update, clientInstructionRecord) .set(examId).equalToWhenPresent(record::getExamId) @@ -165,7 +165,7 @@ public interface ClientInstructionRecordMapper { .set(timestamp).equalToWhenPresent(record::getTimestamp); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.107+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.754+02:00", comments="Source Table: client_instruction") default int updateByPrimaryKey(ClientInstructionRecord record) { return UpdateDSL.updateWithMapper(this::update, clientInstructionRecord) .set(examId).equalTo(record::getExamId) @@ -179,7 +179,7 @@ public interface ClientInstructionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.107+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.754+02:00", comments="Source Table: client_instruction") default int updateByPrimaryKeySelective(ClientInstructionRecord record) { return UpdateDSL.updateWithMapper(this::update, clientInstructionRecord) .set(examId).equalToWhenPresent(record::getExamId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientNotificationRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientNotificationRecordDynamicSqlSupport.java index ef9adaca..7ad65e73 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientNotificationRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientNotificationRecordDynamicSqlSupport.java @@ -6,28 +6,28 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ClientNotificationRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.146+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.808+02:00", comments="Source Table: client_notification") public static final ClientNotificationRecord clientNotificationRecord = new ClientNotificationRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.146+02:00", comments="Source field: client_notification.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.808+02:00", comments="Source field: client_notification.id") public static final SqlColumn id = clientNotificationRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.146+02:00", comments="Source field: client_notification.client_connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.808+02:00", comments="Source field: client_notification.client_connection_id") public static final SqlColumn clientConnectionId = clientNotificationRecord.clientConnectionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.146+02:00", comments="Source field: client_notification.event_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.808+02:00", comments="Source field: client_notification.event_type") public static final SqlColumn eventType = clientNotificationRecord.eventType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.146+02:00", comments="Source field: client_notification.notification_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.808+02:00", comments="Source field: client_notification.notification_type") public static final SqlColumn notificationType = clientNotificationRecord.notificationType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.146+02:00", comments="Source field: client_notification.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.808+02:00", comments="Source field: client_notification.value") public static final SqlColumn value = clientNotificationRecord.value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.146+02:00", comments="Source field: client_notification.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.808+02:00", comments="Source field: client_notification.text") public static final SqlColumn text = clientNotificationRecord.text; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.146+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.808+02:00", comments="Source Table: client_notification") public static final class ClientNotificationRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientNotificationRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientNotificationRecordMapper.java index ee79389d..612784c7 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientNotificationRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientNotificationRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ClientNotificationRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.146+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.808+02:00", comments="Source Table: client_notification") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.146+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.808+02:00", comments="Source Table: client_notification") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.146+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.808+02:00", comments="Source Table: client_notification") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.146+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.808+02:00", comments="Source Table: client_notification") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -57,7 +57,7 @@ public interface ClientNotificationRecordMapper { }) ClientNotificationRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.147+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.808+02:00", comments="Source Table: client_notification") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -69,22 +69,22 @@ public interface ClientNotificationRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.147+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.808+02:00", comments="Source Table: client_notification") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.147+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.808+02:00", comments="Source Table: client_notification") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(clientNotificationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.147+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.808+02:00", comments="Source Table: client_notification") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, clientNotificationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.147+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.808+02:00", comments="Source Table: client_notification") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, clientNotificationRecord) .where(id, isEqualTo(id_)) @@ -92,7 +92,7 @@ public interface ClientNotificationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.147+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.808+02:00", comments="Source Table: client_notification") default int insert(ClientNotificationRecord record) { return insert(SqlBuilder.insert(record) .into(clientNotificationRecord) @@ -105,7 +105,7 @@ public interface ClientNotificationRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.147+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.808+02:00", comments="Source Table: client_notification") default int insertSelective(ClientNotificationRecord record) { return insert(SqlBuilder.insert(record) .into(clientNotificationRecord) @@ -118,19 +118,19 @@ public interface ClientNotificationRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.147+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.808+02:00", comments="Source Table: client_notification") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, clientConnectionId, eventType, notificationType, value, text) .from(clientNotificationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.147+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.808+02:00", comments="Source Table: client_notification") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, clientConnectionId, eventType, notificationType, value, text) .from(clientNotificationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.147+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.808+02:00", comments="Source Table: client_notification") default ClientNotificationRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, clientConnectionId, eventType, notificationType, value, text) .from(clientNotificationRecord) @@ -139,7 +139,7 @@ public interface ClientNotificationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.147+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.809+02:00", comments="Source Table: client_notification") default UpdateDSL> updateByExample(ClientNotificationRecord record) { return UpdateDSL.updateWithMapper(this::update, clientNotificationRecord) .set(clientConnectionId).equalTo(record::getClientConnectionId) @@ -149,7 +149,7 @@ public interface ClientNotificationRecordMapper { .set(text).equalTo(record::getText); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.147+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.809+02:00", comments="Source Table: client_notification") default UpdateDSL> updateByExampleSelective(ClientNotificationRecord record) { return UpdateDSL.updateWithMapper(this::update, clientNotificationRecord) .set(clientConnectionId).equalToWhenPresent(record::getClientConnectionId) @@ -159,7 +159,7 @@ public interface ClientNotificationRecordMapper { .set(text).equalToWhenPresent(record::getText); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.147+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.809+02:00", comments="Source Table: client_notification") default int updateByPrimaryKey(ClientNotificationRecord record) { return UpdateDSL.updateWithMapper(this::update, clientNotificationRecord) .set(clientConnectionId).equalTo(record::getClientConnectionId) @@ -172,7 +172,7 @@ public interface ClientNotificationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.147+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.809+02:00", comments="Source Table: client_notification") default int updateByPrimaryKeySelective(ClientNotificationRecord record) { return UpdateDSL.updateWithMapper(this::update, clientNotificationRecord) .set(clientConnectionId).equalToWhenPresent(record::getClientConnectionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordDynamicSqlSupport.java index 5514f3db..736e651a 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordDynamicSqlSupport.java @@ -6,34 +6,34 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ConfigurationAttributeRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.900+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.580+02:00", comments="Source Table: configuration_attribute") public static final ConfigurationAttributeRecord configurationAttributeRecord = new ConfigurationAttributeRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.901+02:00", comments="Source field: configuration_attribute.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.581+02:00", comments="Source field: configuration_attribute.id") public static final SqlColumn id = configurationAttributeRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.902+02:00", comments="Source field: configuration_attribute.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.582+02:00", comments="Source field: configuration_attribute.name") public static final SqlColumn name = configurationAttributeRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.902+02:00", comments="Source field: configuration_attribute.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.582+02:00", comments="Source field: configuration_attribute.type") public static final SqlColumn type = configurationAttributeRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.902+02:00", comments="Source field: configuration_attribute.parent_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.583+02:00", comments="Source field: configuration_attribute.parent_id") public static final SqlColumn parentId = configurationAttributeRecord.parentId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.903+02:00", comments="Source field: configuration_attribute.resources") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.583+02:00", comments="Source field: configuration_attribute.resources") public static final SqlColumn resources = configurationAttributeRecord.resources; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.903+02:00", comments="Source field: configuration_attribute.validator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.583+02:00", comments="Source field: configuration_attribute.validator") public static final SqlColumn validator = configurationAttributeRecord.validator; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.903+02:00", comments="Source field: configuration_attribute.dependencies") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.583+02:00", comments="Source field: configuration_attribute.dependencies") public static final SqlColumn dependencies = configurationAttributeRecord.dependencies; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.903+02:00", comments="Source field: configuration_attribute.default_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.583+02:00", comments="Source field: configuration_attribute.default_value") public static final SqlColumn defaultValue = configurationAttributeRecord.defaultValue; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.901+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.581+02:00", comments="Source Table: configuration_attribute") public static final class ConfigurationAttributeRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordMapper.java index 3032b311..90a13edb 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ConfigurationAttributeRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.904+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.584+02:00", comments="Source Table: configuration_attribute") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.905+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.585+02:00", comments="Source Table: configuration_attribute") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.906+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.586+02:00", comments="Source Table: configuration_attribute") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.908+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.587+02:00", comments="Source Table: configuration_attribute") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -59,7 +59,7 @@ public interface ConfigurationAttributeRecordMapper { }) ConfigurationAttributeRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.909+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.588+02:00", comments="Source Table: configuration_attribute") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -73,22 +73,22 @@ public interface ConfigurationAttributeRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.910+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.589+02:00", comments="Source Table: configuration_attribute") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.911+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.590+02:00", comments="Source Table: configuration_attribute") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(configurationAttributeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.912+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.590+02:00", comments="Source Table: configuration_attribute") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, configurationAttributeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.913+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.591+02:00", comments="Source Table: configuration_attribute") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, configurationAttributeRecord) .where(id, isEqualTo(id_)) @@ -96,7 +96,7 @@ public interface ConfigurationAttributeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.914+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.592+02:00", comments="Source Table: configuration_attribute") default int insert(ConfigurationAttributeRecord record) { return insert(SqlBuilder.insert(record) .into(configurationAttributeRecord) @@ -111,7 +111,7 @@ public interface ConfigurationAttributeRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.916+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.593+02:00", comments="Source Table: configuration_attribute") default int insertSelective(ConfigurationAttributeRecord record) { return insert(SqlBuilder.insert(record) .into(configurationAttributeRecord) @@ -126,19 +126,19 @@ public interface ConfigurationAttributeRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.917+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.594+02:00", comments="Source Table: configuration_attribute") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, name, type, parentId, resources, validator, dependencies, defaultValue) .from(configurationAttributeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.917+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.595+02:00", comments="Source Table: configuration_attribute") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, name, type, parentId, resources, validator, dependencies, defaultValue) .from(configurationAttributeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.918+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.596+02:00", comments="Source Table: configuration_attribute") default ConfigurationAttributeRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, name, type, parentId, resources, validator, dependencies, defaultValue) .from(configurationAttributeRecord) @@ -147,7 +147,7 @@ public interface ConfigurationAttributeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.919+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.597+02:00", comments="Source Table: configuration_attribute") default UpdateDSL> updateByExample(ConfigurationAttributeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord) .set(name).equalTo(record::getName) @@ -159,7 +159,7 @@ public interface ConfigurationAttributeRecordMapper { .set(defaultValue).equalTo(record::getDefaultValue); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.920+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.597+02:00", comments="Source Table: configuration_attribute") default UpdateDSL> updateByExampleSelective(ConfigurationAttributeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord) .set(name).equalToWhenPresent(record::getName) @@ -171,7 +171,7 @@ public interface ConfigurationAttributeRecordMapper { .set(defaultValue).equalToWhenPresent(record::getDefaultValue); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.921+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.598+02:00", comments="Source Table: configuration_attribute") default int updateByPrimaryKey(ConfigurationAttributeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord) .set(name).equalTo(record::getName) @@ -186,7 +186,7 @@ public interface ConfigurationAttributeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.922+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.599+02:00", comments="Source Table: configuration_attribute") default int updateByPrimaryKeySelective(ConfigurationAttributeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord) .set(name).equalToWhenPresent(record::getName) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordDynamicSqlSupport.java index 455a2173..2ae9592f 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordDynamicSqlSupport.java @@ -6,40 +6,40 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ConfigurationNodeRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.067+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.722+02:00", comments="Source Table: configuration_node") public static final ConfigurationNodeRecord configurationNodeRecord = new ConfigurationNodeRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.067+02:00", comments="Source field: configuration_node.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.723+02:00", comments="Source field: configuration_node.id") public static final SqlColumn id = configurationNodeRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.068+02:00", comments="Source field: configuration_node.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.723+02:00", comments="Source field: configuration_node.institution_id") public static final SqlColumn institutionId = configurationNodeRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.068+02:00", comments="Source field: configuration_node.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.723+02:00", comments="Source field: configuration_node.template_id") public static final SqlColumn templateId = configurationNodeRecord.templateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.068+02:00", comments="Source field: configuration_node.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.723+02:00", comments="Source field: configuration_node.owner") public static final SqlColumn owner = configurationNodeRecord.owner; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.068+02:00", comments="Source field: configuration_node.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.723+02:00", comments="Source field: configuration_node.name") public static final SqlColumn name = configurationNodeRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.068+02:00", comments="Source field: configuration_node.description") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.723+02:00", comments="Source field: configuration_node.description") public static final SqlColumn description = configurationNodeRecord.description; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.068+02:00", comments="Source field: configuration_node.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.724+02:00", comments="Source field: configuration_node.type") public static final SqlColumn type = configurationNodeRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.068+02:00", comments="Source field: configuration_node.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.724+02:00", comments="Source field: configuration_node.status") public static final SqlColumn status = configurationNodeRecord.status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.068+02:00", comments="Source field: configuration_node.last_update_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.724+02:00", comments="Source field: configuration_node.last_update_time") public static final SqlColumn lastUpdateTime = configurationNodeRecord.lastUpdateTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.068+02:00", comments="Source field: configuration_node.last_update_user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.724+02:00", comments="Source field: configuration_node.last_update_user") public static final SqlColumn lastUpdateUser = configurationNodeRecord.lastUpdateUser; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.067+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.723+02:00", comments="Source Table: configuration_node") public static final class ConfigurationNodeRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordMapper.java index f82483f9..f61c4360 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ConfigurationNodeRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.068+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.724+02:00", comments="Source Table: configuration_node") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.069+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.724+02:00", comments="Source Table: configuration_node") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.069+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.724+02:00", comments="Source Table: configuration_node") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.069+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.724+02:00", comments="Source Table: configuration_node") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -61,7 +61,7 @@ public interface ConfigurationNodeRecordMapper { }) ConfigurationNodeRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.069+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.724+02:00", comments="Source Table: configuration_node") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -77,22 +77,22 @@ public interface ConfigurationNodeRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.069+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.724+02:00", comments="Source Table: configuration_node") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.069+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.724+02:00", comments="Source Table: configuration_node") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(configurationNodeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.069+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.724+02:00", comments="Source Table: configuration_node") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, configurationNodeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.069+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.725+02:00", comments="Source Table: configuration_node") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, configurationNodeRecord) .where(id, isEqualTo(id_)) @@ -100,7 +100,7 @@ public interface ConfigurationNodeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.069+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.725+02:00", comments="Source Table: configuration_node") default int insert(ConfigurationNodeRecord record) { return insert(SqlBuilder.insert(record) .into(configurationNodeRecord) @@ -117,7 +117,7 @@ public interface ConfigurationNodeRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.069+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.725+02:00", comments="Source Table: configuration_node") default int insertSelective(ConfigurationNodeRecord record) { return insert(SqlBuilder.insert(record) .into(configurationNodeRecord) @@ -134,19 +134,19 @@ public interface ConfigurationNodeRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.069+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.725+02:00", comments="Source Table: configuration_node") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, templateId, owner, name, description, type, status, lastUpdateTime, lastUpdateUser) .from(configurationNodeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.069+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.725+02:00", comments="Source Table: configuration_node") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, templateId, owner, name, description, type, status, lastUpdateTime, lastUpdateUser) .from(configurationNodeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.069+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.725+02:00", comments="Source Table: configuration_node") default ConfigurationNodeRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, templateId, owner, name, description, type, status, lastUpdateTime, lastUpdateUser) .from(configurationNodeRecord) @@ -155,7 +155,7 @@ public interface ConfigurationNodeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.069+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.725+02:00", comments="Source Table: configuration_node") default UpdateDSL> updateByExample(ConfigurationNodeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -169,7 +169,7 @@ public interface ConfigurationNodeRecordMapper { .set(lastUpdateUser).equalTo(record::getLastUpdateUser); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.070+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.725+02:00", comments="Source Table: configuration_node") default UpdateDSL> updateByExampleSelective(ConfigurationNodeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -183,7 +183,7 @@ public interface ConfigurationNodeRecordMapper { .set(lastUpdateUser).equalToWhenPresent(record::getLastUpdateUser); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.070+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.725+02:00", comments="Source Table: configuration_node") default int updateByPrimaryKey(ConfigurationNodeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -200,7 +200,7 @@ public interface ConfigurationNodeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.070+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.725+02:00", comments="Source Table: configuration_node") default int updateByPrimaryKeySelective(ConfigurationNodeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordDynamicSqlSupport.java index 3abb40aa..54f494d0 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordDynamicSqlSupport.java @@ -7,28 +7,28 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ConfigurationRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.064+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.717+02:00", comments="Source Table: configuration") public static final ConfigurationRecord configurationRecord = new ConfigurationRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.064+02:00", comments="Source field: configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.717+02:00", comments="Source field: configuration.id") public static final SqlColumn id = configurationRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.065+02:00", comments="Source field: configuration.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.718+02:00", comments="Source field: configuration.institution_id") public static final SqlColumn institutionId = configurationRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.065+02:00", comments="Source field: configuration.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.718+02:00", comments="Source field: configuration.configuration_node_id") public static final SqlColumn configurationNodeId = configurationRecord.configurationNodeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.065+02:00", comments="Source field: configuration.version") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.718+02:00", comments="Source field: configuration.version") public static final SqlColumn version = configurationRecord.version; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.065+02:00", comments="Source field: configuration.version_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.718+02:00", comments="Source field: configuration.version_date") public static final SqlColumn versionDate = configurationRecord.versionDate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.065+02:00", comments="Source field: configuration.followup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.718+02:00", comments="Source field: configuration.followup") public static final SqlColumn followup = configurationRecord.followup; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.064+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.717+02:00", comments="Source Table: configuration") public static final class ConfigurationRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordMapper.java index 7a1c0270..47651d8a 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordMapper.java @@ -34,20 +34,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ConfigurationRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.065+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.718+02:00", comments="Source Table: configuration") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.065+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.718+02:00", comments="Source Table: configuration") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.065+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.718+02:00", comments="Source Table: configuration") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.065+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.718+02:00", comments="Source Table: configuration") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -59,7 +59,7 @@ public interface ConfigurationRecordMapper { }) ConfigurationRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.065+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.719+02:00", comments="Source Table: configuration") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -71,22 +71,22 @@ public interface ConfigurationRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.065+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.719+02:00", comments="Source Table: configuration") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.065+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.719+02:00", comments="Source Table: configuration") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(configurationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.065+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.719+02:00", comments="Source Table: configuration") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, configurationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.065+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.719+02:00", comments="Source Table: configuration") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, configurationRecord) .where(id, isEqualTo(id_)) @@ -94,7 +94,7 @@ public interface ConfigurationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.065+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.719+02:00", comments="Source Table: configuration") default int insert(ConfigurationRecord record) { return insert(SqlBuilder.insert(record) .into(configurationRecord) @@ -107,7 +107,7 @@ public interface ConfigurationRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.066+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.719+02:00", comments="Source Table: configuration") default int insertSelective(ConfigurationRecord record) { return insert(SqlBuilder.insert(record) .into(configurationRecord) @@ -120,19 +120,19 @@ public interface ConfigurationRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.066+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.719+02:00", comments="Source Table: configuration") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, configurationNodeId, version, versionDate, followup) .from(configurationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.066+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.719+02:00", comments="Source Table: configuration") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, configurationNodeId, version, versionDate, followup) .from(configurationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.066+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.719+02:00", comments="Source Table: configuration") default ConfigurationRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, configurationNodeId, version, versionDate, followup) .from(configurationRecord) @@ -141,7 +141,7 @@ public interface ConfigurationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.066+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.719+02:00", comments="Source Table: configuration") default UpdateDSL> updateByExample(ConfigurationRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -151,7 +151,7 @@ public interface ConfigurationRecordMapper { .set(followup).equalTo(record::getFollowup); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.066+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.719+02:00", comments="Source Table: configuration") default UpdateDSL> updateByExampleSelective(ConfigurationRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -161,7 +161,7 @@ public interface ConfigurationRecordMapper { .set(followup).equalToWhenPresent(record::getFollowup); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.066+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.719+02:00", comments="Source Table: configuration") default int updateByPrimaryKey(ConfigurationRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -174,7 +174,7 @@ public interface ConfigurationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.066+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.720+02:00", comments="Source Table: configuration") default int updateByPrimaryKeySelective(ConfigurationRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordDynamicSqlSupport.java index e747b6b7..4d64a55b 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordDynamicSqlSupport.java @@ -6,28 +6,28 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ConfigurationValueRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.047+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.704+02:00", comments="Source Table: configuration_value") public static final ConfigurationValueRecord configurationValueRecord = new ConfigurationValueRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.047+02:00", comments="Source field: configuration_value.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.704+02:00", comments="Source field: configuration_value.id") public static final SqlColumn id = configurationValueRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.048+02:00", comments="Source field: configuration_value.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.704+02:00", comments="Source field: configuration_value.institution_id") public static final SqlColumn institutionId = configurationValueRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.048+02:00", comments="Source field: configuration_value.configuration_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.705+02:00", comments="Source field: configuration_value.configuration_id") public static final SqlColumn configurationId = configurationValueRecord.configurationId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.048+02:00", comments="Source field: configuration_value.configuration_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.705+02:00", comments="Source field: configuration_value.configuration_attribute_id") public static final SqlColumn configurationAttributeId = configurationValueRecord.configurationAttributeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.048+02:00", comments="Source field: configuration_value.list_index") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.705+02:00", comments="Source field: configuration_value.list_index") public static final SqlColumn listIndex = configurationValueRecord.listIndex; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.048+02:00", comments="Source field: configuration_value.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.705+02:00", comments="Source field: configuration_value.value") public static final SqlColumn value = configurationValueRecord.value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.047+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.704+02:00", comments="Source Table: configuration_value") public static final class ConfigurationValueRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordMapper.java index a37c90ec..486e8084 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordMapper.java @@ -31,19 +31,19 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ConfigurationValueRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.048+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.705+02:00", comments="Source Table: configuration_value") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.048+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.705+02:00", comments="Source Table: configuration_value") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.048+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.705+02:00", comments="Source Table: configuration_value") @InsertProvider(type=SqlProviderAdapter.class, method="insert") int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.048+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.705+02:00", comments="Source Table: configuration_value") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -55,7 +55,7 @@ public interface ConfigurationValueRecordMapper { }) ConfigurationValueRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.048+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.706+02:00", comments="Source Table: configuration_value") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -67,22 +67,22 @@ public interface ConfigurationValueRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.049+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.706+02:00", comments="Source Table: configuration_value") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.049+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.706+02:00", comments="Source Table: configuration_value") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(configurationValueRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.049+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.706+02:00", comments="Source Table: configuration_value") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, configurationValueRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.049+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.706+02:00", comments="Source Table: configuration_value") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, configurationValueRecord) .where(id, isEqualTo(id_)) @@ -90,7 +90,7 @@ public interface ConfigurationValueRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.049+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.706+02:00", comments="Source Table: configuration_value") default int insert(ConfigurationValueRecord record) { return insert(SqlBuilder.insert(record) .into(configurationValueRecord) @@ -104,7 +104,7 @@ public interface ConfigurationValueRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.049+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.706+02:00", comments="Source Table: configuration_value") default int insertSelective(ConfigurationValueRecord record) { return insert(SqlBuilder.insert(record) .into(configurationValueRecord) @@ -118,19 +118,19 @@ public interface ConfigurationValueRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.049+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.706+02:00", comments="Source Table: configuration_value") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, configurationId, configurationAttributeId, listIndex, value) .from(configurationValueRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.049+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.706+02:00", comments="Source Table: configuration_value") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, configurationId, configurationAttributeId, listIndex, value) .from(configurationValueRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.049+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.706+02:00", comments="Source Table: configuration_value") default ConfigurationValueRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, configurationId, configurationAttributeId, listIndex, value) .from(configurationValueRecord) @@ -139,7 +139,7 @@ public interface ConfigurationValueRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.049+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.706+02:00", comments="Source Table: configuration_value") default UpdateDSL> updateByExample(ConfigurationValueRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationValueRecord) .set(id).equalTo(record::getId) @@ -150,7 +150,7 @@ public interface ConfigurationValueRecordMapper { .set(value).equalTo(record::getValue); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.049+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.706+02:00", comments="Source Table: configuration_value") default UpdateDSL> updateByExampleSelective(ConfigurationValueRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationValueRecord) .set(id).equalToWhenPresent(record::getId) @@ -161,7 +161,7 @@ public interface ConfigurationValueRecordMapper { .set(value).equalToWhenPresent(record::getValue); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.049+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.706+02:00", comments="Source Table: configuration_value") default int updateByPrimaryKey(ConfigurationValueRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationValueRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -174,7 +174,7 @@ public interface ConfigurationValueRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.050+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.706+02:00", comments="Source Table: configuration_value") default int updateByPrimaryKeySelective(ConfigurationValueRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationValueRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordDynamicSqlSupport.java index edcc8c35..072bb974 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordDynamicSqlSupport.java @@ -6,28 +6,28 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ExamConfigurationMapRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.072+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.729+02:00", comments="Source Table: exam_configuration_map") public static final ExamConfigurationMapRecord examConfigurationMapRecord = new ExamConfigurationMapRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.073+02:00", comments="Source field: exam_configuration_map.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.729+02:00", comments="Source field: exam_configuration_map.id") public static final SqlColumn id = examConfigurationMapRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.073+02:00", comments="Source field: exam_configuration_map.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.729+02:00", comments="Source field: exam_configuration_map.institution_id") public static final SqlColumn institutionId = examConfigurationMapRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.073+02:00", comments="Source field: exam_configuration_map.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.729+02:00", comments="Source field: exam_configuration_map.exam_id") public static final SqlColumn examId = examConfigurationMapRecord.examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.073+02:00", comments="Source field: exam_configuration_map.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.729+02:00", comments="Source field: exam_configuration_map.configuration_node_id") public static final SqlColumn configurationNodeId = examConfigurationMapRecord.configurationNodeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.073+02:00", comments="Source field: exam_configuration_map.encrypt_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.729+02:00", comments="Source field: exam_configuration_map.encrypt_secret") public static final SqlColumn encryptSecret = examConfigurationMapRecord.encryptSecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.073+02:00", comments="Source field: exam_configuration_map.client_group_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.729+02:00", comments="Source field: exam_configuration_map.client_group_id") public static final SqlColumn clientGroupId = examConfigurationMapRecord.clientGroupId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.073+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.729+02:00", comments="Source Table: exam_configuration_map") public static final class ExamConfigurationMapRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordMapper.java index 43f2d050..b94bcced 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ExamConfigurationMapRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.073+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.729+02:00", comments="Source Table: exam_configuration_map") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.073+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.729+02:00", comments="Source Table: exam_configuration_map") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.073+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.729+02:00", comments="Source Table: exam_configuration_map") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.074+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.729+02:00", comments="Source Table: exam_configuration_map") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -57,7 +57,7 @@ public interface ExamConfigurationMapRecordMapper { }) ExamConfigurationMapRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.074+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.730+02:00", comments="Source Table: exam_configuration_map") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -69,22 +69,22 @@ public interface ExamConfigurationMapRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.074+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.730+02:00", comments="Source Table: exam_configuration_map") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.074+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.730+02:00", comments="Source Table: exam_configuration_map") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(examConfigurationMapRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.074+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.730+02:00", comments="Source Table: exam_configuration_map") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, examConfigurationMapRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.074+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.730+02:00", comments="Source Table: exam_configuration_map") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, examConfigurationMapRecord) .where(id, isEqualTo(id_)) @@ -92,7 +92,7 @@ public interface ExamConfigurationMapRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.074+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.730+02:00", comments="Source Table: exam_configuration_map") default int insert(ExamConfigurationMapRecord record) { return insert(SqlBuilder.insert(record) .into(examConfigurationMapRecord) @@ -105,7 +105,7 @@ public interface ExamConfigurationMapRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.074+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.730+02:00", comments="Source Table: exam_configuration_map") default int insertSelective(ExamConfigurationMapRecord record) { return insert(SqlBuilder.insert(record) .into(examConfigurationMapRecord) @@ -118,19 +118,19 @@ public interface ExamConfigurationMapRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.074+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.730+02:00", comments="Source Table: exam_configuration_map") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, examId, configurationNodeId, encryptSecret, clientGroupId) .from(examConfigurationMapRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.075+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.730+02:00", comments="Source Table: exam_configuration_map") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, examId, configurationNodeId, encryptSecret, clientGroupId) .from(examConfigurationMapRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.075+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.730+02:00", comments="Source Table: exam_configuration_map") default ExamConfigurationMapRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, examId, configurationNodeId, encryptSecret, clientGroupId) .from(examConfigurationMapRecord) @@ -139,7 +139,7 @@ public interface ExamConfigurationMapRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.075+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.730+02:00", comments="Source Table: exam_configuration_map") default UpdateDSL> updateByExample(ExamConfigurationMapRecord record) { return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -149,7 +149,7 @@ public interface ExamConfigurationMapRecordMapper { .set(clientGroupId).equalTo(record::getClientGroupId); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.075+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.730+02:00", comments="Source Table: exam_configuration_map") default UpdateDSL> updateByExampleSelective(ExamConfigurationMapRecord record) { return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -159,7 +159,7 @@ public interface ExamConfigurationMapRecordMapper { .set(clientGroupId).equalToWhenPresent(record::getClientGroupId); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.075+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.730+02:00", comments="Source Table: exam_configuration_map") default int updateByPrimaryKey(ExamConfigurationMapRecord record) { return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -172,7 +172,7 @@ public interface ExamConfigurationMapRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.075+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.730+02:00", comments="Source Table: exam_configuration_map") default int updateByPrimaryKeySelective(ExamConfigurationMapRecord record) { return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordDynamicSqlSupport.java index 9f5d8a55..c6b71fd5 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordDynamicSqlSupport.java @@ -7,70 +7,70 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ExamRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.079+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.735+02:00", comments="Source Table: exam") public static final ExamRecord examRecord = new ExamRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.079+02:00", comments="Source field: exam.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.735+02:00", comments="Source field: exam.id") public static final SqlColumn id = examRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.079+02:00", comments="Source field: exam.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.735+02:00", comments="Source field: exam.institution_id") public static final SqlColumn institutionId = examRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.079+02:00", comments="Source field: exam.lms_setup_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.735+02:00", comments="Source field: exam.lms_setup_id") public static final SqlColumn lmsSetupId = examRecord.lmsSetupId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.079+02:00", comments="Source field: exam.external_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.735+02:00", comments="Source field: exam.external_id") public static final SqlColumn externalId = examRecord.externalId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.079+02:00", comments="Source field: exam.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.735+02:00", comments="Source field: exam.owner") public static final SqlColumn owner = examRecord.owner; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.080+02:00", comments="Source field: exam.supporter") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.735+02:00", comments="Source field: exam.supporter") public static final SqlColumn supporter = examRecord.supporter; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.080+02:00", comments="Source field: exam.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.736+02:00", comments="Source field: exam.type") public static final SqlColumn type = examRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.080+02:00", comments="Source field: exam.quit_password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.736+02:00", comments="Source field: exam.quit_password") public static final SqlColumn quitPassword = examRecord.quitPassword; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.080+02:00", comments="Source field: exam.browser_keys") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.736+02:00", comments="Source field: exam.browser_keys") public static final SqlColumn browserKeys = examRecord.browserKeys; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.080+02:00", comments="Source field: exam.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.736+02:00", comments="Source field: exam.status") public static final SqlColumn status = examRecord.status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.080+02:00", comments="Source field: exam.lms_seb_restriction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.736+02:00", comments="Source field: exam.lms_seb_restriction") public static final SqlColumn lmsSebRestriction = examRecord.lmsSebRestriction; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.080+02:00", comments="Source field: exam.updating") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.736+02:00", comments="Source field: exam.updating") public static final SqlColumn updating = examRecord.updating; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.080+02:00", comments="Source field: exam.lastupdate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.736+02:00", comments="Source field: exam.lastupdate") public static final SqlColumn lastupdate = examRecord.lastupdate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.080+02:00", comments="Source field: exam.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.736+02:00", comments="Source field: exam.active") public static final SqlColumn active = examRecord.active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.081+02:00", comments="Source field: exam.exam_template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.736+02:00", comments="Source field: exam.exam_template_id") public static final SqlColumn examTemplateId = examRecord.examTemplateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.081+02:00", comments="Source field: exam.last_modified") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.737+02:00", comments="Source field: exam.last_modified") public static final SqlColumn lastModified = examRecord.lastModified; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.081+02:00", comments="Source field: exam.quiz_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.737+02:00", comments="Source field: exam.quiz_name") public static final SqlColumn quizName = examRecord.quizName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.081+02:00", comments="Source field: exam.quiz_start_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.737+02:00", comments="Source field: exam.quiz_start_time") public static final SqlColumn quizStartTime = examRecord.quizStartTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.081+02:00", comments="Source field: exam.quiz_end_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.737+02:00", comments="Source field: exam.quiz_end_time") public static final SqlColumn quizEndTime = examRecord.quizEndTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.081+02:00", comments="Source field: exam.lms_available") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.737+02:00", comments="Source field: exam.lms_available") public static final SqlColumn lmsAvailable = examRecord.lmsAvailable; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.079+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.735+02:00", comments="Source Table: exam") public static final class ExamRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordMapper.java index 44ecd597..0c5e20f0 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordMapper.java @@ -34,20 +34,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ExamRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.081+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.737+02:00", comments="Source Table: exam") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.081+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.737+02:00", comments="Source Table: exam") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.082+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.737+02:00", comments="Source Table: exam") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.082+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.737+02:00", comments="Source Table: exam") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -73,7 +73,7 @@ public interface ExamRecordMapper { }) ExamRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.082+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.737+02:00", comments="Source Table: exam") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -99,22 +99,22 @@ public interface ExamRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.082+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.738+02:00", comments="Source Table: exam") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.082+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.738+02:00", comments="Source Table: exam") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(examRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.082+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.738+02:00", comments="Source Table: exam") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, examRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.082+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.738+02:00", comments="Source Table: exam") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, examRecord) .where(id, isEqualTo(id_)) @@ -122,7 +122,7 @@ public interface ExamRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.082+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.738+02:00", comments="Source Table: exam") default int insert(ExamRecord record) { return insert(SqlBuilder.insert(record) .into(examRecord) @@ -149,7 +149,7 @@ public interface ExamRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.082+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.738+02:00", comments="Source Table: exam") default int insertSelective(ExamRecord record) { return insert(SqlBuilder.insert(record) .into(examRecord) @@ -176,19 +176,19 @@ public interface ExamRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.083+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.738+02:00", comments="Source Table: exam") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, lmsSetupId, externalId, owner, supporter, type, quitPassword, browserKeys, status, lmsSebRestriction, updating, lastupdate, active, examTemplateId, lastModified, quizName, quizStartTime, quizEndTime, lmsAvailable) .from(examRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.083+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.738+02:00", comments="Source Table: exam") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, lmsSetupId, externalId, owner, supporter, type, quitPassword, browserKeys, status, lmsSebRestriction, updating, lastupdate, active, examTemplateId, lastModified, quizName, quizStartTime, quizEndTime, lmsAvailable) .from(examRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.083+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.738+02:00", comments="Source Table: exam") default ExamRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, lmsSetupId, externalId, owner, supporter, type, quitPassword, browserKeys, status, lmsSebRestriction, updating, lastupdate, active, examTemplateId, lastModified, quizName, quizStartTime, quizEndTime, lmsAvailable) .from(examRecord) @@ -197,7 +197,7 @@ public interface ExamRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.083+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.738+02:00", comments="Source Table: exam") default UpdateDSL> updateByExample(ExamRecord record) { return UpdateDSL.updateWithMapper(this::update, examRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -221,7 +221,7 @@ public interface ExamRecordMapper { .set(lmsAvailable).equalTo(record::getLmsAvailable); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.083+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.738+02:00", comments="Source Table: exam") default UpdateDSL> updateByExampleSelective(ExamRecord record) { return UpdateDSL.updateWithMapper(this::update, examRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -245,7 +245,7 @@ public interface ExamRecordMapper { .set(lmsAvailable).equalToWhenPresent(record::getLmsAvailable); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.083+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.738+02:00", comments="Source Table: exam") default int updateByPrimaryKey(ExamRecord record) { return UpdateDSL.updateWithMapper(this::update, examRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -272,7 +272,7 @@ public interface ExamRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.083+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.738+02:00", comments="Source Table: exam") default int updateByPrimaryKeySelective(ExamRecord record) { return UpdateDSL.updateWithMapper(this::update, examRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamTemplateRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamTemplateRecordDynamicSqlSupport.java index 477f4166..be9681ad 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamTemplateRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamTemplateRecordDynamicSqlSupport.java @@ -6,37 +6,37 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ExamTemplateRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.139+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.799+02:00", comments="Source Table: exam_template") public static final ExamTemplateRecord examTemplateRecord = new ExamTemplateRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.139+02:00", comments="Source field: exam_template.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.799+02:00", comments="Source field: exam_template.id") public static final SqlColumn id = examTemplateRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.139+02:00", comments="Source field: exam_template.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.800+02:00", comments="Source field: exam_template.institution_id") public static final SqlColumn institutionId = examTemplateRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.139+02:00", comments="Source field: exam_template.configuration_template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.800+02:00", comments="Source field: exam_template.configuration_template_id") public static final SqlColumn configurationTemplateId = examTemplateRecord.configurationTemplateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.140+02:00", comments="Source field: exam_template.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.800+02:00", comments="Source field: exam_template.name") public static final SqlColumn name = examTemplateRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.140+02:00", comments="Source field: exam_template.description") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.800+02:00", comments="Source field: exam_template.description") public static final SqlColumn description = examTemplateRecord.description; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.140+02:00", comments="Source field: exam_template.exam_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.800+02:00", comments="Source field: exam_template.exam_type") public static final SqlColumn examType = examTemplateRecord.examType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.140+02:00", comments="Source field: exam_template.supporter") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.800+02:00", comments="Source field: exam_template.supporter") public static final SqlColumn supporter = examTemplateRecord.supporter; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.140+02:00", comments="Source field: exam_template.indicator_templates") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.800+02:00", comments="Source field: exam_template.indicator_templates") public static final SqlColumn indicatorTemplates = examTemplateRecord.indicatorTemplates; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.140+02:00", comments="Source field: exam_template.institutional_default") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.800+02:00", comments="Source field: exam_template.institutional_default") public static final SqlColumn institutionalDefault = examTemplateRecord.institutionalDefault; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.139+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.799+02:00", comments="Source Table: exam_template") public static final class ExamTemplateRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamTemplateRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamTemplateRecordMapper.java index ef922261..2324ebdb 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamTemplateRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamTemplateRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ExamTemplateRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.140+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.800+02:00", comments="Source Table: exam_template") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.140+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.800+02:00", comments="Source Table: exam_template") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.140+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.801+02:00", comments="Source Table: exam_template") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.140+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.801+02:00", comments="Source Table: exam_template") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -60,7 +60,7 @@ public interface ExamTemplateRecordMapper { }) ExamTemplateRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.140+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.801+02:00", comments="Source Table: exam_template") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -75,22 +75,22 @@ public interface ExamTemplateRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.140+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.801+02:00", comments="Source Table: exam_template") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.140+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.801+02:00", comments="Source Table: exam_template") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(examTemplateRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.140+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.801+02:00", comments="Source Table: exam_template") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, examTemplateRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.140+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.801+02:00", comments="Source Table: exam_template") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, examTemplateRecord) .where(id, isEqualTo(id_)) @@ -98,7 +98,7 @@ public interface ExamTemplateRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.140+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.801+02:00", comments="Source Table: exam_template") default int insert(ExamTemplateRecord record) { return insert(SqlBuilder.insert(record) .into(examTemplateRecord) @@ -114,7 +114,7 @@ public interface ExamTemplateRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.140+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.801+02:00", comments="Source Table: exam_template") default int insertSelective(ExamTemplateRecord record) { return insert(SqlBuilder.insert(record) .into(examTemplateRecord) @@ -130,19 +130,19 @@ public interface ExamTemplateRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.141+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.801+02:00", comments="Source Table: exam_template") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, configurationTemplateId, name, description, examType, supporter, indicatorTemplates, institutionalDefault) .from(examTemplateRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.141+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.801+02:00", comments="Source Table: exam_template") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, configurationTemplateId, name, description, examType, supporter, indicatorTemplates, institutionalDefault) .from(examTemplateRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.141+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.801+02:00", comments="Source Table: exam_template") default ExamTemplateRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, configurationTemplateId, name, description, examType, supporter, indicatorTemplates, institutionalDefault) .from(examTemplateRecord) @@ -151,7 +151,7 @@ public interface ExamTemplateRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.141+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.801+02:00", comments="Source Table: exam_template") default UpdateDSL> updateByExample(ExamTemplateRecord record) { return UpdateDSL.updateWithMapper(this::update, examTemplateRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -164,7 +164,7 @@ public interface ExamTemplateRecordMapper { .set(institutionalDefault).equalTo(record::getInstitutionalDefault); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.141+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.801+02:00", comments="Source Table: exam_template") default UpdateDSL> updateByExampleSelective(ExamTemplateRecord record) { return UpdateDSL.updateWithMapper(this::update, examTemplateRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -177,7 +177,7 @@ public interface ExamTemplateRecordMapper { .set(institutionalDefault).equalToWhenPresent(record::getInstitutionalDefault); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.141+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.801+02:00", comments="Source Table: exam_template") default int updateByPrimaryKey(ExamTemplateRecord record) { return UpdateDSL.updateWithMapper(this::update, examTemplateRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -193,7 +193,7 @@ public interface ExamTemplateRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.141+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.801+02:00", comments="Source Table: exam_template") default int updateByPrimaryKeySelective(ExamTemplateRecord record) { return UpdateDSL.updateWithMapper(this::update, examTemplateRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordDynamicSqlSupport.java index e5a105b6..94e3e0ae 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordDynamicSqlSupport.java @@ -6,31 +6,31 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class IndicatorRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.109+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.755+02:00", comments="Source Table: indicator") public static final IndicatorRecord indicatorRecord = new IndicatorRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.109+02:00", comments="Source field: indicator.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.755+02:00", comments="Source field: indicator.id") public static final SqlColumn id = indicatorRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.110+02:00", comments="Source field: indicator.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.755+02:00", comments="Source field: indicator.exam_id") public static final SqlColumn examId = indicatorRecord.examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.110+02:00", comments="Source field: indicator.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.755+02:00", comments="Source field: indicator.type") public static final SqlColumn type = indicatorRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.110+02:00", comments="Source field: indicator.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.755+02:00", comments="Source field: indicator.name") public static final SqlColumn name = indicatorRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.110+02:00", comments="Source field: indicator.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.756+02:00", comments="Source field: indicator.color") public static final SqlColumn color = indicatorRecord.color; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.110+02:00", comments="Source field: indicator.icon") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.756+02:00", comments="Source field: indicator.icon") public static final SqlColumn icon = indicatorRecord.icon; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.110+02:00", comments="Source field: indicator.tags") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.756+02:00", comments="Source field: indicator.tags") public static final SqlColumn tags = indicatorRecord.tags; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.109+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.755+02:00", comments="Source Table: indicator") public static final class IndicatorRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordMapper.java index 26508297..66cd4ad2 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface IndicatorRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.110+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.756+02:00", comments="Source Table: indicator") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.110+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.756+02:00", comments="Source Table: indicator") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.110+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.756+02:00", comments="Source Table: indicator") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.110+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.756+02:00", comments="Source Table: indicator") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -58,7 +58,7 @@ public interface IndicatorRecordMapper { }) IndicatorRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.110+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.756+02:00", comments="Source Table: indicator") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -71,22 +71,22 @@ public interface IndicatorRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.110+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.756+02:00", comments="Source Table: indicator") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.110+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.756+02:00", comments="Source Table: indicator") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(indicatorRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.110+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.756+02:00", comments="Source Table: indicator") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, indicatorRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.111+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.756+02:00", comments="Source Table: indicator") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, indicatorRecord) .where(id, isEqualTo(id_)) @@ -94,7 +94,7 @@ public interface IndicatorRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.111+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.756+02:00", comments="Source Table: indicator") default int insert(IndicatorRecord record) { return insert(SqlBuilder.insert(record) .into(indicatorRecord) @@ -108,7 +108,7 @@ public interface IndicatorRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.111+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.756+02:00", comments="Source Table: indicator") default int insertSelective(IndicatorRecord record) { return insert(SqlBuilder.insert(record) .into(indicatorRecord) @@ -122,19 +122,19 @@ public interface IndicatorRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.111+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.756+02:00", comments="Source Table: indicator") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, examId, type, name, color, icon, tags) .from(indicatorRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.111+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.756+02:00", comments="Source Table: indicator") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, examId, type, name, color, icon, tags) .from(indicatorRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.111+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.756+02:00", comments="Source Table: indicator") default IndicatorRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, examId, type, name, color, icon, tags) .from(indicatorRecord) @@ -143,7 +143,7 @@ public interface IndicatorRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.111+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.756+02:00", comments="Source Table: indicator") default UpdateDSL> updateByExample(IndicatorRecord record) { return UpdateDSL.updateWithMapper(this::update, indicatorRecord) .set(examId).equalTo(record::getExamId) @@ -154,7 +154,7 @@ public interface IndicatorRecordMapper { .set(tags).equalTo(record::getTags); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.111+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.757+02:00", comments="Source Table: indicator") default UpdateDSL> updateByExampleSelective(IndicatorRecord record) { return UpdateDSL.updateWithMapper(this::update, indicatorRecord) .set(examId).equalToWhenPresent(record::getExamId) @@ -165,7 +165,7 @@ public interface IndicatorRecordMapper { .set(tags).equalToWhenPresent(record::getTags); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.111+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.757+02:00", comments="Source Table: indicator") default int updateByPrimaryKey(IndicatorRecord record) { return UpdateDSL.updateWithMapper(this::update, indicatorRecord) .set(examId).equalTo(record::getExamId) @@ -179,7 +179,7 @@ public interface IndicatorRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.111+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.757+02:00", comments="Source Table: indicator") default int updateByPrimaryKeySelective(IndicatorRecord record) { return UpdateDSL.updateWithMapper(this::update, indicatorRecord) .set(examId).equalToWhenPresent(record::getExamId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordDynamicSqlSupport.java index a4364504..196f65b2 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordDynamicSqlSupport.java @@ -6,28 +6,28 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class InstitutionRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.114+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.764+02:00", comments="Source Table: institution") public static final InstitutionRecord institutionRecord = new InstitutionRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.114+02:00", comments="Source field: institution.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.764+02:00", comments="Source field: institution.id") public static final SqlColumn id = institutionRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.114+02:00", comments="Source field: institution.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.764+02:00", comments="Source field: institution.name") public static final SqlColumn name = institutionRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.114+02:00", comments="Source field: institution.url_suffix") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.764+02:00", comments="Source field: institution.url_suffix") public static final SqlColumn urlSuffix = institutionRecord.urlSuffix; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.114+02:00", comments="Source field: institution.theme_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.764+02:00", comments="Source field: institution.theme_name") public static final SqlColumn themeName = institutionRecord.themeName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.114+02:00", comments="Source field: institution.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.764+02:00", comments="Source field: institution.active") public static final SqlColumn active = institutionRecord.active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.114+02:00", comments="Source field: institution.logo_image") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.765+02:00", comments="Source field: institution.logo_image") public static final SqlColumn logoImage = institutionRecord.logoImage; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.114+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.764+02:00", comments="Source Table: institution") public static final class InstitutionRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordMapper.java index 3a3ecf2d..2bca6f41 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface InstitutionRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.114+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.765+02:00", comments="Source Table: institution") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.114+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.765+02:00", comments="Source Table: institution") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.114+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.765+02:00", comments="Source Table: institution") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.114+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.765+02:00", comments="Source Table: institution") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -57,7 +57,7 @@ public interface InstitutionRecordMapper { }) InstitutionRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.114+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.765+02:00", comments="Source Table: institution") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -69,22 +69,22 @@ public interface InstitutionRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.115+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.765+02:00", comments="Source Table: institution") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.115+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.765+02:00", comments="Source Table: institution") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(institutionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.115+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.765+02:00", comments="Source Table: institution") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, institutionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.115+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.765+02:00", comments="Source Table: institution") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, institutionRecord) .where(id, isEqualTo(id_)) @@ -92,7 +92,7 @@ public interface InstitutionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.115+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.765+02:00", comments="Source Table: institution") default int insert(InstitutionRecord record) { return insert(SqlBuilder.insert(record) .into(institutionRecord) @@ -105,7 +105,7 @@ public interface InstitutionRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.115+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.765+02:00", comments="Source Table: institution") default int insertSelective(InstitutionRecord record) { return insert(SqlBuilder.insert(record) .into(institutionRecord) @@ -118,19 +118,19 @@ public interface InstitutionRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.115+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.765+02:00", comments="Source Table: institution") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, name, urlSuffix, themeName, active, logoImage) .from(institutionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.115+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.765+02:00", comments="Source Table: institution") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, name, urlSuffix, themeName, active, logoImage) .from(institutionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.115+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.765+02:00", comments="Source Table: institution") default InstitutionRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, name, urlSuffix, themeName, active, logoImage) .from(institutionRecord) @@ -139,7 +139,7 @@ public interface InstitutionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.115+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.765+02:00", comments="Source Table: institution") default UpdateDSL> updateByExample(InstitutionRecord record) { return UpdateDSL.updateWithMapper(this::update, institutionRecord) .set(name).equalTo(record::getName) @@ -149,7 +149,7 @@ public interface InstitutionRecordMapper { .set(logoImage).equalTo(record::getLogoImage); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.115+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.765+02:00", comments="Source Table: institution") default UpdateDSL> updateByExampleSelective(InstitutionRecord record) { return UpdateDSL.updateWithMapper(this::update, institutionRecord) .set(name).equalToWhenPresent(record::getName) @@ -159,7 +159,7 @@ public interface InstitutionRecordMapper { .set(logoImage).equalToWhenPresent(record::getLogoImage); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.115+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.765+02:00", comments="Source Table: institution") default int updateByPrimaryKey(InstitutionRecord record) { return UpdateDSL.updateWithMapper(this::update, institutionRecord) .set(name).equalTo(record::getName) @@ -172,7 +172,7 @@ public interface InstitutionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.115+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.765+02:00", comments="Source Table: institution") default int updateByPrimaryKeySelective(InstitutionRecord record) { return UpdateDSL.updateWithMapper(this::update, institutionRecord) .set(name).equalToWhenPresent(record::getName) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordDynamicSqlSupport.java index 7e4f147a..b1bb2b8f 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordDynamicSqlSupport.java @@ -6,52 +6,52 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class LmsSetupRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.120+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.769+02:00", comments="Source Table: lms_setup") public static final LmsSetupRecord lmsSetupRecord = new LmsSetupRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.120+02:00", comments="Source field: lms_setup.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.769+02:00", comments="Source field: lms_setup.id") public static final SqlColumn id = lmsSetupRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.120+02:00", comments="Source field: lms_setup.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.770+02:00", comments="Source field: lms_setup.institution_id") public static final SqlColumn institutionId = lmsSetupRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.121+02:00", comments="Source field: lms_setup.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.770+02:00", comments="Source field: lms_setup.name") public static final SqlColumn name = lmsSetupRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.121+02:00", comments="Source field: lms_setup.lms_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.770+02:00", comments="Source field: lms_setup.lms_type") public static final SqlColumn lmsType = lmsSetupRecord.lmsType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.121+02:00", comments="Source field: lms_setup.lms_url") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.770+02:00", comments="Source field: lms_setup.lms_url") public static final SqlColumn lmsUrl = lmsSetupRecord.lmsUrl; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.121+02:00", comments="Source field: lms_setup.lms_clientname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.770+02:00", comments="Source field: lms_setup.lms_clientname") public static final SqlColumn lmsClientname = lmsSetupRecord.lmsClientname; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.121+02:00", comments="Source field: lms_setup.lms_clientsecret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.770+02:00", comments="Source field: lms_setup.lms_clientsecret") public static final SqlColumn lmsClientsecret = lmsSetupRecord.lmsClientsecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.121+02:00", comments="Source field: lms_setup.lms_rest_api_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.770+02:00", comments="Source field: lms_setup.lms_rest_api_token") public static final SqlColumn lmsRestApiToken = lmsSetupRecord.lmsRestApiToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.121+02:00", comments="Source field: lms_setup.lms_proxy_host") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.770+02:00", comments="Source field: lms_setup.lms_proxy_host") public static final SqlColumn lmsProxyHost = lmsSetupRecord.lmsProxyHost; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.121+02:00", comments="Source field: lms_setup.lms_proxy_port") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.770+02:00", comments="Source field: lms_setup.lms_proxy_port") public static final SqlColumn lmsProxyPort = lmsSetupRecord.lmsProxyPort; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.121+02:00", comments="Source field: lms_setup.lms_proxy_auth_username") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.770+02:00", comments="Source field: lms_setup.lms_proxy_auth_username") public static final SqlColumn lmsProxyAuthUsername = lmsSetupRecord.lmsProxyAuthUsername; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.121+02:00", comments="Source field: lms_setup.lms_proxy_auth_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.770+02:00", comments="Source field: lms_setup.lms_proxy_auth_secret") public static final SqlColumn lmsProxyAuthSecret = lmsSetupRecord.lmsProxyAuthSecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.121+02:00", comments="Source field: lms_setup.update_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.770+02:00", comments="Source field: lms_setup.update_time") public static final SqlColumn updateTime = lmsSetupRecord.updateTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.121+02:00", comments="Source field: lms_setup.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.770+02:00", comments="Source field: lms_setup.active") public static final SqlColumn active = lmsSetupRecord.active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.120+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.769+02:00", comments="Source Table: lms_setup") public static final class LmsSetupRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordMapper.java index fe8b2047..ea7e2057 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface LmsSetupRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.121+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.770+02:00", comments="Source Table: lms_setup") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.121+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.770+02:00", comments="Source Table: lms_setup") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.121+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.770+02:00", comments="Source Table: lms_setup") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.121+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.770+02:00", comments="Source Table: lms_setup") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -65,7 +65,7 @@ public interface LmsSetupRecordMapper { }) LmsSetupRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.121+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.770+02:00", comments="Source Table: lms_setup") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -85,22 +85,22 @@ public interface LmsSetupRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.122+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.771+02:00", comments="Source Table: lms_setup") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.122+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.771+02:00", comments="Source Table: lms_setup") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(lmsSetupRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.122+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.771+02:00", comments="Source Table: lms_setup") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, lmsSetupRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.122+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.771+02:00", comments="Source Table: lms_setup") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, lmsSetupRecord) .where(id, isEqualTo(id_)) @@ -108,7 +108,7 @@ public interface LmsSetupRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.122+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.771+02:00", comments="Source Table: lms_setup") default int insert(LmsSetupRecord record) { return insert(SqlBuilder.insert(record) .into(lmsSetupRecord) @@ -129,7 +129,7 @@ public interface LmsSetupRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.122+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.771+02:00", comments="Source Table: lms_setup") default int insertSelective(LmsSetupRecord record) { return insert(SqlBuilder.insert(record) .into(lmsSetupRecord) @@ -150,19 +150,19 @@ public interface LmsSetupRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.122+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.771+02:00", comments="Source Table: lms_setup") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, lmsProxyHost, lmsProxyPort, lmsProxyAuthUsername, lmsProxyAuthSecret, updateTime, active) .from(lmsSetupRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.122+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.771+02:00", comments="Source Table: lms_setup") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, lmsProxyHost, lmsProxyPort, lmsProxyAuthUsername, lmsProxyAuthSecret, updateTime, active) .from(lmsSetupRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.122+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.771+02:00", comments="Source Table: lms_setup") default LmsSetupRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, lmsProxyHost, lmsProxyPort, lmsProxyAuthUsername, lmsProxyAuthSecret, updateTime, active) .from(lmsSetupRecord) @@ -171,7 +171,7 @@ public interface LmsSetupRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.122+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.771+02:00", comments="Source Table: lms_setup") default UpdateDSL> updateByExample(LmsSetupRecord record) { return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -189,7 +189,7 @@ public interface LmsSetupRecordMapper { .set(active).equalTo(record::getActive); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.122+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.771+02:00", comments="Source Table: lms_setup") default UpdateDSL> updateByExampleSelective(LmsSetupRecord record) { return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -207,7 +207,7 @@ public interface LmsSetupRecordMapper { .set(active).equalToWhenPresent(record::getActive); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.122+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.771+02:00", comments="Source Table: lms_setup") default int updateByPrimaryKey(LmsSetupRecord record) { return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -228,7 +228,7 @@ public interface LmsSetupRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.122+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.771+02:00", comments="Source Table: lms_setup") default int updateByPrimaryKeySelective(LmsSetupRecord record) { return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordDynamicSqlSupport.java index 5df624ad..ec1ff966 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordDynamicSqlSupport.java @@ -6,40 +6,40 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class OrientationRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.059+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.713+02:00", comments="Source Table: orientation") public static final OrientationRecord orientationRecord = new OrientationRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.060+02:00", comments="Source field: orientation.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.713+02:00", comments="Source field: orientation.id") public static final SqlColumn id = orientationRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.060+02:00", comments="Source field: orientation.config_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.713+02:00", comments="Source field: orientation.config_attribute_id") public static final SqlColumn configAttributeId = orientationRecord.configAttributeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.060+02:00", comments="Source field: orientation.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.714+02:00", comments="Source field: orientation.template_id") public static final SqlColumn templateId = orientationRecord.templateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.060+02:00", comments="Source field: orientation.view_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.714+02:00", comments="Source field: orientation.view_id") public static final SqlColumn viewId = orientationRecord.viewId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.060+02:00", comments="Source field: orientation.group_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.714+02:00", comments="Source field: orientation.group_id") public static final SqlColumn groupId = orientationRecord.groupId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.060+02:00", comments="Source field: orientation.x_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.714+02:00", comments="Source field: orientation.x_position") public static final SqlColumn xPosition = orientationRecord.xPosition; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.060+02:00", comments="Source field: orientation.y_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.714+02:00", comments="Source field: orientation.y_position") public static final SqlColumn yPosition = orientationRecord.yPosition; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.060+02:00", comments="Source field: orientation.width") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.714+02:00", comments="Source field: orientation.width") public static final SqlColumn width = orientationRecord.width; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.061+02:00", comments="Source field: orientation.height") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.714+02:00", comments="Source field: orientation.height") public static final SqlColumn height = orientationRecord.height; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.061+02:00", comments="Source field: orientation.title") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.714+02:00", comments="Source field: orientation.title") public static final SqlColumn title = orientationRecord.title; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.060+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.713+02:00", comments="Source Table: orientation") public static final class OrientationRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordMapper.java index 002ce1df..99e5f74c 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface OrientationRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.061+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.715+02:00", comments="Source Table: orientation") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.061+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.715+02:00", comments="Source Table: orientation") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.061+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.715+02:00", comments="Source Table: orientation") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.061+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.715+02:00", comments="Source Table: orientation") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -61,7 +61,7 @@ public interface OrientationRecordMapper { }) OrientationRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.061+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.715+02:00", comments="Source Table: orientation") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -77,22 +77,22 @@ public interface OrientationRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.061+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.715+02:00", comments="Source Table: orientation") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.061+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.715+02:00", comments="Source Table: orientation") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(orientationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.061+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.715+02:00", comments="Source Table: orientation") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, orientationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.061+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.715+02:00", comments="Source Table: orientation") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, orientationRecord) .where(id, isEqualTo(id_)) @@ -100,7 +100,7 @@ public interface OrientationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.061+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.715+02:00", comments="Source Table: orientation") default int insert(OrientationRecord record) { return insert(SqlBuilder.insert(record) .into(orientationRecord) @@ -117,7 +117,7 @@ public interface OrientationRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.061+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.715+02:00", comments="Source Table: orientation") default int insertSelective(OrientationRecord record) { return insert(SqlBuilder.insert(record) .into(orientationRecord) @@ -134,19 +134,19 @@ public interface OrientationRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.062+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.715+02:00", comments="Source Table: orientation") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, configAttributeId, templateId, viewId, groupId, xPosition, yPosition, width, height, title) .from(orientationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.062+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.716+02:00", comments="Source Table: orientation") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, configAttributeId, templateId, viewId, groupId, xPosition, yPosition, width, height, title) .from(orientationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.062+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.716+02:00", comments="Source Table: orientation") default OrientationRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, configAttributeId, templateId, viewId, groupId, xPosition, yPosition, width, height, title) .from(orientationRecord) @@ -155,7 +155,7 @@ public interface OrientationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.062+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.716+02:00", comments="Source Table: orientation") default UpdateDSL> updateByExample(OrientationRecord record) { return UpdateDSL.updateWithMapper(this::update, orientationRecord) .set(configAttributeId).equalTo(record::getConfigAttributeId) @@ -169,7 +169,7 @@ public interface OrientationRecordMapper { .set(title).equalTo(record::getTitle); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.062+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.716+02:00", comments="Source Table: orientation") default UpdateDSL> updateByExampleSelective(OrientationRecord record) { return UpdateDSL.updateWithMapper(this::update, orientationRecord) .set(configAttributeId).equalToWhenPresent(record::getConfigAttributeId) @@ -183,7 +183,7 @@ public interface OrientationRecordMapper { .set(title).equalToWhenPresent(record::getTitle); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.062+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.716+02:00", comments="Source Table: orientation") default int updateByPrimaryKey(OrientationRecord record) { return UpdateDSL.updateWithMapper(this::update, orientationRecord) .set(configAttributeId).equalTo(record::getConfigAttributeId) @@ -200,7 +200,7 @@ public interface OrientationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.062+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.716+02:00", comments="Source Table: orientation") default int updateByPrimaryKeySelective(OrientationRecord record) { return UpdateDSL.updateWithMapper(this::update, orientationRecord) .set(configAttributeId).equalToWhenPresent(record::getConfigAttributeId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RemoteProctoringRoomRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RemoteProctoringRoomRecordDynamicSqlSupport.java index f7971803..21a10023 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RemoteProctoringRoomRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RemoteProctoringRoomRecordDynamicSqlSupport.java @@ -6,37 +6,37 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class RemoteProctoringRoomRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.096+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.746+02:00", comments="Source Table: remote_proctoring_room") public static final RemoteProctoringRoomRecord remoteProctoringRoomRecord = new RemoteProctoringRoomRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.096+02:00", comments="Source field: remote_proctoring_room.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.746+02:00", comments="Source field: remote_proctoring_room.id") public static final SqlColumn id = remoteProctoringRoomRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.096+02:00", comments="Source field: remote_proctoring_room.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.746+02:00", comments="Source field: remote_proctoring_room.exam_id") public static final SqlColumn examId = remoteProctoringRoomRecord.examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.097+02:00", comments="Source field: remote_proctoring_room.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.746+02:00", comments="Source field: remote_proctoring_room.name") public static final SqlColumn name = remoteProctoringRoomRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.097+02:00", comments="Source field: remote_proctoring_room.size") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.746+02:00", comments="Source field: remote_proctoring_room.size") public static final SqlColumn size = remoteProctoringRoomRecord.size; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.097+02:00", comments="Source field: remote_proctoring_room.subject") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.747+02:00", comments="Source field: remote_proctoring_room.subject") public static final SqlColumn subject = remoteProctoringRoomRecord.subject; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.097+02:00", comments="Source field: remote_proctoring_room.townhall_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.747+02:00", comments="Source field: remote_proctoring_room.townhall_room") public static final SqlColumn townhallRoom = remoteProctoringRoomRecord.townhallRoom; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.097+02:00", comments="Source field: remote_proctoring_room.break_out_connections") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.747+02:00", comments="Source field: remote_proctoring_room.break_out_connections") public static final SqlColumn breakOutConnections = remoteProctoringRoomRecord.breakOutConnections; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.097+02:00", comments="Source field: remote_proctoring_room.join_key") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.747+02:00", comments="Source field: remote_proctoring_room.join_key") public static final SqlColumn joinKey = remoteProctoringRoomRecord.joinKey; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.097+02:00", comments="Source field: remote_proctoring_room.room_data") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.747+02:00", comments="Source field: remote_proctoring_room.room_data") public static final SqlColumn roomData = remoteProctoringRoomRecord.roomData; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.096+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.746+02:00", comments="Source Table: remote_proctoring_room") public static final class RemoteProctoringRoomRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RemoteProctoringRoomRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RemoteProctoringRoomRecordMapper.java index a714e257..5f35d916 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RemoteProctoringRoomRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RemoteProctoringRoomRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface RemoteProctoringRoomRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.097+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.747+02:00", comments="Source Table: remote_proctoring_room") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.097+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.747+02:00", comments="Source Table: remote_proctoring_room") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.097+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.747+02:00", comments="Source Table: remote_proctoring_room") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.097+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.747+02:00", comments="Source Table: remote_proctoring_room") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -60,7 +60,7 @@ public interface RemoteProctoringRoomRecordMapper { }) RemoteProctoringRoomRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.097+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.747+02:00", comments="Source Table: remote_proctoring_room") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -75,22 +75,22 @@ public interface RemoteProctoringRoomRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.097+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.747+02:00", comments="Source Table: remote_proctoring_room") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.098+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.747+02:00", comments="Source Table: remote_proctoring_room") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(remoteProctoringRoomRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.098+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.747+02:00", comments="Source Table: remote_proctoring_room") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, remoteProctoringRoomRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.098+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.747+02:00", comments="Source Table: remote_proctoring_room") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, remoteProctoringRoomRecord) .where(id, isEqualTo(id_)) @@ -98,7 +98,7 @@ public interface RemoteProctoringRoomRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.098+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.747+02:00", comments="Source Table: remote_proctoring_room") default int insert(RemoteProctoringRoomRecord record) { return insert(SqlBuilder.insert(record) .into(remoteProctoringRoomRecord) @@ -114,7 +114,7 @@ public interface RemoteProctoringRoomRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.098+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.747+02:00", comments="Source Table: remote_proctoring_room") default int insertSelective(RemoteProctoringRoomRecord record) { return insert(SqlBuilder.insert(record) .into(remoteProctoringRoomRecord) @@ -130,19 +130,19 @@ public interface RemoteProctoringRoomRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.098+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.747+02:00", comments="Source Table: remote_proctoring_room") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, examId, name, size, subject, townhallRoom, breakOutConnections, joinKey, roomData) .from(remoteProctoringRoomRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.098+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.748+02:00", comments="Source Table: remote_proctoring_room") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, examId, name, size, subject, townhallRoom, breakOutConnections, joinKey, roomData) .from(remoteProctoringRoomRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.098+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.748+02:00", comments="Source Table: remote_proctoring_room") default RemoteProctoringRoomRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, examId, name, size, subject, townhallRoom, breakOutConnections, joinKey, roomData) .from(remoteProctoringRoomRecord) @@ -151,7 +151,7 @@ public interface RemoteProctoringRoomRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.098+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.748+02:00", comments="Source Table: remote_proctoring_room") default UpdateDSL> updateByExample(RemoteProctoringRoomRecord record) { return UpdateDSL.updateWithMapper(this::update, remoteProctoringRoomRecord) .set(examId).equalTo(record::getExamId) @@ -164,7 +164,7 @@ public interface RemoteProctoringRoomRecordMapper { .set(roomData).equalTo(record::getRoomData); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.098+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.748+02:00", comments="Source Table: remote_proctoring_room") default UpdateDSL> updateByExampleSelective(RemoteProctoringRoomRecord record) { return UpdateDSL.updateWithMapper(this::update, remoteProctoringRoomRecord) .set(examId).equalToWhenPresent(record::getExamId) @@ -177,7 +177,7 @@ public interface RemoteProctoringRoomRecordMapper { .set(roomData).equalToWhenPresent(record::getRoomData); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.098+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.748+02:00", comments="Source Table: remote_proctoring_room") default int updateByPrimaryKey(RemoteProctoringRoomRecord record) { return UpdateDSL.updateWithMapper(this::update, remoteProctoringRoomRecord) .set(examId).equalTo(record::getExamId) @@ -193,7 +193,7 @@ public interface RemoteProctoringRoomRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.098+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.748+02:00", comments="Source Table: remote_proctoring_room") default int updateByPrimaryKeySelective(RemoteProctoringRoomRecord record) { return UpdateDSL.updateWithMapper(this::update, remoteProctoringRoomRecord) .set(examId).equalToWhenPresent(record::getExamId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordDynamicSqlSupport.java index 420d4951..5dc0f341 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordDynamicSqlSupport.java @@ -6,19 +6,19 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class RoleRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.128+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.780+02:00", comments="Source Table: user_role") public static final RoleRecord roleRecord = new RoleRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.128+02:00", comments="Source field: user_role.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.780+02:00", comments="Source field: user_role.id") public static final SqlColumn id = roleRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.128+02:00", comments="Source field: user_role.user_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.780+02:00", comments="Source field: user_role.user_id") public static final SqlColumn userId = roleRecord.userId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.128+02:00", comments="Source field: user_role.role_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.780+02:00", comments="Source field: user_role.role_name") public static final SqlColumn roleName = roleRecord.roleName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.128+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.780+02:00", comments="Source Table: user_role") public static final class RoleRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordMapper.java index d7e26c17..883e5b5d 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface RoleRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.128+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.780+02:00", comments="Source Table: user_role") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.128+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.780+02:00", comments="Source Table: user_role") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.128+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.780+02:00", comments="Source Table: user_role") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.128+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.780+02:00", comments="Source Table: user_role") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -54,7 +54,7 @@ public interface RoleRecordMapper { }) RoleRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.128+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.780+02:00", comments="Source Table: user_role") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -63,22 +63,22 @@ public interface RoleRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.128+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.780+02:00", comments="Source Table: user_role") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.128+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.780+02:00", comments="Source Table: user_role") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(roleRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.128+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.780+02:00", comments="Source Table: user_role") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, roleRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.128+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.780+02:00", comments="Source Table: user_role") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, roleRecord) .where(id, isEqualTo(id_)) @@ -86,7 +86,7 @@ public interface RoleRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.128+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.780+02:00", comments="Source Table: user_role") default int insert(RoleRecord record) { return insert(SqlBuilder.insert(record) .into(roleRecord) @@ -96,7 +96,7 @@ public interface RoleRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.128+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.780+02:00", comments="Source Table: user_role") default int insertSelective(RoleRecord record) { return insert(SqlBuilder.insert(record) .into(roleRecord) @@ -106,19 +106,19 @@ public interface RoleRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.128+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.780+02:00", comments="Source Table: user_role") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, userId, roleName) .from(roleRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.128+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.781+02:00", comments="Source Table: user_role") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, userId, roleName) .from(roleRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.128+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.781+02:00", comments="Source Table: user_role") default RoleRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, userId, roleName) .from(roleRecord) @@ -127,21 +127,21 @@ public interface RoleRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.128+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.781+02:00", comments="Source Table: user_role") default UpdateDSL> updateByExample(RoleRecord record) { return UpdateDSL.updateWithMapper(this::update, roleRecord) .set(userId).equalTo(record::getUserId) .set(roleName).equalTo(record::getRoleName); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.128+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.781+02:00", comments="Source Table: user_role") default UpdateDSL> updateByExampleSelective(RoleRecord record) { return UpdateDSL.updateWithMapper(this::update, roleRecord) .set(userId).equalToWhenPresent(record::getUserId) .set(roleName).equalToWhenPresent(record::getRoleName); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.128+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.781+02:00", comments="Source Table: user_role") default int updateByPrimaryKey(RoleRecord record) { return UpdateDSL.updateWithMapper(this::update, roleRecord) .set(userId).equalTo(record::getUserId) @@ -151,7 +151,7 @@ public interface RoleRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.128+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.781+02:00", comments="Source Table: user_role") default int updateByPrimaryKeySelective(RoleRecord record) { return UpdateDSL.updateWithMapper(this::update, roleRecord) .set(userId).equalToWhenPresent(record::getUserId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordDynamicSqlSupport.java index b4f700c0..66293718 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordDynamicSqlSupport.java @@ -7,40 +7,40 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class SebClientConfigRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.116+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.766+02:00", comments="Source Table: seb_client_configuration") public static final SebClientConfigRecord sebClientConfigRecord = new SebClientConfigRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.116+02:00", comments="Source field: seb_client_configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.766+02:00", comments="Source field: seb_client_configuration.id") public static final SqlColumn id = sebClientConfigRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.116+02:00", comments="Source field: seb_client_configuration.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.766+02:00", comments="Source field: seb_client_configuration.institution_id") public static final SqlColumn institutionId = sebClientConfigRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.116+02:00", comments="Source field: seb_client_configuration.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.766+02:00", comments="Source field: seb_client_configuration.name") public static final SqlColumn name = sebClientConfigRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.116+02:00", comments="Source field: seb_client_configuration.date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.766+02:00", comments="Source field: seb_client_configuration.date") public static final SqlColumn date = sebClientConfigRecord.date; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.116+02:00", comments="Source field: seb_client_configuration.client_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.766+02:00", comments="Source field: seb_client_configuration.client_name") public static final SqlColumn clientName = sebClientConfigRecord.clientName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.116+02:00", comments="Source field: seb_client_configuration.client_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.766+02:00", comments="Source field: seb_client_configuration.client_secret") public static final SqlColumn clientSecret = sebClientConfigRecord.clientSecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.116+02:00", comments="Source field: seb_client_configuration.encrypt_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.766+02:00", comments="Source field: seb_client_configuration.encrypt_secret") public static final SqlColumn encryptSecret = sebClientConfigRecord.encryptSecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.116+02:00", comments="Source field: seb_client_configuration.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.766+02:00", comments="Source field: seb_client_configuration.active") public static final SqlColumn active = sebClientConfigRecord.active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.116+02:00", comments="Source field: seb_client_configuration.last_update_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.766+02:00", comments="Source field: seb_client_configuration.last_update_time") public static final SqlColumn lastUpdateTime = sebClientConfigRecord.lastUpdateTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.116+02:00", comments="Source field: seb_client_configuration.last_update_user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.766+02:00", comments="Source field: seb_client_configuration.last_update_user") public static final SqlColumn lastUpdateUser = sebClientConfigRecord.lastUpdateUser; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.116+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.766+02:00", comments="Source Table: seb_client_configuration") public static final class SebClientConfigRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordMapper.java index 00d8572b..28689fba 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordMapper.java @@ -34,20 +34,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface SebClientConfigRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.117+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.766+02:00", comments="Source Table: seb_client_configuration") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.117+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.766+02:00", comments="Source Table: seb_client_configuration") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.117+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.767+02:00", comments="Source Table: seb_client_configuration") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.117+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.767+02:00", comments="Source Table: seb_client_configuration") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -63,7 +63,7 @@ public interface SebClientConfigRecordMapper { }) SebClientConfigRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.117+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.767+02:00", comments="Source Table: seb_client_configuration") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -79,22 +79,22 @@ public interface SebClientConfigRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.117+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.767+02:00", comments="Source Table: seb_client_configuration") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.117+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.767+02:00", comments="Source Table: seb_client_configuration") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(sebClientConfigRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.117+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.767+02:00", comments="Source Table: seb_client_configuration") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, sebClientConfigRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.117+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.767+02:00", comments="Source Table: seb_client_configuration") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, sebClientConfigRecord) .where(id, isEqualTo(id_)) @@ -102,7 +102,7 @@ public interface SebClientConfigRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.117+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.767+02:00", comments="Source Table: seb_client_configuration") default int insert(SebClientConfigRecord record) { return insert(SqlBuilder.insert(record) .into(sebClientConfigRecord) @@ -119,7 +119,7 @@ public interface SebClientConfigRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.117+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.767+02:00", comments="Source Table: seb_client_configuration") default int insertSelective(SebClientConfigRecord record) { return insert(SqlBuilder.insert(record) .into(sebClientConfigRecord) @@ -136,19 +136,19 @@ public interface SebClientConfigRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.117+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.767+02:00", comments="Source Table: seb_client_configuration") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, name, date, clientName, clientSecret, encryptSecret, active, lastUpdateTime, lastUpdateUser) .from(sebClientConfigRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.117+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.767+02:00", comments="Source Table: seb_client_configuration") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, name, date, clientName, clientSecret, encryptSecret, active, lastUpdateTime, lastUpdateUser) .from(sebClientConfigRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.117+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.767+02:00", comments="Source Table: seb_client_configuration") default SebClientConfigRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, name, date, clientName, clientSecret, encryptSecret, active, lastUpdateTime, lastUpdateUser) .from(sebClientConfigRecord) @@ -157,7 +157,7 @@ public interface SebClientConfigRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.117+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.767+02:00", comments="Source Table: seb_client_configuration") default UpdateDSL> updateByExample(SebClientConfigRecord record) { return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -171,7 +171,7 @@ public interface SebClientConfigRecordMapper { .set(lastUpdateUser).equalTo(record::getLastUpdateUser); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.117+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.767+02:00", comments="Source Table: seb_client_configuration") default UpdateDSL> updateByExampleSelective(SebClientConfigRecord record) { return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -185,7 +185,7 @@ public interface SebClientConfigRecordMapper { .set(lastUpdateUser).equalToWhenPresent(record::getLastUpdateUser); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.117+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.767+02:00", comments="Source Table: seb_client_configuration") default int updateByPrimaryKey(SebClientConfigRecord record) { return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -202,7 +202,7 @@ public interface SebClientConfigRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.117+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.767+02:00", comments="Source Table: seb_client_configuration") default int updateByPrimaryKeySelective(SebClientConfigRecord record) { return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordDynamicSqlSupport.java index bdb31840..36cabb0a 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordDynamicSqlSupport.java @@ -7,25 +7,25 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ThresholdRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.112+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.759+02:00", comments="Source Table: threshold") public static final ThresholdRecord thresholdRecord = new ThresholdRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.112+02:00", comments="Source field: threshold.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.759+02:00", comments="Source field: threshold.id") public static final SqlColumn id = thresholdRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.112+02:00", comments="Source field: threshold.indicator_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.760+02:00", comments="Source field: threshold.indicator_id") public static final SqlColumn indicatorId = thresholdRecord.indicatorId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.112+02:00", comments="Source field: threshold.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.760+02:00", comments="Source field: threshold.value") public static final SqlColumn value = thresholdRecord.value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.112+02:00", comments="Source field: threshold.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.760+02:00", comments="Source field: threshold.color") public static final SqlColumn color = thresholdRecord.color; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.112+02:00", comments="Source field: threshold.icon") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.760+02:00", comments="Source field: threshold.icon") public static final SqlColumn icon = thresholdRecord.icon; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.112+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.759+02:00", comments="Source Table: threshold") public static final class ThresholdRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordMapper.java index f7e0c04a..bd6482d0 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordMapper.java @@ -33,20 +33,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ThresholdRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.112+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.760+02:00", comments="Source Table: threshold") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.112+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.760+02:00", comments="Source Table: threshold") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.112+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.760+02:00", comments="Source Table: threshold") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.112+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.760+02:00", comments="Source Table: threshold") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -57,7 +57,7 @@ public interface ThresholdRecordMapper { }) ThresholdRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.112+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.760+02:00", comments="Source Table: threshold") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -68,22 +68,22 @@ public interface ThresholdRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.112+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.760+02:00", comments="Source Table: threshold") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.113+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.760+02:00", comments="Source Table: threshold") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(thresholdRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.113+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.760+02:00", comments="Source Table: threshold") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, thresholdRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.113+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.760+02:00", comments="Source Table: threshold") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, thresholdRecord) .where(id, isEqualTo(id_)) @@ -91,7 +91,7 @@ public interface ThresholdRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.113+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.760+02:00", comments="Source Table: threshold") default int insert(ThresholdRecord record) { return insert(SqlBuilder.insert(record) .into(thresholdRecord) @@ -103,7 +103,7 @@ public interface ThresholdRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.113+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.760+02:00", comments="Source Table: threshold") default int insertSelective(ThresholdRecord record) { return insert(SqlBuilder.insert(record) .into(thresholdRecord) @@ -115,19 +115,19 @@ public interface ThresholdRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.113+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.760+02:00", comments="Source Table: threshold") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, indicatorId, value, color, icon) .from(thresholdRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.113+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.760+02:00", comments="Source Table: threshold") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, indicatorId, value, color, icon) .from(thresholdRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.113+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.760+02:00", comments="Source Table: threshold") default ThresholdRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, indicatorId, value, color, icon) .from(thresholdRecord) @@ -136,7 +136,7 @@ public interface ThresholdRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.113+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.760+02:00", comments="Source Table: threshold") default UpdateDSL> updateByExample(ThresholdRecord record) { return UpdateDSL.updateWithMapper(this::update, thresholdRecord) .set(indicatorId).equalTo(record::getIndicatorId) @@ -145,7 +145,7 @@ public interface ThresholdRecordMapper { .set(icon).equalTo(record::getIcon); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.113+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.760+02:00", comments="Source Table: threshold") default UpdateDSL> updateByExampleSelective(ThresholdRecord record) { return UpdateDSL.updateWithMapper(this::update, thresholdRecord) .set(indicatorId).equalToWhenPresent(record::getIndicatorId) @@ -154,7 +154,7 @@ public interface ThresholdRecordMapper { .set(icon).equalToWhenPresent(record::getIcon); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.113+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.761+02:00", comments="Source Table: threshold") default int updateByPrimaryKey(ThresholdRecord record) { return UpdateDSL.updateWithMapper(this::update, thresholdRecord) .set(indicatorId).equalTo(record::getIndicatorId) @@ -166,7 +166,7 @@ public interface ThresholdRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.113+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.761+02:00", comments="Source Table: threshold") default int updateByPrimaryKeySelective(ThresholdRecord record) { return UpdateDSL.updateWithMapper(this::update, thresholdRecord) .set(indicatorId).equalToWhenPresent(record::getIndicatorId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordDynamicSqlSupport.java index 48998903..a8f478bd 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordDynamicSqlSupport.java @@ -6,31 +6,31 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class UserActivityLogRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.129+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.783+02:00", comments="Source Table: user_activity_log") public static final UserActivityLogRecord userActivityLogRecord = new UserActivityLogRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.129+02:00", comments="Source field: user_activity_log.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.783+02:00", comments="Source field: user_activity_log.id") public static final SqlColumn id = userActivityLogRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.129+02:00", comments="Source field: user_activity_log.user_uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.783+02:00", comments="Source field: user_activity_log.user_uuid") public static final SqlColumn userUuid = userActivityLogRecord.userUuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.130+02:00", comments="Source field: user_activity_log.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.783+02:00", comments="Source field: user_activity_log.timestamp") public static final SqlColumn timestamp = userActivityLogRecord.timestamp; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.130+02:00", comments="Source field: user_activity_log.activity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.783+02:00", comments="Source field: user_activity_log.activity_type") public static final SqlColumn activityType = userActivityLogRecord.activityType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.130+02:00", comments="Source field: user_activity_log.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.783+02:00", comments="Source field: user_activity_log.entity_type") public static final SqlColumn entityType = userActivityLogRecord.entityType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.130+02:00", comments="Source field: user_activity_log.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.784+02:00", comments="Source field: user_activity_log.entity_id") public static final SqlColumn entityId = userActivityLogRecord.entityId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.130+02:00", comments="Source field: user_activity_log.message") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.784+02:00", comments="Source field: user_activity_log.message") public static final SqlColumn message = userActivityLogRecord.message; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.129+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.783+02:00", comments="Source Table: user_activity_log") public static final class UserActivityLogRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordMapper.java index e931d0b8..70bc07d2 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface UserActivityLogRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.130+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.784+02:00", comments="Source Table: user_activity_log") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.130+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.784+02:00", comments="Source Table: user_activity_log") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.130+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.784+02:00", comments="Source Table: user_activity_log") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.130+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.784+02:00", comments="Source Table: user_activity_log") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -58,7 +58,7 @@ public interface UserActivityLogRecordMapper { }) UserActivityLogRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.130+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.784+02:00", comments="Source Table: user_activity_log") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -71,22 +71,22 @@ public interface UserActivityLogRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.130+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.784+02:00", comments="Source Table: user_activity_log") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.130+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.784+02:00", comments="Source Table: user_activity_log") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(userActivityLogRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.130+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.784+02:00", comments="Source Table: user_activity_log") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, userActivityLogRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.130+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.784+02:00", comments="Source Table: user_activity_log") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, userActivityLogRecord) .where(id, isEqualTo(id_)) @@ -94,7 +94,7 @@ public interface UserActivityLogRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.130+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.784+02:00", comments="Source Table: user_activity_log") default int insert(UserActivityLogRecord record) { return insert(SqlBuilder.insert(record) .into(userActivityLogRecord) @@ -108,7 +108,7 @@ public interface UserActivityLogRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.130+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.784+02:00", comments="Source Table: user_activity_log") default int insertSelective(UserActivityLogRecord record) { return insert(SqlBuilder.insert(record) .into(userActivityLogRecord) @@ -122,19 +122,19 @@ public interface UserActivityLogRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.130+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.784+02:00", comments="Source Table: user_activity_log") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, userUuid, timestamp, activityType, entityType, entityId, message) .from(userActivityLogRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.130+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.784+02:00", comments="Source Table: user_activity_log") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, userUuid, timestamp, activityType, entityType, entityId, message) .from(userActivityLogRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.130+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.784+02:00", comments="Source Table: user_activity_log") default UserActivityLogRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, userUuid, timestamp, activityType, entityType, entityId, message) .from(userActivityLogRecord) @@ -143,7 +143,7 @@ public interface UserActivityLogRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.130+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.784+02:00", comments="Source Table: user_activity_log") default UpdateDSL> updateByExample(UserActivityLogRecord record) { return UpdateDSL.updateWithMapper(this::update, userActivityLogRecord) .set(userUuid).equalTo(record::getUserUuid) @@ -154,7 +154,7 @@ public interface UserActivityLogRecordMapper { .set(message).equalTo(record::getMessage); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.130+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.784+02:00", comments="Source Table: user_activity_log") default UpdateDSL> updateByExampleSelective(UserActivityLogRecord record) { return UpdateDSL.updateWithMapper(this::update, userActivityLogRecord) .set(userUuid).equalToWhenPresent(record::getUserUuid) @@ -165,7 +165,7 @@ public interface UserActivityLogRecordMapper { .set(message).equalToWhenPresent(record::getMessage); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.131+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.786+02:00", comments="Source Table: user_activity_log") default int updateByPrimaryKey(UserActivityLogRecord record) { return UpdateDSL.updateWithMapper(this::update, userActivityLogRecord) .set(userUuid).equalTo(record::getUserUuid) @@ -179,7 +179,7 @@ public interface UserActivityLogRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.131+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.786+02:00", comments="Source Table: user_activity_log") default int updateByPrimaryKeySelective(UserActivityLogRecord record) { return UpdateDSL.updateWithMapper(this::update, userActivityLogRecord) .set(userUuid).equalToWhenPresent(record::getUserUuid) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordDynamicSqlSupport.java index 6a6f23ed..cd2c63fc 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordDynamicSqlSupport.java @@ -7,46 +7,46 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class UserRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.124+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.775+02:00", comments="Source Table: user") public static final UserRecord userRecord = new UserRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.124+02:00", comments="Source field: user.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.775+02:00", comments="Source field: user.id") public static final SqlColumn id = userRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.125+02:00", comments="Source field: user.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.775+02:00", comments="Source field: user.institution_id") public static final SqlColumn institutionId = userRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.125+02:00", comments="Source field: user.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.775+02:00", comments="Source field: user.uuid") public static final SqlColumn uuid = userRecord.uuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.125+02:00", comments="Source field: user.creation_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.775+02:00", comments="Source field: user.creation_date") public static final SqlColumn creationDate = userRecord.creationDate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.125+02:00", comments="Source field: user.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.775+02:00", comments="Source field: user.name") public static final SqlColumn name = userRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.125+02:00", comments="Source field: user.surname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.775+02:00", comments="Source field: user.surname") public static final SqlColumn surname = userRecord.surname; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.125+02:00", comments="Source field: user.username") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.775+02:00", comments="Source field: user.username") public static final SqlColumn username = userRecord.username; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.125+02:00", comments="Source field: user.password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.776+02:00", comments="Source field: user.password") public static final SqlColumn password = userRecord.password; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.125+02:00", comments="Source field: user.email") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.776+02:00", comments="Source field: user.email") public static final SqlColumn email = userRecord.email; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.125+02:00", comments="Source field: user.language") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.776+02:00", comments="Source field: user.language") public static final SqlColumn language = userRecord.language; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.125+02:00", comments="Source field: user.timezone") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.776+02:00", comments="Source field: user.timezone") public static final SqlColumn timezone = userRecord.timezone; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.125+02:00", comments="Source field: user.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.776+02:00", comments="Source field: user.active") public static final SqlColumn active = userRecord.active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.124+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.775+02:00", comments="Source Table: user") public static final class UserRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordMapper.java index 4c9d0366..0caea0b6 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordMapper.java @@ -34,20 +34,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface UserRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.126+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.776+02:00", comments="Source Table: user") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.126+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.776+02:00", comments="Source Table: user") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.126+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.776+02:00", comments="Source Table: user") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.126+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.776+02:00", comments="Source Table: user") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -65,7 +65,7 @@ public interface UserRecordMapper { }) UserRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.126+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.776+02:00", comments="Source Table: user") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -83,22 +83,22 @@ public interface UserRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.126+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.776+02:00", comments="Source Table: user") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.126+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.776+02:00", comments="Source Table: user") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(userRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.126+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.776+02:00", comments="Source Table: user") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, userRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.126+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.776+02:00", comments="Source Table: user") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, userRecord) .where(id, isEqualTo(id_)) @@ -106,7 +106,7 @@ public interface UserRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.126+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.776+02:00", comments="Source Table: user") default int insert(UserRecord record) { return insert(SqlBuilder.insert(record) .into(userRecord) @@ -125,7 +125,7 @@ public interface UserRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.126+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.776+02:00", comments="Source Table: user") default int insertSelective(UserRecord record) { return insert(SqlBuilder.insert(record) .into(userRecord) @@ -144,19 +144,19 @@ public interface UserRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.126+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.776+02:00", comments="Source Table: user") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, uuid, creationDate, name, surname, username, password, email, language, timezone, active) .from(userRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.126+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.776+02:00", comments="Source Table: user") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, uuid, creationDate, name, surname, username, password, email, language, timezone, active) .from(userRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.126+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.777+02:00", comments="Source Table: user") default UserRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, uuid, creationDate, name, surname, username, password, email, language, timezone, active) .from(userRecord) @@ -165,7 +165,7 @@ public interface UserRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.126+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.777+02:00", comments="Source Table: user") default UpdateDSL> updateByExample(UserRecord record) { return UpdateDSL.updateWithMapper(this::update, userRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -181,7 +181,7 @@ public interface UserRecordMapper { .set(active).equalTo(record::getActive); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.126+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.777+02:00", comments="Source Table: user") default UpdateDSL> updateByExampleSelective(UserRecord record) { return UpdateDSL.updateWithMapper(this::update, userRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -197,7 +197,7 @@ public interface UserRecordMapper { .set(active).equalToWhenPresent(record::getActive); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.126+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.777+02:00", comments="Source Table: user") default int updateByPrimaryKey(UserRecord record) { return UpdateDSL.updateWithMapper(this::update, userRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -216,7 +216,7 @@ public interface UserRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.126+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.777+02:00", comments="Source Table: user") default int updateByPrimaryKeySelective(UserRecord record) { return UpdateDSL.updateWithMapper(this::update, userRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordDynamicSqlSupport.java index 73fa4305..e33c3c8f 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordDynamicSqlSupport.java @@ -6,25 +6,25 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ViewRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.051+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.708+02:00", comments="Source Table: view") public static final ViewRecord viewRecord = new ViewRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.051+02:00", comments="Source field: view.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.708+02:00", comments="Source field: view.id") public static final SqlColumn id = viewRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.053+02:00", comments="Source field: view.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.708+02:00", comments="Source field: view.name") public static final SqlColumn name = viewRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.053+02:00", comments="Source field: view.columns") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.708+02:00", comments="Source field: view.columns") public static final SqlColumn columns = viewRecord.columns; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.053+02:00", comments="Source field: view.position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.708+02:00", comments="Source field: view.position") public static final SqlColumn position = viewRecord.position; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.054+02:00", comments="Source field: view.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.708+02:00", comments="Source field: view.template_id") public static final SqlColumn templateId = viewRecord.templateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.051+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.708+02:00", comments="Source Table: view") public static final class ViewRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordMapper.java index ef4ad7a5..9786fad7 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ViewRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.054+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.709+02:00", comments="Source Table: view") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.054+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.709+02:00", comments="Source Table: view") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.054+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.709+02:00", comments="Source Table: view") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.054+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.709+02:00", comments="Source Table: view") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -56,7 +56,7 @@ public interface ViewRecordMapper { }) ViewRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.054+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.709+02:00", comments="Source Table: view") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -67,22 +67,22 @@ public interface ViewRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.054+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.709+02:00", comments="Source Table: view") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.054+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.709+02:00", comments="Source Table: view") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(viewRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.054+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.709+02:00", comments="Source Table: view") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, viewRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.054+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.709+02:00", comments="Source Table: view") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, viewRecord) .where(id, isEqualTo(id_)) @@ -90,7 +90,7 @@ public interface ViewRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.054+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.709+02:00", comments="Source Table: view") default int insert(ViewRecord record) { return insert(SqlBuilder.insert(record) .into(viewRecord) @@ -102,7 +102,7 @@ public interface ViewRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.054+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.709+02:00", comments="Source Table: view") default int insertSelective(ViewRecord record) { return insert(SqlBuilder.insert(record) .into(viewRecord) @@ -114,19 +114,19 @@ public interface ViewRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.054+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.709+02:00", comments="Source Table: view") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, name, columns, position, templateId) .from(viewRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.054+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.709+02:00", comments="Source Table: view") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, name, columns, position, templateId) .from(viewRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.055+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.710+02:00", comments="Source Table: view") default ViewRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, name, columns, position, templateId) .from(viewRecord) @@ -135,7 +135,7 @@ public interface ViewRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.055+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.710+02:00", comments="Source Table: view") default UpdateDSL> updateByExample(ViewRecord record) { return UpdateDSL.updateWithMapper(this::update, viewRecord) .set(name).equalTo(record::getName) @@ -144,7 +144,7 @@ public interface ViewRecordMapper { .set(templateId).equalTo(record::getTemplateId); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.055+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.710+02:00", comments="Source Table: view") default UpdateDSL> updateByExampleSelective(ViewRecord record) { return UpdateDSL.updateWithMapper(this::update, viewRecord) .set(name).equalToWhenPresent(record::getName) @@ -153,7 +153,7 @@ public interface ViewRecordMapper { .set(templateId).equalToWhenPresent(record::getTemplateId); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.055+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.710+02:00", comments="Source Table: view") default int updateByPrimaryKey(ViewRecord record) { return UpdateDSL.updateWithMapper(this::update, viewRecord) .set(name).equalTo(record::getName) @@ -165,7 +165,7 @@ public interface ViewRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.055+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.710+02:00", comments="Source Table: view") default int updateByPrimaryKeySelective(ViewRecord record) { return UpdateDSL.updateWithMapper(this::update, viewRecord) .set(name).equalToWhenPresent(record::getName) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoRecordDynamicSqlSupport.java index 9a52f589..7450296e 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoRecordDynamicSqlSupport.java @@ -6,25 +6,25 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class WebserviceServerInfoRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.136+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.794+02:00", comments="Source Table: webservice_server_info") public static final WebserviceServerInfoRecord webserviceServerInfoRecord = new WebserviceServerInfoRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.136+02:00", comments="Source field: webservice_server_info.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.794+02:00", comments="Source field: webservice_server_info.id") public static final SqlColumn id = webserviceServerInfoRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.136+02:00", comments="Source field: webservice_server_info.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.794+02:00", comments="Source field: webservice_server_info.uuid") public static final SqlColumn uuid = webserviceServerInfoRecord.uuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.136+02:00", comments="Source field: webservice_server_info.service_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.794+02:00", comments="Source field: webservice_server_info.service_address") public static final SqlColumn serviceAddress = webserviceServerInfoRecord.serviceAddress; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.136+02:00", comments="Source field: webservice_server_info.master") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.794+02:00", comments="Source field: webservice_server_info.master") public static final SqlColumn master = webserviceServerInfoRecord.master; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.136+02:00", comments="Source field: webservice_server_info.update_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.795+02:00", comments="Source field: webservice_server_info.update_time") public static final SqlColumn updateTime = webserviceServerInfoRecord.updateTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.136+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.794+02:00", comments="Source Table: webservice_server_info") public static final class WebserviceServerInfoRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoRecordMapper.java index 23c5977f..618485b0 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface WebserviceServerInfoRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.136+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.795+02:00", comments="Source Table: webservice_server_info") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.136+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.795+02:00", comments="Source Table: webservice_server_info") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.136+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.795+02:00", comments="Source Table: webservice_server_info") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.136+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.795+02:00", comments="Source Table: webservice_server_info") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -56,7 +56,7 @@ public interface WebserviceServerInfoRecordMapper { }) WebserviceServerInfoRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.136+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.795+02:00", comments="Source Table: webservice_server_info") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -67,22 +67,22 @@ public interface WebserviceServerInfoRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.136+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.795+02:00", comments="Source Table: webservice_server_info") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.136+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.795+02:00", comments="Source Table: webservice_server_info") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(webserviceServerInfoRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.136+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.796+02:00", comments="Source Table: webservice_server_info") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, webserviceServerInfoRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.136+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.796+02:00", comments="Source Table: webservice_server_info") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, webserviceServerInfoRecord) .where(id, isEqualTo(id_)) @@ -90,7 +90,7 @@ public interface WebserviceServerInfoRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.136+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.796+02:00", comments="Source Table: webservice_server_info") default int insert(WebserviceServerInfoRecord record) { return insert(SqlBuilder.insert(record) .into(webserviceServerInfoRecord) @@ -102,7 +102,7 @@ public interface WebserviceServerInfoRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.136+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.796+02:00", comments="Source Table: webservice_server_info") default int insertSelective(WebserviceServerInfoRecord record) { return insert(SqlBuilder.insert(record) .into(webserviceServerInfoRecord) @@ -114,19 +114,19 @@ public interface WebserviceServerInfoRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.137+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.796+02:00", comments="Source Table: webservice_server_info") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, uuid, serviceAddress, master, updateTime) .from(webserviceServerInfoRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.137+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.796+02:00", comments="Source Table: webservice_server_info") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, uuid, serviceAddress, master, updateTime) .from(webserviceServerInfoRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.137+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.796+02:00", comments="Source Table: webservice_server_info") default WebserviceServerInfoRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, uuid, serviceAddress, master, updateTime) .from(webserviceServerInfoRecord) @@ -135,7 +135,7 @@ public interface WebserviceServerInfoRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.137+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.796+02:00", comments="Source Table: webservice_server_info") default UpdateDSL> updateByExample(WebserviceServerInfoRecord record) { return UpdateDSL.updateWithMapper(this::update, webserviceServerInfoRecord) .set(uuid).equalTo(record::getUuid) @@ -144,7 +144,7 @@ public interface WebserviceServerInfoRecordMapper { .set(updateTime).equalTo(record::getUpdateTime); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.137+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.796+02:00", comments="Source Table: webservice_server_info") default UpdateDSL> updateByExampleSelective(WebserviceServerInfoRecord record) { return UpdateDSL.updateWithMapper(this::update, webserviceServerInfoRecord) .set(uuid).equalToWhenPresent(record::getUuid) @@ -153,7 +153,7 @@ public interface WebserviceServerInfoRecordMapper { .set(updateTime).equalToWhenPresent(record::getUpdateTime); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.137+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.796+02:00", comments="Source Table: webservice_server_info") default int updateByPrimaryKey(WebserviceServerInfoRecord record) { return UpdateDSL.updateWithMapper(this::update, webserviceServerInfoRecord) .set(uuid).equalTo(record::getUuid) @@ -165,7 +165,7 @@ public interface WebserviceServerInfoRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.137+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.796+02:00", comments="Source Table: webservice_server_info") default int updateByPrimaryKeySelective(WebserviceServerInfoRecord record) { return UpdateDSL.updateWithMapper(this::update, webserviceServerInfoRecord) .set(uuid).equalToWhenPresent(record::getUuid) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/AdditionalAttributeRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/AdditionalAttributeRecord.java index 28457cb2..5277d8d6 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/AdditionalAttributeRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/AdditionalAttributeRecord.java @@ -3,22 +3,22 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class AdditionalAttributeRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.131+02:00", comments="Source field: additional_attributes.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.789+02:00", comments="Source field: additional_attributes.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.131+02:00", comments="Source field: additional_attributes.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.789+02:00", comments="Source field: additional_attributes.entity_type") private String entityType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.131+02:00", comments="Source field: additional_attributes.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.789+02:00", comments="Source field: additional_attributes.entity_id") private Long entityId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.131+02:00", comments="Source field: additional_attributes.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.789+02:00", comments="Source field: additional_attributes.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.131+02:00", comments="Source field: additional_attributes.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.789+02:00", comments="Source field: additional_attributes.value") private String value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.131+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.789+02:00", comments="Source Table: additional_attributes") public AdditionalAttributeRecord(Long id, String entityType, Long entityId, String name, String value) { this.id = id; this.entityType = entityType; @@ -27,27 +27,27 @@ public class AdditionalAttributeRecord { this.value = value; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.131+02:00", comments="Source field: additional_attributes.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.789+02:00", comments="Source field: additional_attributes.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.131+02:00", comments="Source field: additional_attributes.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.789+02:00", comments="Source field: additional_attributes.entity_type") public String getEntityType() { return entityType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.131+02:00", comments="Source field: additional_attributes.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.789+02:00", comments="Source field: additional_attributes.entity_id") public Long getEntityId() { return entityId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.131+02:00", comments="Source field: additional_attributes.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.789+02:00", comments="Source field: additional_attributes.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.131+02:00", comments="Source field: additional_attributes.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.789+02:00", comments="Source field: additional_attributes.value") public String getValue() { return value; } @@ -56,7 +56,7 @@ public class AdditionalAttributeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table additional_attributes * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public String toString() { @@ -77,7 +77,7 @@ public class AdditionalAttributeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table additional_attributes * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public boolean equals(Object that) { @@ -102,7 +102,7 @@ public class AdditionalAttributeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table additional_attributes * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/BatchActionRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/BatchActionRecord.java index 8c547205..d3b3b735 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/BatchActionRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/BatchActionRecord.java @@ -3,34 +3,34 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class BatchActionRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.141+02:00", comments="Source field: batch_action.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.802+02:00", comments="Source field: batch_action.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.142+02:00", comments="Source field: batch_action.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.802+02:00", comments="Source field: batch_action.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.142+02:00", comments="Source field: batch_action.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.802+02:00", comments="Source field: batch_action.owner") private String owner; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.142+02:00", comments="Source field: batch_action.action_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.802+02:00", comments="Source field: batch_action.action_type") private String actionType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.142+02:00", comments="Source field: batch_action.attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.802+02:00", comments="Source field: batch_action.attributes") private String attributes; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.142+02:00", comments="Source field: batch_action.source_ids") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.802+02:00", comments="Source field: batch_action.source_ids") private String sourceIds; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.142+02:00", comments="Source field: batch_action.successful") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.802+02:00", comments="Source field: batch_action.successful") private String successful; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.142+02:00", comments="Source field: batch_action.last_update") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.802+02:00", comments="Source field: batch_action.last_update") private Long lastUpdate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.142+02:00", comments="Source field: batch_action.processor_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.802+02:00", comments="Source field: batch_action.processor_id") private String processorId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.141+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.802+02:00", comments="Source Table: batch_action") public BatchActionRecord(Long id, Long institutionId, String owner, String actionType, String attributes, String sourceIds, String successful, Long lastUpdate, String processorId) { this.id = id; this.institutionId = institutionId; @@ -43,47 +43,47 @@ public class BatchActionRecord { this.processorId = processorId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.141+02:00", comments="Source field: batch_action.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.802+02:00", comments="Source field: batch_action.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.142+02:00", comments="Source field: batch_action.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.802+02:00", comments="Source field: batch_action.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.142+02:00", comments="Source field: batch_action.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.802+02:00", comments="Source field: batch_action.owner") public String getOwner() { return owner; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.142+02:00", comments="Source field: batch_action.action_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.802+02:00", comments="Source field: batch_action.action_type") public String getActionType() { return actionType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.142+02:00", comments="Source field: batch_action.attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.802+02:00", comments="Source field: batch_action.attributes") public String getAttributes() { return attributes; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.142+02:00", comments="Source field: batch_action.source_ids") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.802+02:00", comments="Source field: batch_action.source_ids") public String getSourceIds() { return sourceIds; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.142+02:00", comments="Source field: batch_action.successful") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.802+02:00", comments="Source field: batch_action.successful") public String getSuccessful() { return successful; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.142+02:00", comments="Source field: batch_action.last_update") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.802+02:00", comments="Source field: batch_action.last_update") public Long getLastUpdate() { return lastUpdate; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.142+02:00", comments="Source field: batch_action.processor_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.802+02:00", comments="Source field: batch_action.processor_id") public String getProcessorId() { return processorId; } @@ -92,7 +92,7 @@ public class BatchActionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table batch_action * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public String toString() { @@ -117,7 +117,7 @@ public class BatchActionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table batch_action * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public boolean equals(Object that) { @@ -146,7 +146,7 @@ public class BatchActionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table batch_action * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/CertificateRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/CertificateRecord.java index 3aa1742d..33419b4c 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/CertificateRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/CertificateRecord.java @@ -4,19 +4,19 @@ import java.util.Arrays; import javax.annotation.Generated; public class CertificateRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.137+02:00", comments="Source field: certificate.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.796+02:00", comments="Source field: certificate.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.137+02:00", comments="Source field: certificate.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.796+02:00", comments="Source field: certificate.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.137+02:00", comments="Source field: certificate.aliases") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.796+02:00", comments="Source field: certificate.aliases") private String aliases; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.137+02:00", comments="Source field: certificate.cert_store") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.796+02:00", comments="Source field: certificate.cert_store") private byte[] certStore; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.137+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.796+02:00", comments="Source Table: certificate") public CertificateRecord(Long id, Long institutionId, String aliases, byte[] certStore) { this.id = id; this.institutionId = institutionId; @@ -24,22 +24,22 @@ public class CertificateRecord { this.certStore = certStore; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.137+02:00", comments="Source field: certificate.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.796+02:00", comments="Source field: certificate.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.137+02:00", comments="Source field: certificate.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.796+02:00", comments="Source field: certificate.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.137+02:00", comments="Source field: certificate.aliases") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.796+02:00", comments="Source field: certificate.aliases") public String getAliases() { return aliases; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.137+02:00", comments="Source field: certificate.cert_store") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.796+02:00", comments="Source field: certificate.cert_store") public byte[] getCertStore() { return certStore; } @@ -48,7 +48,7 @@ public class CertificateRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table certificate * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public String toString() { @@ -68,7 +68,7 @@ public class CertificateRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table certificate * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public boolean equals(Object that) { @@ -92,7 +92,7 @@ public class CertificateRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table certificate * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientConnectionRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientConnectionRecord.java index 5132133e..c9a13d9d 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientConnectionRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientConnectionRecord.java @@ -3,58 +3,58 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class ClientConnectionRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.086+02:00", comments="Source field: client_connection.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.740+02:00", comments="Source field: client_connection.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.086+02:00", comments="Source field: client_connection.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.740+02:00", comments="Source field: client_connection.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.087+02:00", comments="Source field: client_connection.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.740+02:00", comments="Source field: client_connection.exam_id") private Long examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.087+02:00", comments="Source field: client_connection.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.740+02:00", comments="Source field: client_connection.status") private String status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.087+02:00", comments="Source field: client_connection.connection_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.740+02:00", comments="Source field: client_connection.connection_token") private String connectionToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.087+02:00", comments="Source field: client_connection.exam_user_session_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.740+02:00", comments="Source field: client_connection.exam_user_session_id") private String examUserSessionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.087+02:00", comments="Source field: client_connection.client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.740+02:00", comments="Source field: client_connection.client_address") private String clientAddress; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.087+02:00", comments="Source field: client_connection.virtual_client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.740+02:00", comments="Source field: client_connection.virtual_client_address") private String virtualClientAddress; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.087+02:00", comments="Source field: client_connection.vdi") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.741+02:00", comments="Source field: client_connection.vdi") private Integer vdi; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.087+02:00", comments="Source field: client_connection.vdi_pair_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.741+02:00", comments="Source field: client_connection.vdi_pair_token") private String vdiPairToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.087+02:00", comments="Source field: client_connection.creation_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.741+02:00", comments="Source field: client_connection.creation_time") private Long creationTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.087+02:00", comments="Source field: client_connection.update_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.741+02:00", comments="Source field: client_connection.update_time") private Long updateTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.087+02:00", comments="Source field: client_connection.remote_proctoring_room_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.741+02:00", comments="Source field: client_connection.remote_proctoring_room_id") private Long remoteProctoringRoomId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.087+02:00", comments="Source field: client_connection.remote_proctoring_room_update") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.741+02:00", comments="Source field: client_connection.remote_proctoring_room_update") private Integer remoteProctoringRoomUpdate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.088+02:00", comments="Source field: client_connection.client_machine_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.741+02:00", comments="Source field: client_connection.client_machine_name") private String clientMachineName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.088+02:00", comments="Source field: client_connection.client_os_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.741+02:00", comments="Source field: client_connection.client_os_name") private String clientOsName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.088+02:00", comments="Source field: client_connection.client_version") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.741+02:00", comments="Source field: client_connection.client_version") private String clientVersion; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.086+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.740+02:00", comments="Source Table: client_connection") public ClientConnectionRecord(Long id, Long institutionId, Long examId, String status, String connectionToken, String examUserSessionId, String clientAddress, String virtualClientAddress, Integer vdi, String vdiPairToken, Long creationTime, Long updateTime, Long remoteProctoringRoomId, Integer remoteProctoringRoomUpdate, String clientMachineName, String clientOsName, String clientVersion) { this.id = id; this.institutionId = institutionId; @@ -75,87 +75,87 @@ public class ClientConnectionRecord { this.clientVersion = clientVersion; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.086+02:00", comments="Source field: client_connection.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.740+02:00", comments="Source field: client_connection.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.087+02:00", comments="Source field: client_connection.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.740+02:00", comments="Source field: client_connection.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.087+02:00", comments="Source field: client_connection.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.740+02:00", comments="Source field: client_connection.exam_id") public Long getExamId() { return examId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.087+02:00", comments="Source field: client_connection.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.740+02:00", comments="Source field: client_connection.status") public String getStatus() { return status; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.087+02:00", comments="Source field: client_connection.connection_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.740+02:00", comments="Source field: client_connection.connection_token") public String getConnectionToken() { return connectionToken; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.087+02:00", comments="Source field: client_connection.exam_user_session_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.740+02:00", comments="Source field: client_connection.exam_user_session_id") public String getExamUserSessionId() { return examUserSessionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.087+02:00", comments="Source field: client_connection.client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.740+02:00", comments="Source field: client_connection.client_address") public String getClientAddress() { return clientAddress; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.087+02:00", comments="Source field: client_connection.virtual_client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.740+02:00", comments="Source field: client_connection.virtual_client_address") public String getVirtualClientAddress() { return virtualClientAddress; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.087+02:00", comments="Source field: client_connection.vdi") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.741+02:00", comments="Source field: client_connection.vdi") public Integer getVdi() { return vdi; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.087+02:00", comments="Source field: client_connection.vdi_pair_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.741+02:00", comments="Source field: client_connection.vdi_pair_token") public String getVdiPairToken() { return vdiPairToken; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.087+02:00", comments="Source field: client_connection.creation_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.741+02:00", comments="Source field: client_connection.creation_time") public Long getCreationTime() { return creationTime; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.087+02:00", comments="Source field: client_connection.update_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.741+02:00", comments="Source field: client_connection.update_time") public Long getUpdateTime() { return updateTime; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.087+02:00", comments="Source field: client_connection.remote_proctoring_room_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.741+02:00", comments="Source field: client_connection.remote_proctoring_room_id") public Long getRemoteProctoringRoomId() { return remoteProctoringRoomId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.087+02:00", comments="Source field: client_connection.remote_proctoring_room_update") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.741+02:00", comments="Source field: client_connection.remote_proctoring_room_update") public Integer getRemoteProctoringRoomUpdate() { return remoteProctoringRoomUpdate; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.088+02:00", comments="Source field: client_connection.client_machine_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.741+02:00", comments="Source field: client_connection.client_machine_name") public String getClientMachineName() { return clientMachineName; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.088+02:00", comments="Source field: client_connection.client_os_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.741+02:00", comments="Source field: client_connection.client_os_name") public String getClientOsName() { return clientOsName; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.088+02:00", comments="Source field: client_connection.client_version") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.741+02:00", comments="Source field: client_connection.client_version") public String getClientVersion() { return clientVersion; } @@ -164,7 +164,7 @@ public class ClientConnectionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_connection * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public String toString() { @@ -197,7 +197,7 @@ public class ClientConnectionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_connection * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public boolean equals(Object that) { @@ -234,7 +234,7 @@ public class ClientConnectionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_connection * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientEventRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientEventRecord.java index 13c7fe9f..a970e248 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientEventRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientEventRecord.java @@ -4,28 +4,28 @@ import java.math.BigDecimal; import javax.annotation.Generated; public class ClientEventRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.099+02:00", comments="Source field: client_event.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.749+02:00", comments="Source field: client_event.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.099+02:00", comments="Source field: client_event.client_connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.749+02:00", comments="Source field: client_event.client_connection_id") private Long clientConnectionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.099+02:00", comments="Source field: client_event.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.749+02:00", comments="Source field: client_event.type") private Integer type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.099+02:00", comments="Source field: client_event.client_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.749+02:00", comments="Source field: client_event.client_time") private Long clientTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.100+02:00", comments="Source field: client_event.server_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.749+02:00", comments="Source field: client_event.server_time") private Long serverTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.100+02:00", comments="Source field: client_event.numeric_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.750+02:00", comments="Source field: client_event.numeric_value") private BigDecimal numericValue; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.100+02:00", comments="Source field: client_event.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.750+02:00", comments="Source field: client_event.text") private String text; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.099+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.748+02:00", comments="Source Table: client_event") public ClientEventRecord(Long id, Long clientConnectionId, Integer type, Long clientTime, Long serverTime, BigDecimal numericValue, String text) { this.id = id; this.clientConnectionId = clientConnectionId; @@ -36,77 +36,77 @@ public class ClientEventRecord { this.text = text; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.099+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.749+02:00", comments="Source Table: client_event") public ClientEventRecord() { super(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.099+02:00", comments="Source field: client_event.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.749+02:00", comments="Source field: client_event.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.099+02:00", comments="Source field: client_event.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.749+02:00", comments="Source field: client_event.id") public void setId(Long id) { this.id = id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.099+02:00", comments="Source field: client_event.client_connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.749+02:00", comments="Source field: client_event.client_connection_id") public Long getClientConnectionId() { return clientConnectionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.099+02:00", comments="Source field: client_event.client_connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.749+02:00", comments="Source field: client_event.client_connection_id") public void setClientConnectionId(Long clientConnectionId) { this.clientConnectionId = clientConnectionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.099+02:00", comments="Source field: client_event.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.749+02:00", comments="Source field: client_event.type") public Integer getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.099+02:00", comments="Source field: client_event.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.749+02:00", comments="Source field: client_event.type") public void setType(Integer type) { this.type = type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.099+02:00", comments="Source field: client_event.client_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.749+02:00", comments="Source field: client_event.client_time") public Long getClientTime() { return clientTime; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.100+02:00", comments="Source field: client_event.client_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.749+02:00", comments="Source field: client_event.client_time") public void setClientTime(Long clientTime) { this.clientTime = clientTime; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.100+02:00", comments="Source field: client_event.server_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.750+02:00", comments="Source field: client_event.server_time") public Long getServerTime() { return serverTime; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.100+02:00", comments="Source field: client_event.server_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.750+02:00", comments="Source field: client_event.server_time") public void setServerTime(Long serverTime) { this.serverTime = serverTime; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.100+02:00", comments="Source field: client_event.numeric_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.750+02:00", comments="Source field: client_event.numeric_value") public BigDecimal getNumericValue() { return numericValue; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.100+02:00", comments="Source field: client_event.numeric_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.750+02:00", comments="Source field: client_event.numeric_value") public void setNumericValue(BigDecimal numericValue) { this.numericValue = numericValue; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.100+02:00", comments="Source field: client_event.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.750+02:00", comments="Source field: client_event.text") public String getText() { return text; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.100+02:00", comments="Source field: client_event.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.750+02:00", comments="Source field: client_event.text") public void setText(String text) { this.text = text == null ? null : text.trim(); } @@ -115,7 +115,7 @@ public class ClientEventRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_event * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public String toString() { @@ -138,7 +138,7 @@ public class ClientEventRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_event * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public boolean equals(Object that) { @@ -165,7 +165,7 @@ public class ClientEventRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_event * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientGroupRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientGroupRecord.java index 669a59de..16a30858 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientGroupRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientGroupRecord.java @@ -3,60 +3,69 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class ClientGroupRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.147+02:00", comments="Source field: client_group.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.810+02:00", comments="Source field: client_group.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.147+02:00", comments="Source field: client_group.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.810+02:00", comments="Source field: client_group.exam_id") private Long examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.147+02:00", comments="Source field: client_group.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.810+02:00", comments="Source field: client_group.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.147+02:00", comments="Source field: client_group.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.810+02:00", comments="Source field: client_group.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.147+02:00", comments="Source field: client_group.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.810+02:00", comments="Source field: client_group.color") private String color; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.147+02:00", comments="Source field: client_group.data") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.810+02:00", comments="Source field: client_group.icon") + private String icon; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.810+02:00", comments="Source field: client_group.data") private String data; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.147+02:00", comments="Source Table: client_group") - public ClientGroupRecord(Long id, Long examId, String name, String type, String color, String data) { + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.810+02:00", comments="Source Table: client_group") + public ClientGroupRecord(Long id, Long examId, String name, String type, String color, String icon, String data) { this.id = id; this.examId = examId; this.name = name; this.type = type; this.color = color; + this.icon = icon; this.data = data; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.147+02:00", comments="Source field: client_group.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.810+02:00", comments="Source field: client_group.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.147+02:00", comments="Source field: client_group.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.810+02:00", comments="Source field: client_group.exam_id") public Long getExamId() { return examId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.147+02:00", comments="Source field: client_group.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.810+02:00", comments="Source field: client_group.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.147+02:00", comments="Source field: client_group.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.810+02:00", comments="Source field: client_group.type") public String getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.147+02:00", comments="Source field: client_group.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.810+02:00", comments="Source field: client_group.color") public String getColor() { return color; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.148+02:00", comments="Source field: client_group.data") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.810+02:00", comments="Source field: client_group.icon") + public String getIcon() { + return icon; + } + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.810+02:00", comments="Source field: client_group.data") public String getData() { return data; } @@ -65,7 +74,7 @@ public class ClientGroupRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_group * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public String toString() { @@ -78,6 +87,7 @@ public class ClientGroupRecord { sb.append(", name=").append(name); sb.append(", type=").append(type); sb.append(", color=").append(color); + sb.append(", icon=").append(icon); sb.append(", data=").append(data); sb.append("]"); return sb.toString(); @@ -87,7 +97,7 @@ public class ClientGroupRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_group * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public boolean equals(Object that) { @@ -106,6 +116,7 @@ public class ClientGroupRecord { && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName())) && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType())) && (this.getColor() == null ? other.getColor() == null : this.getColor().equals(other.getColor())) + && (this.getIcon() == null ? other.getIcon() == null : this.getIcon().equals(other.getIcon())) && (this.getData() == null ? other.getData() == null : this.getData().equals(other.getData())); } @@ -113,7 +124,7 @@ public class ClientGroupRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_group * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public int hashCode() { @@ -124,6 +135,7 @@ public class ClientGroupRecord { result = prime * result + ((getName() == null) ? 0 : getName().hashCode()); result = prime * result + ((getType() == null) ? 0 : getType().hashCode()); result = prime * result + ((getColor() == null) ? 0 : getColor().hashCode()); + result = prime * result + ((getIcon() == null) ? 0 : getIcon().hashCode()); result = prime * result + ((getData() == null) ? 0 : getData().hashCode()); return result; } diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientIndicatorRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientIndicatorRecord.java index f0d632de..61a01786 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientIndicatorRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientIndicatorRecord.java @@ -3,19 +3,19 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class ClientIndicatorRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.144+02:00", comments="Source field: client_indicator.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.804+02:00", comments="Source field: client_indicator.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.144+02:00", comments="Source field: client_indicator.client_connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.804+02:00", comments="Source field: client_indicator.client_connection_id") private Long clientConnectionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.144+02:00", comments="Source field: client_indicator.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.804+02:00", comments="Source field: client_indicator.type") private Integer type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.144+02:00", comments="Source field: client_indicator.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.805+02:00", comments="Source field: client_indicator.value") private Long value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.144+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.804+02:00", comments="Source Table: client_indicator") public ClientIndicatorRecord(Long id, Long clientConnectionId, Integer type, Long value) { this.id = id; this.clientConnectionId = clientConnectionId; @@ -23,47 +23,47 @@ public class ClientIndicatorRecord { this.value = value; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.144+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.804+02:00", comments="Source Table: client_indicator") public ClientIndicatorRecord() { super(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.144+02:00", comments="Source field: client_indicator.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.804+02:00", comments="Source field: client_indicator.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.144+02:00", comments="Source field: client_indicator.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.804+02:00", comments="Source field: client_indicator.id") public void setId(Long id) { this.id = id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.144+02:00", comments="Source field: client_indicator.client_connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.804+02:00", comments="Source field: client_indicator.client_connection_id") public Long getClientConnectionId() { return clientConnectionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.144+02:00", comments="Source field: client_indicator.client_connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.804+02:00", comments="Source field: client_indicator.client_connection_id") public void setClientConnectionId(Long clientConnectionId) { this.clientConnectionId = clientConnectionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.144+02:00", comments="Source field: client_indicator.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.804+02:00", comments="Source field: client_indicator.type") public Integer getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.144+02:00", comments="Source field: client_indicator.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.804+02:00", comments="Source field: client_indicator.type") public void setType(Integer type) { this.type = type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.144+02:00", comments="Source field: client_indicator.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.805+02:00", comments="Source field: client_indicator.value") public Long getValue() { return value; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.144+02:00", comments="Source field: client_indicator.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.805+02:00", comments="Source field: client_indicator.value") public void setValue(Long value) { this.value = value; } @@ -72,7 +72,7 @@ public class ClientIndicatorRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_indicator * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public String toString() { @@ -92,7 +92,7 @@ public class ClientIndicatorRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_indicator * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public boolean equals(Object that) { @@ -116,7 +116,7 @@ public class ClientIndicatorRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_indicator * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientInstructionRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientInstructionRecord.java index b6cff372..45896476 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientInstructionRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientInstructionRecord.java @@ -3,28 +3,28 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class ClientInstructionRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.105+02:00", comments="Source field: client_instruction.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.752+02:00", comments="Source field: client_instruction.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.105+02:00", comments="Source field: client_instruction.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.752+02:00", comments="Source field: client_instruction.exam_id") private Long examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.105+02:00", comments="Source field: client_instruction.connection_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.752+02:00", comments="Source field: client_instruction.connection_token") private String connectionToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.105+02:00", comments="Source field: client_instruction.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.752+02:00", comments="Source field: client_instruction.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.105+02:00", comments="Source field: client_instruction.attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.752+02:00", comments="Source field: client_instruction.attributes") private String attributes; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.105+02:00", comments="Source field: client_instruction.needs_confirmation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.752+02:00", comments="Source field: client_instruction.needs_confirmation") private Integer needsConfirmation; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.105+02:00", comments="Source field: client_instruction.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.752+02:00", comments="Source field: client_instruction.timestamp") private Long timestamp; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.105+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.752+02:00", comments="Source Table: client_instruction") public ClientInstructionRecord(Long id, Long examId, String connectionToken, String type, String attributes, Integer needsConfirmation, Long timestamp) { this.id = id; this.examId = examId; @@ -35,37 +35,37 @@ public class ClientInstructionRecord { this.timestamp = timestamp; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.105+02:00", comments="Source field: client_instruction.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.752+02:00", comments="Source field: client_instruction.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.105+02:00", comments="Source field: client_instruction.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.752+02:00", comments="Source field: client_instruction.exam_id") public Long getExamId() { return examId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.105+02:00", comments="Source field: client_instruction.connection_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.752+02:00", comments="Source field: client_instruction.connection_token") public String getConnectionToken() { return connectionToken; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.105+02:00", comments="Source field: client_instruction.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.752+02:00", comments="Source field: client_instruction.type") public String getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.105+02:00", comments="Source field: client_instruction.attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.752+02:00", comments="Source field: client_instruction.attributes") public String getAttributes() { return attributes; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.105+02:00", comments="Source field: client_instruction.needs_confirmation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.752+02:00", comments="Source field: client_instruction.needs_confirmation") public Integer getNeedsConfirmation() { return needsConfirmation; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.106+02:00", comments="Source field: client_instruction.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.752+02:00", comments="Source field: client_instruction.timestamp") public Long getTimestamp() { return timestamp; } @@ -74,7 +74,7 @@ public class ClientInstructionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_instruction * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public String toString() { @@ -97,7 +97,7 @@ public class ClientInstructionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_instruction * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public boolean equals(Object that) { @@ -124,7 +124,7 @@ public class ClientInstructionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_instruction * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientNotificationRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientNotificationRecord.java index b4101e85..a6744841 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientNotificationRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientNotificationRecord.java @@ -3,25 +3,25 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class ClientNotificationRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.146+02:00", comments="Source field: client_notification.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.807+02:00", comments="Source field: client_notification.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.146+02:00", comments="Source field: client_notification.client_connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.807+02:00", comments="Source field: client_notification.client_connection_id") private Long clientConnectionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.146+02:00", comments="Source field: client_notification.event_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.807+02:00", comments="Source field: client_notification.event_type") private Integer eventType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.146+02:00", comments="Source field: client_notification.notification_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.807+02:00", comments="Source field: client_notification.notification_type") private Integer notificationType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.146+02:00", comments="Source field: client_notification.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.807+02:00", comments="Source field: client_notification.value") private Long value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.146+02:00", comments="Source field: client_notification.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.807+02:00", comments="Source field: client_notification.text") private String text; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.146+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.807+02:00", comments="Source Table: client_notification") public ClientNotificationRecord(Long id, Long clientConnectionId, Integer eventType, Integer notificationType, Long value, String text) { this.id = id; this.clientConnectionId = clientConnectionId; @@ -31,32 +31,32 @@ public class ClientNotificationRecord { this.text = text; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.146+02:00", comments="Source field: client_notification.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.807+02:00", comments="Source field: client_notification.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.146+02:00", comments="Source field: client_notification.client_connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.807+02:00", comments="Source field: client_notification.client_connection_id") public Long getClientConnectionId() { return clientConnectionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.146+02:00", comments="Source field: client_notification.event_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.807+02:00", comments="Source field: client_notification.event_type") public Integer getEventType() { return eventType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.146+02:00", comments="Source field: client_notification.notification_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.807+02:00", comments="Source field: client_notification.notification_type") public Integer getNotificationType() { return notificationType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.146+02:00", comments="Source field: client_notification.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.807+02:00", comments="Source field: client_notification.value") public Long getValue() { return value; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.146+02:00", comments="Source field: client_notification.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.807+02:00", comments="Source field: client_notification.text") public String getText() { return text; } @@ -65,7 +65,7 @@ public class ClientNotificationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_notification * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public String toString() { @@ -87,7 +87,7 @@ public class ClientNotificationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_notification * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public boolean equals(Object that) { @@ -113,7 +113,7 @@ public class ClientNotificationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_notification * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationAttributeRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationAttributeRecord.java index 768bf941..50524f56 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationAttributeRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationAttributeRecord.java @@ -3,31 +3,31 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class ConfigurationAttributeRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.892+02:00", comments="Source field: configuration_attribute.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.573+02:00", comments="Source field: configuration_attribute.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.893+02:00", comments="Source field: configuration_attribute.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.574+02:00", comments="Source field: configuration_attribute.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.893+02:00", comments="Source field: configuration_attribute.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.574+02:00", comments="Source field: configuration_attribute.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.893+02:00", comments="Source field: configuration_attribute.parent_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.574+02:00", comments="Source field: configuration_attribute.parent_id") private Long parentId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.893+02:00", comments="Source field: configuration_attribute.resources") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.574+02:00", comments="Source field: configuration_attribute.resources") private String resources; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.893+02:00", comments="Source field: configuration_attribute.validator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.574+02:00", comments="Source field: configuration_attribute.validator") private String validator; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.894+02:00", comments="Source field: configuration_attribute.dependencies") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.575+02:00", comments="Source field: configuration_attribute.dependencies") private String dependencies; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.894+02:00", comments="Source field: configuration_attribute.default_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.575+02:00", comments="Source field: configuration_attribute.default_value") private String defaultValue; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.887+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.569+02:00", comments="Source Table: configuration_attribute") public ConfigurationAttributeRecord(Long id, String name, String type, Long parentId, String resources, String validator, String dependencies, String defaultValue) { this.id = id; this.name = name; @@ -39,42 +39,42 @@ public class ConfigurationAttributeRecord { this.defaultValue = defaultValue; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.893+02:00", comments="Source field: configuration_attribute.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.574+02:00", comments="Source field: configuration_attribute.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.893+02:00", comments="Source field: configuration_attribute.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.574+02:00", comments="Source field: configuration_attribute.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.893+02:00", comments="Source field: configuration_attribute.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.574+02:00", comments="Source field: configuration_attribute.type") public String getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.893+02:00", comments="Source field: configuration_attribute.parent_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.574+02:00", comments="Source field: configuration_attribute.parent_id") public Long getParentId() { return parentId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.893+02:00", comments="Source field: configuration_attribute.resources") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.574+02:00", comments="Source field: configuration_attribute.resources") public String getResources() { return resources; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.894+02:00", comments="Source field: configuration_attribute.validator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.575+02:00", comments="Source field: configuration_attribute.validator") public String getValidator() { return validator; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.894+02:00", comments="Source field: configuration_attribute.dependencies") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.575+02:00", comments="Source field: configuration_attribute.dependencies") public String getDependencies() { return dependencies; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:54:59.894+02:00", comments="Source field: configuration_attribute.default_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.575+02:00", comments="Source field: configuration_attribute.default_value") public String getDefaultValue() { return defaultValue; } @@ -83,7 +83,7 @@ public class ConfigurationAttributeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_attribute * - * @mbg.generated Wed Aug 17 15:54:59 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public String toString() { @@ -107,7 +107,7 @@ public class ConfigurationAttributeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_attribute * - * @mbg.generated Wed Aug 17 15:54:59 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public boolean equals(Object that) { @@ -135,7 +135,7 @@ public class ConfigurationAttributeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_attribute * - * @mbg.generated Wed Aug 17 15:54:59 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationNodeRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationNodeRecord.java index c5467488..dea0a2b5 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationNodeRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationNodeRecord.java @@ -3,37 +3,37 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class ConfigurationNodeRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.066+02:00", comments="Source field: configuration_node.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.721+02:00", comments="Source field: configuration_node.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.066+02:00", comments="Source field: configuration_node.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.721+02:00", comments="Source field: configuration_node.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.067+02:00", comments="Source field: configuration_node.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.721+02:00", comments="Source field: configuration_node.template_id") private Long templateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.067+02:00", comments="Source field: configuration_node.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.721+02:00", comments="Source field: configuration_node.owner") private String owner; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.067+02:00", comments="Source field: configuration_node.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.721+02:00", comments="Source field: configuration_node.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.067+02:00", comments="Source field: configuration_node.description") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.721+02:00", comments="Source field: configuration_node.description") private String description; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.067+02:00", comments="Source field: configuration_node.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.722+02:00", comments="Source field: configuration_node.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.067+02:00", comments="Source field: configuration_node.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.722+02:00", comments="Source field: configuration_node.status") private String status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.067+02:00", comments="Source field: configuration_node.last_update_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.722+02:00", comments="Source field: configuration_node.last_update_time") private Long lastUpdateTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.067+02:00", comments="Source field: configuration_node.last_update_user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.722+02:00", comments="Source field: configuration_node.last_update_user") private String lastUpdateUser; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.066+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.721+02:00", comments="Source Table: configuration_node") public ConfigurationNodeRecord(Long id, Long institutionId, Long templateId, String owner, String name, String description, String type, String status, Long lastUpdateTime, String lastUpdateUser) { this.id = id; this.institutionId = institutionId; @@ -47,52 +47,52 @@ public class ConfigurationNodeRecord { this.lastUpdateUser = lastUpdateUser; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.066+02:00", comments="Source field: configuration_node.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.721+02:00", comments="Source field: configuration_node.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.066+02:00", comments="Source field: configuration_node.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.721+02:00", comments="Source field: configuration_node.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.067+02:00", comments="Source field: configuration_node.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.721+02:00", comments="Source field: configuration_node.template_id") public Long getTemplateId() { return templateId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.067+02:00", comments="Source field: configuration_node.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.721+02:00", comments="Source field: configuration_node.owner") public String getOwner() { return owner; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.067+02:00", comments="Source field: configuration_node.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.721+02:00", comments="Source field: configuration_node.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.067+02:00", comments="Source field: configuration_node.description") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.721+02:00", comments="Source field: configuration_node.description") public String getDescription() { return description; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.067+02:00", comments="Source field: configuration_node.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.722+02:00", comments="Source field: configuration_node.type") public String getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.067+02:00", comments="Source field: configuration_node.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.722+02:00", comments="Source field: configuration_node.status") public String getStatus() { return status; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.067+02:00", comments="Source field: configuration_node.last_update_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.722+02:00", comments="Source field: configuration_node.last_update_time") public Long getLastUpdateTime() { return lastUpdateTime; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.067+02:00", comments="Source field: configuration_node.last_update_user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.722+02:00", comments="Source field: configuration_node.last_update_user") public String getLastUpdateUser() { return lastUpdateUser; } @@ -101,7 +101,7 @@ public class ConfigurationNodeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_node * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public String toString() { @@ -127,7 +127,7 @@ public class ConfigurationNodeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_node * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public boolean equals(Object that) { @@ -157,7 +157,7 @@ public class ConfigurationNodeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_node * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationRecord.java index 9859eab6..363e4b99 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationRecord.java @@ -4,25 +4,25 @@ import javax.annotation.Generated; import org.joda.time.DateTime; public class ConfigurationRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.063+02:00", comments="Source field: configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.716+02:00", comments="Source field: configuration.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.063+02:00", comments="Source field: configuration.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.716+02:00", comments="Source field: configuration.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.063+02:00", comments="Source field: configuration.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.717+02:00", comments="Source field: configuration.configuration_node_id") private Long configurationNodeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.063+02:00", comments="Source field: configuration.version") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.717+02:00", comments="Source field: configuration.version") private String version; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.063+02:00", comments="Source field: configuration.version_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.717+02:00", comments="Source field: configuration.version_date") private DateTime versionDate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.064+02:00", comments="Source field: configuration.followup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.717+02:00", comments="Source field: configuration.followup") private Integer followup; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.063+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.716+02:00", comments="Source Table: configuration") public ConfigurationRecord(Long id, Long institutionId, Long configurationNodeId, String version, DateTime versionDate, Integer followup) { this.id = id; this.institutionId = institutionId; @@ -32,32 +32,32 @@ public class ConfigurationRecord { this.followup = followup; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.063+02:00", comments="Source field: configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.716+02:00", comments="Source field: configuration.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.063+02:00", comments="Source field: configuration.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.717+02:00", comments="Source field: configuration.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.063+02:00", comments="Source field: configuration.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.717+02:00", comments="Source field: configuration.configuration_node_id") public Long getConfigurationNodeId() { return configurationNodeId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.063+02:00", comments="Source field: configuration.version") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.717+02:00", comments="Source field: configuration.version") public String getVersion() { return version; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.064+02:00", comments="Source field: configuration.version_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.717+02:00", comments="Source field: configuration.version_date") public DateTime getVersionDate() { return versionDate; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.064+02:00", comments="Source field: configuration.followup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.717+02:00", comments="Source field: configuration.followup") public Integer getFollowup() { return followup; } @@ -66,7 +66,7 @@ public class ConfigurationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public String toString() { @@ -88,7 +88,7 @@ public class ConfigurationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public boolean equals(Object that) { @@ -114,7 +114,7 @@ public class ConfigurationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationValueRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationValueRecord.java index f9de8d45..e61ef7d8 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationValueRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationValueRecord.java @@ -3,25 +3,25 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class ConfigurationValueRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.047+02:00", comments="Source field: configuration_value.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.703+02:00", comments="Source field: configuration_value.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.047+02:00", comments="Source field: configuration_value.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.703+02:00", comments="Source field: configuration_value.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.047+02:00", comments="Source field: configuration_value.configuration_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.703+02:00", comments="Source field: configuration_value.configuration_id") private Long configurationId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.047+02:00", comments="Source field: configuration_value.configuration_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.704+02:00", comments="Source field: configuration_value.configuration_attribute_id") private Long configurationAttributeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.047+02:00", comments="Source field: configuration_value.list_index") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.704+02:00", comments="Source field: configuration_value.list_index") private Integer listIndex; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.047+02:00", comments="Source field: configuration_value.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.704+02:00", comments="Source field: configuration_value.value") private String value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.047+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.703+02:00", comments="Source Table: configuration_value") public ConfigurationValueRecord(Long id, Long institutionId, Long configurationId, Long configurationAttributeId, Integer listIndex, String value) { this.id = id; this.institutionId = institutionId; @@ -31,32 +31,32 @@ public class ConfigurationValueRecord { this.value = value; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.047+02:00", comments="Source field: configuration_value.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.703+02:00", comments="Source field: configuration_value.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.047+02:00", comments="Source field: configuration_value.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.703+02:00", comments="Source field: configuration_value.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.047+02:00", comments="Source field: configuration_value.configuration_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.703+02:00", comments="Source field: configuration_value.configuration_id") public Long getConfigurationId() { return configurationId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.047+02:00", comments="Source field: configuration_value.configuration_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.704+02:00", comments="Source field: configuration_value.configuration_attribute_id") public Long getConfigurationAttributeId() { return configurationAttributeId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.047+02:00", comments="Source field: configuration_value.list_index") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.704+02:00", comments="Source field: configuration_value.list_index") public Integer getListIndex() { return listIndex; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.047+02:00", comments="Source field: configuration_value.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.704+02:00", comments="Source field: configuration_value.value") public String getValue() { return value; } @@ -65,7 +65,7 @@ public class ConfigurationValueRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_value * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public String toString() { @@ -87,7 +87,7 @@ public class ConfigurationValueRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_value * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public boolean equals(Object that) { @@ -113,7 +113,7 @@ public class ConfigurationValueRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_value * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamConfigurationMapRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamConfigurationMapRecord.java index d4bd238a..64714c72 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamConfigurationMapRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamConfigurationMapRecord.java @@ -3,25 +3,25 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class ExamConfigurationMapRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.070+02:00", comments="Source field: exam_configuration_map.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.728+02:00", comments="Source field: exam_configuration_map.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.071+02:00", comments="Source field: exam_configuration_map.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.728+02:00", comments="Source field: exam_configuration_map.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.071+02:00", comments="Source field: exam_configuration_map.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.728+02:00", comments="Source field: exam_configuration_map.exam_id") private Long examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.072+02:00", comments="Source field: exam_configuration_map.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.728+02:00", comments="Source field: exam_configuration_map.configuration_node_id") private Long configurationNodeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.072+02:00", comments="Source field: exam_configuration_map.encrypt_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.728+02:00", comments="Source field: exam_configuration_map.encrypt_secret") private String encryptSecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.072+02:00", comments="Source field: exam_configuration_map.client_group_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.728+02:00", comments="Source field: exam_configuration_map.client_group_id") private Long clientGroupId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.070+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.728+02:00", comments="Source Table: exam_configuration_map") public ExamConfigurationMapRecord(Long id, Long institutionId, Long examId, Long configurationNodeId, String encryptSecret, Long clientGroupId) { this.id = id; this.institutionId = institutionId; @@ -31,32 +31,32 @@ public class ExamConfigurationMapRecord { this.clientGroupId = clientGroupId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.071+02:00", comments="Source field: exam_configuration_map.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.728+02:00", comments="Source field: exam_configuration_map.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.071+02:00", comments="Source field: exam_configuration_map.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.728+02:00", comments="Source field: exam_configuration_map.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.072+02:00", comments="Source field: exam_configuration_map.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.728+02:00", comments="Source field: exam_configuration_map.exam_id") public Long getExamId() { return examId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.072+02:00", comments="Source field: exam_configuration_map.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.728+02:00", comments="Source field: exam_configuration_map.configuration_node_id") public Long getConfigurationNodeId() { return configurationNodeId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.072+02:00", comments="Source field: exam_configuration_map.encrypt_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.728+02:00", comments="Source field: exam_configuration_map.encrypt_secret") public String getEncryptSecret() { return encryptSecret; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.072+02:00", comments="Source field: exam_configuration_map.client_group_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.728+02:00", comments="Source field: exam_configuration_map.client_group_id") public Long getClientGroupId() { return clientGroupId; } @@ -65,7 +65,7 @@ public class ExamConfigurationMapRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam_configuration_map * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public String toString() { @@ -87,7 +87,7 @@ public class ExamConfigurationMapRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam_configuration_map * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public boolean equals(Object that) { @@ -113,7 +113,7 @@ public class ExamConfigurationMapRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam_configuration_map * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamRecord.java index aae2bb36..ee69860f 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamRecord.java @@ -4,67 +4,67 @@ import javax.annotation.Generated; import org.joda.time.DateTime; public class ExamRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.075+02:00", comments="Source field: exam.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.732+02:00", comments="Source field: exam.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.075+02:00", comments="Source field: exam.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.733+02:00", comments="Source field: exam.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.075+02:00", comments="Source field: exam.lms_setup_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.733+02:00", comments="Source field: exam.lms_setup_id") private Long lmsSetupId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.076+02:00", comments="Source field: exam.external_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.733+02:00", comments="Source field: exam.external_id") private String externalId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.076+02:00", comments="Source field: exam.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.733+02:00", comments="Source field: exam.owner") private String owner; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.076+02:00", comments="Source field: exam.supporter") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.733+02:00", comments="Source field: exam.supporter") private String supporter; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.076+02:00", comments="Source field: exam.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.733+02:00", comments="Source field: exam.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.076+02:00", comments="Source field: exam.quit_password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.733+02:00", comments="Source field: exam.quit_password") private String quitPassword; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.077+02:00", comments="Source field: exam.browser_keys") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.733+02:00", comments="Source field: exam.browser_keys") private String browserKeys; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.077+02:00", comments="Source field: exam.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.734+02:00", comments="Source field: exam.status") private String status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.077+02:00", comments="Source field: exam.lms_seb_restriction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.734+02:00", comments="Source field: exam.lms_seb_restriction") private Integer lmsSebRestriction; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.078+02:00", comments="Source field: exam.updating") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.734+02:00", comments="Source field: exam.updating") private Integer updating; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.078+02:00", comments="Source field: exam.lastupdate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.734+02:00", comments="Source field: exam.lastupdate") private String lastupdate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.078+02:00", comments="Source field: exam.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.734+02:00", comments="Source field: exam.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.078+02:00", comments="Source field: exam.exam_template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.734+02:00", comments="Source field: exam.exam_template_id") private Long examTemplateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.078+02:00", comments="Source field: exam.last_modified") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.734+02:00", comments="Source field: exam.last_modified") private Long lastModified; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.078+02:00", comments="Source field: exam.quiz_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.734+02:00", comments="Source field: exam.quiz_name") private String quizName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.078+02:00", comments="Source field: exam.quiz_start_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.734+02:00", comments="Source field: exam.quiz_start_time") private DateTime quizStartTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.078+02:00", comments="Source field: exam.quiz_end_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.734+02:00", comments="Source field: exam.quiz_end_time") private DateTime quizEndTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.078+02:00", comments="Source field: exam.lms_available") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.734+02:00", comments="Source field: exam.lms_available") private Integer lmsAvailable; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.075+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.732+02:00", comments="Source Table: exam") public ExamRecord(Long id, Long institutionId, Long lmsSetupId, String externalId, String owner, String supporter, String type, String quitPassword, String browserKeys, String status, Integer lmsSebRestriction, Integer updating, String lastupdate, Integer active, Long examTemplateId, Long lastModified, String quizName, DateTime quizStartTime, DateTime quizEndTime, Integer lmsAvailable) { this.id = id; this.institutionId = institutionId; @@ -88,102 +88,102 @@ public class ExamRecord { this.lmsAvailable = lmsAvailable; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.075+02:00", comments="Source field: exam.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.733+02:00", comments="Source field: exam.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.075+02:00", comments="Source field: exam.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.733+02:00", comments="Source field: exam.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.076+02:00", comments="Source field: exam.lms_setup_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.733+02:00", comments="Source field: exam.lms_setup_id") public Long getLmsSetupId() { return lmsSetupId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.076+02:00", comments="Source field: exam.external_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.733+02:00", comments="Source field: exam.external_id") public String getExternalId() { return externalId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.076+02:00", comments="Source field: exam.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.733+02:00", comments="Source field: exam.owner") public String getOwner() { return owner; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.076+02:00", comments="Source field: exam.supporter") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.733+02:00", comments="Source field: exam.supporter") public String getSupporter() { return supporter; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.076+02:00", comments="Source field: exam.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.733+02:00", comments="Source field: exam.type") public String getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.077+02:00", comments="Source field: exam.quit_password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.733+02:00", comments="Source field: exam.quit_password") public String getQuitPassword() { return quitPassword; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.077+02:00", comments="Source field: exam.browser_keys") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.733+02:00", comments="Source field: exam.browser_keys") public String getBrowserKeys() { return browserKeys; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.077+02:00", comments="Source field: exam.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.734+02:00", comments="Source field: exam.status") public String getStatus() { return status; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.077+02:00", comments="Source field: exam.lms_seb_restriction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.734+02:00", comments="Source field: exam.lms_seb_restriction") public Integer getLmsSebRestriction() { return lmsSebRestriction; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.078+02:00", comments="Source field: exam.updating") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.734+02:00", comments="Source field: exam.updating") public Integer getUpdating() { return updating; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.078+02:00", comments="Source field: exam.lastupdate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.734+02:00", comments="Source field: exam.lastupdate") public String getLastupdate() { return lastupdate; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.078+02:00", comments="Source field: exam.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.734+02:00", comments="Source field: exam.active") public Integer getActive() { return active; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.078+02:00", comments="Source field: exam.exam_template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.734+02:00", comments="Source field: exam.exam_template_id") public Long getExamTemplateId() { return examTemplateId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.078+02:00", comments="Source field: exam.last_modified") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.734+02:00", comments="Source field: exam.last_modified") public Long getLastModified() { return lastModified; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.078+02:00", comments="Source field: exam.quiz_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.734+02:00", comments="Source field: exam.quiz_name") public String getQuizName() { return quizName; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.078+02:00", comments="Source field: exam.quiz_start_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.734+02:00", comments="Source field: exam.quiz_start_time") public DateTime getQuizStartTime() { return quizStartTime; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.078+02:00", comments="Source field: exam.quiz_end_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.734+02:00", comments="Source field: exam.quiz_end_time") public DateTime getQuizEndTime() { return quizEndTime; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.079+02:00", comments="Source field: exam.lms_available") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.734+02:00", comments="Source field: exam.lms_available") public Integer getLmsAvailable() { return lmsAvailable; } @@ -192,7 +192,7 @@ public class ExamRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public String toString() { @@ -228,7 +228,7 @@ public class ExamRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public boolean equals(Object that) { @@ -268,7 +268,7 @@ public class ExamRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamTemplateRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamTemplateRecord.java index 82528773..0f869f4a 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamTemplateRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamTemplateRecord.java @@ -3,34 +3,34 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class ExamTemplateRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.139+02:00", comments="Source field: exam_template.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.799+02:00", comments="Source field: exam_template.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.139+02:00", comments="Source field: exam_template.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.799+02:00", comments="Source field: exam_template.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.139+02:00", comments="Source field: exam_template.configuration_template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.799+02:00", comments="Source field: exam_template.configuration_template_id") private Long configurationTemplateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.139+02:00", comments="Source field: exam_template.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.799+02:00", comments="Source field: exam_template.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.139+02:00", comments="Source field: exam_template.description") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.799+02:00", comments="Source field: exam_template.description") private String description; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.139+02:00", comments="Source field: exam_template.exam_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.799+02:00", comments="Source field: exam_template.exam_type") private String examType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.139+02:00", comments="Source field: exam_template.supporter") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.799+02:00", comments="Source field: exam_template.supporter") private String supporter; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.139+02:00", comments="Source field: exam_template.indicator_templates") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.799+02:00", comments="Source field: exam_template.indicator_templates") private String indicatorTemplates; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.139+02:00", comments="Source field: exam_template.institutional_default") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.799+02:00", comments="Source field: exam_template.institutional_default") private Integer institutionalDefault; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.139+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.799+02:00", comments="Source Table: exam_template") public ExamTemplateRecord(Long id, Long institutionId, Long configurationTemplateId, String name, String description, String examType, String supporter, String indicatorTemplates, Integer institutionalDefault) { this.id = id; this.institutionId = institutionId; @@ -43,47 +43,47 @@ public class ExamTemplateRecord { this.institutionalDefault = institutionalDefault; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.139+02:00", comments="Source field: exam_template.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.799+02:00", comments="Source field: exam_template.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.139+02:00", comments="Source field: exam_template.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.799+02:00", comments="Source field: exam_template.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.139+02:00", comments="Source field: exam_template.configuration_template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.799+02:00", comments="Source field: exam_template.configuration_template_id") public Long getConfigurationTemplateId() { return configurationTemplateId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.139+02:00", comments="Source field: exam_template.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.799+02:00", comments="Source field: exam_template.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.139+02:00", comments="Source field: exam_template.description") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.799+02:00", comments="Source field: exam_template.description") public String getDescription() { return description; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.139+02:00", comments="Source field: exam_template.exam_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.799+02:00", comments="Source field: exam_template.exam_type") public String getExamType() { return examType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.139+02:00", comments="Source field: exam_template.supporter") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.799+02:00", comments="Source field: exam_template.supporter") public String getSupporter() { return supporter; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.139+02:00", comments="Source field: exam_template.indicator_templates") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.799+02:00", comments="Source field: exam_template.indicator_templates") public String getIndicatorTemplates() { return indicatorTemplates; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.139+02:00", comments="Source field: exam_template.institutional_default") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.799+02:00", comments="Source field: exam_template.institutional_default") public Integer getInstitutionalDefault() { return institutionalDefault; } @@ -92,7 +92,7 @@ public class ExamTemplateRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam_template * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public String toString() { @@ -117,7 +117,7 @@ public class ExamTemplateRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam_template * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public boolean equals(Object that) { @@ -146,7 +146,7 @@ public class ExamTemplateRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam_template * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/IndicatorRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/IndicatorRecord.java index 43ddd96b..2db0ce55 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/IndicatorRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/IndicatorRecord.java @@ -3,28 +3,28 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class IndicatorRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.108+02:00", comments="Source field: indicator.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.754+02:00", comments="Source field: indicator.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.108+02:00", comments="Source field: indicator.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.754+02:00", comments="Source field: indicator.exam_id") private Long examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.108+02:00", comments="Source field: indicator.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.754+02:00", comments="Source field: indicator.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.108+02:00", comments="Source field: indicator.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.754+02:00", comments="Source field: indicator.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.108+02:00", comments="Source field: indicator.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.754+02:00", comments="Source field: indicator.color") private String color; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.108+02:00", comments="Source field: indicator.icon") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.755+02:00", comments="Source field: indicator.icon") private String icon; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.108+02:00", comments="Source field: indicator.tags") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.755+02:00", comments="Source field: indicator.tags") private String tags; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.108+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.754+02:00", comments="Source Table: indicator") public IndicatorRecord(Long id, Long examId, String type, String name, String color, String icon, String tags) { this.id = id; this.examId = examId; @@ -35,37 +35,37 @@ public class IndicatorRecord { this.tags = tags; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.108+02:00", comments="Source field: indicator.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.754+02:00", comments="Source field: indicator.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.108+02:00", comments="Source field: indicator.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.754+02:00", comments="Source field: indicator.exam_id") public Long getExamId() { return examId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.108+02:00", comments="Source field: indicator.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.754+02:00", comments="Source field: indicator.type") public String getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.108+02:00", comments="Source field: indicator.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.754+02:00", comments="Source field: indicator.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.108+02:00", comments="Source field: indicator.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.755+02:00", comments="Source field: indicator.color") public String getColor() { return color; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.108+02:00", comments="Source field: indicator.icon") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.755+02:00", comments="Source field: indicator.icon") public String getIcon() { return icon; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.108+02:00", comments="Source field: indicator.tags") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.755+02:00", comments="Source field: indicator.tags") public String getTags() { return tags; } @@ -74,7 +74,7 @@ public class IndicatorRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table indicator * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public String toString() { @@ -97,7 +97,7 @@ public class IndicatorRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table indicator * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public boolean equals(Object that) { @@ -124,7 +124,7 @@ public class IndicatorRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table indicator * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/InstitutionRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/InstitutionRecord.java index 41931b10..5c5e2d51 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/InstitutionRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/InstitutionRecord.java @@ -3,25 +3,25 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class InstitutionRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.113+02:00", comments="Source field: institution.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.763+02:00", comments="Source field: institution.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.113+02:00", comments="Source field: institution.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.764+02:00", comments="Source field: institution.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.114+02:00", comments="Source field: institution.url_suffix") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.764+02:00", comments="Source field: institution.url_suffix") private String urlSuffix; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.114+02:00", comments="Source field: institution.theme_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.764+02:00", comments="Source field: institution.theme_name") private String themeName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.114+02:00", comments="Source field: institution.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.764+02:00", comments="Source field: institution.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.114+02:00", comments="Source field: institution.logo_image") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.764+02:00", comments="Source field: institution.logo_image") private String logoImage; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.113+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.763+02:00", comments="Source Table: institution") public InstitutionRecord(Long id, String name, String urlSuffix, String themeName, Integer active, String logoImage) { this.id = id; this.name = name; @@ -31,32 +31,32 @@ public class InstitutionRecord { this.logoImage = logoImage; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.113+02:00", comments="Source field: institution.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.763+02:00", comments="Source field: institution.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.114+02:00", comments="Source field: institution.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.764+02:00", comments="Source field: institution.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.114+02:00", comments="Source field: institution.url_suffix") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.764+02:00", comments="Source field: institution.url_suffix") public String getUrlSuffix() { return urlSuffix; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.114+02:00", comments="Source field: institution.theme_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.764+02:00", comments="Source field: institution.theme_name") public String getThemeName() { return themeName; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.114+02:00", comments="Source field: institution.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.764+02:00", comments="Source field: institution.active") public Integer getActive() { return active; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.114+02:00", comments="Source field: institution.logo_image") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.764+02:00", comments="Source field: institution.logo_image") public String getLogoImage() { return logoImage; } @@ -65,7 +65,7 @@ public class InstitutionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table institution * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public String toString() { @@ -87,7 +87,7 @@ public class InstitutionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table institution * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public boolean equals(Object that) { @@ -113,7 +113,7 @@ public class InstitutionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table institution * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/LmsSetupRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/LmsSetupRecord.java index 34182cc2..14a33697 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/LmsSetupRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/LmsSetupRecord.java @@ -3,49 +3,49 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class LmsSetupRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.118+02:00", comments="Source field: lms_setup.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.768+02:00", comments="Source field: lms_setup.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.118+02:00", comments="Source field: lms_setup.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.768+02:00", comments="Source field: lms_setup.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.118+02:00", comments="Source field: lms_setup.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.768+02:00", comments="Source field: lms_setup.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.118+02:00", comments="Source field: lms_setup.lms_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.768+02:00", comments="Source field: lms_setup.lms_type") private String lmsType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.118+02:00", comments="Source field: lms_setup.lms_url") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.769+02:00", comments="Source field: lms_setup.lms_url") private String lmsUrl; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.118+02:00", comments="Source field: lms_setup.lms_clientname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.769+02:00", comments="Source field: lms_setup.lms_clientname") private String lmsClientname; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.118+02:00", comments="Source field: lms_setup.lms_clientsecret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.769+02:00", comments="Source field: lms_setup.lms_clientsecret") private String lmsClientsecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.118+02:00", comments="Source field: lms_setup.lms_rest_api_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.769+02:00", comments="Source field: lms_setup.lms_rest_api_token") private String lmsRestApiToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.118+02:00", comments="Source field: lms_setup.lms_proxy_host") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.769+02:00", comments="Source field: lms_setup.lms_proxy_host") private String lmsProxyHost; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.119+02:00", comments="Source field: lms_setup.lms_proxy_port") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.769+02:00", comments="Source field: lms_setup.lms_proxy_port") private Integer lmsProxyPort; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.120+02:00", comments="Source field: lms_setup.lms_proxy_auth_username") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.769+02:00", comments="Source field: lms_setup.lms_proxy_auth_username") private String lmsProxyAuthUsername; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.120+02:00", comments="Source field: lms_setup.lms_proxy_auth_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.769+02:00", comments="Source field: lms_setup.lms_proxy_auth_secret") private String lmsProxyAuthSecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.120+02:00", comments="Source field: lms_setup.update_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.769+02:00", comments="Source field: lms_setup.update_time") private Long updateTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.120+02:00", comments="Source field: lms_setup.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.769+02:00", comments="Source field: lms_setup.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.118+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.768+02:00", comments="Source Table: lms_setup") public LmsSetupRecord(Long id, Long institutionId, String name, String lmsType, String lmsUrl, String lmsClientname, String lmsClientsecret, String lmsRestApiToken, String lmsProxyHost, Integer lmsProxyPort, String lmsProxyAuthUsername, String lmsProxyAuthSecret, Long updateTime, Integer active) { this.id = id; this.institutionId = institutionId; @@ -63,72 +63,72 @@ public class LmsSetupRecord { this.active = active; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.118+02:00", comments="Source field: lms_setup.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.768+02:00", comments="Source field: lms_setup.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.118+02:00", comments="Source field: lms_setup.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.768+02:00", comments="Source field: lms_setup.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.118+02:00", comments="Source field: lms_setup.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.768+02:00", comments="Source field: lms_setup.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.118+02:00", comments="Source field: lms_setup.lms_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.769+02:00", comments="Source field: lms_setup.lms_type") public String getLmsType() { return lmsType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.118+02:00", comments="Source field: lms_setup.lms_url") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.769+02:00", comments="Source field: lms_setup.lms_url") public String getLmsUrl() { return lmsUrl; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.118+02:00", comments="Source field: lms_setup.lms_clientname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.769+02:00", comments="Source field: lms_setup.lms_clientname") public String getLmsClientname() { return lmsClientname; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.118+02:00", comments="Source field: lms_setup.lms_clientsecret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.769+02:00", comments="Source field: lms_setup.lms_clientsecret") public String getLmsClientsecret() { return lmsClientsecret; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.118+02:00", comments="Source field: lms_setup.lms_rest_api_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.769+02:00", comments="Source field: lms_setup.lms_rest_api_token") public String getLmsRestApiToken() { return lmsRestApiToken; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.119+02:00", comments="Source field: lms_setup.lms_proxy_host") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.769+02:00", comments="Source field: lms_setup.lms_proxy_host") public String getLmsProxyHost() { return lmsProxyHost; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.120+02:00", comments="Source field: lms_setup.lms_proxy_port") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.769+02:00", comments="Source field: lms_setup.lms_proxy_port") public Integer getLmsProxyPort() { return lmsProxyPort; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.120+02:00", comments="Source field: lms_setup.lms_proxy_auth_username") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.769+02:00", comments="Source field: lms_setup.lms_proxy_auth_username") public String getLmsProxyAuthUsername() { return lmsProxyAuthUsername; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.120+02:00", comments="Source field: lms_setup.lms_proxy_auth_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.769+02:00", comments="Source field: lms_setup.lms_proxy_auth_secret") public String getLmsProxyAuthSecret() { return lmsProxyAuthSecret; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.120+02:00", comments="Source field: lms_setup.update_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.769+02:00", comments="Source field: lms_setup.update_time") public Long getUpdateTime() { return updateTime; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.120+02:00", comments="Source field: lms_setup.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.769+02:00", comments="Source field: lms_setup.active") public Integer getActive() { return active; } @@ -137,7 +137,7 @@ public class LmsSetupRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table lms_setup * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public String toString() { @@ -167,7 +167,7 @@ public class LmsSetupRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table lms_setup * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public boolean equals(Object that) { @@ -201,7 +201,7 @@ public class LmsSetupRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table lms_setup * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/OrientationRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/OrientationRecord.java index 5c88330b..7843d84b 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/OrientationRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/OrientationRecord.java @@ -3,37 +3,37 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class OrientationRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.058+02:00", comments="Source field: orientation.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.711+02:00", comments="Source field: orientation.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.058+02:00", comments="Source field: orientation.config_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.712+02:00", comments="Source field: orientation.config_attribute_id") private Long configAttributeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.058+02:00", comments="Source field: orientation.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.712+02:00", comments="Source field: orientation.template_id") private Long templateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.059+02:00", comments="Source field: orientation.view_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.712+02:00", comments="Source field: orientation.view_id") private Long viewId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.059+02:00", comments="Source field: orientation.group_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.712+02:00", comments="Source field: orientation.group_id") private String groupId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.059+02:00", comments="Source field: orientation.x_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.712+02:00", comments="Source field: orientation.x_position") private Integer xPosition; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.059+02:00", comments="Source field: orientation.y_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.712+02:00", comments="Source field: orientation.y_position") private Integer yPosition; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.059+02:00", comments="Source field: orientation.width") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.713+02:00", comments="Source field: orientation.width") private Integer width; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.059+02:00", comments="Source field: orientation.height") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.713+02:00", comments="Source field: orientation.height") private Integer height; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.059+02:00", comments="Source field: orientation.title") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.713+02:00", comments="Source field: orientation.title") private String title; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.058+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.711+02:00", comments="Source Table: orientation") public OrientationRecord(Long id, Long configAttributeId, Long templateId, Long viewId, String groupId, Integer xPosition, Integer yPosition, Integer width, Integer height, String title) { this.id = id; this.configAttributeId = configAttributeId; @@ -47,52 +47,52 @@ public class OrientationRecord { this.title = title; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.058+02:00", comments="Source field: orientation.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.711+02:00", comments="Source field: orientation.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.058+02:00", comments="Source field: orientation.config_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.712+02:00", comments="Source field: orientation.config_attribute_id") public Long getConfigAttributeId() { return configAttributeId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.058+02:00", comments="Source field: orientation.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.712+02:00", comments="Source field: orientation.template_id") public Long getTemplateId() { return templateId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.059+02:00", comments="Source field: orientation.view_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.712+02:00", comments="Source field: orientation.view_id") public Long getViewId() { return viewId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.059+02:00", comments="Source field: orientation.group_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.712+02:00", comments="Source field: orientation.group_id") public String getGroupId() { return groupId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.059+02:00", comments="Source field: orientation.x_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.712+02:00", comments="Source field: orientation.x_position") public Integer getxPosition() { return xPosition; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.059+02:00", comments="Source field: orientation.y_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.713+02:00", comments="Source field: orientation.y_position") public Integer getyPosition() { return yPosition; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.059+02:00", comments="Source field: orientation.width") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.713+02:00", comments="Source field: orientation.width") public Integer getWidth() { return width; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.059+02:00", comments="Source field: orientation.height") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.713+02:00", comments="Source field: orientation.height") public Integer getHeight() { return height; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.059+02:00", comments="Source field: orientation.title") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.713+02:00", comments="Source field: orientation.title") public String getTitle() { return title; } @@ -101,7 +101,7 @@ public class OrientationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table orientation * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public String toString() { @@ -127,7 +127,7 @@ public class OrientationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table orientation * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public boolean equals(Object that) { @@ -157,7 +157,7 @@ public class OrientationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table orientation * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/RemoteProctoringRoomRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/RemoteProctoringRoomRecord.java index aeef8524..1df4cac8 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/RemoteProctoringRoomRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/RemoteProctoringRoomRecord.java @@ -3,34 +3,34 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class RemoteProctoringRoomRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.095+02:00", comments="Source field: remote_proctoring_room.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.745+02:00", comments="Source field: remote_proctoring_room.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.095+02:00", comments="Source field: remote_proctoring_room.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.745+02:00", comments="Source field: remote_proctoring_room.exam_id") private Long examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.095+02:00", comments="Source field: remote_proctoring_room.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.745+02:00", comments="Source field: remote_proctoring_room.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.095+02:00", comments="Source field: remote_proctoring_room.size") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.746+02:00", comments="Source field: remote_proctoring_room.size") private Integer size; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.095+02:00", comments="Source field: remote_proctoring_room.subject") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.746+02:00", comments="Source field: remote_proctoring_room.subject") private String subject; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.095+02:00", comments="Source field: remote_proctoring_room.townhall_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.746+02:00", comments="Source field: remote_proctoring_room.townhall_room") private Integer townhallRoom; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.096+02:00", comments="Source field: remote_proctoring_room.break_out_connections") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.746+02:00", comments="Source field: remote_proctoring_room.break_out_connections") private String breakOutConnections; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.096+02:00", comments="Source field: remote_proctoring_room.join_key") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.746+02:00", comments="Source field: remote_proctoring_room.join_key") private String joinKey; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.096+02:00", comments="Source field: remote_proctoring_room.room_data") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.746+02:00", comments="Source field: remote_proctoring_room.room_data") private String roomData; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.095+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.745+02:00", comments="Source Table: remote_proctoring_room") public RemoteProctoringRoomRecord(Long id, Long examId, String name, Integer size, String subject, Integer townhallRoom, String breakOutConnections, String joinKey, String roomData) { this.id = id; this.examId = examId; @@ -43,47 +43,47 @@ public class RemoteProctoringRoomRecord { this.roomData = roomData; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.095+02:00", comments="Source field: remote_proctoring_room.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.745+02:00", comments="Source field: remote_proctoring_room.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.095+02:00", comments="Source field: remote_proctoring_room.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.745+02:00", comments="Source field: remote_proctoring_room.exam_id") public Long getExamId() { return examId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.095+02:00", comments="Source field: remote_proctoring_room.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.745+02:00", comments="Source field: remote_proctoring_room.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.095+02:00", comments="Source field: remote_proctoring_room.size") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.746+02:00", comments="Source field: remote_proctoring_room.size") public Integer getSize() { return size; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.095+02:00", comments="Source field: remote_proctoring_room.subject") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.746+02:00", comments="Source field: remote_proctoring_room.subject") public String getSubject() { return subject; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.096+02:00", comments="Source field: remote_proctoring_room.townhall_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.746+02:00", comments="Source field: remote_proctoring_room.townhall_room") public Integer getTownhallRoom() { return townhallRoom; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.096+02:00", comments="Source field: remote_proctoring_room.break_out_connections") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.746+02:00", comments="Source field: remote_proctoring_room.break_out_connections") public String getBreakOutConnections() { return breakOutConnections; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.096+02:00", comments="Source field: remote_proctoring_room.join_key") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.746+02:00", comments="Source field: remote_proctoring_room.join_key") public String getJoinKey() { return joinKey; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.096+02:00", comments="Source field: remote_proctoring_room.room_data") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.746+02:00", comments="Source field: remote_proctoring_room.room_data") public String getRoomData() { return roomData; } @@ -92,7 +92,7 @@ public class RemoteProctoringRoomRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table remote_proctoring_room * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public String toString() { @@ -117,7 +117,7 @@ public class RemoteProctoringRoomRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table remote_proctoring_room * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public boolean equals(Object that) { @@ -146,7 +146,7 @@ public class RemoteProctoringRoomRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table remote_proctoring_room * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/RoleRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/RoleRecord.java index 43cbf03b..679e292c 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/RoleRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/RoleRecord.java @@ -3,33 +3,33 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class RoleRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.127+02:00", comments="Source field: user_role.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.780+02:00", comments="Source field: user_role.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.127+02:00", comments="Source field: user_role.user_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.780+02:00", comments="Source field: user_role.user_id") private Long userId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.127+02:00", comments="Source field: user_role.role_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.780+02:00", comments="Source field: user_role.role_name") private String roleName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.127+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.779+02:00", comments="Source Table: user_role") public RoleRecord(Long id, Long userId, String roleName) { this.id = id; this.userId = userId; this.roleName = roleName; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.127+02:00", comments="Source field: user_role.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.780+02:00", comments="Source field: user_role.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.127+02:00", comments="Source field: user_role.user_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.780+02:00", comments="Source field: user_role.user_id") public Long getUserId() { return userId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.127+02:00", comments="Source field: user_role.role_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.780+02:00", comments="Source field: user_role.role_name") public String getRoleName() { return roleName; } @@ -38,7 +38,7 @@ public class RoleRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user_role * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public String toString() { @@ -57,7 +57,7 @@ public class RoleRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user_role * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public boolean equals(Object that) { @@ -80,7 +80,7 @@ public class RoleRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user_role * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/SebClientConfigRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/SebClientConfigRecord.java index e50dbac6..abb42a06 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/SebClientConfigRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/SebClientConfigRecord.java @@ -4,37 +4,37 @@ import javax.annotation.Generated; import org.joda.time.DateTime; public class SebClientConfigRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.115+02:00", comments="Source field: seb_client_configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.765+02:00", comments="Source field: seb_client_configuration.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.115+02:00", comments="Source field: seb_client_configuration.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.765+02:00", comments="Source field: seb_client_configuration.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.115+02:00", comments="Source field: seb_client_configuration.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.765+02:00", comments="Source field: seb_client_configuration.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.115+02:00", comments="Source field: seb_client_configuration.date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.766+02:00", comments="Source field: seb_client_configuration.date") private DateTime date; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.115+02:00", comments="Source field: seb_client_configuration.client_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.766+02:00", comments="Source field: seb_client_configuration.client_name") private String clientName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.115+02:00", comments="Source field: seb_client_configuration.client_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.766+02:00", comments="Source field: seb_client_configuration.client_secret") private String clientSecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.116+02:00", comments="Source field: seb_client_configuration.encrypt_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.766+02:00", comments="Source field: seb_client_configuration.encrypt_secret") private String encryptSecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.116+02:00", comments="Source field: seb_client_configuration.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.766+02:00", comments="Source field: seb_client_configuration.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.116+02:00", comments="Source field: seb_client_configuration.last_update_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.766+02:00", comments="Source field: seb_client_configuration.last_update_time") private Long lastUpdateTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.116+02:00", comments="Source field: seb_client_configuration.last_update_user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.766+02:00", comments="Source field: seb_client_configuration.last_update_user") private String lastUpdateUser; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.115+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.765+02:00", comments="Source Table: seb_client_configuration") public SebClientConfigRecord(Long id, Long institutionId, String name, DateTime date, String clientName, String clientSecret, String encryptSecret, Integer active, Long lastUpdateTime, String lastUpdateUser) { this.id = id; this.institutionId = institutionId; @@ -48,52 +48,52 @@ public class SebClientConfigRecord { this.lastUpdateUser = lastUpdateUser; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.115+02:00", comments="Source field: seb_client_configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.765+02:00", comments="Source field: seb_client_configuration.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.115+02:00", comments="Source field: seb_client_configuration.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.765+02:00", comments="Source field: seb_client_configuration.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.115+02:00", comments="Source field: seb_client_configuration.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.766+02:00", comments="Source field: seb_client_configuration.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.115+02:00", comments="Source field: seb_client_configuration.date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.766+02:00", comments="Source field: seb_client_configuration.date") public DateTime getDate() { return date; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.115+02:00", comments="Source field: seb_client_configuration.client_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.766+02:00", comments="Source field: seb_client_configuration.client_name") public String getClientName() { return clientName; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.115+02:00", comments="Source field: seb_client_configuration.client_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.766+02:00", comments="Source field: seb_client_configuration.client_secret") public String getClientSecret() { return clientSecret; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.116+02:00", comments="Source field: seb_client_configuration.encrypt_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.766+02:00", comments="Source field: seb_client_configuration.encrypt_secret") public String getEncryptSecret() { return encryptSecret; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.116+02:00", comments="Source field: seb_client_configuration.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.766+02:00", comments="Source field: seb_client_configuration.active") public Integer getActive() { return active; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.116+02:00", comments="Source field: seb_client_configuration.last_update_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.766+02:00", comments="Source field: seb_client_configuration.last_update_time") public Long getLastUpdateTime() { return lastUpdateTime; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.116+02:00", comments="Source field: seb_client_configuration.last_update_user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.766+02:00", comments="Source field: seb_client_configuration.last_update_user") public String getLastUpdateUser() { return lastUpdateUser; } @@ -102,7 +102,7 @@ public class SebClientConfigRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table seb_client_configuration * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public String toString() { @@ -128,7 +128,7 @@ public class SebClientConfigRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table seb_client_configuration * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public boolean equals(Object that) { @@ -158,7 +158,7 @@ public class SebClientConfigRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table seb_client_configuration * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ThresholdRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ThresholdRecord.java index 0c12e269..da1d9a54 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ThresholdRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ThresholdRecord.java @@ -4,22 +4,22 @@ import java.math.BigDecimal; import javax.annotation.Generated; public class ThresholdRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.111+02:00", comments="Source field: threshold.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.758+02:00", comments="Source field: threshold.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.112+02:00", comments="Source field: threshold.indicator_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.759+02:00", comments="Source field: threshold.indicator_id") private Long indicatorId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.112+02:00", comments="Source field: threshold.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.759+02:00", comments="Source field: threshold.value") private BigDecimal value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.112+02:00", comments="Source field: threshold.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.759+02:00", comments="Source field: threshold.color") private String color; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.112+02:00", comments="Source field: threshold.icon") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.759+02:00", comments="Source field: threshold.icon") private String icon; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.111+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.757+02:00", comments="Source Table: threshold") public ThresholdRecord(Long id, Long indicatorId, BigDecimal value, String color, String icon) { this.id = id; this.indicatorId = indicatorId; @@ -28,27 +28,27 @@ public class ThresholdRecord { this.icon = icon; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.111+02:00", comments="Source field: threshold.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.758+02:00", comments="Source field: threshold.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.112+02:00", comments="Source field: threshold.indicator_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.759+02:00", comments="Source field: threshold.indicator_id") public Long getIndicatorId() { return indicatorId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.112+02:00", comments="Source field: threshold.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.759+02:00", comments="Source field: threshold.value") public BigDecimal getValue() { return value; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.112+02:00", comments="Source field: threshold.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.759+02:00", comments="Source field: threshold.color") public String getColor() { return color; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.112+02:00", comments="Source field: threshold.icon") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.759+02:00", comments="Source field: threshold.icon") public String getIcon() { return icon; } @@ -57,7 +57,7 @@ public class ThresholdRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table threshold * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public String toString() { @@ -78,7 +78,7 @@ public class ThresholdRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table threshold * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public boolean equals(Object that) { @@ -103,7 +103,7 @@ public class ThresholdRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table threshold * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/UserActivityLogRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/UserActivityLogRecord.java index 5780203b..b1b07fbc 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/UserActivityLogRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/UserActivityLogRecord.java @@ -3,28 +3,28 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class UserActivityLogRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.129+02:00", comments="Source field: user_activity_log.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.781+02:00", comments="Source field: user_activity_log.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.129+02:00", comments="Source field: user_activity_log.user_uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.781+02:00", comments="Source field: user_activity_log.user_uuid") private String userUuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.129+02:00", comments="Source field: user_activity_log.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.781+02:00", comments="Source field: user_activity_log.timestamp") private Long timestamp; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.129+02:00", comments="Source field: user_activity_log.activity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.782+02:00", comments="Source field: user_activity_log.activity_type") private String activityType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.129+02:00", comments="Source field: user_activity_log.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.783+02:00", comments="Source field: user_activity_log.entity_type") private String entityType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.129+02:00", comments="Source field: user_activity_log.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.783+02:00", comments="Source field: user_activity_log.entity_id") private String entityId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.129+02:00", comments="Source field: user_activity_log.message") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.783+02:00", comments="Source field: user_activity_log.message") private String message; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.129+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.781+02:00", comments="Source Table: user_activity_log") public UserActivityLogRecord(Long id, String userUuid, Long timestamp, String activityType, String entityType, String entityId, String message) { this.id = id; this.userUuid = userUuid; @@ -35,37 +35,37 @@ public class UserActivityLogRecord { this.message = message; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.129+02:00", comments="Source field: user_activity_log.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.781+02:00", comments="Source field: user_activity_log.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.129+02:00", comments="Source field: user_activity_log.user_uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.781+02:00", comments="Source field: user_activity_log.user_uuid") public String getUserUuid() { return userUuid; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.129+02:00", comments="Source field: user_activity_log.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.782+02:00", comments="Source field: user_activity_log.timestamp") public Long getTimestamp() { return timestamp; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.129+02:00", comments="Source field: user_activity_log.activity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.782+02:00", comments="Source field: user_activity_log.activity_type") public String getActivityType() { return activityType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.129+02:00", comments="Source field: user_activity_log.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.783+02:00", comments="Source field: user_activity_log.entity_type") public String getEntityType() { return entityType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.129+02:00", comments="Source field: user_activity_log.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.783+02:00", comments="Source field: user_activity_log.entity_id") public String getEntityId() { return entityId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.129+02:00", comments="Source field: user_activity_log.message") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.783+02:00", comments="Source field: user_activity_log.message") public String getMessage() { return message; } @@ -74,7 +74,7 @@ public class UserActivityLogRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user_activity_log * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public String toString() { @@ -97,7 +97,7 @@ public class UserActivityLogRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user_activity_log * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public boolean equals(Object that) { @@ -124,7 +124,7 @@ public class UserActivityLogRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user_activity_log * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/UserRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/UserRecord.java index 319cc16f..74037913 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/UserRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/UserRecord.java @@ -4,43 +4,43 @@ import javax.annotation.Generated; import org.joda.time.DateTime; public class UserRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.123+02:00", comments="Source field: user.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.772+02:00", comments="Source field: user.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.123+02:00", comments="Source field: user.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.772+02:00", comments="Source field: user.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.123+02:00", comments="Source field: user.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.772+02:00", comments="Source field: user.uuid") private String uuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.123+02:00", comments="Source field: user.creation_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.772+02:00", comments="Source field: user.creation_date") private DateTime creationDate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.124+02:00", comments="Source field: user.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.774+02:00", comments="Source field: user.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.124+02:00", comments="Source field: user.surname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.774+02:00", comments="Source field: user.surname") private String surname; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.124+02:00", comments="Source field: user.username") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.775+02:00", comments="Source field: user.username") private String username; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.124+02:00", comments="Source field: user.password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.775+02:00", comments="Source field: user.password") private String password; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.124+02:00", comments="Source field: user.email") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.775+02:00", comments="Source field: user.email") private String email; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.124+02:00", comments="Source field: user.language") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.775+02:00", comments="Source field: user.language") private String language; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.124+02:00", comments="Source field: user.timezone") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.775+02:00", comments="Source field: user.timezone") private String timezone; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.124+02:00", comments="Source field: user.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.775+02:00", comments="Source field: user.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.123+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.771+02:00", comments="Source Table: user") public UserRecord(Long id, Long institutionId, String uuid, DateTime creationDate, String name, String surname, String username, String password, String email, String language, String timezone, Integer active) { this.id = id; this.institutionId = institutionId; @@ -56,62 +56,62 @@ public class UserRecord { this.active = active; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.123+02:00", comments="Source field: user.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.772+02:00", comments="Source field: user.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.123+02:00", comments="Source field: user.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.772+02:00", comments="Source field: user.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.123+02:00", comments="Source field: user.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.772+02:00", comments="Source field: user.uuid") public String getUuid() { return uuid; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.124+02:00", comments="Source field: user.creation_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.774+02:00", comments="Source field: user.creation_date") public DateTime getCreationDate() { return creationDate; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.124+02:00", comments="Source field: user.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.774+02:00", comments="Source field: user.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.124+02:00", comments="Source field: user.surname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.775+02:00", comments="Source field: user.surname") public String getSurname() { return surname; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.124+02:00", comments="Source field: user.username") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.775+02:00", comments="Source field: user.username") public String getUsername() { return username; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.124+02:00", comments="Source field: user.password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.775+02:00", comments="Source field: user.password") public String getPassword() { return password; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.124+02:00", comments="Source field: user.email") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.775+02:00", comments="Source field: user.email") public String getEmail() { return email; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.124+02:00", comments="Source field: user.language") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.775+02:00", comments="Source field: user.language") public String getLanguage() { return language; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.124+02:00", comments="Source field: user.timezone") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.775+02:00", comments="Source field: user.timezone") public String getTimezone() { return timezone; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.124+02:00", comments="Source field: user.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.775+02:00", comments="Source field: user.active") public Integer getActive() { return active; } @@ -120,7 +120,7 @@ public class UserRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public String toString() { @@ -148,7 +148,7 @@ public class UserRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public boolean equals(Object that) { @@ -180,7 +180,7 @@ public class UserRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ViewRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ViewRecord.java index 5a15e418..57eee317 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ViewRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ViewRecord.java @@ -3,22 +3,22 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class ViewRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.051+02:00", comments="Source field: view.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.707+02:00", comments="Source field: view.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.051+02:00", comments="Source field: view.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.707+02:00", comments="Source field: view.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.051+02:00", comments="Source field: view.columns") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.707+02:00", comments="Source field: view.columns") private Integer columns; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.051+02:00", comments="Source field: view.position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.707+02:00", comments="Source field: view.position") private Integer position; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.051+02:00", comments="Source field: view.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.707+02:00", comments="Source field: view.template_id") private Long templateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.051+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.707+02:00", comments="Source Table: view") public ViewRecord(Long id, String name, Integer columns, Integer position, Long templateId) { this.id = id; this.name = name; @@ -27,27 +27,27 @@ public class ViewRecord { this.templateId = templateId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.051+02:00", comments="Source field: view.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.707+02:00", comments="Source field: view.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.051+02:00", comments="Source field: view.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.707+02:00", comments="Source field: view.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.051+02:00", comments="Source field: view.columns") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.707+02:00", comments="Source field: view.columns") public Integer getColumns() { return columns; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.051+02:00", comments="Source field: view.position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.707+02:00", comments="Source field: view.position") public Integer getPosition() { return position; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.051+02:00", comments="Source field: view.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.707+02:00", comments="Source field: view.template_id") public Long getTemplateId() { return templateId; } @@ -56,7 +56,7 @@ public class ViewRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table view * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public String toString() { @@ -77,7 +77,7 @@ public class ViewRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table view * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public boolean equals(Object that) { @@ -102,7 +102,7 @@ public class ViewRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table view * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/WebserviceServerInfoRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/WebserviceServerInfoRecord.java index c80e477b..3bb0957f 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/WebserviceServerInfoRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/WebserviceServerInfoRecord.java @@ -3,22 +3,22 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class WebserviceServerInfoRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.135+02:00", comments="Source field: webservice_server_info.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.794+02:00", comments="Source field: webservice_server_info.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.135+02:00", comments="Source field: webservice_server_info.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.794+02:00", comments="Source field: webservice_server_info.uuid") private String uuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.135+02:00", comments="Source field: webservice_server_info.service_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.794+02:00", comments="Source field: webservice_server_info.service_address") private String serviceAddress; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.135+02:00", comments="Source field: webservice_server_info.master") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.794+02:00", comments="Source field: webservice_server_info.master") private Integer master; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.135+02:00", comments="Source field: webservice_server_info.update_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.794+02:00", comments="Source field: webservice_server_info.update_time") private Long updateTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.135+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.794+02:00", comments="Source Table: webservice_server_info") public WebserviceServerInfoRecord(Long id, String uuid, String serviceAddress, Integer master, Long updateTime) { this.id = id; this.uuid = uuid; @@ -27,27 +27,27 @@ public class WebserviceServerInfoRecord { this.updateTime = updateTime; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.135+02:00", comments="Source field: webservice_server_info.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.794+02:00", comments="Source field: webservice_server_info.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.135+02:00", comments="Source field: webservice_server_info.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.794+02:00", comments="Source field: webservice_server_info.uuid") public String getUuid() { return uuid; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.135+02:00", comments="Source field: webservice_server_info.service_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.794+02:00", comments="Source field: webservice_server_info.service_address") public String getServiceAddress() { return serviceAddress; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.135+02:00", comments="Source field: webservice_server_info.master") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.794+02:00", comments="Source field: webservice_server_info.master") public Integer getMaster() { return master; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-17T15:55:00.135+02:00", comments="Source field: webservice_server_info.update_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-08-18T13:41:40.794+02:00", comments="Source field: webservice_server_info.update_time") public Long getUpdateTime() { return updateTime; } @@ -56,7 +56,7 @@ public class WebserviceServerInfoRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table webservice_server_info * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public String toString() { @@ -77,7 +77,7 @@ public class WebserviceServerInfoRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table webservice_server_info * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public boolean equals(Object that) { @@ -102,7 +102,7 @@ public class WebserviceServerInfoRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table webservice_server_info * - * @mbg.generated Wed Aug 17 15:55:00 CEST 2022 + * @mbg.generated Thu Aug 18 13:41:40 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/bulkaction/impl/BulkActionServiceImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/bulkaction/impl/BulkActionServiceImpl.java index b782532b..6d453c87 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/bulkaction/impl/BulkActionServiceImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/bulkaction/impl/BulkActionServiceImpl.java @@ -79,6 +79,7 @@ public class BulkActionServiceImpl implements BulkActionService { this.directDependancyMap.put(EntityType.EXAM, EnumSet.of( EntityType.EXAM_CONFIGURATION_MAP, EntityType.INDICATOR, + EntityType.CLIENT_GROUP, EntityType.CLIENT_CONNECTION)); this.directDependancyMap.put(EntityType.CONFIGURATION_NODE, EnumSet.of(EntityType.EXAM_CONFIGURATION_MAP)); @@ -260,6 +261,7 @@ public class BulkActionServiceImpl implements BulkActionService { this.supporter.get(EntityType.USER), this.supporter.get(EntityType.EXAM), this.supporter.get(EntityType.INDICATOR), + this.supporter.get(EntityType.CLIENT_GROUP), this.supporter.get(EntityType.SEB_CLIENT_CONFIGURATION), this.supporter.get(EntityType.CLIENT_CONNECTION), this.supporter.get(EntityType.CONFIGURATION_NODE), @@ -269,6 +271,7 @@ public class BulkActionServiceImpl implements BulkActionService { return Arrays.asList( this.supporter.get(EntityType.EXAM), this.supporter.get(EntityType.INDICATOR), + this.supporter.get(EntityType.CLIENT_GROUP), this.supporter.get(EntityType.CLIENT_CONNECTION), this.supporter.get(EntityType.CONFIGURATION_NODE), this.supporter.get(EntityType.EXAM_CONFIGURATION_MAP)); @@ -276,11 +279,13 @@ public class BulkActionServiceImpl implements BulkActionService { return Arrays.asList( this.supporter.get(EntityType.EXAM), this.supporter.get(EntityType.INDICATOR), + this.supporter.get(EntityType.CLIENT_GROUP), this.supporter.get(EntityType.EXAM_CONFIGURATION_MAP), this.supporter.get(EntityType.CLIENT_CONNECTION)); case EXAM: return Arrays.asList( this.supporter.get(EntityType.INDICATOR), + this.supporter.get(EntityType.CLIENT_GROUP), this.supporter.get(EntityType.EXAM_CONFIGURATION_MAP), this.supporter.get(EntityType.CLIENT_CONNECTION)); case CONFIGURATION_NODE: diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/ClientGroupDAO.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/ClientGroupDAO.java new file mode 100644 index 00000000..19ec33a2 --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/ClientGroupDAO.java @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2022 ETH Zürich, Educational Development and Technology (LET) + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +package ch.ethz.seb.sebserver.webservice.servicelayer.dao; + +import java.util.Collection; + +import ch.ethz.seb.sebserver.gbl.model.exam.ClientGroup; +import ch.ethz.seb.sebserver.gbl.util.Result; +import ch.ethz.seb.sebserver.webservice.servicelayer.bulkaction.BulkActionSupportDAO; + +/** Concrete EntityDAO interface of ClientGroup entities */ +public interface ClientGroupDAO extends EntityDAO, BulkActionSupportDAO { + + /** Get a collection of all ClientGroup entities for a specified exam. + * + * @param examId the Exam identifier to get the ClientGroups for + * @return Result referring to the collection of ClientGroups of an Exam or to an error if happened */ + Result> allForExam(Long examId); + +} diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/ExamTemplateDAO.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/ExamTemplateDAO.java index 747c53fc..49674b95 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/ExamTemplateDAO.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/ExamTemplateDAO.java @@ -9,6 +9,7 @@ package ch.ethz.seb.sebserver.webservice.servicelayer.dao; import ch.ethz.seb.sebserver.gbl.model.EntityKey; +import ch.ethz.seb.sebserver.gbl.model.exam.ClientGroupTemplate; import ch.ethz.seb.sebserver.gbl.model.exam.ExamTemplate; import ch.ethz.seb.sebserver.gbl.model.exam.IndicatorTemplate; import ch.ethz.seb.sebserver.gbl.util.Result; @@ -37,8 +38,28 @@ public interface ExamTemplateDAO extends EntityDAO, /** Deletes an already existing indicator template * - * @param indicatorTemplate The IndicatorTemplate refer also to the exam template (examTemplateId) + * @param examTemplateId the ExamTemplate id where the specified IndicatorTemplate shall be deleted from + * @param indicatorTemplateId the id of the IndicatorTemplate to delete * @return Result refer to the EntityKey of the deleted IndicatorTemplate or to an error when happened */ Result deleteIndicatorTemplate(String examTemplateId, String indicatorTemplateId); + /** Creates a new client group template + * + * @param clientGroupTemplate The ClientGroupTemplate refer also to the exam template (examTemplateId) + * @return Result refer to the created ClientGroupTemplate or to an error when happened */ + Result createNewClientGroupTemplate(ClientGroupTemplate clientGroupTemplate); + + /** Saves an already existing client group template + * + * @param clientGroupTemplate The ClientGroupTemplate refer also to the exam template (examTemplateId) + * @return Result refer to the saved ClientGroupTemplate or to an error when happened */ + Result saveClientGroupTemplate(ClientGroupTemplate clientGroupTemplate); + + /** Deletes an already existing client group template + * + * @param examTemplateId the ExamTemplate id where the specified ClientGroupTemplate shall be deleted from + * @param clientGroupTemplateId the id of the ClientGroupTemplate to delete + * @return Result refer to the EntityKey of the deleted ClientGroupTemplate or to an error when happened */ + Result deleteClientGroupTemplate(String examTemplateId, String clientGroupTemplateId); + } diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ClientGroupDAOImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ClientGroupDAOImpl.java new file mode 100644 index 00000000..abd4e3f9 --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ClientGroupDAOImpl.java @@ -0,0 +1,344 @@ +/* + * Copyright (c) 2022 ETH Zürich, Educational Development and Technology (LET) + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +package ch.ethz.seb.sebserver.webservice.servicelayer.dao.impl; + +import static org.mybatis.dynamic.sql.SqlBuilder.*; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Set; +import java.util.function.Function; +import java.util.function.Predicate; +import java.util.stream.Collectors; + +import org.mybatis.dynamic.sql.SqlBuilder; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +import ch.ethz.seb.sebserver.gbl.api.API.BulkActionType; +import ch.ethz.seb.sebserver.gbl.api.EntityType; +import ch.ethz.seb.sebserver.gbl.model.EntityDependency; +import ch.ethz.seb.sebserver.gbl.model.EntityKey; +import ch.ethz.seb.sebserver.gbl.model.exam.ClientGroup; +import ch.ethz.seb.sebserver.gbl.model.exam.ClientGroup.ClientGroupType; +import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile; +import ch.ethz.seb.sebserver.gbl.util.Result; +import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.ClientGroupRecordDynamicSqlSupport; +import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.ClientGroupRecordMapper; +import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.ExamRecordDynamicSqlSupport; +import ch.ethz.seb.sebserver.webservice.datalayer.batis.model.ClientGroupRecord; +import ch.ethz.seb.sebserver.webservice.servicelayer.bulkaction.impl.BulkAction; +import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ClientGroupDAO; +import ch.ethz.seb.sebserver.webservice.servicelayer.dao.DAOLoggingSupport; +import ch.ethz.seb.sebserver.webservice.servicelayer.dao.FilterMap; +import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ResourceNotFoundException; +import ch.ethz.seb.sebserver.webservice.servicelayer.dao.TransactionHandler; + +@Lazy +@Component +@WebServiceProfile +public class ClientGroupDAOImpl implements ClientGroupDAO { + + private final ClientGroupRecordMapper clientGroupRecordMapper; + + public ClientGroupDAOImpl(final ClientGroupRecordMapper clientGroupRecordMapper) { + this.clientGroupRecordMapper = clientGroupRecordMapper; + } + + @Override + public EntityType entityType() { + return EntityType.CLIENT_GROUP; + } + + @Override + @Transactional(readOnly = true) + public Result byPK(final Long id) { + return recordById(id) + .flatMap(this::toDomainModel); + } + + @Override + @Transactional(readOnly = true) + public Result> allMatching( + final FilterMap filterMap, + final Predicate predicate) { + + return Result.tryCatch(() -> this.clientGroupRecordMapper + .selectByExample() + .leftJoin(ExamRecordDynamicSqlSupport.examRecord) + .on( + ExamRecordDynamicSqlSupport.id, + SqlBuilder.equalTo(ClientGroupRecordDynamicSqlSupport.examId)) + .where( + ExamRecordDynamicSqlSupport.institutionId, + isEqualToWhenPresent(filterMap.getInstitutionId())) + .and( + ClientGroupRecordDynamicSqlSupport.examId, + isEqualToWhenPresent(filterMap.getLong(ClientGroup.FILTER_ATTR_EXAM_ID))) + .and( + ClientGroupRecordDynamicSqlSupport.name, + isLikeWhenPresent(filterMap.getString(ClientGroup.FILTER_ATTR_NAME))) + .build() + .execute() + .stream() + .map(this::toDomainModel) + .flatMap(DAOLoggingSupport::logAndSkipOnError) + .filter(predicate) + .collect(Collectors.toList())); + } + + @Override + @Transactional(readOnly = true) + public Result> allOf(final Set pks) { + return Result.tryCatch(() -> { + + if (pks == null || pks.isEmpty()) { + return Collections.emptyList(); + } + + return this.clientGroupRecordMapper + .selectByExample() + .where(ClientGroupRecordDynamicSqlSupport.id, isIn(new ArrayList<>(pks))) + .build() + .execute() + .stream() + .map(this::toDomainModel) + .flatMap(DAOLoggingSupport::logAndSkipOnError) + .collect(Collectors.toList()); + }); + } + + @Override + @Transactional + public Result createNew(final ClientGroup data) { + return Result.tryCatch(() -> { + + final ClientGroupRecord newRecord = new ClientGroupRecord( + null, + data.examId, + data.name, + data.type.name(), + data.color, + data.icon, + data.data); + + this.clientGroupRecordMapper.insert(newRecord); + + return newRecord; + }) + .flatMap(this::toDomainModel) + .onError(TransactionHandler::rollback); + } + + @Override + @Transactional + public Result save(final ClientGroup data) { + return Result.tryCatch(() -> { + + final ClientGroupRecord newRecord = new ClientGroupRecord( + data.id, + data.examId, + data.name, + data.type.name(), + data.color, + data.icon, + data.data); + + this.clientGroupRecordMapper.updateByPrimaryKeySelective(newRecord); + return this.clientGroupRecordMapper.selectByPrimaryKey(data.id); + }) + .flatMap(this::toDomainModel) + .onError(TransactionHandler::rollback); + } + + @Override + @Transactional + public Result> delete(final Set all) { + return Result.tryCatch(() -> { + + final List ids = extractListOfPKs(all); + if (ids == null || ids.isEmpty()) { + return Collections.emptyList(); + } + + // then delete all client groups + this.clientGroupRecordMapper + .deleteByExample() + .where(ClientGroupRecordDynamicSqlSupport.id, isIn(ids)) + .build() + .execute(); + + return ids.stream() + .map(id -> new EntityKey(id, EntityType.CLIENT_GROUP)) + .collect(Collectors.toList()); + }); + } + + @Override + @Transactional(readOnly = true) + public Result> allForExam(final Long examId) { + return Result.tryCatch(() -> this.clientGroupRecordMapper + .selectByExample() + .where(ClientGroupRecordDynamicSqlSupport.examId, isEqualTo(examId)) + .build() + .execute() + .stream() + .map(this::toDomainModel) + .flatMap(DAOLoggingSupport::logAndSkipOnError) + .collect(Collectors.toList())); + } + + @Override + @Transactional(readOnly = true) + public Set getDependencies(final BulkAction bulkAction) { + // only for deletion + if (bulkAction.type == BulkActionType.ACTIVATE || bulkAction.type == BulkActionType.DEACTIVATE) { + return Collections.emptySet(); + } + // only if included + if (!bulkAction.includesDependencyType(EntityType.CLIENT_GROUP)) { + return Collections.emptySet(); + } + + // define the select function in case of source type + Function>> selectionFunction; + switch (bulkAction.sourceType) { + case INSTITUTION: + selectionFunction = this::allIdsOfInstitution; + break; + case LMS_SETUP: + selectionFunction = this::allIdsOfLmsSetup; + break; + case USER: + selectionFunction = this::allIdsOfUser; + break; + case EXAM: + selectionFunction = this::allIdsOfExam; + break; + default: + selectionFunction = key -> Result.of(Collections.emptyList()); //empty select function + break; + } + + return getDependencies(bulkAction, selectionFunction); + } + + private Result> allIdsOfInstitution(final EntityKey institutionKey) { + return Result.tryCatch(() -> this.clientGroupRecordMapper + .selectByExample() + .leftJoin(ExamRecordDynamicSqlSupport.examRecord) + .on( + ExamRecordDynamicSqlSupport.id, + equalTo(ClientGroupRecordDynamicSqlSupport.examId)) + .where( + ExamRecordDynamicSqlSupport.institutionId, + isEqualTo(Long.parseLong(institutionKey.modelId))) + .build() + .execute() + .stream() + .map(rec -> new EntityDependency( + institutionKey, + new EntityKey(rec.getId(), EntityType.CLIENT_GROUP), + rec.getName(), + rec.getType())) + .collect(Collectors.toList())); + } + + private Result> allIdsOfLmsSetup(final EntityKey lmsSetupKey) { + return Result.tryCatch(() -> this.clientGroupRecordMapper + .selectByExample() + .leftJoin(ExamRecordDynamicSqlSupport.examRecord) + .on( + ExamRecordDynamicSqlSupport.id, + equalTo(ClientGroupRecordDynamicSqlSupport.examId)) + .where( + ExamRecordDynamicSqlSupport.lmsSetupId, + isEqualTo(Long.parseLong(lmsSetupKey.modelId))) + .build() + .execute() + .stream() + .map(rec -> new EntityDependency( + lmsSetupKey, + new EntityKey(rec.getId(), EntityType.CLIENT_GROUP), + rec.getName(), + rec.getType())) + .collect(Collectors.toList())); + } + + private Result> allIdsOfUser(final EntityKey userKey) { + return Result.tryCatch(() -> this.clientGroupRecordMapper + .selectByExample() + .leftJoin(ExamRecordDynamicSqlSupport.examRecord) + .on( + ExamRecordDynamicSqlSupport.id, + equalTo(ClientGroupRecordDynamicSqlSupport.examId)) + .where( + ExamRecordDynamicSqlSupport.owner, + isEqualTo(userKey.modelId)) + .build() + .execute() + .stream() + .map(rec -> new EntityDependency( + userKey, + new EntityKey(rec.getId(), EntityType.CLIENT_GROUP), + rec.getName(), + rec.getType())) + .collect(Collectors.toList())); + } + + private Result> allIdsOfExam(final EntityKey examKey) { + return Result.tryCatch(() -> this.clientGroupRecordMapper + .selectByExample() + .where( + ClientGroupRecordDynamicSqlSupport.examId, + isEqualTo(Long.parseLong(examKey.modelId))) + .build() + .execute() + .stream() + .map(rec -> new EntityDependency( + examKey, + new EntityKey(rec.getId(), EntityType.CLIENT_GROUP), + rec.getName(), + rec.getType())) + .collect(Collectors.toList())); + } + + private Result recordById(final Long id) { + return Result.tryCatch(() -> { + + final ClientGroupRecord record = this.clientGroupRecordMapper + .selectByPrimaryKey(id); + + if (record == null) { + throw new ResourceNotFoundException( + entityType(), + String.valueOf(id)); + } + + return record; + }); + } + + private Result toDomainModel(final ClientGroupRecord record) { + return Result.tryCatch(() -> { + return new ClientGroup( + record.getId(), + record.getExamId(), + record.getName(), + ClientGroupType.valueOf(record.getType()), + record.getColor(), + record.getIcon(), + record.getData()); + }); + } + +} diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamTemplateDAOImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamTemplateDAOImpl.java index 240ad1ac..82d7aa12 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamTemplateDAOImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamTemplateDAOImpl.java @@ -30,7 +30,9 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.JsonMappingException; import ch.ethz.seb.sebserver.gbl.Constants; import ch.ethz.seb.sebserver.gbl.api.APIMessage.FieldValidationException; @@ -38,6 +40,7 @@ import ch.ethz.seb.sebserver.gbl.api.EntityType; import ch.ethz.seb.sebserver.gbl.api.JSONMapper; import ch.ethz.seb.sebserver.gbl.model.EntityDependency; import ch.ethz.seb.sebserver.gbl.model.EntityKey; +import ch.ethz.seb.sebserver.gbl.model.exam.ClientGroupTemplate; import ch.ethz.seb.sebserver.gbl.model.exam.Exam.ExamType; import ch.ethz.seb.sebserver.gbl.model.exam.ExamTemplate; import ch.ethz.seb.sebserver.gbl.model.exam.IndicatorTemplate; @@ -262,15 +265,7 @@ public class ExamTemplateDAOImpl implements ExamTemplateDAO { } final Long examTemplatePK = indicatorTemplate.examTemplateId; - final ExamTemplateRecord examTemplateRec = this.examTemplateRecordMapper - .selectByPrimaryKey(examTemplatePK); - final String indicatorTemplatesJSON = examTemplateRec.getIndicatorTemplates(); - final Collection indicators = (StringUtils.isNotBlank(indicatorTemplatesJSON)) - ? this.jsonMapper.readValue( - indicatorTemplatesJSON, - new TypeReference>() { - }) - : Collections.emptyList(); + final Collection indicators = extractIndicatorTemplates(examTemplatePK); checkUniqueIndicatorName(indicatorTemplate, indicators); @@ -281,15 +276,7 @@ public class ExamTemplateDAOImpl implements ExamTemplateDAO { final List newIndicators = new ArrayList<>(indicators); newIndicators.add(newIndicatorTemplate); - final String newIndicatorTemplatesJSON = newIndicators.isEmpty() - ? StringUtils.EMPTY - : this.jsonMapper.writeValueAsString(newIndicators); - - final ExamTemplateRecord newRecord = new ExamTemplateRecord( - examTemplatePK, null, null, null, null, null, null, - newIndicatorTemplatesJSON, null); - - this.examTemplateRecordMapper.updateByPrimaryKeySelective(newRecord); + storeIndicatorTemplates(examTemplatePK, newIndicators); return newIndicatorTemplate; }) @@ -306,15 +293,7 @@ public class ExamTemplateDAOImpl implements ExamTemplateDAO { } final Long examTemplatePK = indicatorTemplate.examTemplateId; - final ExamTemplateRecord examTemplateRec = this.examTemplateRecordMapper - .selectByPrimaryKey(examTemplatePK); - final String indicatorTemplatesJSON = examTemplateRec.getIndicatorTemplates(); - final Collection indicators = (StringUtils.isNotBlank(indicatorTemplatesJSON)) - ? this.jsonMapper.readValue( - indicatorTemplatesJSON, - new TypeReference>() { - }) - : Collections.emptyList(); + final Collection indicators = extractIndicatorTemplates(examTemplatePK); checkUniqueIndicatorName(indicatorTemplate, indicators); @@ -323,15 +302,7 @@ public class ExamTemplateDAOImpl implements ExamTemplateDAO { .map(i -> indicatorTemplate.id.equals(i.id) ? indicatorTemplate : i) .collect(Collectors.toList()); - final String newIndicatorTemplatesJSON = newIndicators.isEmpty() - ? StringUtils.EMPTY - : this.jsonMapper.writeValueAsString(newIndicators); - - final ExamTemplateRecord newRecord = new ExamTemplateRecord( - examTemplatePK, null, null, null, null, null, null, - newIndicatorTemplatesJSON, null); - - this.examTemplateRecordMapper.updateByPrimaryKeySelective(newRecord); + storeIndicatorTemplates(examTemplatePK, newIndicators); return indicatorTemplate; }) @@ -354,35 +325,105 @@ public class ExamTemplateDAOImpl implements ExamTemplateDAO { } final Long examTemplatePK = Long.valueOf(examTemplateId); - final ExamTemplateRecord examTemplateRec = this.examTemplateRecordMapper - .selectByPrimaryKey(examTemplatePK); - final String indicatorTemplatesJSON = examTemplateRec.getIndicatorTemplates(); - final Collection indicators = (StringUtils.isNotBlank(indicatorTemplatesJSON)) - ? this.jsonMapper.readValue( - indicatorTemplatesJSON, - new TypeReference>() { - }) - : Collections.emptyList(); + final Collection indicators = extractIndicatorTemplates(examTemplatePK); final List newIndicators = indicators.stream() .filter(indicatorTemplate -> !indicatorTemplateId.equals(indicatorTemplate.getModelId())) .collect(Collectors.toList()); - final String newIndicatorTemplatesJSON = newIndicators.isEmpty() - ? StringUtils.EMPTY - : this.jsonMapper.writeValueAsString(newIndicators); - - final ExamTemplateRecord newRecord = new ExamTemplateRecord( - examTemplatePK, null, null, null, null, null, null, - newIndicatorTemplatesJSON, null); - - this.examTemplateRecordMapper.updateByPrimaryKeySelective(newRecord); + storeIndicatorTemplates(examTemplatePK, newIndicators); return new EntityKey(indicatorTemplateId, EntityType.INDICATOR); }) .onError(TransactionHandler::rollback); } + @Override + @Transactional + public Result createNewClientGroupTemplate(final ClientGroupTemplate clientGroupTemplate) { + return Result.tryCatch(() -> { + + if (log.isDebugEnabled()) { + log.debug("Create new clientGroup template: {}", clientGroupTemplate); + } + + final Long examTemplateId = clientGroupTemplate.examTemplateId; + final Collection clientGroups = + loadClientGroupTemplates(examTemplateId); + + checkUniqueClientGroupName(clientGroupTemplate, clientGroups); + + final ClientGroupTemplate newClientGroupTemplate = new ClientGroupTemplate( + getNextClientGroupId(clientGroups), + clientGroupTemplate); + + final List newClientGroups = new ArrayList<>(clientGroups); + newClientGroups.add(newClientGroupTemplate); + + storeClientGroupTemplates(examTemplateId, newClientGroups); + + return newClientGroupTemplate; + }) + .onError(TransactionHandler::rollback); + } + + @Override + @Transactional + public Result saveClientGroupTemplate(final ClientGroupTemplate clientGroupTemplate) { + return Result.tryCatch(() -> { + + if (log.isDebugEnabled()) { + log.debug("Save client group template: {}", clientGroupTemplate); + } + + final Long examTemplateId = clientGroupTemplate.examTemplateId; + final Collection clientGroups = + loadClientGroupTemplates(examTemplateId); + + checkUniqueClientGroupName(clientGroupTemplate, clientGroups); + + final List newClientGroups = clientGroups + .stream() + .map(i -> clientGroupTemplate.id.equals(i.id) ? clientGroupTemplate : i) + .collect(Collectors.toList()); + + storeClientGroupTemplates(examTemplateId, newClientGroups); + + return clientGroupTemplate; + }) + .onError(TransactionHandler::rollback); + } + + @Override + @Transactional + public Result deleteClientGroupTemplate( + final String examTemplateId, + final String clientGroupTemplateId) { + + return Result.tryCatch(() -> { + + if (log.isDebugEnabled()) { + log.debug( + "Delete client group template for exam template: {} indicator template id", + examTemplateId, + clientGroupTemplateId); + } + + final Long examTemplatePK = Long.valueOf(examTemplateId); + final Collection clientGroups = + loadClientGroupTemplates(examTemplatePK); + + final List newClientGroups = clientGroups.stream() + .filter(clientGroupTemplate -> !clientGroupTemplateId.equals(clientGroupTemplate.getModelId())) + .collect(Collectors.toList()); + + storeClientGroupTemplates(examTemplatePK, newClientGroups); + + return new EntityKey(clientGroupTemplateId, EntityType.CLIENT_GROUP); + }) + .onError(TransactionHandler::rollback); + } + @Override public Set getDependencies(final BulkAction bulkAction) { // all of institution @@ -418,6 +459,10 @@ public class ExamTemplateDAOImpl implements ExamTemplateDAO { } }); + // delete all additional attributes + ids.stream() + .forEach(id -> this.additionalAttributesDAO.deleteAll(EntityType.EXAM_TEMPLATE, id)); + this.examTemplateRecordMapper.deleteByExample() .where(ExamTemplateRecordDynamicSqlSupport.id, isIn(ids)) .build() @@ -470,6 +515,8 @@ public class ExamTemplateDAOImpl implements ExamTemplateDAO { ? ExamType.valueOf(record.getExamType()) : ExamType.UNDEFINED; + final Collection clientGroupTemplates = loadClientGroupTemplates(record.getId()); + return new ExamTemplate( record.getId(), record.getInstitutionId(), @@ -480,6 +527,7 @@ public class ExamTemplateDAOImpl implements ExamTemplateDAO { record.getConfigurationTemplateId(), BooleanUtils.toBooleanObject(record.getInstitutionalDefault()), indicators, + clientGroupTemplates, examAttributes); }); } @@ -551,6 +599,22 @@ public class ExamTemplateDAOImpl implements ExamTemplateDAO { }); } + private void checkUniqueClientGroupName( + final ClientGroupTemplate clientGroupTemplate, + final Collection clinetGroups) { + + // check unique name + clinetGroups.stream() + .filter(it -> !Objects.equals(it, clientGroupTemplate) + && Objects.equals(it.name, clientGroupTemplate.name)) + .findAny() + .ifPresent(it -> { + throw new FieldValidationException( + "name", + "clientGroupTemplate:name:exists"); + }); + } + private long getNextIndicatorId(final Collection indicators) { return indicators.stream() .map(IndicatorTemplate::getId) @@ -558,6 +622,13 @@ public class ExamTemplateDAOImpl implements ExamTemplateDAO { .orElse(-1L) + 1; } + private long getNextClientGroupId(final Collection clientGroups) { + return clientGroups.stream() + .map(ClientGroupTemplate::getId) + .max(Long::compare) + .orElse(-1L) + 1; + } + private Result> allIdsOfInstitution(final EntityKey institutionKey) { return Result.tryCatch(() -> this.examTemplateRecordMapper.selectByExample() .where(ExamTemplateRecordDynamicSqlSupport.institutionId, @@ -573,4 +644,68 @@ public class ExamTemplateDAOImpl implements ExamTemplateDAO { .collect(Collectors.toList())); } + private Collection extractIndicatorTemplates(final Long examTemplatePK) + throws JsonProcessingException, JsonMappingException { + + final ExamTemplateRecord examTemplateRec = this.examTemplateRecordMapper + .selectByPrimaryKey(examTemplatePK); + final String indicatorTemplatesJSON = examTemplateRec.getIndicatorTemplates(); + final Collection indicators = (StringUtils.isNotBlank(indicatorTemplatesJSON)) + ? this.jsonMapper.readValue( + indicatorTemplatesJSON, + new TypeReference>() { + }) + : Collections.emptyList(); + return indicators; + } + + private void storeIndicatorTemplates(final Long examTemplatePK, final List newIndicators) + throws JsonProcessingException { + + final String newIndicatorTemplatesJSON = newIndicators.isEmpty() + ? StringUtils.EMPTY + : this.jsonMapper.writeValueAsString(newIndicators); + + final ExamTemplateRecord newRecord = new ExamTemplateRecord( + examTemplatePK, null, null, null, null, null, null, + newIndicatorTemplatesJSON, null); + + this.examTemplateRecordMapper.updateByPrimaryKeySelective(newRecord); + } + + private void storeClientGroupTemplates(final Long examTemplateId, final List newClientGroups) + throws JsonProcessingException { + + final String newIndicatorTemplatesJSON = newClientGroups.isEmpty() + ? StringUtils.EMPTY + : this.jsonMapper.writeValueAsString(newClientGroups); + + this.additionalAttributesDAO.saveAdditionalAttribute( + EntityType.EXAM_TEMPLATE, + examTemplateId, + ExamTemplate.ATTR_CLIENT_GROUP_TEMPLATES, + newIndicatorTemplatesJSON) + .getOrThrow(); + } + + private Collection loadClientGroupTemplates(final Long examTemplatePK) + throws JsonProcessingException, JsonMappingException { + + final String clientGroupTemplatesJSON = this.additionalAttributesDAO + .getAdditionalAttribute( + EntityType.EXAM_TEMPLATE, + examTemplatePK, + ExamTemplate.ATTR_CLIENT_GROUP_TEMPLATES) + .map(rec -> rec.getValue()) + .getOr(StringUtils.EMPTY); + + final Collection clientGroups = (StringUtils.isNotBlank(clientGroupTemplatesJSON)) + ? this.jsonMapper.readValue( + clientGroupTemplatesJSON, + new TypeReference>() { + }) + : Collections.emptyList(); + return clientGroups; + } + } diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/IndicatorDAOImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/IndicatorDAOImpl.java index 82f92564..b8fd8bbd 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/IndicatorDAOImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/IndicatorDAOImpl.java @@ -349,7 +349,9 @@ public class IndicatorDAOImpl implements IndicatorDAO { private Result recordById(final Long id) { return Result.tryCatch(() -> { - final IndicatorRecord record = this.indicatorRecordMapper.selectByPrimaryKey(id); + final IndicatorRecord record = this.indicatorRecordMapper + .selectByPrimaryKey(id); + if (record == null) { throw new ResourceNotFoundException( entityType(), @@ -384,7 +386,6 @@ public class IndicatorDAOImpl implements IndicatorDAO { record.getTags(), thresholds); }); - } } diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/exam/ExamTemplateService.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/exam/ExamTemplateService.java index 106e8d83..ed65bfdb 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/exam/ExamTemplateService.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/exam/ExamTemplateService.java @@ -37,6 +37,12 @@ public interface ExamTemplateService { * @return Result refer to the Exam with added default indicator or to an error if happened */ Result addDefinedIndicators(Exam exam); + /** Adds the client groups that are defined by a exam template + * + * @param exam The Exam to add the client groups + * @return Result refer to the Exam with added client groups or to an error if happened */ + Result addDefinedClientGroups(Exam exam); + /** Initializes additional attributes for a specified Exam on creation. * * @param exam The Exam to add the default indicator diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/exam/impl/ExamTemplateServiceImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/exam/impl/ExamTemplateServiceImpl.java index cd0f88a0..af47b13a 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/exam/impl/ExamTemplateServiceImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/exam/impl/ExamTemplateServiceImpl.java @@ -29,6 +29,8 @@ import ch.ethz.seb.sebserver.gbl.api.APIMessage.ErrorMessage; import ch.ethz.seb.sebserver.gbl.api.EntityType; import ch.ethz.seb.sebserver.gbl.api.JSONMapper; import ch.ethz.seb.sebserver.gbl.model.Entity; +import ch.ethz.seb.sebserver.gbl.model.exam.ClientGroup; +import ch.ethz.seb.sebserver.gbl.model.exam.ClientGroupTemplate; import ch.ethz.seb.sebserver.gbl.model.exam.Exam; import ch.ethz.seb.sebserver.gbl.model.exam.ExamConfigurationMap; import ch.ethz.seb.sebserver.gbl.model.exam.ExamTemplate; @@ -42,6 +44,7 @@ import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile; import ch.ethz.seb.sebserver.gbl.util.Result; import ch.ethz.seb.sebserver.gbl.util.Utils; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.AdditionalAttributesDAO; +import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ClientGroupDAO; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ConfigurationNodeDAO; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ExamConfigurationMapDAO; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ExamTemplateDAO; @@ -63,6 +66,7 @@ public class ExamTemplateServiceImpl implements ExamTemplateService { private final ConfigurationNodeDAO configurationNodeDAO; private final ExamConfigurationMapDAO examConfigurationMapDAO; private final IndicatorDAO indicatorDAO; + private final ClientGroupDAO clientGroupDAO; private final JSONMapper jsonMapper; private final String defaultIndicatorName; @@ -79,6 +83,7 @@ public class ExamTemplateServiceImpl implements ExamTemplateService { final ConfigurationNodeDAO configurationNodeDAO, final ExamConfigurationMapDAO examConfigurationMapDAO, final IndicatorDAO indicatorDAO, + final ClientGroupDAO clientGroupDAO, final JSONMapper jsonMapper, @Value("${sebserver.webservice.api.exam.indicator.name:}") final String defaultIndicatorName, @@ -94,6 +99,7 @@ public class ExamTemplateServiceImpl implements ExamTemplateService { this.additionalAttributesDAO = additionalAttributesDAO; this.examAdminService = examAdminService; this.indicatorDAO = indicatorDAO; + this.clientGroupDAO = clientGroupDAO; this.jsonMapper = jsonMapper; this.defaultIndicatorName = defaultIndicatorName; @@ -118,6 +124,36 @@ public class ExamTemplateServiceImpl implements ExamTemplateService { } } + @Override + public Result addDefinedClientGroups(final Exam exam) { + return Result.tryCatch(() -> { + + if (exam.examTemplateId != null) { + + if (log.isDebugEnabled()) { + log.debug("Init client groups for exam: {} from template: {}", exam.externalId, + exam.examTemplateId); + } + + final ExamTemplate examTemplate = this.examTemplateDAO + .byPK(exam.examTemplateId) + .onError(error -> log.warn("No exam template found for id: {}", + exam.examTemplateId, + error.getMessage())) + .getOr(null); + + if (examTemplate == null) { + return exam; + } + + examTemplate.clientGroupTemplates + .forEach(it -> createClientGroupFromTemplate(it, exam)); + } + + return exam; + }).onError(error -> log.error("Failed to create indicators defined by template for exam: ", error)); + } + @Override public Result initAdditionalAttributes(final Exam exam) { return this.examAdminService @@ -302,26 +338,37 @@ public class ExamTemplateServiceImpl implements ExamTemplateService { } private void createIndicatorFromTemplate(final IndicatorTemplate template, final Exam exam) { - try { + this.indicatorDAO + .createNew(new Indicator( + null, + exam.id, + template.name, + template.type, + template.defaultColor, + template.defaultIcon, + template.tags, + template.thresholds)) + .onError(error -> log.error("Failed to automatically create indicator from template: {} for exam: {}", + template, + exam, + error)); + } - this.indicatorDAO.createNew( - new Indicator( - null, - exam.id, - template.name, - template.type, - template.defaultColor, - template.defaultIcon, - template.tags, - template.thresholds)) - .getOrThrow(); - - } catch (final Exception e) { - log.error("Failed to automatically create indicator from template: {} for exam: {}", - template, - exam, - e); - } + private void createClientGroupFromTemplate(final ClientGroupTemplate template, final Exam exam) { + this.clientGroupDAO + .createNew(new ClientGroup( + null, + exam.id, + template.name, + template.type, + template.color, + template.icon, + template.data)) + .onError( + error -> log.error("Failed to automatically create client group from template: {} for exam: {}", + template, + exam, + error)); } private Result addDefaultIndicator(final Exam exam) { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/ClientIndicator.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/ClientIndicator.java index 5fac4a91..8c8b4cec 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/ClientIndicator.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/ClientIndicator.java @@ -16,7 +16,7 @@ import ch.ethz.seb.sebserver.gbl.model.exam.Indicator; import ch.ethz.seb.sebserver.gbl.model.exam.Indicator.IndicatorType; import ch.ethz.seb.sebserver.gbl.model.session.ClientEvent; import ch.ethz.seb.sebserver.gbl.model.session.ClientEvent.EventType; -import ch.ethz.seb.sebserver.gbl.model.session.IndicatorValue; +import ch.ethz.seb.sebserver.gbl.monitoring.IndicatorValue; import ch.ethz.seb.sebserver.webservice.datalayer.batis.model.ClientEventRecord; /** A client indicator is a indicator value holder for a specific Indicator diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/ExamSessionService.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/ExamSessionService.java index 38679835..87ba1c8b 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/ExamSessionService.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/ExamSessionService.java @@ -18,8 +18,8 @@ import ch.ethz.seb.sebserver.gbl.api.APIMessage; import ch.ethz.seb.sebserver.gbl.model.exam.Exam; import ch.ethz.seb.sebserver.gbl.model.session.ClientConnection; import ch.ethz.seb.sebserver.gbl.model.session.ClientConnection.ConnectionStatus; +import ch.ethz.seb.sebserver.gbl.monitoring.MonitoringSEBConnectionData; import ch.ethz.seb.sebserver.gbl.model.session.ClientConnectionData; -import ch.ethz.seb.sebserver.gbl.model.session.MonitoringSEBConnectionData; import ch.ethz.seb.sebserver.gbl.util.Result; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ClientConnectionDAO; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ExamDAO; diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ClientIndicatorFactory.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ClientIndicatorFactory.java index 80333c5d..32561558 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ClientIndicatorFactory.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ClientIndicatorFactory.java @@ -25,7 +25,7 @@ import org.springframework.stereotype.Component; import ch.ethz.seb.sebserver.gbl.model.exam.Indicator; import ch.ethz.seb.sebserver.gbl.model.exam.Indicator.IndicatorType; import ch.ethz.seb.sebserver.gbl.model.session.ClientConnection; -import ch.ethz.seb.sebserver.gbl.model.session.IndicatorValue; +import ch.ethz.seb.sebserver.gbl.monitoring.IndicatorValue; import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile; import ch.ethz.seb.sebserver.gbl.util.Utils; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.IndicatorDAO; diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamSessionServiceImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamSessionServiceImpl.java index 84be861e..df7c165f 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamSessionServiceImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamSessionServiceImpl.java @@ -38,8 +38,8 @@ import ch.ethz.seb.sebserver.gbl.model.exam.Exam; import ch.ethz.seb.sebserver.gbl.model.exam.Exam.ExamStatus; import ch.ethz.seb.sebserver.gbl.model.session.ClientConnection; import ch.ethz.seb.sebserver.gbl.model.session.ClientConnection.ConnectionStatus; +import ch.ethz.seb.sebserver.gbl.monitoring.MonitoringSEBConnectionData; import ch.ethz.seb.sebserver.gbl.model.session.ClientConnectionData; -import ch.ethz.seb.sebserver.gbl.model.session.MonitoringSEBConnectionData; import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile; import ch.ethz.seb.sebserver.gbl.util.Result; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ClientConnectionDAO; diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ClientGroupController.java b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ClientGroupController.java new file mode 100644 index 00000000..4c2636f3 --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ClientGroupController.java @@ -0,0 +1,144 @@ +/* + * Copyright (c) 2022 ETH Zürich, Educational Development and Technology (LET) + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +package ch.ethz.seb.sebserver.webservice.weblayer.api; + +import org.mybatis.dynamic.sql.SqlTable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import ch.ethz.seb.sebserver.gbl.api.API; +import ch.ethz.seb.sebserver.gbl.api.EntityType; +import ch.ethz.seb.sebserver.gbl.api.POSTMapper; +import ch.ethz.seb.sebserver.gbl.model.Domain; +import ch.ethz.seb.sebserver.gbl.model.EntityProcessingReport; +import ch.ethz.seb.sebserver.gbl.model.GrantEntity; +import ch.ethz.seb.sebserver.gbl.model.exam.ClientGroup; +import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile; +import ch.ethz.seb.sebserver.gbl.util.Pair; +import ch.ethz.seb.sebserver.gbl.util.Result; +import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.ClientGroupRecordDynamicSqlSupport; +import ch.ethz.seb.sebserver.webservice.servicelayer.PaginationService; +import ch.ethz.seb.sebserver.webservice.servicelayer.authorization.AuthorizationService; +import ch.ethz.seb.sebserver.webservice.servicelayer.bulkaction.BulkActionService; +import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ClientGroupDAO; +import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ExamDAO; +import ch.ethz.seb.sebserver.webservice.servicelayer.dao.UserActivityLogDAO; +import ch.ethz.seb.sebserver.webservice.servicelayer.session.ExamSessionService; +import ch.ethz.seb.sebserver.webservice.servicelayer.validation.BeanValidationService; + +@WebServiceProfile +@RestController +@RequestMapping("${sebserver.webservice.api.admin.endpoint}" + API.EXAM_CLIENT_GROUP_ENDPOINT) +public class ClientGroupController extends EntityController { + + private final ExamDAO examDao; + private final ExamSessionService examSessionService; + + protected ClientGroupController( + final AuthorizationService authorization, + final BulkActionService bulkActionService, + final ClientGroupDAO entityDAO, + final ExamDAO examDao, + final UserActivityLogDAO userActivityLogDAO, + final PaginationService paginationService, + final BeanValidationService beanValidationService, + final ExamSessionService examSessionService) { + + super(authorization, + bulkActionService, + entityDAO, + userActivityLogDAO, + paginationService, + beanValidationService); + + this.examDao = examDao; + this.examSessionService = examSessionService; + } + + @Override + protected ClientGroup createNew(final POSTMapper postParams) { + final Long examId = postParams.getLong(Domain.CLIENT_GROUP.ATTR_EXAM_ID); + if (examId == null) { + throw new RuntimeException("Missing exam model id from request parameter map!"); + } + return new ClientGroup(examId, postParams); + } + + @Override + protected SqlTable getSQLTableOfEntity() { + return ClientGroupRecordDynamicSqlSupport.clientGroupRecord; + } + + @Override + protected Result checkCreateAccess(final ClientGroup entity) { + if (entity == null) { + return null; + } + + return this.examDao.byPK(entity.examId) + .flatMap(e -> this.authorization.checkWrite(e)) + .map(e -> entity); + } + + @Override + protected Result validForCreate(final ClientGroup entity) { + // TODO check consistency!? + return super.validForCreate(entity); + + } + + @Override + protected Result validForSave(final ClientGroup entity) { + // TODO check consistency!? + return super.validForSave(entity); + } + + @Override + protected GrantEntity toGrantEntity(final ClientGroup entity) { + if (entity == null) { + return null; + } + + return this.examDao + .examGrantEntityByPK(entity.examId) + .getOrThrow(); + } + + @Override + protected EntityType getGrantEntityType() { + return EntityType.EXAM; + } + + @Override + protected Result notifyCreated(final ClientGroup entity) { + flushExamSessionCaches(entity); + return super.notifyCreated(entity); + } + + @Override + protected Result notifySaved(final ClientGroup entity) { + flushExamSessionCaches(entity); + return super.notifySaved(entity); + } + + @Override + protected Result> notifyDeleted( + final Pair pair) { + + flushExamSessionCaches(pair.a); + return super.notifyDeleted(pair); + } + + private void flushExamSessionCaches(final ClientGroup entity) { + if (this.examSessionService.isExamRunning(entity.examId)) { + this.examSessionService.flushCache(this.examSessionService.getRunningExam(entity.examId).getOrThrow()); + } + } + +} diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamMonitoringController.java b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamMonitoringController.java index 69f81a65..f9c007dd 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamMonitoringController.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamMonitoringController.java @@ -46,11 +46,11 @@ import ch.ethz.seb.sebserver.gbl.model.session.ClientConnection.ConnectionStatus import ch.ethz.seb.sebserver.gbl.model.session.ClientConnectionData; import ch.ethz.seb.sebserver.gbl.model.session.ClientInstruction; import ch.ethz.seb.sebserver.gbl.model.session.ClientNotification; -import ch.ethz.seb.sebserver.gbl.model.session.MonitoringFullPageData; -import ch.ethz.seb.sebserver.gbl.model.session.MonitoringSEBConnectionData; import ch.ethz.seb.sebserver.gbl.model.session.RemoteProctoringRoom; import ch.ethz.seb.sebserver.gbl.model.user.UserInfo; import ch.ethz.seb.sebserver.gbl.model.user.UserRole; +import ch.ethz.seb.sebserver.gbl.monitoring.MonitoringFullPageData; +import ch.ethz.seb.sebserver.gbl.monitoring.MonitoringSEBConnectionData; import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile; import ch.ethz.seb.sebserver.webservice.servicelayer.PaginationService; import ch.ethz.seb.sebserver.webservice.servicelayer.authorization.AuthorizationService; diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamTemplateController.java b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamTemplateController.java index 3e9b237d..22638eb0 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamTemplateController.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamTemplateController.java @@ -36,6 +36,7 @@ import ch.ethz.seb.sebserver.gbl.api.authorization.PrivilegeType; import ch.ethz.seb.sebserver.gbl.model.EntityKey; import ch.ethz.seb.sebserver.gbl.model.Page; import ch.ethz.seb.sebserver.gbl.model.PageSortOrder; +import ch.ethz.seb.sebserver.gbl.model.exam.ClientGroupTemplate; import ch.ethz.seb.sebserver.gbl.model.exam.ExamTemplate; import ch.ethz.seb.sebserver.gbl.model.exam.Indicator; import ch.ethz.seb.sebserver.gbl.model.exam.IndicatorTemplate; @@ -100,7 +101,7 @@ public class ExamTemplateController extends EntityController new ResourceNotFoundException(EntityType.INDICATOR, parentModelId))) .getOrThrow(); - } @RequestMapping( @@ -248,7 +248,150 @@ public class ExamTemplateController extends EntityController getClientGroupTemplatePage( + @PathVariable final String modelId, + @RequestParam( + name = API.PARAM_INSTITUTION_ID, + required = true, + defaultValue = UserService.USERS_INSTITUTION_AS_DEFAULT) final Long institutionId, + @RequestParam(name = Page.ATTR_PAGE_NUMBER, required = false) final Integer pageNumber, + @RequestParam(name = Page.ATTR_PAGE_SIZE, required = false) final Integer pageSize, + @RequestParam(name = Page.ATTR_SORT, required = false) final String sort, + @RequestParam final MultiValueMap allRequestParams, + final HttpServletRequest request) { + + checkReadPrivilege(institutionId); + + this.authorization.check( + PrivilegeType.READ, + EntityType.EXAM_TEMPLATE, + institutionId); + + final ExamTemplate examTemplate = super.entityDAO + .byModelId(modelId) + .getOrThrow(); + + return this.paginationService.buildPageFromList( + pageNumber, + pageSize, + sort, + examTemplate.clientGroupTemplates, + clientGroupTemplatePageSort(sort)); + } + + @RequestMapping( + path = API.PARENT_MODEL_ID_VAR_PATH_SEGMENT + + API.EXAM_TEMPLATE_CLIENT_GROUP_PATH_SEGMENT + + API.MODEL_ID_VAR_PATH_SEGMENT, + method = RequestMethod.GET, + consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, + produces = MediaType.APPLICATION_JSON_VALUE) + public ClientGroupTemplate getClientGroupTemplateBy( + @PathVariable final String parentModelId, + @PathVariable final String modelId, + @RequestParam( + name = API.PARAM_INSTITUTION_ID, + required = true, + defaultValue = UserService.USERS_INSTITUTION_AS_DEFAULT) final Long institutionId) { + + this.authorization.check( + PrivilegeType.READ, + EntityType.EXAM_TEMPLATE, + institutionId); + + return super.entityDAO + .byModelId(parentModelId) + .map(t -> t.clientGroupTemplates + .stream() + .filter(i -> modelId.equals(i.getModelId())) + .findFirst() + .orElseThrow(() -> new ResourceNotFoundException(EntityType.CLIENT_GROUP, parentModelId))) + .getOrThrow(); + } + + @RequestMapping( + path = API.EXAM_TEMPLATE_CLIENT_GROUP_PATH_SEGMENT, + method = RequestMethod.POST, + consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, + produces = MediaType.APPLICATION_JSON_VALUE) + public ClientGroupTemplate createClientGroupTemplate( + @RequestParam final MultiValueMap allRequestParams, + @RequestParam( + name = API.PARAM_INSTITUTION_ID, + required = true, + defaultValue = UserService.USERS_INSTITUTION_AS_DEFAULT) final Long institutionId, + final HttpServletRequest request) { + + // check write privilege for requested institution and concrete entityType + this.checkWritePrivilege(institutionId); + final POSTMapper postMap = new POSTMapper(allRequestParams, request.getQueryString()) + .putIfAbsent(API.PARAM_INSTITUTION_ID, String.valueOf(institutionId)); + + return this.beanValidationService + .validateBean(new ClientGroupTemplate( + null, + postMap.getLong(ClientGroupTemplate.ATTR_EXAM_TEMPLATE_ID), + postMap)) + .flatMap(this.examTemplateDAO::createNewClientGroupTemplate) + .flatMap(this.userActivityLogDAO::logCreate) + .getOrThrow(); + } + + @RequestMapping( + path = API.EXAM_TEMPLATE_CLIENT_GROUP_PATH_SEGMENT, + method = RequestMethod.PUT, + consumes = MediaType.APPLICATION_JSON_VALUE, + produces = MediaType.APPLICATION_JSON_VALUE) + public ClientGroupTemplate saveClientGroupTemplate( + @RequestParam( + name = API.PARAM_INSTITUTION_ID, + required = true, + defaultValue = UserService.USERS_INSTITUTION_AS_DEFAULT) final Long institutionId, + @Valid @RequestBody final ClientGroupTemplate modifyData) { + + // check modify privilege for requested institution and concrete entityType + this.checkModifyPrivilege(institutionId); + return this.beanValidationService + .validateBean(modifyData) + .flatMap(this.examTemplateDAO::saveClientGroupTemplate) + .flatMap(this.userActivityLogDAO::logModify) + .getOrThrow(); + } + + @RequestMapping( + path = API.PARENT_MODEL_ID_VAR_PATH_SEGMENT + + API.EXAM_TEMPLATE_CLIENT_GROUP_PATH_SEGMENT + + API.MODEL_ID_VAR_PATH_SEGMENT, + method = RequestMethod.DELETE, + produces = MediaType.APPLICATION_JSON_VALUE) + public EntityKey deleteClientGroupTemplate( + @PathVariable final String parentModelId, + @PathVariable final String modelId, + @RequestParam( + name = API.PARAM_INSTITUTION_ID, + required = true, + defaultValue = UserService.USERS_INSTITUTION_AS_DEFAULT) final Long institutionId) { + + // check write privilege for requested institution and concrete entityType + this.checkWritePrivilege(institutionId); + return this.examTemplateDAO + .deleteClientGroupTemplate(parentModelId, modelId) + .flatMap(this.userActivityLogDAO::logDelete) + .getOrThrow(); + } + + // **** Client Group Templates // **************************************************************************** // **************************************************************************** // **** Proctoring @@ -313,7 +456,8 @@ public class ExamTemplateController extends EntityController, List> pageSort(final String sort) { + static Function, List> indicatorTemplatePageSort( + final String sort) { final String sortBy = PageSortOrder.decode(sort); return indicators -> { @@ -333,4 +477,25 @@ public class ExamTemplateController extends EntityController, List> clientGroupTemplatePageSort( + final String sort) { + + final String sortBy = PageSortOrder.decode(sort); + return clientGroups -> { + final List list = clientGroups.stream().collect(Collectors.toList()); + if (StringUtils.isBlank(sort)) { + return list; + } + + if (sortBy.equals(Indicator.FILTER_ATTR_NAME)) { + list.sort(Comparator.comparing(indicator -> indicator.name)); + } + + if (PageSortOrder.DESCENDING == PageSortOrder.getSortOrder(sort)) { + Collections.reverse(list); + } + return list; + }; + } + } diff --git a/src/main/resources/config/sql/base/V16__clientGroupMigration_v1_5.sql b/src/main/resources/config/sql/base/V16__clientGroupMigration_v1_5.sql index edf48a0f..af2154cc 100644 --- a/src/main/resources/config/sql/base/V16__clientGroupMigration_v1_5.sql +++ b/src/main/resources/config/sql/base/V16__clientGroupMigration_v1_5.sql @@ -8,6 +8,7 @@ CREATE TABLE IF NOT EXISTS `client_group` ( `name` VARCHAR(255) NOT NULL, `type` VARCHAR(45) NOT NULL, `color` VARCHAR(45) NULL, + `icon` VARCHAR(45) NULL, `data` VARCHAR(4000) NULL, PRIMARY KEY (`id`), INDEX `clientGroupExamRef_idx` (`exam_id` ASC), diff --git a/src/test/java/ch/ethz/seb/sebserver/gbl/model/ModelObjectJSONGenerator.java b/src/test/java/ch/ethz/seb/sebserver/gbl/model/ModelObjectJSONGenerator.java index e28ee399..b18cfc90 100644 --- a/src/test/java/ch/ethz/seb/sebserver/gbl/model/ModelObjectJSONGenerator.java +++ b/src/test/java/ch/ethz/seb/sebserver/gbl/model/ModelObjectJSONGenerator.java @@ -63,13 +63,13 @@ import ch.ethz.seb.sebserver.gbl.model.session.ClientInstruction; import ch.ethz.seb.sebserver.gbl.model.session.ClientInstruction.InstructionType; import ch.ethz.seb.sebserver.gbl.model.session.ExtendedClientEvent; import ch.ethz.seb.sebserver.gbl.model.session.RunningExamInfo; -import ch.ethz.seb.sebserver.gbl.model.session.SimpleIndicatorValue; import ch.ethz.seb.sebserver.gbl.model.user.PasswordChange; import ch.ethz.seb.sebserver.gbl.model.user.UserActivityLog; import ch.ethz.seb.sebserver.gbl.model.user.UserInfo; import ch.ethz.seb.sebserver.gbl.model.user.UserLogActivityType; import ch.ethz.seb.sebserver.gbl.model.user.UserMod; import ch.ethz.seb.sebserver.gbl.model.user.UserRole; +import ch.ethz.seb.sebserver.gbl.monitoring.SimpleIndicatorValue; public class ModelObjectJSONGenerator { diff --git a/src/test/java/ch/ethz/seb/sebserver/gui/integration/UseCasesIntegrationTest.java b/src/test/java/ch/ethz/seb/sebserver/gui/integration/UseCasesIntegrationTest.java index 67bb12ec..7d49e19d 100644 --- a/src/test/java/ch/ethz/seb/sebserver/gui/integration/UseCasesIntegrationTest.java +++ b/src/test/java/ch/ethz/seb/sebserver/gui/integration/UseCasesIntegrationTest.java @@ -65,6 +65,8 @@ import ch.ethz.seb.sebserver.gbl.model.EntityProcessingReport; import ch.ethz.seb.sebserver.gbl.model.EntityProcessingReport.ErrorEntry; import ch.ethz.seb.sebserver.gbl.model.Page; import ch.ethz.seb.sebserver.gbl.model.exam.Chapters; +import ch.ethz.seb.sebserver.gbl.model.exam.ClientGroup; +import ch.ethz.seb.sebserver.gbl.model.exam.ClientGroup.ClientGroupType; import ch.ethz.seb.sebserver.gbl.model.exam.Exam; import ch.ethz.seb.sebserver.gbl.model.exam.Exam.ExamStatus; import ch.ethz.seb.sebserver.gbl.model.exam.Exam.ExamType; @@ -108,13 +110,13 @@ import ch.ethz.seb.sebserver.gbl.model.session.ClientInstruction; import ch.ethz.seb.sebserver.gbl.model.session.ClientInstruction.InstructionType; import ch.ethz.seb.sebserver.gbl.model.session.ClientNotification; import ch.ethz.seb.sebserver.gbl.model.session.ExtendedClientEvent; -import ch.ethz.seb.sebserver.gbl.model.session.IndicatorValue; -import ch.ethz.seb.sebserver.gbl.model.session.MonitoringFullPageData; -import ch.ethz.seb.sebserver.gbl.model.session.MonitoringSEBConnectionData; import ch.ethz.seb.sebserver.gbl.model.session.RemoteProctoringRoom; import ch.ethz.seb.sebserver.gbl.model.user.PasswordChange; import ch.ethz.seb.sebserver.gbl.model.user.UserInfo; import ch.ethz.seb.sebserver.gbl.model.user.UserRole; +import ch.ethz.seb.sebserver.gbl.monitoring.IndicatorValue; +import ch.ethz.seb.sebserver.gbl.monitoring.MonitoringFullPageData; +import ch.ethz.seb.sebserver.gbl.monitoring.MonitoringSEBConnectionData; import ch.ethz.seb.sebserver.gbl.util.Cryptor; import ch.ethz.seb.sebserver.gbl.util.Result; import ch.ethz.seb.sebserver.gbl.util.Utils; @@ -134,7 +136,6 @@ import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.DeactivateSE import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.DeleteExam; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.DeleteExamConfigMapping; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.DeleteExamTemplate; -import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.DeleteIndicatorTemplate; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.ExportSEBSettingsConfig; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetCourseChapters; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetDefaultExamTemplate; @@ -149,23 +150,28 @@ import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetExamProct import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetExamTemplate; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetExamTemplatePage; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetExamTemplates; -import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetIndicator; -import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetIndicatorPage; -import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetIndicatorTemplate; -import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetIndicatorTemplatePage; -import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetIndicators; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetSEBRestrictionSettings; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.NewExamConfigMapping; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.NewExamTemplate; -import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.NewIndicator; -import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.NewIndicatorTemplate; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.SaveExam; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.SaveExamConfigMapping; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.SaveExamProctoringSettings; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.SaveExamTemplate; -import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.SaveIndicator; -import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.SaveIndicatorTemplate; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.SaveSEBRestriction; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.clientgroup.GetClientGroup; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.clientgroup.GetClientGroupPage; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.clientgroup.NewClientGroup; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.clientgroup.SaveClientGroup; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.indicator.DeleteIndicatorTemplate; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.indicator.GetIndicator; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.indicator.GetIndicatorPage; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.indicator.GetIndicatorTemplate; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.indicator.GetIndicatorTemplatePage; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.indicator.GetIndicators; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.indicator.NewIndicator; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.indicator.NewIndicatorTemplate; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.indicator.SaveIndicator; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.indicator.SaveIndicatorTemplate; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.institution.ActivateInstitution; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.institution.GetInstitution; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.institution.GetInstitutionNames; @@ -806,7 +812,7 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest { } @Test - @Order(7) + @Order(6) // ************************************* // Use Case 6: Login as examAdmin2 // - Check if there are some quizzes from previous LMS Setup @@ -814,7 +820,7 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest { // - get exam page and check the exam is there // - get exam page with none native sort attribute to test this // - edit exam property and save again - public void testUsecase07_ImportExam() { + public void testUsecase06_ImportExam() { final RestServiceImpl restService = createRestServiceForUser( "examAdmin2", "examAdmin2", @@ -930,14 +936,14 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest { } @Test - @Order(8) + @Order(7) // ************************************* // Use Case 7: Login as examAdmin2 // - Get imported exam // - add new indicator for exam // - save exam with new indicator and test // - create some thresholds for the new indicator - public void testUsecase08_CreateExamIndicator() { + public void testUsecase07_CreateExamIndicator() { final RestServiceImpl restService = createRestServiceForUser( "examAdmin2", "examAdmin2", @@ -1019,6 +1025,82 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest { assertEquals("001111", t2.color); } + @Test + @Order(8) + // ************************************* + // Use Case 8: Login as examAdmin2 + // - Get imported exam + // - add new client group for exam + // - save exam with new client and test + public void testUsecase08_CreateExamClientGroup() { + final RestServiceImpl restService = createRestServiceForUser( + "examAdmin2", + "examAdmin2", + new GetExam(), + new GetExamNames(), + new NewClientGroup(), + new SaveClientGroup(), + new GetClientGroup(), + new GetClientGroupPage()); + + final Result> examNamesResult = restService + .getBuilder(GetExamNames.class) + .call(); + + assertNotNull(examNamesResult); + assertFalse(examNamesResult.hasError()); + final List exams = examNamesResult.get(); + assertFalse(exams.isEmpty()); + final EntityName examName = exams.get(0); + assertEquals("Demo Quiz 1 (MOCKUP)", examName.name); + + final Result examResult = restService + .getBuilder(GetExam.class) + .withURIVariable(API.PARAM_MODEL_ID, examName.modelId) + .call(); + + assertNotNull(examResult); + assertFalse(examResult.hasError()); + final Exam exam = examResult.get(); + + final Result newClientGroupResult = restService + .getBuilder(NewClientGroup.class) + .withFormParam(Domain.CLIENT_GROUP.ATTR_EXAM_ID, exam.getModelId()) + .withFormParam(Domain.CLIENT_GROUP.ATTR_NAME, "Room XY") + .withFormParam(Domain.CLIENT_GROUP.ATTR_TYPE, ClientGroupType.IP_V4_RANGE.name()) + .withFormParam(Domain.CLIENT_GROUP.ATTR_COLOR, "000001") + .withFormParam(Domain.CLIENT_GROUP.ATTR_DATA, "10.114.3.10,10.114.3.99") + .call(); + + assertNotNull(newClientGroupResult); + assertFalse(newClientGroupResult.hasError()); + final ClientGroup newClientGroup = newClientGroupResult.get(); + + assertEquals("Room XY", newClientGroup.name); + assertEquals("000001", newClientGroup.color); + + final ClientGroup clientGroupToSave = new ClientGroup( + newClientGroup.id, + newClientGroup.examId, + "Room XYZ", + newClientGroup.type, + "000002", + newClientGroup.icon, + newClientGroup.data); + + final Result savedClientGroupResult = restService + .getBuilder(SaveClientGroup.class) + .withBody(clientGroupToSave) + .call(); + + assertNotNull(savedClientGroupResult); + assertFalse(savedClientGroupResult.hasError()); + final ClientGroup savedClientGroup = savedClientGroupResult.get(); + + assertEquals("Room XYZ", savedClientGroup.name); + assertEquals("000002", savedClientGroup.color); + } + @Test @Order(9) // ************************************* @@ -2491,6 +2573,7 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest { "[EXAM, " + "INDICATOR, " + "INDICATOR, " + + "CLIENT_GROUP, " + "EXAM_CONFIGURATION_MAP, " + "CONFIGURATION_NODE, " + "CONFIGURATION_NODE, " @@ -2540,6 +2623,7 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest { "[EXAM, " + "INDICATOR, " + "INDICATOR, " + + "CLIENT_GROUP, " + "EXAM_CONFIGURATION_MAP, " + "CLIENT_CONNECTION, " + "CLIENT_CONNECTION, " @@ -2578,6 +2662,7 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest { "[EXAM, " + "INDICATOR, " + "INDICATOR, " + + "CLIENT_GROUP, " + "EXAM_CONFIGURATION_MAP, " + "CONFIGURATION_NODE, " + "CONFIGURATION_NODE, " @@ -2655,6 +2740,7 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest { + "CLIENT_CONNECTION, " + "CLIENT_CONNECTION, " + "CLIENT_CONNECTION, " + + "CLIENT_GROUP, " + "CONFIGURATION_NODE, " + "CONFIGURATION_NODE, " + "CONFIGURATION_NODE, " @@ -3009,6 +3095,7 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest { Long.parseLong(configTemplateName.modelId), // assosiate with given config template true, null, + null, null)) .call() .getOrThrow(); diff --git a/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/exam/SebConnectionTest.java b/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/exam/SebConnectionTest.java index 883a9c4b..39c6439d 100644 --- a/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/exam/SebConnectionTest.java +++ b/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/exam/SebConnectionTest.java @@ -30,7 +30,7 @@ import ch.ethz.seb.sebserver.gbl.api.APIMessage; import ch.ethz.seb.sebserver.gbl.api.APIMessage.ErrorMessage; import ch.ethz.seb.sebserver.gbl.api.JSONMapper; import ch.ethz.seb.sebserver.gbl.model.session.ClientEvent.EventType; -import ch.ethz.seb.sebserver.gbl.model.session.IndicatorValue; +import ch.ethz.seb.sebserver.gbl.monitoring.IndicatorValue; import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.ClientConnectionRecordDynamicSqlSupport; import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.ClientConnectionRecordMapper; import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.ClientEventRecordDynamicSqlSupport; diff --git a/src/test/java/ch/ethz/seb/sebserver/webservice/integration/services/ClientEventServiceTest.java b/src/test/java/ch/ethz/seb/sebserver/webservice/integration/services/ClientEventServiceTest.java index 62912021..03109f58 100644 --- a/src/test/java/ch/ethz/seb/sebserver/webservice/integration/services/ClientEventServiceTest.java +++ b/src/test/java/ch/ethz/seb/sebserver/webservice/integration/services/ClientEventServiceTest.java @@ -27,7 +27,7 @@ import ch.ethz.seb.sebserver.gbl.model.session.ClientConnection.ConnectionStatus import ch.ethz.seb.sebserver.gbl.model.session.ClientConnectionData; import ch.ethz.seb.sebserver.gbl.model.session.ClientEvent; import ch.ethz.seb.sebserver.gbl.model.session.ClientEvent.EventType; -import ch.ethz.seb.sebserver.gbl.model.session.IndicatorValue; +import ch.ethz.seb.sebserver.gbl.monitoring.IndicatorValue; import ch.ethz.seb.sebserver.webservice.integration.api.admin.AdministrationAPIIntegrationTester; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ClientConnectionDAO; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ClientEventDAO; diff --git a/src/test/resources/schema-test.sql b/src/test/resources/schema-test.sql index 9cabf6a7..0f79f605 100644 --- a/src/test/resources/schema-test.sql +++ b/src/test/resources/schema-test.sql @@ -721,6 +721,7 @@ CREATE TABLE IF NOT EXISTS `client_group` ( `name` VARCHAR(255) NOT NULL, `type` VARCHAR(45) NOT NULL, `color` VARCHAR(45) NULL, + `icon` VARCHAR(45) NULL, `data` VARCHAR(4000) NULL, PRIMARY KEY (`id`), INDEX `clientGroupExamRef_idx` (`exam_id` ASC),