Skip to content

Commit

Permalink
Merge pull request #166 from qbicsoftware/release/2.2.0
Browse files Browse the repository at this point in the history
Release 2.2.0
  • Loading branch information
sven1103 authored Mar 2, 2021
2 parents 481f0f6 + 6ec72c3 commit b29746f
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .qube.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ email: [email protected]
project_name: data-model-lib
project_short_description: "Data models. A collection of QBiC's central data models\
\ and DTOs. "
version: 2.1.0
version: 2.2.0
domain: lib
language: groovy
project_slug: data-model-lib
Expand Down
14 changes: 14 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,20 @@ Changelog
This project adheres to `Semantic Versioning <https://semver.org/>`_.


2.2.0 (2021-03-02)
------------------

**Added**

* Checksum property for ``life.qbic.datamodel.dtos.business.Offer``

**Fixed**

**Dependencies**

**Deprecated**


2.1.0 (2021-02-24)
------------------

Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@
# the built documents.
#
# The short X.Y version.
version = '2.1.0'
version = '2.2.0'
# The full version, including alpha/beta/rc tags.
release = '2.1.0'
release = '2.2.0'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<groupId>life.qbic</groupId>
<artifactId>data-model-lib</artifactId>
<version>2.1.0</version> <!-- <<QUBE_FORCE_BUMP>> -->
<version>2.2.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>
Expand Down
2 changes: 1 addition & 1 deletion qube.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 2.1.0
current_version = 2.2.0

[bumpversion_files_whitelisted]
dot_qube = .qube.yml
Expand Down
13 changes: 13 additions & 0 deletions src/main/groovy/life/qbic/datamodel/dtos/business/Offer.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ import groovy.transform.EqualsAndHashCode
@EqualsAndHashCode
class Offer {

/**
* The checksum of the offer
*/
final String checksum

/**
* Date on which the offer was lastly modified
*/
Expand Down Expand Up @@ -102,6 +107,7 @@ class Offer {
List<ProductItem> items
List<ProductItem> itemsWithOverhead
List<ProductItem> itemsWithoutOverhead
String checksum
/*
Offer identifier
*/
Expand Down Expand Up @@ -144,13 +150,19 @@ class Offer {
this.itemsWithoutOverhead = []
this.itemsWithOverheadNet = 0
this.itemsWithoutOverheadNet = 0
this.checksum = ""

/*
Deprecated
*/
this.projectDescription = Objects.requireNonNull(projectObjective, "Project Objective must not be null")
}

Builder checksum(String checksum) {
this.checksum = checksum
return this
}

Builder modificationDate(Date modificationDate) {
this.modificationDate = modificationDate
return this
Expand Down Expand Up @@ -228,6 +240,7 @@ class Offer {
this.projectTitle = builder.projectTitle
this.selectedCustomerAffiliation = builder.selectedCustomerAffiliation
this.items = builder.items
this.checksum = builder.checksum

/*
Offer Identifier
Expand Down

0 comments on commit b29746f

Please sign in to comment.