From 43b9f9e94d8c92b5eb69a64e837fae829dbbe41f Mon Sep 17 00:00:00 2001
From: Carsten Karbach <c.karbach@fz-juelich.de>
Date: Mon, 22 Oct 2018 17:34:55 +0200
Subject: [PATCH] Upgrade events api implementation to use events api client
3.2
---
composer.json | 2 +-
composer.lock | 9 +++++----
rest/events/events_api.json | 16 ++++++++++++++++
3 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/composer.json b/composer.json
index 73f4038..a707ac0 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
],
"require": {
"silex/silex": ">=2.0",
- "jards/eventsapiclient": "=3.1",
+ "jards/eventsapiclient": "=3.2",
"jards/gcsjardsapiclient": "=2.1",
"phpmailer/phpmailer": ">=6.0"
},
diff --git a/composer.lock b/composer.lock
index 0cc0cae..7d56271 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,15 +4,15 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "817b1b07c4d12ae5dabfa859d38696b4",
+ "content-hash": "3a20cbde8de71a098db1c9a64e742d27",
"packages": [
{
"name": "jards/eventsapiclient",
- "version": "v3.1",
+ "version": "v3.2",
"source": {
"type": "git",
"url": "https://gitlab.version.fz-juelich.de/jards/EventsAPIClient.git",
- "reference": "cad3fd33956e8daa1f368f06fc8da50b3d08bebe"
+ "reference": "b2ec5e16acf1d6c2bea409069d555ae75f7d61c3"
},
"require": {
"ext-curl": "*",
@@ -53,7 +53,7 @@
"sdk",
"swagger"
],
- "time": "2018-06-07T07:00:45+00:00"
+ "time": "2018-10-22T15:23:47+00:00"
},
{
"name": "jards/gcsjardsapiclient",
@@ -402,6 +402,7 @@
"keywords": [
"microframework"
],
+ "abandoned": "symfony/flex",
"time": "2017-07-23T07:40:14+00:00"
},
{
diff --git a/rest/events/events_api.json b/rest/events/events_api.json
index e498b08..496e4a0 100644
--- a/rest/events/events_api.json
+++ b/rest/events/events_api.json
@@ -104,6 +104,22 @@
"description": "Name of the trigger which is activated by this event",
"type": "string"
},
+ "institutions": {
+ "description": "Institutions, for which this event is relevant. Active institution for this event. E.g. HLRS, JSC, LRZ",
+ "type": "array",
+ "items": {
+ "title": "institution",
+ "type": "string"
+ }
+ },
+ "categoryid":{
+ "description": "This is only available for review events. ID of review category where the event took place. ",
+ "type": "integer"
+ },
+ "categoryname":{
+ "description": "This is only available for review events. Name of review category where the event took place. ",
+ "type": "string"
+ },
"project" : {
"$ref": "#/definitions/Project"
},
--
GitLab