Merge pull request #263 from qbicsoftware/release/2.13.0

Release/2.13.0

Author: Steffengreiner

.qube.yml

@@ -4,7 +4,7 @@ email: sven.fillinger@qbic.uni-tuebingen.de
 project_name: data-model-lib
 project_short_description: "Data models. A collection of QBiC's central data models\
   \ and DTOs. "
-version: 2.12.1
+version: 2.13.0
 domain: lib
 language: groovy
 project_slug: data-model-lib

CHANGELOG.rst

@@ -4,6 +4,21 @@ Changelog
 
 This project adheres to `Semantic Versioning <https://semver.org/>`_.
 
+2.13.0 (2021-10-13)
+-------------------
+
+**Added**
+
+* Added new product type ``life.qbic.datamodel.dtos.business.services.ExternalServiceProduct`` (#262)
+* Added new ``Facility`` enum ``CEGAT`` in ``life.qbic.datamodel.dtos.business.facilities.Facility`` (#262)
+* Added new product type ``EXTERNAL_SERVICE`` for ``life.qbic.datamodel.dtos.business.ProductCategory`` (#262)
+
+**Fixed**
+
+**Dependencies**
+
+**Deprecated**
+
 2.12.1 (2021-09-13)
 -------------------
 

docs/conf.py

@@ -55,9 +55,9 @@
 # the built documents.
 #
 # The short X.Y version.
-version = '2.12.1'
+version = '2.13.0'
 # The full version, including alpha/beta/rc tags.
-release = '2.12.1'
+release = '2.13.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

pom.xml

@@ -7,7 +7,7 @@
 
     <groupId>life.qbic</groupId>
 	<artifactId>data-model-lib</artifactId>
-	<version>2.12.1</version> <!-- <<QUBE_FORCE_BUMP>> -->
+	<version>2.13.0</version> <!-- <<QUBE_FORCE_BUMP>> -->
 	<name>data-model-lib</name>
 	<url>http://github.com/qbicsoftware/data-model-lib</url>
 	<description>Data models. A collection of QBiC's central data models and DTOs. </description>

qube.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.12.1
+current_version = 2.13.0
 
 [bumpversion_files_whitelisted]
 dot_qube = .qube.yml

src/main/groovy/life/qbic/datamodel/dtos/business/ProductCategory.groovy

@@ -15,7 +15,8 @@ enum ProductCategory {
     SECONDARY_BIOINFO("Secondary Bioinformatics"),
     DATA_STORAGE("Data Storage"),
     PROTEOMIC("Proteomics"),
-    METABOLOMIC("Metabolomics")
+    METABOLOMIC("Metabolomics"),
+    EXTERNAL_SERVICE("External Service")
 
     /**
      * Value describing the enum type with a string

src/main/groovy/life/qbic/datamodel/dtos/business/facilities/Facility.groovy

@@ -10,7 +10,8 @@ package life.qbic.datamodel.dtos.business.facilities
  *     <li>IMGAG: Institute for Medical Genetics and Applied Genomics</li>
  *     <li>MGM: Institute for Medical Microbiology and Hygiene</li>
  *     <li>QBIC: Quantitative Biology Center</li>
- *     <li>PCT: Proteome Center Tübingen</li>
+ *     <li>CFMB_PCT: Proteomics Facility Tübingen</li>
+ *     <li>CEGAT: CeGaT GmbH</li>
  * </ul>
  *
  * @since 2.11.0
@@ -21,7 +22,8 @@ enum Facility {
     IMGAG("Institute for Medical Genetics and Applied Genomics", "IMGAG"),
     MGM("Institute for Medical Microbiology and Hygiene", "MGM"),
     QBIC("Quantitative Biology Center", "QBIC"),
-    CFMB_PCT("Proteomics Facility Tübingen", "Proteomics Facility")
+    CFMB_PCT("Proteomics Facility Tübingen", "Proteomics Facility"),
+    CEGAT("CeGaT GmbH", "CeGaT GmbH")
 
     private final String fullName
     private final String label

src/main/groovy/life/qbic/datamodel/dtos/business/services/ExternalServiceProduct.groovy

@@ -0,0 +1,29 @@
+package life.qbic.datamodel.dtos.business.services
+
+import groovy.transform.EqualsAndHashCode
+import life.qbic.datamodel.dtos.business.ProductId
+import life.qbic.datamodel.dtos.business.facilities.Facility
+
+/**
+ * <p>External service product</p>
+ *
+ * <p>Represents a service product that is offered through QBiC by an external partner.</p>
+ *
+ * @since 2.13.0
+ */
+@EqualsAndHashCode(callSuper = true)
+class ExternalServiceProduct extends PartialProduct {
+    /**
+     * Creates an instance of an {@link ExternalServiceProduct}.
+     * @param name The name of the product
+     * @param description A product description
+     * @param internalUnitPrice The net internal unit price of the product
+     * @param externalUnitPrice The net external unit price of the product
+     * @param unit The unit of the product
+     * @param productId A product id, uniquely identifying the product in the offer environment
+     * @param serviceProvider The service provider
+     */
+    ExternalServiceProduct(String name, String description, double internalUnitPrice, double externalUnitPrice, ProductUnit unit, long runningNumber, Facility serviceProvider) {
+        super(name, description, internalUnitPrice, externalUnitPrice, unit, new ProductId.Builder(ProductType.EXTERNAL_SERVICE.toString(), runningNumber).build(), serviceProvider)
+    }
+}

src/main/groovy/life/qbic/datamodel/dtos/business/services/ProductType.groovy

@@ -15,7 +15,8 @@ enum ProductType {
     SECONDARY_BIOINFO("SB"),
     DATA_STORAGE("DS"),
     PROTEOMIC("PR"),
-    METABOLOMIC("ME")
+    METABOLOMIC("ME"),
+    EXTERNAL_SERVICE("EXT")
 
     /**
      Holds the String value of the enum