Hotfix/1.0.0 beta.2

qbicsoftware · Apr 30, 2021 · a7241d9 · a7241d9
2 parents 18dce26 + a318dfc
commit a7241d9
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 47 deletions.
diff --git a/.github/workflows/pr_to_master_from_development_only.yml b/.github/workflows/pr_to_master_from_development_only.yml
diff --git a/.qube.yml b/.qube.yml
@@ -3,7 +3,7 @@ full_name: Sven Fillinger
 email: [email protected]
 project_name: qoffer-2-portlet
 project_short_description: qOffer assists in managing and creating offers
-version: 1.0.0-beta.1
+version: 1.0.0-beta.2
 domain: portlet
 language: groovy
 project_slug: qoffer-2-portlet

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,6 +4,21 @@ Changelog
 
 This project adheres to `Semantic Versioning <https://semver.org/>`_.
 
+1.0.0-beta.2 (2021-04-30)
+-------------------------
+
+**Added**
+
+**Fixed**
+
+* Duplicate product identifiers are no longer generated (`#551 <https://github.com/qbicsoftware/offer-manager-2-portlet/pull/551>`_) fixes (`#546 <https://github.com/qbicsoftware/offer-manager-2-portlet/pull/546>`_)
+
+* Rephrased error message for product creation failure (`#552 <https://github.com/qbicsoftware/offer-manager-2-portlet/issues/263>`_)
+
+**Dependencies**
+
+**Deprecated**
+
 1.0.0-beta.1 (2021-04-27)
 -----------------------------------
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -55,9 +55,9 @@
 # the built documents.
 #
 # The short X.Y version.
-version = '1.0.0-beta.1'
+version = '1.0.0-beta.2'
 # The full version, including alpha/beta/rc tags.
-release = '1.0.0-beta.1'
+release = '1.0.0-beta.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/offer-manager-app/pom.xml b/offer-manager-app/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>offer-manager</artifactId>
         <groupId>life.qbic</groupId>
-        <version>1.0.0-beta.1</version>
+        <version>1.0.0-beta.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>war</packaging>
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>life.qbic</groupId>
             <artifactId>offer-manager-domain</artifactId>
-            <version>1.0.0-beta.1</version>
+            <version>1.0.0-beta.2</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/...in/groovy/life/qbic/portal/offermanager/dataresources/products/ProductsDbConnector.groovy b/...in/groovy/life/qbic/portal/offermanager/dataresources/products/ProductsDbConnector.groovy
@@ -318,7 +318,7 @@ class ProductsDbConnector implements ArchiveProductDataSource, CreateProductData
   }
 
   private Long fetchLatestIdentifier(String productType){
-    String query = "SELECT MAX(productId) FROM product WHERE productId LIKE ?"
+    String query = "SELECT productId FROM product WHERE productId LIKE ?"
     Connection connection = provider.connect()
 
     String category = productType + "_%"
@@ -332,8 +332,10 @@ class ProductsDbConnector implements ArchiveProductDataSource, CreateProductData
 
       while(result.next()){
         String id = result.getString(1)
-
-        if(id) latestUniqueId = Long.parseLong(id.split('_')[1])
+        if(id) {
+          long idRunningNumber = Long.parseLong(id.split('_')[1])
+          if(idRunningNumber > latestUniqueId) latestUniqueId = idRunningNumber
+        }
       }
     }
 

diff --git a/offer-manager-domain/pom.xml b/offer-manager-domain/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<artifactId>offer-manager</artifactId>
 		<groupId>life.qbic</groupId>
-		<version>1.0.0-beta.1</version>
+		<version>1.0.0-beta.2</version>
 	</parent>
 	<dependencies>
 		<dependency>

diff --git a/offer-manager-domain/src/main/groovy/life/qbic/business/products/create/CreateProduct.groovy b/offer-manager-domain/src/main/groovy/life/qbic/business/products/create/CreateProduct.groovy
@@ -44,8 +44,8 @@ class CreateProduct implements CreateProductInput {
             log.warn("Product $product.productName with identifier $product.productId already exists.", productExistsException)
             output.foundDuplicate(product)
         } catch(Exception exception) {
-            log.error("An unexpected during the project creation occurred.", exception)
-            output.failNotification("An unexpected during the project creation occurred. " +
+            log.error("An unexpected error occured during product creation.", exception)
+            output.failNotification("An unexpected error occured during product creation. " +
                     "Please contact ${Constants.QBIC_HELPDESK_EMAIL}.")
         }
     }

diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
 		<module>offer-manager-app</module>
 	</modules>
 	<artifactId>offer-manager</artifactId>
-	<version>1.0.0-beta.1</version> <!-- <<QUBE_FORCE_BUMP>> -->
+	<version>1.0.0-beta.2</version> <!-- <<QUBE_FORCE_BUMP>> -->
 	<groupId>life.qbic</groupId>
 	<name>The new offer manager</name>
 	<url>http://github.com/qbicsoftware/qOffer_2.0</url>

diff --git a/qube.cfg b/qube.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.0.0-beta.1
+current_version = 1.0.0-beta.2
 
 [bumpversion_files_whitelisted]
 dot_qube = .qube.yml