From af23f96eb8918fd779272441f818982ee1bbc928 Mon Sep 17 00:00:00 2001 From: Maximilian Stiede Date: Sat, 5 Oct 2019 19:50:24 +0200 Subject: [PATCH 1/7] feat(course): add enrollment_deadline and attendance to Course --- hpi/cloud/course/v1test/course.proto | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hpi/cloud/course/v1test/course.proto b/hpi/cloud/course/v1test/course.proto index 8fe8a9d..156c7ef 100644 --- a/hpi/cloud/course/v1test/course.proto +++ b/hpi/cloud/course/v1test/course.proto @@ -81,6 +81,12 @@ message Course { // A website that contains more information about the course. string website = 6; + + // An upper bound for the number of participants or null if there is none. + google.protobuf.UInt32Value attendance = 7; + + // Required. The enrollment deadline. + google.type.Date enrollment_deadline = 8; } // Details of a course. From 37d33cc3eeda42c8cf41ade251e577282993fbef Mon Sep 17 00:00:00 2001 From: Maximilian Stiede Date: Sat, 5 Oct 2019 19:51:08 +0200 Subject: [PATCH 2/7] feat(course): add PROJECT to Type enum of CourseSeries --- hpi/cloud/course/v1test/course.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/hpi/cloud/course/v1test/course.proto b/hpi/cloud/course/v1test/course.proto index 156c7ef..2453732 100644 --- a/hpi/cloud/course/v1test/course.proto +++ b/hpi/cloud/course/v1test/course.proto @@ -39,6 +39,7 @@ message CourseSeries { SEMINAR = 1; BLOCK_SEMINAR = 2; EXERCISE = 3; + PROJECT = 4; } // Types of this course series. Must contain at least one value. From e10fd725936761db482ecb8359e42240955a7100 Mon Sep 17 00:00:00 2001 From: Maximilian Stiede Date: Sat, 5 Oct 2019 19:52:10 +0200 Subject: [PATCH 3/7] BREAKING CHANGE(course): mandatory status has to be a tri-state / enum --- hpi/cloud/course/v1test/course.proto | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/hpi/cloud/course/v1test/course.proto b/hpi/cloud/course/v1test/course.proto index 2453732..c64c541 100644 --- a/hpi/cloud/course/v1test/course.proto +++ b/hpi/cloud/course/v1test/course.proto @@ -29,7 +29,13 @@ message CourseSeries { sint32 hours_per_week = 6; // Required. Whether it's mandatory to particiapte in a course of this series. - bool mandatory = 7; + Mandatory mandatory = 7; + + enum Mandatory { + COMPULSORY = 0; + NON_COMPULSORY = 1; + BRIDGE = 2; + } // Required. The language courses of this series are taught in. Must be a valid [BCP 47](https://en.wikipedia.org/wiki/IETF_language_tag) language tag. string language = 8; From 6294296ddc949bf2f5c988616679c9588d8747b9 Mon Sep 17 00:00:00 2001 From: Maximilian Stiede Date: Sun, 6 Oct 2019 16:53:02 +0200 Subject: [PATCH 4/7] fix(course): imports, mandatory enum --- hpi/cloud/course/v1test/course.proto | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/hpi/cloud/course/v1test/course.proto b/hpi/cloud/course/v1test/course.proto index c64c541..1ca9ef3 100644 --- a/hpi/cloud/course/v1test/course.proto +++ b/hpi/cloud/course/v1test/course.proto @@ -2,6 +2,9 @@ syntax = "proto3"; package hpi.cloud.course.v1test; +import "google/protobuf/wrappers.proto"; +import "google/protobuf/date.proto"; + option java_multiple_files = true; option java_outer_classname = "CourseProto"; option java_package = "de.hpi.cloud.course.v1test"; @@ -28,15 +31,15 @@ message CourseSeries { // Required. The hours per week that courses of this series typically require. sint32 hours_per_week = 6; - // Required. Whether it's mandatory to particiapte in a course of this series. - Mandatory mandatory = 7; - enum Mandatory { - COMPULSORY = 0; - NON_COMPULSORY = 1; + NON_COMPULSORY = 0; + COMPULSORY = 1; BRIDGE = 2; } + // Required. Whether it's mandatory to particiapte in a course of this series. + Mandatory mandatory = 7; + // Required. The language courses of this series are taught in. Must be a valid [BCP 47](https://en.wikipedia.org/wiki/IETF_language_tag) language tag. string language = 8; From 2a8b9b16f6da6fc0c6e7a0b8e093074d85b51d0f Mon Sep 17 00:00:00 2001 From: Jonas Wanke Date: Sun, 6 Oct 2019 18:04:01 +0200 Subject: [PATCH 5/7] refactor(course): minor changes --- hpi/cloud/course/v1test/course.proto | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hpi/cloud/course/v1test/course.proto b/hpi/cloud/course/v1test/course.proto index 1ca9ef3..6d8a564 100644 --- a/hpi/cloud/course/v1test/course.proto +++ b/hpi/cloud/course/v1test/course.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package hpi.cloud.course.v1test; import "google/protobuf/wrappers.proto"; -import "google/protobuf/date.proto"; +import "google/type/date.proto"; option java_multiple_files = true; option java_outer_classname = "CourseProto"; @@ -31,14 +31,14 @@ message CourseSeries { // Required. The hours per week that courses of this series typically require. sint32 hours_per_week = 6; - enum Mandatory { + enum Occupancy { NON_COMPULSORY = 0; COMPULSORY = 1; BRIDGE = 2; } - // Required. Whether it's mandatory to particiapte in a course of this series. - Mandatory mandatory = 7; + // Required. Whether it's mandatory to participate in a course of this series. + Occupancy occupancy = 7; // Required. The language courses of this series are taught in. Must be a valid [BCP 47](https://en.wikipedia.org/wiki/IETF_language_tag) language tag. string language = 8; @@ -92,10 +92,10 @@ message Course { // A website that contains more information about the course. string website = 6; - // An upper bound for the number of participants or null if there is none. + // An optional upper bound for the number of participants. google.protobuf.UInt32Value attendance = 7; - // Required. The enrollment deadline. + // The enrollment deadline. google.type.Date enrollment_deadline = 8; } From f352a22741e0a45f979de0c5cf122cd092d72c49 Mon Sep 17 00:00:00 2001 From: Jonas Wanke Date: Sun, 6 Oct 2019 18:10:53 +0200 Subject: [PATCH 6/7] refactor(course): rename CourseSeries.occupancy to compulsory --- hpi/cloud/course/v1test/course.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hpi/cloud/course/v1test/course.proto b/hpi/cloud/course/v1test/course.proto index 6d8a564..ebf3732 100644 --- a/hpi/cloud/course/v1test/course.proto +++ b/hpi/cloud/course/v1test/course.proto @@ -31,14 +31,14 @@ message CourseSeries { // Required. The hours per week that courses of this series typically require. sint32 hours_per_week = 6; - enum Occupancy { + enum Compulsory { NON_COMPULSORY = 0; COMPULSORY = 1; BRIDGE = 2; } // Required. Whether it's mandatory to participate in a course of this series. - Occupancy occupancy = 7; + Compulsory compulsory = 7; // Required. The language courses of this series are taught in. Must be a valid [BCP 47](https://en.wikipedia.org/wiki/IETF_language_tag) language tag. string language = 8; From 494c19b21261eb42d491b00c617e418056dbe340 Mon Sep 17 00:00:00 2001 From: Jonas Wanke Date: Sun, 6 Oct 2019 18:42:46 +0200 Subject: [PATCH 7/7] chore: prepare release --- .unicornfig.yml | 2 +- CHANGELOG.md | 6 +++++- build.gradle | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.unicornfig.yml b/.unicornfig.yml index bd2ae77..94648f6 100644 --- a/.unicornfig.yml +++ b/.unicornfig.yml @@ -7,5 +7,5 @@ description: "This repository contains the original interface definitions of pub \ definitions can provide a better understanding of HPI Cloud APIs and help you\ \ to utilize them more efficiently. You can also use these definitions with open\ \ source tools to generate client libraries, documentation, and other artifacts." -version: "0.0.10" +version: "0.0.11" githubName: "HPI-de/hpi-cloud-apis" diff --git a/CHANGELOG.md b/CHANGELOG.md index e204e52..9091748 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +## [0.0.11] - 2019-10-06 +### BREAKING CHANGES +- **course:** add Course.attendance, enrollment_deadline; make CourseSeries.mandatory an enum ## [0.0.10] - 2019-10-05 ### BREAKING CHANGES @@ -91,7 +94,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. Initial release with NewsService. -[Unreleased]: https://github.com/HPI-de/hpi-cloud-apis/compare/0.0.10...dev +[Unreleased]: https://github.com/HPI-de/hpi-cloud-apis/compare/0.0.11...dev +[0.0.11]: https://github.com/HPI-de/hpi-cloud-apis/compare/0.0.10...0.0.11 [0.0.10]: https://github.com/HPI-de/hpi-cloud-apis/compare/0.0.9...0.0.10 [0.0.9]: https://github.com/HPI-de/hpi-cloud-apis/compare/0.0.8...0.0.9 [0.0.8]: https://github.com/HPI-de/hpi-cloud-apis/compare/0.0.7...0.0.8 diff --git a/build.gradle b/build.gradle index 3a436e5..2615ffe 100644 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,7 @@ ext { githubReleaseNotes = 'CHANGELOG.md' allLicenses = ["Apache-2.0"] - libraryVersion = "0.0.10" + libraryVersion = "0.0.11" } task sourcesJar(type: Jar, dependsOn: classes) {