From 6d127dcec621da76e817db7809ba6edbf074b486 Mon Sep 17 00:00:00 2001 From: Sylvain Jermini Date: Wed, 27 Dec 2017 19:20:49 +0100 Subject: [PATCH 01/31] #349 stubs/initial work --- .../alfio/config/DataSourceConfiguration.java | 2 +- .../api/admin/ScriptController.java | 69 ++++++++++++ src/main/java/alfio/model/ScriptSupport.java | 47 ++++++++ .../alfio/repository/ScriptRepository.java | 61 +++++++++++ src/main/java/alfio/scripting/Script.java | 34 ++++++ .../java/alfio/scripting/ScriptMetadata.java | 25 +++++ .../scripting/ScriptingExecutionService.java | 93 ++++++++++++++++ .../alfio/scripting/ScriptingService.java | 100 ++++++++++++++++++ .../db/HSQLDB/V22_1.14.0__ADD_SCRIPTING.sql | 31 ++++++ .../webapp/WEB-INF/templates/admin/index.ms | 4 + .../add-update/scripting-add-update.html | 1 + .../add-update/scripting-add-update.js | 12 +++ .../js/admin/feature/scripting/scripting.html | 29 +++++ .../js/admin/feature/scripting/scripting.js | 32 ++++++ .../js/admin/ng-app/admin-application.js | 3 + 15 files changed, 542 insertions(+), 1 deletion(-) create mode 100644 src/main/java/alfio/controller/api/admin/ScriptController.java create mode 100644 src/main/java/alfio/model/ScriptSupport.java create mode 100644 src/main/java/alfio/repository/ScriptRepository.java create mode 100644 src/main/java/alfio/scripting/Script.java create mode 100644 src/main/java/alfio/scripting/ScriptMetadata.java create mode 100644 src/main/java/alfio/scripting/ScriptingExecutionService.java create mode 100644 src/main/java/alfio/scripting/ScriptingService.java create mode 100644 src/main/resources/alfio/db/HSQLDB/V22_1.14.0__ADD_SCRIPTING.sql create mode 100644 src/main/webapp/resources/js/admin/feature/scripting/add-update/scripting-add-update.html create mode 100644 src/main/webapp/resources/js/admin/feature/scripting/add-update/scripting-add-update.js create mode 100644 src/main/webapp/resources/js/admin/feature/scripting/scripting.html create mode 100644 src/main/webapp/resources/js/admin/feature/scripting/scripting.js diff --git a/src/main/java/alfio/config/DataSourceConfiguration.java b/src/main/java/alfio/config/DataSourceConfiguration.java index d4af6175ef..c2184d4328 100644 --- a/src/main/java/alfio/config/DataSourceConfiguration.java +++ b/src/main/java/alfio/config/DataSourceConfiguration.java @@ -70,7 +70,7 @@ @EnableTransactionManagement @EnableScheduling @EnableAsync -@ComponentScan(basePackages = {"alfio.manager"}) +@ComponentScan(basePackages = {"alfio.manager", "alfio.scripting"}) @Log4j2 public class DataSourceConfiguration implements ResourceLoaderAware { diff --git a/src/main/java/alfio/controller/api/admin/ScriptController.java b/src/main/java/alfio/controller/api/admin/ScriptController.java new file mode 100644 index 0000000000..60f110c925 --- /dev/null +++ b/src/main/java/alfio/controller/api/admin/ScriptController.java @@ -0,0 +1,69 @@ +/** + * This file is part of alf.io. + * + * alf.io is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * alf.io is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with alf.io. If not, see . + */ + +package alfio.controller.api.admin; + +import alfio.manager.user.UserManager; +import alfio.model.ScriptSupport; +import alfio.model.user.Role; +import alfio.scripting.Script; +import alfio.scripting.ScriptingService; +import lombok.AllArgsConstructor; +import org.apache.commons.lang3.Validate; +import org.springframework.web.bind.annotation.*; + +import java.security.Principal; +import java.util.List; + +@RestController +@AllArgsConstructor +@RequestMapping("/admin/api") +public class ScriptController { + + private final ScriptingService scriptingService; + private final UserManager userManager; + + + @RequestMapping(value = "/scripting", method = RequestMethod.GET) + public List listAll(Principal principal) { + ensureAdmin(principal); + return scriptingService.listAll(); + } + + @RequestMapping(value = "/scripting", method = RequestMethod.POST) + public void createOrUpdate(@RequestBody Script script, Principal principal) { + ensureAdmin(principal); + scriptingService.createOrUpdate(script); + } + + + @RequestMapping(value = "/scripting/{path}", method = RequestMethod.DELETE) + public void delete(@PathVariable("path") String path, Principal principal) { + ensureAdmin(principal); + scriptingService.delete(path); + } + + @RequestMapping(value = "/scripting/{path}/toggle/{enable}", method = RequestMethod.POST) + public void toggle(@PathVariable("path") String path, @PathVariable("enable") boolean enable, Principal principal) { + ensureAdmin(principal); + scriptingService.toggle(path, enable); + } + + private void ensureAdmin(Principal principal) { + Validate.isTrue(userManager.isAdmin(userManager.findUserByUsername(principal.getName()))); + } +} diff --git a/src/main/java/alfio/model/ScriptSupport.java b/src/main/java/alfio/model/ScriptSupport.java new file mode 100644 index 0000000000..16ac699461 --- /dev/null +++ b/src/main/java/alfio/model/ScriptSupport.java @@ -0,0 +1,47 @@ +/** + * This file is part of alf.io. + * + * alf.io is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * alf.io is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with alf.io. If not, see . + */ +package alfio.model; + +import ch.digitalfondue.npjt.ConstructorAnnotationRowMapper.Column; + +public class ScriptSupport { + + private final String path; + private final String name; + private final String hash; + private final boolean enabled; + private final boolean async; + private final String script; + private final String configuration; + + + public ScriptSupport(@Column("path") String path, + @Column("name") String name, + @Column("hash") String hash, + @Column("enabled") boolean enabled, + @Column("async") boolean async, + @Column("script") String script, + @Column("configuration") String configuration) { + this.path = path; + this.name = name; + this.hash = hash; + this.enabled = enabled; + this.async = async; + this.script = script; + this.configuration = configuration; + } +} diff --git a/src/main/java/alfio/repository/ScriptRepository.java b/src/main/java/alfio/repository/ScriptRepository.java new file mode 100644 index 0000000000..dbc0c43126 --- /dev/null +++ b/src/main/java/alfio/repository/ScriptRepository.java @@ -0,0 +1,61 @@ +/** + * This file is part of alf.io. + * + * alf.io is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * alf.io is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with alf.io. If not, see . + */ + +package alfio.repository; + +import alfio.model.ScriptSupport; +import ch.digitalfondue.npjt.Bind; +import ch.digitalfondue.npjt.Query; +import ch.digitalfondue.npjt.QueryRepository; + +import java.util.List; + +@QueryRepository +public interface ScriptRepository { + + @Query("insert into script_support(path, name, hash, enabled, async, script, configuration) values " + + " (:path, :name, :hash, :enabled, :async, :script, :configuration)") + int insert(@Bind("path") String path, + @Bind("name") String name, + @Bind("hash") String hash, + @Bind("enabled") boolean enabled, + @Bind("async") boolean async, + @Bind("script") String script, + @Bind("configuration") String configuration); + + @Query("update script_support set enabled = :enabled where path = :path") + int toggle(@Bind("path") String path, @Bind("enabled") boolean enabled); + + @Query("insert into script_event(path, event) values " + + " (:path, :event)") + int insert(@Bind("path") String path, @Bind("event ") String event); + + @Query("select count(*) from script_support where path = :path") + int hasPath(@Bind("path") String path); + + @Query("select script from script_support where path = :path") + String getScript(@Bind("path") String path); + + @Query("delete from script_event where path = :path") + int deleteEventsForPath(@Bind("path") String path); + + @Query("delete from script_support where path = :path") + int deleteScriptForPath(@Bind("path") String path); + + @Query("select * from script_support order by path") + List listAll(); +} diff --git a/src/main/java/alfio/scripting/Script.java b/src/main/java/alfio/scripting/Script.java new file mode 100644 index 0000000000..905cd74736 --- /dev/null +++ b/src/main/java/alfio/scripting/Script.java @@ -0,0 +1,34 @@ +/** + * This file is part of alf.io. + * + * alf.io is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * alf.io is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with alf.io. If not, see . + */ + +package alfio.scripting; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.util.Map; + +@Getter +@AllArgsConstructor +public class Script { + + private final String path; + private final String name; + private final String script; + private final Map configuration; + private final boolean enabled; +} diff --git a/src/main/java/alfio/scripting/ScriptMetadata.java b/src/main/java/alfio/scripting/ScriptMetadata.java new file mode 100644 index 0000000000..b35b2420da --- /dev/null +++ b/src/main/java/alfio/scripting/ScriptMetadata.java @@ -0,0 +1,25 @@ +/** + * This file is part of alf.io. + * + * alf.io is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * alf.io is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with alf.io. If not, see . + */ + +package alfio.scripting; + +import java.util.List; + +public class ScriptMetadata { + boolean async; + List events; +} diff --git a/src/main/java/alfio/scripting/ScriptingExecutionService.java b/src/main/java/alfio/scripting/ScriptingExecutionService.java new file mode 100644 index 0000000000..4df1f55d4b --- /dev/null +++ b/src/main/java/alfio/scripting/ScriptingExecutionService.java @@ -0,0 +1,93 @@ +/** + * This file is part of alf.io. + * + * alf.io is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * alf.io is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with alf.io. If not, see . + */ + +package alfio.scripting; + +import com.github.benmanes.caffeine.cache.Cache; +import com.github.benmanes.caffeine.cache.Caffeine; +import lombok.extern.log4j.Log4j2; +import org.springframework.stereotype.Service; + +import javax.script.*; +import java.util.Map; +import java.util.concurrent.*; +import java.util.function.Supplier; + + +// +// table {path, name, hash, script content, params} +// where path is unique, in our case can be: +// +// /name +// /organization/name +// /organization/event/name +// /organization/event/ticket_category/name +// +// for async execution -> for each path make a queue + +@Service +@Log4j2 +public class ScriptingExecutionService { + + private final static Compilable engine = (Compilable) new ScriptEngineManager().getEngineByName("javascript"); + private final Cache compiledScriptCache = Caffeine.newBuilder() + .expireAfterAccess(12, TimeUnit.HOURS) + .build(); + private final Cache asyncExecutors = Caffeine.newBuilder() + .expireAfterAccess(12, TimeUnit.HOURS) + .build(); + + public T executeScript(String path, String name, String hash, Supplier scriptFetcher, Map params) { + CompiledScript compiledScript = compiledScriptCache.get(hash, (key) -> { + try { + return engine.compile(scriptFetcher.get()); + } catch (ScriptException se) { + log.warn("Was not able to compile script " + name, se); + throw new IllegalStateException(se); + } + }); + return (T) executeScript(name, compiledScript, params); + } + + public void executeScriptAsync(String path, String name, String hash, Supplier scriptFetcher, Map params) { + asyncExecutors.get(path, (key) -> Executors.newSingleThreadExecutor()).submit(() -> { + executeScript(path, name, hash, scriptFetcher, params); + }); + } + + public static T executeScript(String name, String script, Map params) { + try { + CompiledScript compiledScript = engine.compile(script); + return (T) executeScript(name, compiledScript, params); + } catch (ScriptException se) { + log.warn("Was not able to compile script", se); + throw new IllegalStateException(se); + } + } + + private static Object executeScript(String name, CompiledScript script, Map params) { + try { + ScriptContext newContext = new SimpleScriptContext(); + Bindings engineScope = newContext.getBindings(ScriptContext.ENGINE_SCOPE); + engineScope.putAll(params); + return script.eval(newContext); + } catch (ScriptException ex) { + log.warn("Error while executing script " + name, ex); + throw new IllegalStateException(ex); + } + } +} diff --git a/src/main/java/alfio/scripting/ScriptingService.java b/src/main/java/alfio/scripting/ScriptingService.java new file mode 100644 index 0000000000..5db412ee80 --- /dev/null +++ b/src/main/java/alfio/scripting/ScriptingService.java @@ -0,0 +1,100 @@ +/** + * This file is part of alf.io. + * + * alf.io is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * alf.io is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with alf.io. If not, see . + */ + +package alfio.scripting; + +import alfio.model.ScriptSupport; +import alfio.repository.ScriptRepository; +import alfio.util.Json; +import lombok.AllArgsConstructor; +import lombok.extern.log4j.Log4j2; +import org.apache.commons.codec.digest.DigestUtils; +import org.apache.commons.lang3.tuple.Triple; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Service +@Log4j2 +@AllArgsConstructor +public class ScriptingService { + + private final ScriptingExecutionService scriptingExecutionService; + + private final ScriptRepository scriptRepository; + + @Transactional + public void createOrUpdate(Script script) { + String hash = DigestUtils.sha256Hex(script.getScript()); + ScriptMetadata scriptMetadata = ScriptingExecutionService.executeScript( + script.getName(), + script.getScript() + "\n;return getScriptMetadata();", + script.getConfiguration()); + + + if(scriptRepository.hasPath(script.getPath()) > 0) { + scriptRepository.deleteEventsForPath(script.getPath()); + scriptRepository.deleteScriptForPath(script.getPath()); + } + + scriptRepository.insert(script.getPath(), script.getName(), hash, script.isEnabled(), scriptMetadata.async, script.getScript(), Json.toJson(script.getConfiguration())); + for(String event : scriptMetadata.events) { + scriptRepository.insert(script.getPath(), event); + } + } + + @Transactional + public void toggle(String path, boolean status) { + scriptRepository.toggle(path, status); + } + + @Transactional + public void delete(String path) { + scriptRepository.deleteEventsForPath(path); + scriptRepository.deleteScriptForPath(path); + } + + public String getScript(String path) { + return scriptRepository.getScript(path); + } + + public T executeScriptsForEvent(String event, String basePath, Map payload) { + List> activePaths = getActiveScriptsForEvent(event, basePath); + T res = null; + Map input = new HashMap<>(payload); + input.put("event", event); + for(Triple activePath : activePaths) { + String path = activePath.getLeft(); + res = scriptingExecutionService.executeScript(activePath.getLeft(), activePath.getMiddle(), activePath.getRight(), + () -> getScript(path)+"\n;return executeScript(event);", input); + input.put("output", res); + } + return res; + } + + private List> getActiveScriptsForEvent(String event, String basePath) { + return Collections.emptyList(); + } + + public List listAll() { + return scriptRepository.listAll(); + } +} diff --git a/src/main/resources/alfio/db/HSQLDB/V22_1.14.0__ADD_SCRIPTING.sql b/src/main/resources/alfio/db/HSQLDB/V22_1.14.0__ADD_SCRIPTING.sql new file mode 100644 index 0000000000..63e6a4bd7e --- /dev/null +++ b/src/main/resources/alfio/db/HSQLDB/V22_1.14.0__ADD_SCRIPTING.sql @@ -0,0 +1,31 @@ +-- +-- This file is part of alf.io. +-- +-- alf.io is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation, either version 3 of the License, or +-- (at your option) any later version. +-- +-- alf.io is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with alf.io. If not, see . +-- + +create table script_support ( + path varchar(256) not null, + name varchar(256) not null, + hash varchar(256) not null, + enabled boolean not null, + async boolean not null, + script clob not null, + configuration clob +); + +create table script_event ( + path_fk varchar(256) not null, + event varchar(256) not null +); \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/templates/admin/index.ms b/src/main/webapp/WEB-INF/templates/admin/index.ms index acb4862687..be7d3b4ace 100644 --- a/src/main/webapp/WEB-INF/templates/admin/index.ms +++ b/src/main/webapp/WEB-INF/templates/admin/index.ms @@ -83,6 +83,9 @@ + + + @@ -114,6 +117,7 @@
  • Organizations
  • Users
  • Configuration
    • +
  • Scripting
    • {{/isOwner}}
      diff --git a/src/main/webapp/resources/js/admin/feature/scripting/add-update/scripting-add-update.html b/src/main/webapp/resources/js/admin/feature/scripting/add-update/scripting-add-update.html new file mode 100644 index 0000000000..a9065c7896 --- /dev/null +++ b/src/main/webapp/resources/js/admin/feature/scripting/add-update/scripting-add-update.html @@ -0,0 +1 @@ +add/update \ No newline at end of file diff --git a/src/main/webapp/resources/js/admin/feature/scripting/add-update/scripting-add-update.js b/src/main/webapp/resources/js/admin/feature/scripting/add-update/scripting-add-update.js new file mode 100644 index 0000000000..42fce675d7 --- /dev/null +++ b/src/main/webapp/resources/js/admin/feature/scripting/add-update/scripting-add-update.js @@ -0,0 +1,12 @@ +(function() { + 'use strict'; + + angular.module('adminApplication').component('scriptingAddUpdate', { + controller: ['$http', ScriptingAddUpdateCtrl], + templateUrl: '../resources/js/admin/feature/scripting/add-update/scripting-add-update.html' + }); + + function ScriptingAddUpdateCtrl($http) { + var ctrl = this; + } +})(); \ No newline at end of file diff --git a/src/main/webapp/resources/js/admin/feature/scripting/scripting.html b/src/main/webapp/resources/js/admin/feature/scripting/scripting.html new file mode 100644 index 0000000000..3a0fd2abf3 --- /dev/null +++ b/src/main/webapp/resources/js/admin/feature/scripting/scripting.html @@ -0,0 +1,29 @@ +
      +

      Scripting

      +
      +
      + +
      + + + + + + + + + + + + + + + + + + +
      pathnameactions
      no scripts have been found.
      {{script.path}}{{script.name}} + + +
      +
      diff --git a/src/main/webapp/resources/js/admin/feature/scripting/scripting.js b/src/main/webapp/resources/js/admin/feature/scripting/scripting.js new file mode 100644 index 0000000000..d44af1b3cc --- /dev/null +++ b/src/main/webapp/resources/js/admin/feature/scripting/scripting.js @@ -0,0 +1,32 @@ +(function() { + 'use strict'; + + angular.module('adminApplication').component('scripting', { + controller: ['$http', '$uibModal', ScriptingCtrl], + templateUrl: '../resources/js/admin/feature/scripting/scripting.html' + }); + + function ScriptingCtrl($http, $uibModal) { + var ctrl = this; + + this.$onInit = function() { + load(); + }; + + this.addNewOrUpdate = addNewOrUpdate; + + + function load() { + $http.get('/admin/api/scripting').then(function(res) { + ctrl.scripts = res.data; + }) + } + + + function addNewOrUpdate(script) { + $uibModal.open({ + template: '' + }) + } + } +})(); \ No newline at end of file diff --git a/src/main/webapp/resources/js/admin/ng-app/admin-application.js b/src/main/webapp/resources/js/admin/ng-app/admin-application.js index bbaadc7ffa..8c5c2a511d 100644 --- a/src/main/webapp/resources/js/admin/ng-app/admin-application.js +++ b/src/main/webapp/resources/js/admin/ng-app/admin-application.js @@ -277,6 +277,9 @@ return AdminReservationService.load($stateParams.eventName, $stateParams.reservationId); } } + }).state('scripting', { + url: '/scripting/', + template: '' }); growlProvider.globalPosition('bottom-right'); From 5dd972a05a8c1a68f1d6f9972d2086f787393854 Mon Sep 17 00:00:00 2001 From: Sylvain Jermini Date: Tue, 2 Jan 2018 17:58:17 +0100 Subject: [PATCH 02/31] #349 add support for inserting/updating/deleting scripts --- .../api/admin/ScriptController.java | 9 +++++ src/main/java/alfio/model/ScriptSupport.java | 2 + .../alfio/repository/ScriptRepository.java | 6 +-- .../java/alfio/scripting/ScriptMetadata.java | 5 +++ .../scripting/ScriptingExecutionService.java | 6 ++- .../alfio/scripting/ScriptingService.java | 18 +++++---- .../add-update/scripting-add-update.html | 37 ++++++++++++++++++- .../add-update/scripting-add-update.js | 26 ++++++++++++- .../js/admin/feature/scripting/scripting.html | 4 +- .../js/admin/feature/scripting/scripting.js | 30 +++++++++++++-- 10 files changed, 126 insertions(+), 17 deletions(-) diff --git a/src/main/java/alfio/controller/api/admin/ScriptController.java b/src/main/java/alfio/controller/api/admin/ScriptController.java index 60f110c925..964ac797f3 100644 --- a/src/main/java/alfio/controller/api/admin/ScriptController.java +++ b/src/main/java/alfio/controller/api/admin/ScriptController.java @@ -44,6 +44,15 @@ public List listAll(Principal principal) { return scriptingService.listAll(); } + /* + function getScriptMetadata() { + return {async:true, events: ['TEST']}; + } + + function executeScript() { + + } + */ @RequestMapping(value = "/scripting", method = RequestMethod.POST) public void createOrUpdate(@RequestBody Script script, Principal principal) { ensureAdmin(principal); diff --git a/src/main/java/alfio/model/ScriptSupport.java b/src/main/java/alfio/model/ScriptSupport.java index 16ac699461..b08e1ba0e9 100644 --- a/src/main/java/alfio/model/ScriptSupport.java +++ b/src/main/java/alfio/model/ScriptSupport.java @@ -17,7 +17,9 @@ package alfio.model; import ch.digitalfondue.npjt.ConstructorAnnotationRowMapper.Column; +import lombok.Getter; +@Getter public class ScriptSupport { private final String path; diff --git a/src/main/java/alfio/repository/ScriptRepository.java b/src/main/java/alfio/repository/ScriptRepository.java index dbc0c43126..58eeb8fab4 100644 --- a/src/main/java/alfio/repository/ScriptRepository.java +++ b/src/main/java/alfio/repository/ScriptRepository.java @@ -40,9 +40,9 @@ int insert(@Bind("path") String path, @Query("update script_support set enabled = :enabled where path = :path") int toggle(@Bind("path") String path, @Bind("enabled") boolean enabled); - @Query("insert into script_event(path, event) values " + + @Query("insert into script_event(path_fk, event) values " + " (:path, :event)") - int insert(@Bind("path") String path, @Bind("event ") String event); + int insert(@Bind("path") String path, @Bind("event") String event); @Query("select count(*) from script_support where path = :path") int hasPath(@Bind("path") String path); @@ -50,7 +50,7 @@ int insert(@Bind("path") String path, @Query("select script from script_support where path = :path") String getScript(@Bind("path") String path); - @Query("delete from script_event where path = :path") + @Query("delete from script_event where path_fk = :path") int deleteEventsForPath(@Bind("path") String path); @Query("delete from script_support where path = :path") diff --git a/src/main/java/alfio/scripting/ScriptMetadata.java b/src/main/java/alfio/scripting/ScriptMetadata.java index b35b2420da..273e86eb2a 100644 --- a/src/main/java/alfio/scripting/ScriptMetadata.java +++ b/src/main/java/alfio/scripting/ScriptMetadata.java @@ -17,8 +17,13 @@ package alfio.scripting; +import lombok.AllArgsConstructor; +import lombok.Getter; + import java.util.List; +@Getter +@AllArgsConstructor public class ScriptMetadata { boolean async; List events; diff --git a/src/main/java/alfio/scripting/ScriptingExecutionService.java b/src/main/java/alfio/scripting/ScriptingExecutionService.java index 4df1f55d4b..9d2e44ca0e 100644 --- a/src/main/java/alfio/scripting/ScriptingExecutionService.java +++ b/src/main/java/alfio/scripting/ScriptingExecutionService.java @@ -23,6 +23,7 @@ import org.springframework.stereotype.Service; import javax.script.*; +import java.util.Collections; import java.util.Map; import java.util.concurrent.*; import java.util.function.Supplier; @@ -43,7 +44,7 @@ @Log4j2 public class ScriptingExecutionService { - private final static Compilable engine = (Compilable) new ScriptEngineManager().getEngineByName("javascript"); + private final static Compilable engine = (Compilable) new ScriptEngineManager().getEngineByName("nashorn"); private final Cache compiledScriptCache = Caffeine.newBuilder() .expireAfterAccess(12, TimeUnit.HOURS) .build(); @@ -81,6 +82,9 @@ public static T executeScript(String name, String script, Map params) { try { + if(params == null) { + params = Collections.emptyMap(); + } ScriptContext newContext = new SimpleScriptContext(); Bindings engineScope = newContext.getBindings(ScriptContext.ENGINE_SCOPE); engineScope.putAll(params); diff --git a/src/main/java/alfio/scripting/ScriptingService.java b/src/main/java/alfio/scripting/ScriptingService.java index 5db412ee80..09f70f2105 100644 --- a/src/main/java/alfio/scripting/ScriptingService.java +++ b/src/main/java/alfio/scripting/ScriptingService.java @@ -20,6 +20,7 @@ import alfio.model.ScriptSupport; import alfio.repository.ScriptRepository; import alfio.util.Json; +import jdk.nashorn.api.scripting.ScriptObjectMirror; import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; import org.apache.commons.codec.digest.DigestUtils; @@ -27,10 +28,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import javax.script.Bindings; +import java.util.*; @Service @Log4j2 @@ -44,11 +43,16 @@ public class ScriptingService { @Transactional public void createOrUpdate(Script script) { String hash = DigestUtils.sha256Hex(script.getScript()); - ScriptMetadata scriptMetadata = ScriptingExecutionService.executeScript( + Bindings scriptMetadataBinding = ScriptingExecutionService.executeScript( script.getName(), - script.getScript() + "\n;return getScriptMetadata();", + script.getScript() + "\n;getScriptMetadata();", script.getConfiguration()); + //extracting the object {async: boolean, events: String[]} + boolean async = (Boolean) scriptMetadataBinding.getOrDefault("async", Boolean.FALSE); + List events = Arrays.asList(((ScriptObjectMirror) scriptMetadataBinding.get("events")).to(String[].class)); + + ScriptMetadata scriptMetadata = new ScriptMetadata(async, events); if(scriptRepository.hasPath(script.getPath()) > 0) { scriptRepository.deleteEventsForPath(script.getPath()); @@ -84,7 +88,7 @@ public T executeScriptsForEvent(String event, String basePath, Map activePath : activePaths) { String path = activePath.getLeft(); res = scriptingExecutionService.executeScript(activePath.getLeft(), activePath.getMiddle(), activePath.getRight(), - () -> getScript(path)+"\n;return executeScript(event);", input); + () -> getScript(path)+"\n;executeScript(event);", input); input.put("output", res); } return res; diff --git a/src/main/webapp/resources/js/admin/feature/scripting/add-update/scripting-add-update.html b/src/main/webapp/resources/js/admin/feature/scripting/add-update/scripting-add-update.html index a9065c7896..ba54c9b903 100644 --- a/src/main/webapp/resources/js/admin/feature/scripting/add-update/scripting-add-update.html +++ b/src/main/webapp/resources/js/admin/feature/scripting/add-update/scripting-add-update.html @@ -1 +1,36 @@ -add/update \ No newline at end of file +
      +

      Add/Update script

      +
      +
      +
      +
      + + + +
      + +
      + + + +
      + +
      + + + +
      + +
      + + + +
      +
      +
      +
      + + +
      +
      +
      \ No newline at end of file diff --git a/src/main/webapp/resources/js/admin/feature/scripting/add-update/scripting-add-update.js b/src/main/webapp/resources/js/admin/feature/scripting/add-update/scripting-add-update.js index 42fce675d7..fb53758145 100644 --- a/src/main/webapp/resources/js/admin/feature/scripting/add-update/scripting-add-update.js +++ b/src/main/webapp/resources/js/admin/feature/scripting/add-update/scripting-add-update.js @@ -3,10 +3,34 @@ angular.module('adminApplication').component('scriptingAddUpdate', { controller: ['$http', ScriptingAddUpdateCtrl], - templateUrl: '../resources/js/admin/feature/scripting/add-update/scripting-add-update.html' + templateUrl: '../resources/js/admin/feature/scripting/add-update/scripting-add-update.html', + bindings: { + dismiss:'&', + close:'&', + toUpdate:'<' + } }); function ScriptingAddUpdateCtrl($http) { var ctrl = this; + + ctrl.$onInit = function() { + if(ctrl.toUpdate) { + //deep cloning + ctrl.script = JSON.parse(JSON.stringify(ctrl.toUpdate)); + } + } + + + ctrl.save = function(script) { + $http.post('/admin/api/scripting', { + path: script.path, + name: script.name, + enabled: script.enabled, + script: script.script + }).then(function() { + ctrl.close({$script: script}); + }); + } } })(); \ No newline at end of file diff --git a/src/main/webapp/resources/js/admin/feature/scripting/scripting.html b/src/main/webapp/resources/js/admin/feature/scripting/scripting.html index 3a0fd2abf3..e6d42fccec 100644 --- a/src/main/webapp/resources/js/admin/feature/scripting/scripting.html +++ b/src/main/webapp/resources/js/admin/feature/scripting/scripting.html @@ -9,6 +9,7 @@

      Scripting

      path name + enabled actions @@ -19,9 +20,10 @@

      Scripting

      {{script.path}} {{script.name}} + {{script.enabled}} - + diff --git a/src/main/webapp/resources/js/admin/feature/scripting/scripting.js b/src/main/webapp/resources/js/admin/feature/scripting/scripting.js index d44af1b3cc..29ca3afad1 100644 --- a/src/main/webapp/resources/js/admin/feature/scripting/scripting.js +++ b/src/main/webapp/resources/js/admin/feature/scripting/scripting.js @@ -14,6 +14,7 @@ }; this.addNewOrUpdate = addNewOrUpdate; + this.deleteScript = deleteScript; function load() { @@ -21,12 +22,35 @@ ctrl.scripts = res.data; }) } + + function deleteScript(script) { + if(window.confirm('Delete script ' + script.name+'?')) { + $http.delete('/admin/api/scripting/' + script.path).then(function () { + load(); + }); + } + } function addNewOrUpdate(script) { - $uibModal.open({ - template: '' - }) + var modal = $uibModal.open({ + template: '', + controller: function() { + var ctrl = this; + + ctrl.toUpdate = script; + + ctrl.dismiss = function() { + modal.dismiss(); + } + + ctrl.close = function(script) { + modal.close(); + load(); + } + }, + controllerAs: 'ctrl' + }); } } })(); \ No newline at end of file From c95fe35fc4425ab94db32699124379fef26a0a28 Mon Sep 17 00:00:00 2001 From: Celestino Bellone Date: Wed, 3 Jan 2018 08:17:39 +0100 Subject: [PATCH 03/31] suppress unchecked warnings, prevent NPE --- .../alfio/scripting/ScriptingExecutionService.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/alfio/scripting/ScriptingExecutionService.java b/src/main/java/alfio/scripting/ScriptingExecutionService.java index 9d2e44ca0e..43d23f34a9 100644 --- a/src/main/java/alfio/scripting/ScriptingExecutionService.java +++ b/src/main/java/alfio/scripting/ScriptingExecutionService.java @@ -25,7 +25,10 @@ import javax.script.*; import java.util.Collections; import java.util.Map; -import java.util.concurrent.*; +import java.util.Optional; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; import java.util.function.Supplier; @@ -52,6 +55,7 @@ public class ScriptingExecutionService { .expireAfterAccess(12, TimeUnit.HOURS) .build(); + @SuppressWarnings("unchecked") public T executeScript(String path, String name, String hash, Supplier scriptFetcher, Map params) { CompiledScript compiledScript = compiledScriptCache.get(hash, (key) -> { try { @@ -65,11 +69,13 @@ public T executeScript(String path, String name, String hash, Supplier scriptFetcher, Map params) { - asyncExecutors.get(path, (key) -> Executors.newSingleThreadExecutor()).submit(() -> { - executeScript(path, name, hash, scriptFetcher, params); - }); + Optional.ofNullable(asyncExecutors.get(path, (key) -> Executors.newSingleThreadExecutor())) + .ifPresent(it -> it.submit(() -> { + executeScript(path, name, hash, scriptFetcher, params); + })); } + @SuppressWarnings("unchecked") public static T executeScript(String name, String script, Map params) { try { CompiledScript compiledScript = engine.compile(script); From 7c487c7b1047d56760a6377cc30c6f5a91129700 Mon Sep 17 00:00:00 2001 From: Sylvain Jermini Date: Wed, 3 Jan 2018 14:29:50 +0100 Subject: [PATCH 04/31] #349 refactor script: remove configuration column, add extension manager + stubs for calling the plugins --- .../java/alfio/manager/ExtensionManager.java | 60 +++++++++++++++++++ .../manager/TicketReservationManager.java | 15 ++++- .../alfio/manager/WaitingQueueManager.java | 2 + src/main/java/alfio/model/ScriptSupport.java | 5 +- .../alfio/repository/ScriptRepository.java | 7 +-- src/main/java/alfio/scripting/Script.java | 1 - .../alfio/scripting/ScriptingService.java | 4 +- .../db/HSQLDB/V22_1.14.0__ADD_SCRIPTING.sql | 3 +- .../manager/TicketReservationManagerTest.java | 6 +- .../TicketReservationManagerUnitTest.java | 6 +- .../manager/WaitingQueueManagerTest.java | 4 +- 11 files changed, 94 insertions(+), 19 deletions(-) create mode 100644 src/main/java/alfio/manager/ExtensionManager.java diff --git a/src/main/java/alfio/manager/ExtensionManager.java b/src/main/java/alfio/manager/ExtensionManager.java new file mode 100644 index 0000000000..514b2f1081 --- /dev/null +++ b/src/main/java/alfio/manager/ExtensionManager.java @@ -0,0 +1,60 @@ +/** + * This file is part of alf.io. + * + * alf.io is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * alf.io is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with alf.io. If not, see . + */ + +package alfio.manager; + +import alfio.model.Ticket; +import alfio.model.TicketReservation; +import alfio.model.WaitingQueueSubscription; +import alfio.repository.EventRepository; +import alfio.repository.TicketCategoryRepository; +import alfio.scripting.ScriptingService; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; + +@Component +@AllArgsConstructor +public class ExtensionManager { + + private final ScriptingService scriptingService; + private final EventRepository eventRepository; + private final TicketCategoryRepository ticketCategoryRepository; + + public enum ExtensionEvent { + RESERVATION_CONFIRMATION, + TICKET_ASSIGNMENT, + WAITING_QUEUE_SUBSCRIPTION, + INVOICE_GENERATION + } + + + public void handleReservationConfirmation(TicketReservation reservation, int eventId) { + int organizationId = eventRepository.findOrganizationIdByEventId(eventId); + } + + public void handleTicketAssignment(Ticket ticket) { + int eventId = ticket.getEventId(); + int organizationId = eventRepository.findOrganizationIdByEventId(eventId); + + } + + public void handleWaitingQueueSubscription(WaitingQueueSubscription waitingQueueSubscription) { + int organizationId = eventRepository.findOrganizationIdByEventId(waitingQueueSubscription.getEventId()); + } + + +} diff --git a/src/main/java/alfio/manager/TicketReservationManager.java b/src/main/java/alfio/manager/TicketReservationManager.java index 40cdfa6a6d..9d973dc65f 100644 --- a/src/main/java/alfio/manager/TicketReservationManager.java +++ b/src/main/java/alfio/manager/TicketReservationManager.java @@ -120,6 +120,7 @@ public class TicketReservationManager { private final InvoiceSequencesRepository invoiceSequencesRepository; private final AuditingRepository auditingRepository; private final UserRepository userRepository; + private final ExtensionManager extensionManager; public static class NotEnoughTicketsException extends RuntimeException { @@ -158,7 +159,9 @@ public TicketReservationManager(EventRepository eventRepository, AdditionalServiceItemRepository additionalServiceItemRepository, AdditionalServiceTextRepository additionalServiceTextRepository, InvoiceSequencesRepository invoiceSequencesRepository, - AuditingRepository auditingRepository, UserRepository userRepository) { + AuditingRepository auditingRepository, + UserRepository userRepository, + ExtensionManager extensionManager) { this.eventRepository = eventRepository; this.organizationRepository = organizationRepository; this.ticketRepository = ticketRepository; @@ -183,6 +186,7 @@ public TicketReservationManager(EventRepository eventRepository, this.invoiceSequencesRepository = invoiceSequencesRepository; this.auditingRepository = auditingRepository; this.userRepository = userRepository; + this.extensionManager = extensionManager; } /** @@ -435,7 +439,9 @@ public void confirmOfflinePayment(Event event, String reservationId, String user sendConfirmationEmail(event, findById(reservationId).orElseThrow(IllegalArgumentException::new), language); - pluginManager.handleReservationConfirmation(ticketReservationRepository.findReservationById(reservationId), event.getId()); + final TicketReservation finalReservation = ticketReservationRepository.findReservationById(reservationId); + pluginManager.handleReservationConfirmation(finalReservation, event.getId()); + extensionManager.handleReservationConfirmation(finalReservation, event.getId()); } void registerAlfioTransaction(Event event, String reservationId, PaymentProxy paymentProxy) { @@ -612,7 +618,9 @@ void completeReservation(int eventId, String reservationId, String email, Custom TicketStatus ticketStatus = paymentProxy.isDeskPaymentRequired() ? TicketStatus.TO_BE_PAID : TicketStatus.ACQUIRED; AdditionalServiceItemStatus asStatus = paymentProxy.isDeskPaymentRequired() ? AdditionalServiceItemStatus.TO_BE_PAID : AdditionalServiceItemStatus.ACQUIRED; acquireItems(ticketStatus, asStatus, paymentProxy, reservationId, email, customerName, userLanguage.getLanguage(), billingAddress, eventId); - pluginManager.handleReservationConfirmation(ticketReservationRepository.findReservationById(reservationId), eventId); + final TicketReservation reservation = ticketReservationRepository.findReservationById(reservationId); + pluginManager.handleReservationConfirmation(reservation, eventId); + extensionManager.handleReservationConfirmation(reservation, eventId); //cleanup unused special price codes... specialPriceSessionId.ifPresent(specialPriceRepository::unbindFromSession); } @@ -649,6 +657,7 @@ private void acquireItems(TicketStatus ticketStatus, AdditionalServiceItemStatus sendTicketByEmail(ticket, locale, event, getTicketEmailGenerator(event, reservation, locale)); } pluginManager.handleTicketAssignment(ticket); + extensionManager.handleTicketAssignment(ticket); }); } diff --git a/src/main/java/alfio/manager/WaitingQueueManager.java b/src/main/java/alfio/manager/WaitingQueueManager.java index 75b4c561ef..2a9799aae7 100644 --- a/src/main/java/alfio/manager/WaitingQueueManager.java +++ b/src/main/java/alfio/manager/WaitingQueueManager.java @@ -69,6 +69,7 @@ public class WaitingQueueManager { private final OrganizationRepository organizationRepository; private final PluginManager pluginManager; private final EventRepository eventRepository; + private final ExtensionManager extensionManager; public boolean subscribe(Event event, CustomerName customerName, String email, Integer selectedCategoryId, Locale userLanguage) { try { @@ -82,6 +83,7 @@ public boolean subscribe(Event event, CustomerName customerName, String email, I AffectedRowCountAndKey key = waitingQueueRepository.insert(event.getId(), customerName.getFullName(), customerName.getFirstName(), customerName.getLastName(), email, ZonedDateTime.now(event.getZoneId()), userLanguage.getLanguage(), subscriptionType, selectedCategoryId); notifySubscription(event, customerName, email, userLanguage, subscriptionType); pluginManager.handleWaitingQueueSubscription(waitingQueueRepository.loadById(key.getKey())); + extensionManager.handleWaitingQueueSubscription(waitingQueueRepository.loadById(key.getKey())); return true; } catch(DuplicateKeyException e) { return true;//why are you subscribing twice? diff --git a/src/main/java/alfio/model/ScriptSupport.java b/src/main/java/alfio/model/ScriptSupport.java index b08e1ba0e9..e38b3ecf18 100644 --- a/src/main/java/alfio/model/ScriptSupport.java +++ b/src/main/java/alfio/model/ScriptSupport.java @@ -28,7 +28,6 @@ public class ScriptSupport { private final boolean enabled; private final boolean async; private final String script; - private final String configuration; public ScriptSupport(@Column("path") String path, @@ -36,14 +35,12 @@ public ScriptSupport(@Column("path") String path, @Column("hash") String hash, @Column("enabled") boolean enabled, @Column("async") boolean async, - @Column("script") String script, - @Column("configuration") String configuration) { + @Column("script") String script) { this.path = path; this.name = name; this.hash = hash; this.enabled = enabled; this.async = async; this.script = script; - this.configuration = configuration; } } diff --git a/src/main/java/alfio/repository/ScriptRepository.java b/src/main/java/alfio/repository/ScriptRepository.java index 58eeb8fab4..f560a6e5f4 100644 --- a/src/main/java/alfio/repository/ScriptRepository.java +++ b/src/main/java/alfio/repository/ScriptRepository.java @@ -27,15 +27,14 @@ @QueryRepository public interface ScriptRepository { - @Query("insert into script_support(path, name, hash, enabled, async, script, configuration) values " + - " (:path, :name, :hash, :enabled, :async, :script, :configuration)") + @Query("insert into script_support(path, name, hash, enabled, async, script) values " + + " (:path, :name, :hash, :enabled, :async, :script)") int insert(@Bind("path") String path, @Bind("name") String name, @Bind("hash") String hash, @Bind("enabled") boolean enabled, @Bind("async") boolean async, - @Bind("script") String script, - @Bind("configuration") String configuration); + @Bind("script") String script); @Query("update script_support set enabled = :enabled where path = :path") int toggle(@Bind("path") String path, @Bind("enabled") boolean enabled); diff --git a/src/main/java/alfio/scripting/Script.java b/src/main/java/alfio/scripting/Script.java index 905cd74736..f60671ed5f 100644 --- a/src/main/java/alfio/scripting/Script.java +++ b/src/main/java/alfio/scripting/Script.java @@ -29,6 +29,5 @@ public class Script { private final String path; private final String name; private final String script; - private final Map configuration; private final boolean enabled; } diff --git a/src/main/java/alfio/scripting/ScriptingService.java b/src/main/java/alfio/scripting/ScriptingService.java index 09f70f2105..58ea882a53 100644 --- a/src/main/java/alfio/scripting/ScriptingService.java +++ b/src/main/java/alfio/scripting/ScriptingService.java @@ -46,7 +46,7 @@ public void createOrUpdate(Script script) { Bindings scriptMetadataBinding = ScriptingExecutionService.executeScript( script.getName(), script.getScript() + "\n;getScriptMetadata();", - script.getConfiguration()); + Collections.emptyMap()); //extracting the object {async: boolean, events: String[]} boolean async = (Boolean) scriptMetadataBinding.getOrDefault("async", Boolean.FALSE); @@ -59,7 +59,7 @@ public void createOrUpdate(Script script) { scriptRepository.deleteScriptForPath(script.getPath()); } - scriptRepository.insert(script.getPath(), script.getName(), hash, script.isEnabled(), scriptMetadata.async, script.getScript(), Json.toJson(script.getConfiguration())); + scriptRepository.insert(script.getPath(), script.getName(), hash, script.isEnabled(), scriptMetadata.async, script.getScript()); for(String event : scriptMetadata.events) { scriptRepository.insert(script.getPath(), event); } diff --git a/src/main/resources/alfio/db/HSQLDB/V22_1.14.0__ADD_SCRIPTING.sql b/src/main/resources/alfio/db/HSQLDB/V22_1.14.0__ADD_SCRIPTING.sql index 63e6a4bd7e..3845125f6d 100644 --- a/src/main/resources/alfio/db/HSQLDB/V22_1.14.0__ADD_SCRIPTING.sql +++ b/src/main/resources/alfio/db/HSQLDB/V22_1.14.0__ADD_SCRIPTING.sql @@ -21,8 +21,7 @@ create table script_support ( hash varchar(256) not null, enabled boolean not null, async boolean not null, - script clob not null, - configuration clob + script clob not null ); create table script_event ( diff --git a/src/test/java/alfio/manager/TicketReservationManagerTest.java b/src/test/java/alfio/manager/TicketReservationManagerTest.java index 8dc5aa7c3b..fd921428d6 100644 --- a/src/test/java/alfio/manager/TicketReservationManagerTest.java +++ b/src/test/java/alfio/manager/TicketReservationManagerTest.java @@ -148,6 +148,8 @@ public class TicketReservationManagerTest { private Organization organization; @Mock private UserRepository userRepository; + @Mock + private ExtensionManager extensionManager; @Before public void init() { @@ -173,7 +175,9 @@ public void init() { additionalServiceItemRepository, additionalServiceTextRepository, invoiceSequencesRepository, - auditingRepository, userRepository); + auditingRepository, + userRepository, + extensionManager); when(event.getId()).thenReturn(EVENT_ID); when(event.getOrganizationId()).thenReturn(ORGANIZATION_ID); diff --git a/src/test/java/alfio/manager/TicketReservationManagerUnitTest.java b/src/test/java/alfio/manager/TicketReservationManagerUnitTest.java index 788c3ea2e2..43fda7bf01 100644 --- a/src/test/java/alfio/manager/TicketReservationManagerUnitTest.java +++ b/src/test/java/alfio/manager/TicketReservationManagerUnitTest.java @@ -105,6 +105,8 @@ public class TicketReservationManagerUnitTest { private AuditingRepository auditingRepository; @Mock private UserRepository userRepository; + @Mock + private ExtensionManager extensionManager; @Before public void setUp() { @@ -130,7 +132,9 @@ public void setUp() { additionalServiceItemRepository, additionalServiceTextRepository, invoiceSequencesRepository, - auditingRepository, userRepository); + auditingRepository, + userRepository, + extensionManager); } @Test diff --git a/src/test/java/alfio/manager/WaitingQueueManagerTest.java b/src/test/java/alfio/manager/WaitingQueueManagerTest.java index c11b4b3b34..fbcc269868 100644 --- a/src/test/java/alfio/manager/WaitingQueueManagerTest.java +++ b/src/test/java/alfio/manager/WaitingQueueManagerTest.java @@ -35,6 +35,7 @@ import org.springframework.context.MessageSource; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; +import java.security.cert.Extension; import java.time.ZoneId; import java.time.ZonedDateTime; import java.util.Arrays; @@ -62,8 +63,9 @@ public class WaitingQueueManagerTest {{ OrganizationRepository organizationRepository = it.usesMock(OrganizationRepository.class); PluginManager pluginManager = it.usesMock(PluginManager.class); EventRepository eventRepository = it.usesMock(EventRepository.class); + ExtensionManager extensionManager = it.usesMock(ExtensionManager.class); - WaitingQueueManager manager = new WaitingQueueManager(waitingQueueRepository, ticketRepository, ticketCategoryRepository, configurationManager, eventStatisticsManager, jdbc, notificationManager, templateManager, messageSource, organizationRepository, pluginManager, eventRepository); + WaitingQueueManager manager = new WaitingQueueManager(waitingQueueRepository, ticketRepository, ticketCategoryRepository, configurationManager, eventStatisticsManager, jdbc, notificationManager, templateManager, messageSource, organizationRepository, pluginManager, eventRepository, extensionManager); String reservationId = "reservation-id"; it.should("handle a reservation confirmation", expect -> { manager.fireReservationConfirmed(reservationId); From 4f8f850d94c01611ba14d6ce3ac7a70712f5c0b2 Mon Sep 17 00:00:00 2001 From: Sylvain Jermini Date: Wed, 3 Jan 2018 14:52:21 +0100 Subject: [PATCH 05/31] #349 extension manager: call the async script service --- .../java/alfio/manager/ExtensionManager.java | 31 +++++++++++++++++++ .../alfio/scripting/ScriptingService.java | 25 +++++++++++++-- 2 files changed, 53 insertions(+), 3 deletions(-) diff --git a/src/main/java/alfio/manager/ExtensionManager.java b/src/main/java/alfio/manager/ExtensionManager.java index 514b2f1081..be73a795a8 100644 --- a/src/main/java/alfio/manager/ExtensionManager.java +++ b/src/main/java/alfio/manager/ExtensionManager.java @@ -26,6 +26,10 @@ import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + @Component @AllArgsConstructor public class ExtensionManager { @@ -44,17 +48,44 @@ public enum ExtensionEvent { public void handleReservationConfirmation(TicketReservation reservation, int eventId) { int organizationId = eventRepository.findOrganizationIdByEventId(eventId); + + asyncCall(ExtensionEvent.RESERVATION_CONFIRMATION, + eventId, + organizationId, + Collections.singletonMap("reservation", reservation)); } public void handleTicketAssignment(Ticket ticket) { int eventId = ticket.getEventId(); int organizationId = eventRepository.findOrganizationIdByEventId(eventId); + asyncCall(ExtensionEvent.TICKET_ASSIGNMENT, + eventId, + organizationId, + Collections.singletonMap("ticket", ticket)); } public void handleWaitingQueueSubscription(WaitingQueueSubscription waitingQueueSubscription) { int organizationId = eventRepository.findOrganizationIdByEventId(waitingQueueSubscription.getEventId()); + + asyncCall(ExtensionEvent.WAITING_QUEUE_SUBSCRIPTION, + waitingQueueSubscription.getEventId(), + organizationId, + Collections.singletonMap("waitingQueueSubscription", waitingQueueSubscription)); + } + + private void asyncCall(ExtensionEvent event, int eventId, int organizationId, Map payload) { + Map payloadCopy = new HashMap<>(payload); + payloadCopy.put("eventId", eventId); + payloadCopy.put("organizationId", organizationId); + + scriptingService.executeScriptAsync(event.name(), + toPath(organizationId, eventId), payload); } + public static String toPath(int organizationId, int eventId) { + return organizationId + "/" + eventId; + } + } diff --git a/src/main/java/alfio/scripting/ScriptingService.java b/src/main/java/alfio/scripting/ScriptingService.java index 58ea882a53..365cd8ab74 100644 --- a/src/main/java/alfio/scripting/ScriptingService.java +++ b/src/main/java/alfio/scripting/ScriptingService.java @@ -81,20 +81,39 @@ public String getScript(String path) { } public T executeScriptsForEvent(String event, String basePath, Map payload) { - List> activePaths = getActiveScriptsForEvent(event, basePath); + List> activePaths = getActiveScriptsForEvent(event, basePath, false); T res = null; Map input = new HashMap<>(payload); input.put("event", event); for(Triple activePath : activePaths) { String path = activePath.getLeft(); - res = scriptingExecutionService.executeScript(activePath.getLeft(), activePath.getMiddle(), activePath.getRight(), + res = scriptingExecutionService.executeScript(path, activePath.getMiddle(), activePath.getRight(), () -> getScript(path)+"\n;executeScript(event);", input); input.put("output", res); } return res; } - private List> getActiveScriptsForEvent(String event, String basePath) { + public void executeScriptAsync(String event, String basePath, Map payload) { + List> activePaths = getActiveScriptsForEvent(event, basePath, true); + Map input = new HashMap<>(payload); + input.put("event", event); + for(Triple activePath : activePaths) { + String path = activePath.getLeft(); + scriptingExecutionService.executeScriptAsync(path, activePath.getMiddle(), activePath.getRight(), () -> getScript(path)+"\n;executeScript(event);", input); + } + } + + private List> getActiveScriptsForEvent(String event, String basePath, boolean async) { + // fetch all active scripts + // to handle override: + // if there are active two scripts with the same name + // with path: + // - org/event + // - org + // the one with the longest path win + + return Collections.emptyList(); } From 29cda579ee594ac7fb1302294d926aff00326429 Mon Sep 17 00:00:00 2001 From: Sylvain Jermini Date: Wed, 3 Jan 2018 17:35:37 +0100 Subject: [PATCH 06/31] #349 wire up async script execution --- .../api/admin/ScriptController.java | 18 +++--- .../java/alfio/manager/ExtensionManager.java | 2 +- src/main/java/alfio/model/ScriptSupport.java | 16 +++++ .../alfio/repository/ScriptRepository.java | 41 ++++++++----- .../scripting/ScriptingExecutionService.java | 5 ++ .../alfio/scripting/ScriptingService.java | 58 +++++++++++-------- .../db/HSQLDB/V22_1.14.0__ADD_SCRIPTING.sql | 8 ++- .../js/admin/feature/scripting/scripting.js | 2 +- 8 files changed, 99 insertions(+), 51 deletions(-) diff --git a/src/main/java/alfio/controller/api/admin/ScriptController.java b/src/main/java/alfio/controller/api/admin/ScriptController.java index 964ac797f3..303c663a3b 100644 --- a/src/main/java/alfio/controller/api/admin/ScriptController.java +++ b/src/main/java/alfio/controller/api/admin/ScriptController.java @@ -46,11 +46,11 @@ public List listAll(Principal principal) { /* function getScriptMetadata() { - return {async:true, events: ['TEST']}; + return {async:true, events: ['RESERVATION_CONFIRMATION']}; } - function executeScript() { - + function executeScript(event) { + log.warn('hello from script with event: ' + event); } */ @RequestMapping(value = "/scripting", method = RequestMethod.POST) @@ -60,16 +60,16 @@ public void createOrUpdate(@RequestBody Script script, Principal principal) { } - @RequestMapping(value = "/scripting/{path}", method = RequestMethod.DELETE) - public void delete(@PathVariable("path") String path, Principal principal) { + @RequestMapping(value = "/scripting/{path}/{name}", method = RequestMethod.DELETE) + public void delete(@PathVariable("path") String path, @PathVariable("name") String name, Principal principal) { ensureAdmin(principal); - scriptingService.delete(path); + scriptingService.delete(path, name); } - @RequestMapping(value = "/scripting/{path}/toggle/{enable}", method = RequestMethod.POST) - public void toggle(@PathVariable("path") String path, @PathVariable("enable") boolean enable, Principal principal) { + @RequestMapping(value = "/scripting/{path}/{name}/toggle/{enable}", method = RequestMethod.POST) + public void toggle(@PathVariable("path") String path, @PathVariable("name") String name, @PathVariable("enable") boolean enable, Principal principal) { ensureAdmin(principal); - scriptingService.toggle(path, enable); + scriptingService.toggle(path, name, enable); } private void ensureAdmin(Principal principal) { diff --git a/src/main/java/alfio/manager/ExtensionManager.java b/src/main/java/alfio/manager/ExtensionManager.java index be73a795a8..64ce5b7eb9 100644 --- a/src/main/java/alfio/manager/ExtensionManager.java +++ b/src/main/java/alfio/manager/ExtensionManager.java @@ -85,7 +85,7 @@ private void asyncCall(ExtensionEvent event, int eventId, int organizationId, Ma public static String toPath(int organizationId, int eventId) { - return organizationId + "/" + eventId; + return organizationId + "." + eventId; } } diff --git a/src/main/java/alfio/model/ScriptSupport.java b/src/main/java/alfio/model/ScriptSupport.java index e38b3ecf18..a46255b94a 100644 --- a/src/main/java/alfio/model/ScriptSupport.java +++ b/src/main/java/alfio/model/ScriptSupport.java @@ -43,4 +43,20 @@ public ScriptSupport(@Column("path") String path, this.async = async; this.script = script; } + + + @Getter + public static class ScriptPathNameHash { + private final String path; + private final String name; + private final String hash; + + public ScriptPathNameHash(@Column("path") String path, + @Column("name") String name, + @Column("hash") String hash) { + this.path = path; + this.name = name; + this.hash = hash; + } + } } diff --git a/src/main/java/alfio/repository/ScriptRepository.java b/src/main/java/alfio/repository/ScriptRepository.java index f560a6e5f4..eb44323811 100644 --- a/src/main/java/alfio/repository/ScriptRepository.java +++ b/src/main/java/alfio/repository/ScriptRepository.java @@ -23,6 +23,7 @@ import ch.digitalfondue.npjt.QueryRepository; import java.util.List; +import java.util.Set; @QueryRepository public interface ScriptRepository { @@ -36,25 +37,37 @@ int insert(@Bind("path") String path, @Bind("async") boolean async, @Bind("script") String script); - @Query("update script_support set enabled = :enabled where path = :path") - int toggle(@Bind("path") String path, @Bind("enabled") boolean enabled); + @Query("update script_support set enabled = :enabled where path = :path and name = :name") + int toggle(@Bind("path") String path, @Bind("name") String name, @Bind("enabled") boolean enabled); - @Query("insert into script_event(path_fk, event) values " + - " (:path, :event)") - int insert(@Bind("path") String path, @Bind("event") String event); + @Query("insert into script_event(path_fk, name_fk, event) values " + + " (:path, :name, :event)") + int insertEvent(@Bind("path") String path, @Bind("name") String name, @Bind("event") String event); - @Query("select count(*) from script_support where path = :path") - int hasPath(@Bind("path") String path); + @Query("select count(*) from script_support where path = :path and name = :name") + int hasPath(@Bind("path") String path, @Bind("name") String name); - @Query("select script from script_support where path = :path") - String getScript(@Bind("path") String path); + @Query("select script from script_support where path = :path and name = :name") + String getScript(@Bind("path") String path, @Bind("name") String name); - @Query("delete from script_event where path_fk = :path") - int deleteEventsForPath(@Bind("path") String path); + @Query("delete from script_event where path_fk = :path and name_fk = :name") + int deleteEventsForPath(@Bind("path") String path, @Bind("name") String name); - @Query("delete from script_support where path = :path") - int deleteScriptForPath(@Bind("path") String path); + @Query("delete from script_support where path = :path and name = :name") + int deleteScriptForPath(@Bind("path") String path, @Bind("name") String name); - @Query("select * from script_support order by path") + @Query("select * from script_support order by name, path") List listAll(); + + + @Query("select path, name, hash from " + + " (select a1.* from " + + " (select path, name, hash from script_support where enabled = true and async = :async and (path in (:possiblePaths))) a1 " + + " left outer join (select path, name from script_support where enabled = true and async = :async and (path in (:possiblePaths))) a2 on " + + " (a1.name = a2.name) and length(a1.path) < length(a2.path) where a2.path is null) " + + " " + + " inner join script_event on path_fk = path and name_fk = name where event = :event") + List findActive(@Bind("possiblePaths") Set possiblePaths, + @Bind("async") boolean async, + @Bind("event") String event); } diff --git a/src/main/java/alfio/scripting/ScriptingExecutionService.java b/src/main/java/alfio/scripting/ScriptingExecutionService.java index 43d23f34a9..6a508985cb 100644 --- a/src/main/java/alfio/scripting/ScriptingExecutionService.java +++ b/src/main/java/alfio/scripting/ScriptingExecutionService.java @@ -17,10 +17,12 @@ package alfio.scripting; +import alfio.util.Json; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; import lombok.extern.log4j.Log4j2; import org.springframework.stereotype.Service; +import org.springframework.web.client.RestTemplate; import javax.script.*; import java.util.Collections; @@ -93,6 +95,9 @@ private static Object executeScript(String name, CompiledScript script, Map 0) { - scriptRepository.deleteEventsForPath(script.getPath()); - scriptRepository.deleteScriptForPath(script.getPath()); + if(scriptRepository.hasPath(script.getPath(), script.getName()) > 0) { + scriptRepository.deleteEventsForPath(script.getPath(), script.getName()); + scriptRepository.deleteScriptForPath(script.getPath(), script.getName()); } scriptRepository.insert(script.getPath(), script.getName(), hash, script.isEnabled(), scriptMetadata.async, script.getScript()); for(String event : scriptMetadata.events) { - scriptRepository.insert(script.getPath(), event); + scriptRepository.insertEvent(script.getPath(), script.getName(), event); } } @Transactional - public void toggle(String path, boolean status) { - scriptRepository.toggle(path, status); + public void toggle(String path, String name, boolean status) { + scriptRepository.toggle(path, name, status); } @Transactional - public void delete(String path) { - scriptRepository.deleteEventsForPath(path); - scriptRepository.deleteScriptForPath(path); + public void delete(String path, String name) { + scriptRepository.deleteEventsForPath(path, name); + scriptRepository.deleteScriptForPath(path, name); } - public String getScript(String path) { - return scriptRepository.getScript(path); + public String getScript(String path, String name) { + return scriptRepository.getScript(path, name); } public T executeScriptsForEvent(String event, String basePath, Map payload) { - List> activePaths = getActiveScriptsForEvent(event, basePath, false); + List activePaths = getActiveScriptsForEvent(event, basePath, false); T res = null; Map input = new HashMap<>(payload); input.put("event", event); - for(Triple activePath : activePaths) { - String path = activePath.getLeft(); - res = scriptingExecutionService.executeScript(path, activePath.getMiddle(), activePath.getRight(), - () -> getScript(path)+"\n;executeScript(event);", input); + for(ScriptPathNameHash activePath : activePaths) { + String path = activePath.getPath(); + String name = activePath.getName(); + res = scriptingExecutionService.executeScript(path, name, activePath.getHash(), + () -> getScript(path, name)+"\n;executeScript(event);", input); input.put("output", res); } return res; } public void executeScriptAsync(String event, String basePath, Map payload) { - List> activePaths = getActiveScriptsForEvent(event, basePath, true); + List activePaths = getActiveScriptsForEvent(event, basePath, true); Map input = new HashMap<>(payload); input.put("event", event); - for(Triple activePath : activePaths) { - String path = activePath.getLeft(); - scriptingExecutionService.executeScriptAsync(path, activePath.getMiddle(), activePath.getRight(), () -> getScript(path)+"\n;executeScript(event);", input); + for(ScriptPathNameHash activePath : activePaths) { + String path = activePath.getPath(); + String name = activePath.getName(); + scriptingExecutionService.executeScriptAsync(path, name, activePath.getHash(), () -> getScript(path, name)+"\n;executeScript(event);", input); } } - private List> getActiveScriptsForEvent(String event, String basePath, boolean async) { + private List getActiveScriptsForEvent(String event, String basePath, boolean async) { // fetch all active scripts // to handle override: // if there are active two scripts with the same name // with path: - // - org/event + // - org.event // - org // the one with the longest path win + //generate all the paths + Set paths = new TreeSet<>(); + String[] splitted = basePath.split("\\."); + for (int i = 0; i < splitted.length; i++) { + paths.add(StringUtils.join(Arrays.copyOfRange(splitted, 0, i + 1), '.')); + } - return Collections.emptyList(); + return scriptRepository.findActive(paths, async, event); } public List listAll() { diff --git a/src/main/resources/alfio/db/HSQLDB/V22_1.14.0__ADD_SCRIPTING.sql b/src/main/resources/alfio/db/HSQLDB/V22_1.14.0__ADD_SCRIPTING.sql index 3845125f6d..5d1670f055 100644 --- a/src/main/resources/alfio/db/HSQLDB/V22_1.14.0__ADD_SCRIPTING.sql +++ b/src/main/resources/alfio/db/HSQLDB/V22_1.14.0__ADD_SCRIPTING.sql @@ -23,8 +23,14 @@ create table script_support ( async boolean not null, script clob not null ); +alter table script_support add constraint "unique_script_support" unique(path, name); create table script_event ( path_fk varchar(256) not null, + name_fk varchar(256) not null, event varchar(256) not null -); \ No newline at end of file +); + +alter table script_event add constraint "unique_script_event" unique(path_fk, name_fk); + +--TODO: add fk \ No newline at end of file diff --git a/src/main/webapp/resources/js/admin/feature/scripting/scripting.js b/src/main/webapp/resources/js/admin/feature/scripting/scripting.js index 29ca3afad1..5d64b26bec 100644 --- a/src/main/webapp/resources/js/admin/feature/scripting/scripting.js +++ b/src/main/webapp/resources/js/admin/feature/scripting/scripting.js @@ -25,7 +25,7 @@ function deleteScript(script) { if(window.confirm('Delete script ' + script.name+'?')) { - $http.delete('/admin/api/scripting/' + script.path).then(function () { + $http.delete('/admin/api/scripting/' + script.path + '/' + script.name).then(function () { load(); }); } From 1bf85f17dd3f82897f631b1afe71a08e21da730a Mon Sep 17 00:00:00 2001 From: Sylvain Jermini Date: Wed, 3 Jan 2018 17:38:09 +0100 Subject: [PATCH 07/31] #349 unused import --- src/main/java/alfio/controller/api/admin/ScriptController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/alfio/controller/api/admin/ScriptController.java b/src/main/java/alfio/controller/api/admin/ScriptController.java index 303c663a3b..e546dcea2a 100644 --- a/src/main/java/alfio/controller/api/admin/ScriptController.java +++ b/src/main/java/alfio/controller/api/admin/ScriptController.java @@ -19,7 +19,6 @@ import alfio.manager.user.UserManager; import alfio.model.ScriptSupport; -import alfio.model.user.Role; import alfio.scripting.Script; import alfio.scripting.ScriptingService; import lombok.AllArgsConstructor; From bd88745604f7d5db5d1dd043ac08b6ede381d255 Mon Sep 17 00:00:00 2001 From: Sylvain Jermini Date: Wed, 3 Jan 2018 19:29:12 +0100 Subject: [PATCH 08/31] #349 mysql/pgsql scripts --- .../alfio/repository/ScriptRepository.java | 7 ++-- .../db/MYSQL/V22_1.14.0__ADD_SCRIPTING.sql | 36 +++++++++++++++++++ .../db/PGSQL/V22_1.14.0__ADD_SCRIPTING.sql | 36 +++++++++++++++++++ 3 files changed, 75 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/alfio/db/MYSQL/V22_1.14.0__ADD_SCRIPTING.sql create mode 100644 src/main/resources/alfio/db/PGSQL/V22_1.14.0__ADD_SCRIPTING.sql diff --git a/src/main/java/alfio/repository/ScriptRepository.java b/src/main/java/alfio/repository/ScriptRepository.java index eb44323811..873854a0db 100644 --- a/src/main/java/alfio/repository/ScriptRepository.java +++ b/src/main/java/alfio/repository/ScriptRepository.java @@ -59,14 +59,13 @@ int insert(@Bind("path") String path, @Query("select * from script_support order by name, path") List listAll(); - - @Query("select path, name, hash from " + + @Query("select a3.path, a3.name, a3.hash from " + " (select a1.* from " + " (select path, name, hash from script_support where enabled = true and async = :async and (path in (:possiblePaths))) a1 " + " left outer join (select path, name from script_support where enabled = true and async = :async and (path in (:possiblePaths))) a2 on " + - " (a1.name = a2.name) and length(a1.path) < length(a2.path) where a2.path is null) " + + " (a1.name = a2.name) and length(a1.path) < length(a2.path) where a2.path is null) a3 " + " " + - " inner join script_event on path_fk = path and name_fk = name where event = :event") + " inner join script_event on path_fk = a3.path and name_fk = a3.name where event = :event") List findActive(@Bind("possiblePaths") Set possiblePaths, @Bind("async") boolean async, @Bind("event") String event); diff --git a/src/main/resources/alfio/db/MYSQL/V22_1.14.0__ADD_SCRIPTING.sql b/src/main/resources/alfio/db/MYSQL/V22_1.14.0__ADD_SCRIPTING.sql new file mode 100644 index 0000000000..0fddb4957b --- /dev/null +++ b/src/main/resources/alfio/db/MYSQL/V22_1.14.0__ADD_SCRIPTING.sql @@ -0,0 +1,36 @@ +-- +-- This file is part of alf.io. +-- +-- alf.io is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation, either version 3 of the License, or +-- (at your option) any later version. +-- +-- alf.io is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with alf.io. If not, see . +-- + +create table script_support ( + path varchar(256) not null, + name varchar(256) not null, + hash varchar(256) not null, + enabled boolean not null, + async boolean not null, + script mediumtext not null +); +alter table script_support add constraint unique_script_support unique(path, name); + +create table script_event ( + path_fk varchar(256) not null, + name_fk varchar(256) not null, + event varchar(256) not null +); + +alter table script_event add constraint unique_script_event unique(path_fk, name_fk); + +--TODO: add fk \ No newline at end of file diff --git a/src/main/resources/alfio/db/PGSQL/V22_1.14.0__ADD_SCRIPTING.sql b/src/main/resources/alfio/db/PGSQL/V22_1.14.0__ADD_SCRIPTING.sql new file mode 100644 index 0000000000..2f127e13e3 --- /dev/null +++ b/src/main/resources/alfio/db/PGSQL/V22_1.14.0__ADD_SCRIPTING.sql @@ -0,0 +1,36 @@ +-- +-- This file is part of alf.io. +-- +-- alf.io is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation, either version 3 of the License, or +-- (at your option) any later version. +-- +-- alf.io is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with alf.io. If not, see . +-- + +create table script_support ( + path varchar(256) not null, + name varchar(256) not null, + hash varchar(256) not null, + enabled boolean not null, + async boolean not null, + script text not null +); +alter table script_support add constraint "unique_script_support" unique(path, name); + +create table script_event ( + path_fk varchar(256) not null, + name_fk varchar(256) not null, + event varchar(256) not null +); + +alter table script_event add constraint "unique_script_event" unique(path_fk, name_fk); + +--TODO: add fk \ No newline at end of file From 6fd3cf5fe999dc3589f2e01a7dc745d2cd80b56a Mon Sep 17 00:00:00 2001 From: Sylvain Jermini Date: Wed, 3 Jan 2018 19:38:22 +0100 Subject: [PATCH 09/31] #349 mysql: fix sql scripts --- .../alfio/db/HSQLDB/V22_1.14.0__ADD_SCRIPTING.sql | 10 +++++----- .../alfio/db/MYSQL/V22_1.14.0__ADD_SCRIPTING.sql | 10 +++++----- .../alfio/db/PGSQL/V22_1.14.0__ADD_SCRIPTING.sql | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/resources/alfio/db/HSQLDB/V22_1.14.0__ADD_SCRIPTING.sql b/src/main/resources/alfio/db/HSQLDB/V22_1.14.0__ADD_SCRIPTING.sql index 5d1670f055..96bbe9b3cc 100644 --- a/src/main/resources/alfio/db/HSQLDB/V22_1.14.0__ADD_SCRIPTING.sql +++ b/src/main/resources/alfio/db/HSQLDB/V22_1.14.0__ADD_SCRIPTING.sql @@ -16,8 +16,8 @@ -- create table script_support ( - path varchar(256) not null, - name varchar(256) not null, + path varchar(128) not null, + name varchar(64) not null, hash varchar(256) not null, enabled boolean not null, async boolean not null, @@ -26,9 +26,9 @@ create table script_support ( alter table script_support add constraint "unique_script_support" unique(path, name); create table script_event ( - path_fk varchar(256) not null, - name_fk varchar(256) not null, - event varchar(256) not null + path_fk varchar(128) not null, + name_fk varchar(64 ) not null, + event varchar(128) not null ); alter table script_event add constraint "unique_script_event" unique(path_fk, name_fk); diff --git a/src/main/resources/alfio/db/MYSQL/V22_1.14.0__ADD_SCRIPTING.sql b/src/main/resources/alfio/db/MYSQL/V22_1.14.0__ADD_SCRIPTING.sql index 0fddb4957b..a2907851e8 100644 --- a/src/main/resources/alfio/db/MYSQL/V22_1.14.0__ADD_SCRIPTING.sql +++ b/src/main/resources/alfio/db/MYSQL/V22_1.14.0__ADD_SCRIPTING.sql @@ -16,8 +16,8 @@ -- create table script_support ( - path varchar(256) not null, - name varchar(256) not null, + path varchar(128) not null, + name varchar(64) not null, hash varchar(256) not null, enabled boolean not null, async boolean not null, @@ -26,9 +26,9 @@ create table script_support ( alter table script_support add constraint unique_script_support unique(path, name); create table script_event ( - path_fk varchar(256) not null, - name_fk varchar(256) not null, - event varchar(256) not null + path_fk varchar(128) not null, + name_fk varchar(64) not null, + event varchar(128) not null ); alter table script_event add constraint unique_script_event unique(path_fk, name_fk); diff --git a/src/main/resources/alfio/db/PGSQL/V22_1.14.0__ADD_SCRIPTING.sql b/src/main/resources/alfio/db/PGSQL/V22_1.14.0__ADD_SCRIPTING.sql index 2f127e13e3..4a9aaf1d0f 100644 --- a/src/main/resources/alfio/db/PGSQL/V22_1.14.0__ADD_SCRIPTING.sql +++ b/src/main/resources/alfio/db/PGSQL/V22_1.14.0__ADD_SCRIPTING.sql @@ -16,8 +16,8 @@ -- create table script_support ( - path varchar(256) not null, - name varchar(256) not null, + path varchar(128) not null, + name varchar(64) not null, hash varchar(256) not null, enabled boolean not null, async boolean not null, @@ -26,9 +26,9 @@ create table script_support ( alter table script_support add constraint "unique_script_support" unique(path, name); create table script_event ( - path_fk varchar(256) not null, - name_fk varchar(256) not null, - event varchar(256) not null + path_fk varchar(128) not null, + name_fk varchar(64) not null, + event varchar(128) not null ); alter table script_event add constraint "unique_script_event" unique(path_fk, name_fk); From 02df411bf5825795b654078ed1a278d68566adc2 Mon Sep 17 00:00:00 2001 From: Sylvain Jermini Date: Wed, 3 Jan 2018 20:05:49 +0100 Subject: [PATCH 10/31] use JSON.stringify/GSON.fromJSON to simplify the java<->js interop --- .../scripting/ScriptingExecutionService.java | 19 ++++++------- .../alfio/scripting/ScriptingService.java | 27 +++++++------------ 2 files changed, 20 insertions(+), 26 deletions(-) diff --git a/src/main/java/alfio/scripting/ScriptingExecutionService.java b/src/main/java/alfio/scripting/ScriptingExecutionService.java index 6a508985cb..baa10d0d3c 100644 --- a/src/main/java/alfio/scripting/ScriptingExecutionService.java +++ b/src/main/java/alfio/scripting/ScriptingExecutionService.java @@ -57,8 +57,7 @@ public class ScriptingExecutionService { .expireAfterAccess(12, TimeUnit.HOURS) .build(); - @SuppressWarnings("unchecked") - public T executeScript(String path, String name, String hash, Supplier scriptFetcher, Map params) { + public T executeScript(String path, String name, String hash, Supplier scriptFetcher, Map params, Class clazz) { CompiledScript compiledScript = compiledScriptCache.get(hash, (key) -> { try { return engine.compile(scriptFetcher.get()); @@ -67,28 +66,29 @@ public T executeScript(String path, String name, String hash, Supplier scriptFetcher, Map params) { Optional.ofNullable(asyncExecutors.get(path, (key) -> Executors.newSingleThreadExecutor())) .ifPresent(it -> it.submit(() -> { - executeScript(path, name, hash, scriptFetcher, params); + executeScript(path, name, hash, scriptFetcher, params, Object.class); })); } - @SuppressWarnings("unchecked") - public static T executeScript(String name, String script, Map params) { + + public static T executeScript(String name, String script, Map params, Class clazz) { try { CompiledScript compiledScript = engine.compile(script); - return (T) executeScript(name, compiledScript, params); + return executeScript(name, compiledScript, params, clazz); } catch (ScriptException se) { log.warn("Was not able to compile script", se); throw new IllegalStateException(se); } } - private static Object executeScript(String name, CompiledScript script, Map params) { + @SuppressWarnings("unchecked") + private static T executeScript(String name, CompiledScript script, Map params, Class clazz) { try { if(params == null) { params = Collections.emptyMap(); @@ -98,8 +98,9 @@ private static Object executeScript(String name, CompiledScript script, Mapjs is simpler that way... + Collections.emptyMap(), + ScriptMetadata.class); - //extracting the object {async: boolean, events: String[]} - boolean async = (Boolean) scriptMetadataBinding.getOrDefault("async", Boolean.FALSE); - List events = Arrays.asList(((ScriptObjectMirror) scriptMetadataBinding.get("events")).to(String[].class)); - - ScriptMetadata scriptMetadata = new ScriptMetadata(async, events); - - if(scriptRepository.hasPath(script.getPath(), script.getName()) > 0) { + if (scriptRepository.hasPath(script.getPath(), script.getName()) > 0) { scriptRepository.deleteEventsForPath(script.getPath(), script.getName()); scriptRepository.deleteScriptForPath(script.getPath(), script.getName()); } scriptRepository.insert(script.getPath(), script.getName(), hash, script.isEnabled(), scriptMetadata.async, script.getScript()); - for(String event : scriptMetadata.events) { + for (String event : scriptMetadata.events) { scriptRepository.insertEvent(script.getPath(), script.getName(), event); } } @@ -80,16 +73,16 @@ public String getScript(String path, String name) { return scriptRepository.getScript(path, name); } - public T executeScriptsForEvent(String event, String basePath, Map payload) { + public T executeScriptsForEvent(String event, String basePath, Map payload, Class clazz) { List activePaths = getActiveScriptsForEvent(event, basePath, false); T res = null; Map input = new HashMap<>(payload); input.put("event", event); - for(ScriptPathNameHash activePath : activePaths) { + for (ScriptPathNameHash activePath : activePaths) { String path = activePath.getPath(); String name = activePath.getName(); res = scriptingExecutionService.executeScript(path, name, activePath.getHash(), - () -> getScript(path, name)+"\n;executeScript(event);", input); + () -> getScript(path, name)+"\n;executeScript(event);", input, clazz); input.put("output", res); } return res; @@ -99,7 +92,7 @@ public void executeScriptAsync(String event, String basePath, Map activePaths = getActiveScriptsForEvent(event, basePath, true); Map input = new HashMap<>(payload); input.put("event", event); - for(ScriptPathNameHash activePath : activePaths) { + for (ScriptPathNameHash activePath : activePaths) { String path = activePath.getPath(); String name = activePath.getName(); scriptingExecutionService.executeScriptAsync(path, name, activePath.getHash(), () -> getScript(path, name)+"\n;executeScript(event);", input); From 57ad6cd4a34a705e1fd839cd1102c53d6cc8452a Mon Sep 17 00:00:00 2001 From: Sylvain Jermini Date: Thu, 4 Jan 2018 14:15:16 +0100 Subject: [PATCH 11/31] #349 add missing fk --- .../resources/alfio/db/HSQLDB/V22_1.14.0__ADD_SCRIPTING.sql | 3 +-- .../resources/alfio/db/MYSQL/V22_1.14.0__ADD_SCRIPTING.sql | 3 +-- .../resources/alfio/db/PGSQL/V22_1.14.0__ADD_SCRIPTING.sql | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/resources/alfio/db/HSQLDB/V22_1.14.0__ADD_SCRIPTING.sql b/src/main/resources/alfio/db/HSQLDB/V22_1.14.0__ADD_SCRIPTING.sql index 96bbe9b3cc..5c8ed3830b 100644 --- a/src/main/resources/alfio/db/HSQLDB/V22_1.14.0__ADD_SCRIPTING.sql +++ b/src/main/resources/alfio/db/HSQLDB/V22_1.14.0__ADD_SCRIPTING.sql @@ -32,5 +32,4 @@ create table script_event ( ); alter table script_event add constraint "unique_script_event" unique(path_fk, name_fk); - ---TODO: add fk \ No newline at end of file +alter table script_event add foreign key(path_fk, name_fk) references script_support(path, name); \ No newline at end of file diff --git a/src/main/resources/alfio/db/MYSQL/V22_1.14.0__ADD_SCRIPTING.sql b/src/main/resources/alfio/db/MYSQL/V22_1.14.0__ADD_SCRIPTING.sql index a2907851e8..8bbdc8adf0 100644 --- a/src/main/resources/alfio/db/MYSQL/V22_1.14.0__ADD_SCRIPTING.sql +++ b/src/main/resources/alfio/db/MYSQL/V22_1.14.0__ADD_SCRIPTING.sql @@ -32,5 +32,4 @@ create table script_event ( ); alter table script_event add constraint unique_script_event unique(path_fk, name_fk); - ---TODO: add fk \ No newline at end of file +alter table script_event add foreign key(path_fk, name_fk) references script_support(path, name); \ No newline at end of file diff --git a/src/main/resources/alfio/db/PGSQL/V22_1.14.0__ADD_SCRIPTING.sql b/src/main/resources/alfio/db/PGSQL/V22_1.14.0__ADD_SCRIPTING.sql index 4a9aaf1d0f..c7c0b13923 100644 --- a/src/main/resources/alfio/db/PGSQL/V22_1.14.0__ADD_SCRIPTING.sql +++ b/src/main/resources/alfio/db/PGSQL/V22_1.14.0__ADD_SCRIPTING.sql @@ -32,5 +32,4 @@ create table script_event ( ); alter table script_event add constraint "unique_script_event" unique(path_fk, name_fk); - ---TODO: add fk \ No newline at end of file +alter table script_event add foreign key(path_fk, name_fk) references script_support(path, name); \ No newline at end of file From 016c05b347902816a9a2ef90815ff588cc8bb447 Mon Sep 17 00:00:00 2001 From: Sylvain Jermini Date: Thu, 4 Jan 2018 15:33:18 +0100 Subject: [PATCH 12/31] #349 add hook for handling invoice generation scripts --- .../api/admin/ScriptController.java | 16 ++++++++-- .../java/alfio/manager/ExtensionManager.java | 32 +++++++++++++++++-- .../manager/TicketReservationManager.java | 10 ++++++ .../model/extension/InvoiceGeneration.java | 25 +++++++++++++++ .../alfio/scripting/ScriptingService.java | 8 ++--- 5 files changed, 82 insertions(+), 9 deletions(-) create mode 100644 src/main/java/alfio/model/extension/InvoiceGeneration.java diff --git a/src/main/java/alfio/controller/api/admin/ScriptController.java b/src/main/java/alfio/controller/api/admin/ScriptController.java index e546dcea2a..c95a8e7f07 100644 --- a/src/main/java/alfio/controller/api/admin/ScriptController.java +++ b/src/main/java/alfio/controller/api/admin/ScriptController.java @@ -48,9 +48,21 @@ function getScriptMetadata() { return {async:true, events: ['RESERVATION_CONFIRMATION']}; } - function executeScript(event) { - log.warn('hello from script with event: ' + event); + function executeScript(scriptEvent) { + log.warn('hello from script with event: ' + scriptEvent); } + + -- + + function getScriptMetadata() { + return {async:false, events: ['INVOICE_GENERATION']}; + } + + function executeScript(scriptEvent) { + return {invoiceNumber: '42'}; + } + + */ @RequestMapping(value = "/scripting", method = RequestMethod.POST) public void createOrUpdate(@RequestBody Script script, Principal principal) { diff --git a/src/main/java/alfio/manager/ExtensionManager.java b/src/main/java/alfio/manager/ExtensionManager.java index 64ce5b7eb9..b82dc24d0d 100644 --- a/src/main/java/alfio/manager/ExtensionManager.java +++ b/src/main/java/alfio/manager/ExtensionManager.java @@ -17,9 +17,8 @@ package alfio.manager; -import alfio.model.Ticket; -import alfio.model.TicketReservation; -import alfio.model.WaitingQueueSubscription; +import alfio.model.*; +import alfio.model.extension.InvoiceGeneration; import alfio.repository.EventRepository; import alfio.repository.TicketCategoryRepository; import alfio.scripting.ScriptingService; @@ -28,6 +27,7 @@ import java.util.Collections; import java.util.HashMap; +import java.util.Locale; import java.util.Map; @Component @@ -74,6 +74,25 @@ public void handleWaitingQueueSubscription(WaitingQueueSubscription waitingQueue Collections.singletonMap("waitingQueueSubscription", waitingQueueSubscription)); } + public InvoiceGeneration handleInvoiceGeneration(Event event, String reservationId, String email, CustomerName customerName, Locale userLanguage, + String billingAddress, TotalPrice reservationCost, boolean invoiceRequested, + String vatCountryCode, String vatNr, PriceContainer.VatStatus vatStatus) { + Map payload = new HashMap<>(); + payload.put("event", event); + payload.put("reservationId", reservationId); + payload.put("email", email); + payload.put("customerName", customerName); + payload.put("userLanguage", userLanguage); + payload.put("billingAddress", billingAddress); + payload.put("reservationCost", reservationCost); + payload.put("invoiceRequested", invoiceRequested); + payload.put("vatCountryCode", vatCountryCode); + payload.put("vatNr", vatNr); + payload.put("vatStatus", vatStatus); + + return syncCall(ExtensionEvent.INVOICE_GENERATION, event.getId(), event.getOrganizationId(), payload, InvoiceGeneration.class); + } + private void asyncCall(ExtensionEvent event, int eventId, int organizationId, Map payload) { Map payloadCopy = new HashMap<>(payload); payloadCopy.put("eventId", eventId); @@ -83,6 +102,13 @@ private void asyncCall(ExtensionEvent event, int eventId, int organizationId, Ma toPath(organizationId, eventId), payload); } + private T syncCall(ExtensionEvent event, int eventId, int organizationId, Map payload, Class clazz) { + Map payloadCopy = new HashMap<>(payload); + payloadCopy.put("eventId", eventId); + payloadCopy.put("organizationId", organizationId); + return scriptingService.executeScriptsForEvent(event.name(), toPath(eventId, organizationId), payload, clazz); + } + public static String toPath(int organizationId, int eventId) { return organizationId + "." + eventId; diff --git a/src/main/java/alfio/manager/TicketReservationManager.java b/src/main/java/alfio/manager/TicketReservationManager.java index 9d973dc65f..d6d736b142 100644 --- a/src/main/java/alfio/manager/TicketReservationManager.java +++ b/src/main/java/alfio/manager/TicketReservationManager.java @@ -33,6 +33,7 @@ import alfio.model.decorator.AdditionalServiceItemPriceContainer; import alfio.model.decorator.AdditionalServicePriceContainer; import alfio.model.decorator.TicketPriceContainer; +import alfio.model.extension.InvoiceGeneration; import alfio.model.modification.ASReservationWithOptionalCodeModification; import alfio.model.modification.AdditionalServiceReservationModification; import alfio.model.modification.TicketReservationWithOptionalCodeModification; @@ -357,6 +358,15 @@ public PaymentResult confirm(String gatewayToken, String payerId, Event event, S ticketReservationRepository.setInvoiceNumber(reservationId, String.format(pattern, invoiceSequence)); } ticketReservationRepository.updateBillingData(vatStatus, vatNr, vatCountryCode, invoiceRequested, reservationId); + + // + InvoiceGeneration invoiceGeneration = extensionManager.handleInvoiceGeneration(event, reservationId, + email, customerName, userLanguage, billingAddress, + reservationCost, invoiceRequested, vatCountryCode, vatNr, vatStatus); + if (invoiceGeneration.getInvoiceNumber() != null) { + ticketReservationRepository.setInvoiceNumber(reservationId, invoiceGeneration.getInvoiceNumber()); + } + // switch(paymentProxy) { case STRIPE: paymentResult = paymentManager.processStripePayment(reservationId, gatewayToken, reservationCost.getPriceWithVAT(), event, email, customerName, billingAddress); diff --git a/src/main/java/alfio/model/extension/InvoiceGeneration.java b/src/main/java/alfio/model/extension/InvoiceGeneration.java new file mode 100644 index 0000000000..ae2ca1a46d --- /dev/null +++ b/src/main/java/alfio/model/extension/InvoiceGeneration.java @@ -0,0 +1,25 @@ +/** + * This file is part of alf.io. + * + * alf.io is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * alf.io is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with alf.io. If not, see . + */ + +package alfio.model.extension; + +import lombok.Data; + +@Data +public class InvoiceGeneration { + private String invoiceNumber; +} diff --git a/src/main/java/alfio/scripting/ScriptingService.java b/src/main/java/alfio/scripting/ScriptingService.java index 88bf7f5ef0..8753fd5dfa 100644 --- a/src/main/java/alfio/scripting/ScriptingService.java +++ b/src/main/java/alfio/scripting/ScriptingService.java @@ -77,12 +77,12 @@ public T executeScriptsForEvent(String event, String basePath, Map activePaths = getActiveScriptsForEvent(event, basePath, false); T res = null; Map input = new HashMap<>(payload); - input.put("event", event); + input.put("extensionEvent", event); for (ScriptPathNameHash activePath : activePaths) { String path = activePath.getPath(); String name = activePath.getName(); res = scriptingExecutionService.executeScript(path, name, activePath.getHash(), - () -> getScript(path, name)+"\n;executeScript(event);", input, clazz); + () -> getScript(path, name)+"\n;GSON.fromJson(JSON.stringify(executeScript(extensionEvent)), returnClass);", input, clazz); input.put("output", res); } return res; @@ -91,11 +91,11 @@ public T executeScriptsForEvent(String event, String basePath, Map payload) { List activePaths = getActiveScriptsForEvent(event, basePath, true); Map input = new HashMap<>(payload); - input.put("event", event); + input.put("extensionEvent", event); for (ScriptPathNameHash activePath : activePaths) { String path = activePath.getPath(); String name = activePath.getName(); - scriptingExecutionService.executeScriptAsync(path, name, activePath.getHash(), () -> getScript(path, name)+"\n;executeScript(event);", input); + scriptingExecutionService.executeScriptAsync(path, name, activePath.getHash(), () -> getScript(path, name)+"\n;executeScript(extensionEvent);", input); } } From 5000ecf17c509817427c22fe0c8ad2b8dd729515 Mon Sep 17 00:00:00 2001 From: Sylvain Jermini Date: Thu, 4 Jan 2018 15:36:22 +0100 Subject: [PATCH 13/31] #349 add hook for handling invoice generation scripts, use optional --- src/main/java/alfio/manager/ExtensionManager.java | 9 +++------ .../java/alfio/manager/TicketReservationManager.java | 12 +++++++----- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/main/java/alfio/manager/ExtensionManager.java b/src/main/java/alfio/manager/ExtensionManager.java index b82dc24d0d..95ec373b2f 100644 --- a/src/main/java/alfio/manager/ExtensionManager.java +++ b/src/main/java/alfio/manager/ExtensionManager.java @@ -25,10 +25,7 @@ import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; -import java.util.Collections; -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; +import java.util.*; @Component @AllArgsConstructor @@ -74,7 +71,7 @@ public void handleWaitingQueueSubscription(WaitingQueueSubscription waitingQueue Collections.singletonMap("waitingQueueSubscription", waitingQueueSubscription)); } - public InvoiceGeneration handleInvoiceGeneration(Event event, String reservationId, String email, CustomerName customerName, Locale userLanguage, + public Optional handleInvoiceGeneration(Event event, String reservationId, String email, CustomerName customerName, Locale userLanguage, String billingAddress, TotalPrice reservationCost, boolean invoiceRequested, String vatCountryCode, String vatNr, PriceContainer.VatStatus vatStatus) { Map payload = new HashMap<>(); @@ -90,7 +87,7 @@ public InvoiceGeneration handleInvoiceGeneration(Event event, String reservation payload.put("vatNr", vatNr); payload.put("vatStatus", vatStatus); - return syncCall(ExtensionEvent.INVOICE_GENERATION, event.getId(), event.getOrganizationId(), payload, InvoiceGeneration.class); + return Optional.ofNullable(syncCall(ExtensionEvent.INVOICE_GENERATION, event.getId(), event.getOrganizationId(), payload, InvoiceGeneration.class)); } private void asyncCall(ExtensionEvent event, int eventId, int organizationId, Map payload) { diff --git a/src/main/java/alfio/manager/TicketReservationManager.java b/src/main/java/alfio/manager/TicketReservationManager.java index d6d736b142..478dfeed76 100644 --- a/src/main/java/alfio/manager/TicketReservationManager.java +++ b/src/main/java/alfio/manager/TicketReservationManager.java @@ -360,12 +360,14 @@ public PaymentResult confirm(String gatewayToken, String payerId, Event event, S ticketReservationRepository.updateBillingData(vatStatus, vatNr, vatCountryCode, invoiceRequested, reservationId); // - InvoiceGeneration invoiceGeneration = extensionManager.handleInvoiceGeneration(event, reservationId, + extensionManager.handleInvoiceGeneration(event, reservationId, email, customerName, userLanguage, billingAddress, - reservationCost, invoiceRequested, vatCountryCode, vatNr, vatStatus); - if (invoiceGeneration.getInvoiceNumber() != null) { - ticketReservationRepository.setInvoiceNumber(reservationId, invoiceGeneration.getInvoiceNumber()); - } + reservationCost, invoiceRequested, vatCountryCode, vatNr, vatStatus).ifPresent(invoiceGeneration -> { + if (invoiceGeneration.getInvoiceNumber() != null) { + ticketReservationRepository.setInvoiceNumber(reservationId, invoiceGeneration.getInvoiceNumber()); + } + }); + // switch(paymentProxy) { case STRIPE: From fb567ee7419d0dc974dc9094e978c283893aab4d Mon Sep 17 00:00:00 2001 From: Sylvain Jermini Date: Thu, 4 Jan 2018 15:50:11 +0100 Subject: [PATCH 14/31] #349 fix test --- src/test/java/alfio/manager/TicketReservationManagerTest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/test/java/alfio/manager/TicketReservationManagerTest.java b/src/test/java/alfio/manager/TicketReservationManagerTest.java index fd921428d6..0e4daed55a 100644 --- a/src/test/java/alfio/manager/TicketReservationManagerTest.java +++ b/src/test/java/alfio/manager/TicketReservationManagerTest.java @@ -198,6 +198,9 @@ public void init() { when(event.getBegin()).thenReturn(ZonedDateTime.now().plusDays(1)); when(event.getVatStatus()).thenReturn(PriceContainer.VatStatus.NOT_INCLUDED); when(userRepository.findIdByUserName(anyString())).thenReturn(Optional.empty()); + when(extensionManager.handleInvoiceGeneration(any(), anyString(), + anyString(), any(), any(), anyString(), any(), anyBoolean(), anyString(), + anyString(), any())).thenReturn(Optional.empty()); } private void initUpdateTicketOwner(Ticket original, Ticket modified, String ticketId, String originalEmail, String originalName, UpdateTicketOwnerForm form) { From 5593e9448e5a0cdfb55b3631564f62eec8fc8a39 Mon Sep 17 00:00:00 2001 From: Sylvain Jermini Date: Thu, 4 Jan 2018 16:35:32 +0100 Subject: [PATCH 15/31] #349 add sample --- .../controller/api/admin/ScriptController.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/main/java/alfio/controller/api/admin/ScriptController.java b/src/main/java/alfio/controller/api/admin/ScriptController.java index c95a8e7f07..f53eb794bc 100644 --- a/src/main/java/alfio/controller/api/admin/ScriptController.java +++ b/src/main/java/alfio/controller/api/admin/ScriptController.java @@ -62,6 +62,22 @@ function executeScript(scriptEvent) { return {invoiceNumber: '42'}; } + -- + + function getScriptMetadata() { + return {async:false, events: ['INVOICE_GENERATION']}; + } + + function executeScript(scriptEvent) { + var symbol = restTemplate.getForObject('https://api.coinmarketcap.com/v1/ticker/bitcoin/', Java.type('java.util.ArrayList').class)[0].symbol; + return {invoiceNumber: symbol}; + } + + + + + -- + */ @RequestMapping(value = "/scripting", method = RequestMethod.POST) From 6864a61d5155510d034750631072e8eab7b16c6d Mon Sep 17 00:00:00 2001 From: Sylvain Jermini Date: Thu, 4 Jan 2018 16:54:52 +0100 Subject: [PATCH 16/31] #349 keep the order of active scripts always the same when loading them --- src/main/java/alfio/repository/ScriptRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/alfio/repository/ScriptRepository.java b/src/main/java/alfio/repository/ScriptRepository.java index 873854a0db..9da2f75313 100644 --- a/src/main/java/alfio/repository/ScriptRepository.java +++ b/src/main/java/alfio/repository/ScriptRepository.java @@ -65,7 +65,7 @@ int insert(@Bind("path") String path, " left outer join (select path, name from script_support where enabled = true and async = :async and (path in (:possiblePaths))) a2 on " + " (a1.name = a2.name) and length(a1.path) < length(a2.path) where a2.path is null) a3 " + " " + - " inner join script_event on path_fk = a3.path and name_fk = a3.name where event = :event") + " inner join script_event on path_fk = a3.path and name_fk = a3.name where event = :event order by a3.name, a3.path") List findActive(@Bind("possiblePaths") Set possiblePaths, @Bind("async") boolean async, @Bind("event") String event); From 2526c221b680ab9b95b5997c62ca68462e087a84 Mon Sep 17 00:00:00 2001 From: Celestino Bellone Date: Thu, 4 Jan 2018 22:51:39 +0100 Subject: [PATCH 17/31] #349 - UI refinements - first draft --- ...oller.java => ExtensionApiController.java} | 75 ++++++++----------- .../alfio/repository/ScriptRepository.java | 4 + .../alfio/scripting/ScriptingService.java | 4 + src/main/resources/alfio/extension/sample.js | 30 ++++++++ .../webapp/WEB-INF/templates/admin/index.ms | 6 +- .../add-update/extension-add-update.html | 37 +++++++++ .../add-update/extension-add-update.js | 66 ++++++++++++++++ .../js/admin/feature/extension/extension.html | 31 ++++++++ .../js/admin/feature/extension/extension.js | 34 +++++++++ .../add-update/scripting-add-update.html | 36 --------- .../add-update/scripting-add-update.js | 36 --------- .../js/admin/feature/scripting/scripting.html | 31 -------- .../js/admin/feature/scripting/scripting.js | 56 -------------- .../js/admin/ng-app/admin-application.js | 20 ++++- 14 files changed, 259 insertions(+), 207 deletions(-) rename src/main/java/alfio/controller/api/admin/{ScriptController.java => ExtensionApiController.java} (55%) create mode 100644 src/main/resources/alfio/extension/sample.js create mode 100644 src/main/webapp/resources/js/admin/feature/extension/add-update/extension-add-update.html create mode 100644 src/main/webapp/resources/js/admin/feature/extension/add-update/extension-add-update.js create mode 100644 src/main/webapp/resources/js/admin/feature/extension/extension.html create mode 100644 src/main/webapp/resources/js/admin/feature/extension/extension.js delete mode 100644 src/main/webapp/resources/js/admin/feature/scripting/add-update/scripting-add-update.html delete mode 100644 src/main/webapp/resources/js/admin/feature/scripting/add-update/scripting-add-update.js delete mode 100644 src/main/webapp/resources/js/admin/feature/scripting/scripting.html delete mode 100644 src/main/webapp/resources/js/admin/feature/scripting/scripting.js diff --git a/src/main/java/alfio/controller/api/admin/ScriptController.java b/src/main/java/alfio/controller/api/admin/ExtensionApiController.java similarity index 55% rename from src/main/java/alfio/controller/api/admin/ScriptController.java rename to src/main/java/alfio/controller/api/admin/ExtensionApiController.java index f53eb794bc..bdff7db81c 100644 --- a/src/main/java/alfio/controller/api/admin/ScriptController.java +++ b/src/main/java/alfio/controller/api/admin/ExtensionApiController.java @@ -23,77 +23,68 @@ import alfio.scripting.ScriptingService; import lombok.AllArgsConstructor; import org.apache.commons.lang3.Validate; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import java.io.File; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URISyntaxException; +import java.net.URLDecoder; +import java.nio.file.Files; import java.security.Principal; import java.util.List; @RestController @AllArgsConstructor -@RequestMapping("/admin/api") -public class ScriptController { +@RequestMapping("/admin/api/extensions") +public class ExtensionApiController { + + private static final String SAMPLE_JS; + + static { + try { + SAMPLE_JS = new String(Files.readAllBytes(new File(ExtensionApiController.class.getResource("/alfio/extension/sample.js").toURI()).toPath())); + } catch (URISyntaxException | IOException e) { + throw new IllegalStateException("cannot read sample file", e); + } + } private final ScriptingService scriptingService; private final UserManager userManager; - @RequestMapping(value = "/scripting", method = RequestMethod.GET) + @RequestMapping(value = "", method = RequestMethod.GET) public List listAll(Principal principal) { ensureAdmin(principal); return scriptingService.listAll(); } - /* - function getScriptMetadata() { - return {async:true, events: ['RESERVATION_CONFIRMATION']}; - } - - function executeScript(scriptEvent) { - log.warn('hello from script with event: ' + scriptEvent); - } - - -- - - function getScriptMetadata() { - return {async:false, events: ['INVOICE_GENERATION']}; - } - - function executeScript(scriptEvent) { - return {invoiceNumber: '42'}; + @RequestMapping(value = "/sample", method = RequestMethod.GET) + public ScriptSupport getSample() { + return new ScriptSupport("/", "", null, true, true, SAMPLE_JS); } - -- - - function getScriptMetadata() { - return {async:false, events: ['INVOICE_GENERATION']}; - } - - function executeScript(scriptEvent) { - var symbol = restTemplate.getForObject('https://api.coinmarketcap.com/v1/ticker/bitcoin/', Java.type('java.util.ArrayList').class)[0].symbol; - return {invoiceNumber: symbol}; - } - - - - - -- - - - */ - @RequestMapping(value = "/scripting", method = RequestMethod.POST) + @RequestMapping(value = "", method = RequestMethod.POST) public void createOrUpdate(@RequestBody Script script, Principal principal) { ensureAdmin(principal); scriptingService.createOrUpdate(script); } + @RequestMapping(value = "/{name}", method = RequestMethod.GET) + public ResponseEntity loadSingle(@RequestParam("path") String path, @PathVariable("name") String name, Principal principal) throws UnsupportedEncodingException { + ensureAdmin(principal); + return scriptingService.getSingle(URLDecoder.decode(path, "UTF-8"), name).map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.notFound().build()); + } + - @RequestMapping(value = "/scripting/{path}/{name}", method = RequestMethod.DELETE) - public void delete(@PathVariable("path") String path, @PathVariable("name") String name, Principal principal) { + @RequestMapping(value = "/{name}", method = RequestMethod.DELETE) + public void delete(@RequestParam("path") String path, @PathVariable("name") String name, Principal principal) { ensureAdmin(principal); scriptingService.delete(path, name); } - @RequestMapping(value = "/scripting/{path}/{name}/toggle/{enable}", method = RequestMethod.POST) + @RequestMapping(value = "/{path}/{name}/toggle/{enable}", method = RequestMethod.POST) public void toggle(@PathVariable("path") String path, @PathVariable("name") String name, @PathVariable("enable") boolean enable, Principal principal) { ensureAdmin(principal); scriptingService.toggle(path, name, enable); diff --git a/src/main/java/alfio/repository/ScriptRepository.java b/src/main/java/alfio/repository/ScriptRepository.java index 9da2f75313..719f9b6dab 100644 --- a/src/main/java/alfio/repository/ScriptRepository.java +++ b/src/main/java/alfio/repository/ScriptRepository.java @@ -23,6 +23,7 @@ import ch.digitalfondue.npjt.QueryRepository; import java.util.List; +import java.util.Optional; import java.util.Set; @QueryRepository @@ -50,6 +51,9 @@ int insert(@Bind("path") String path, @Query("select script from script_support where path = :path and name = :name") String getScript(@Bind("path") String path, @Bind("name") String name); + @Query("select * from script_support where path = :path and name = :name") + Optional getSingle(@Bind("path") String path, @Bind("name") String name); + @Query("delete from script_event where path_fk = :path and name_fk = :name") int deleteEventsForPath(@Bind("path") String path, @Bind("name") String name); diff --git a/src/main/java/alfio/scripting/ScriptingService.java b/src/main/java/alfio/scripting/ScriptingService.java index 8753fd5dfa..84fe15534f 100644 --- a/src/main/java/alfio/scripting/ScriptingService.java +++ b/src/main/java/alfio/scripting/ScriptingService.java @@ -73,6 +73,10 @@ public String getScript(String path, String name) { return scriptRepository.getScript(path, name); } + public Optional getSingle(String path, String name) { + return scriptRepository.getSingle(path, name); + } + public T executeScriptsForEvent(String event, String basePath, Map payload, Class clazz) { List activePaths = getActiveScriptsForEvent(event, basePath, false); T res = null; diff --git a/src/main/resources/alfio/extension/sample.js b/src/main/resources/alfio/extension/sample.js new file mode 100644 index 0000000000..7303f34b38 --- /dev/null +++ b/src/main/resources/alfio/extension/sample.js @@ -0,0 +1,30 @@ +/** + * The script metadata object describes whether or not your extension should be invoked asynchronously, and which events it supports + * @returns {{ async: boolean, events: string[] }} + */ +function getScriptMetadata() { + return { + async: false, + events: [ + //supported values: + //'RESERVATION_CONFIRMATION', //fired on reservation confirmation. No results expected. + //'TICKET_ASSIGNMENT', //fired on ticket assignment. No results expected. + //'WAITING_QUEUE_SUBSCRIPTION', //fired on waiting queue subscription. No results expected. + 'INVOICE_GENERATION' //fired on invoice generation. Returns the invoice model. + ] + }; +} + +/** + * Executes the extension. + * @param scriptEvent + * @returns Object + */ +function executeScript(scriptEvent) { + log.warn('hello from script with event: ' + scriptEvent); + //this sample calls the https://csrng.net/ website and generates a random invoice number + var symbol = restTemplate.getForObject('https://csrng.net/csrng/csrng.php?min=0&max=100', Java.type('java.util.ArrayList').class)[0].random; + return { + invoiceNumber: symbol + }; +} \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/templates/admin/index.ms b/src/main/webapp/WEB-INF/templates/admin/index.ms index be7d3b4ace..273ab13904 100644 --- a/src/main/webapp/WEB-INF/templates/admin/index.ms +++ b/src/main/webapp/WEB-INF/templates/admin/index.ms @@ -83,8 +83,8 @@ - - + + @@ -117,7 +117,7 @@
    • Organizations
    • Users
    • Configuration
      • -
    • Scripting
      • +
    • Extension
      • {{/isOwner}}
      diff --git a/src/main/webapp/resources/js/admin/feature/extension/add-update/extension-add-update.html b/src/main/webapp/resources/js/admin/feature/extension/add-update/extension-add-update.html new file mode 100644 index 0000000000..03be8cd4ca --- /dev/null +++ b/src/main/webapp/resources/js/admin/feature/extension/add-update/extension-add-update.html @@ -0,0 +1,37 @@ +
      + +
      +

      {{$ctrl.edit ? 'Update' : 'Add'}} Extension

      +
      +
      +
      +
      + + + +
      + +
      + + + +
      + +
      + + + +
      + +
      +
      + +
      +
      + +
      +
      diff --git a/src/main/webapp/resources/js/admin/feature/extension/add-update/extension-add-update.js b/src/main/webapp/resources/js/admin/feature/extension/add-update/extension-add-update.js new file mode 100644 index 0000000000..7ef381b2ad --- /dev/null +++ b/src/main/webapp/resources/js/admin/feature/extension/add-update/extension-add-update.js @@ -0,0 +1,66 @@ +(function() { + 'use strict'; + + angular.module('adminApplication').component('extensionAddUpdate', { + controller: ['$http', '$q', '$state', ExtensionAddUpdateCtrl], + templateUrl: '../resources/js/admin/feature/extension/add-update/extension-add-update.html', + bindings: { + dismiss:'&', + close:'&', + toUpdate:'<' + } + }); + + function ExtensionAddUpdateCtrl($http, $q, $state) { + var ctrl = this; + ctrl.extension = null; + ctrl.extensionLoader = null; + + ctrl.$onInit = function() { + ctrl.edit = ctrl.toUpdate; + if(ctrl.toUpdate) { + ctrl.extensionLoader = $http.get('/admin/api/extensions/' + ctrl.toUpdate.name, {params: {path: ctrl.toUpdate.path}}); + } else { + ctrl.extensionLoader = $http.get('/admin/api/extensions/sample'); + } + ctrl.extensionLoader.then(function(res) { + ctrl.extension = res.data; + }); + }; + + + ctrl.save = function(extension) { + $http.post('/admin/api/extensions', { + path: extension.path, + name: extension.name, + enabled: extension.enabled, + script: extension.script + }).then(function() { + $state.go('extension.list'); + }); + }; + + ctrl.initLoadListener = function() { + return function(editor) { + var session = editor.getSession(); + + // Options + session.setUndoManager(new ace.UndoManager()); + + session.on("change", function(event, editor) { + var newVal = editor.getValue(); + var currVal = ctrl.extension.script; + if(newVal !== currVal) { + ctrl.extension.script = newVal; + } + }); + + ctrl.extensionLoader.then(function() { + editor.setValue(ctrl.extension.script, 0); + editor.clearSelection(); + }); + + } + }; + } +})(); \ No newline at end of file diff --git a/src/main/webapp/resources/js/admin/feature/extension/extension.html b/src/main/webapp/resources/js/admin/feature/extension/extension.html new file mode 100644 index 0000000000..f103175a13 --- /dev/null +++ b/src/main/webapp/resources/js/admin/feature/extension/extension.html @@ -0,0 +1,31 @@ +
      +

      Extension

      +
      +
      + add new +
      + + + + + + + + + + + + + + + + + + + + +
      pathnameenabledactions
      no extensions have been found.
      {{ext.path}}{{ext.name}}{{ext.enabled}} + edit + +
      +
      diff --git a/src/main/webapp/resources/js/admin/feature/extension/extension.js b/src/main/webapp/resources/js/admin/feature/extension/extension.js new file mode 100644 index 0000000000..a437f5286b --- /dev/null +++ b/src/main/webapp/resources/js/admin/feature/extension/extension.js @@ -0,0 +1,34 @@ +(function() { + 'use strict'; + + angular.module('adminApplication').component('extension', { + controller: ['$http', ExtensionCtrl], + templateUrl: '../resources/js/admin/feature/extension/extension.html' + }); + + function ExtensionCtrl($http) { + var ctrl = this; + + this.$onInit = function() { + load(); + }; + + this.deleteExtension = deleteExtension; + + + function load() { + $http.get('/admin/api/extensions').then(function(res) { + ctrl.scripts = res.data; + }) + } + + function deleteExtension(extension) { + if(window.confirm('Delete ' + extension.name+'?')) { + $http.delete('/admin/api/extensions/'+ extension.name, {params: {path: extension.path}}).then(function () { + load(); + }); + } + } + } + +})(); \ No newline at end of file diff --git a/src/main/webapp/resources/js/admin/feature/scripting/add-update/scripting-add-update.html b/src/main/webapp/resources/js/admin/feature/scripting/add-update/scripting-add-update.html deleted file mode 100644 index ba54c9b903..0000000000 --- a/src/main/webapp/resources/js/admin/feature/scripting/add-update/scripting-add-update.html +++ /dev/null @@ -1,36 +0,0 @@ -
      -

      Add/Update script

      -
      -
      -
      -
      - - - -
      - -
      - - - -
      - -
      - - - -
      - -
      - - - -
      -
      -
      -
      - - -
      -
      -
      \ No newline at end of file diff --git a/src/main/webapp/resources/js/admin/feature/scripting/add-update/scripting-add-update.js b/src/main/webapp/resources/js/admin/feature/scripting/add-update/scripting-add-update.js deleted file mode 100644 index fb53758145..0000000000 --- a/src/main/webapp/resources/js/admin/feature/scripting/add-update/scripting-add-update.js +++ /dev/null @@ -1,36 +0,0 @@ -(function() { - 'use strict'; - - angular.module('adminApplication').component('scriptingAddUpdate', { - controller: ['$http', ScriptingAddUpdateCtrl], - templateUrl: '../resources/js/admin/feature/scripting/add-update/scripting-add-update.html', - bindings: { - dismiss:'&', - close:'&', - toUpdate:'<' - } - }); - - function ScriptingAddUpdateCtrl($http) { - var ctrl = this; - - ctrl.$onInit = function() { - if(ctrl.toUpdate) { - //deep cloning - ctrl.script = JSON.parse(JSON.stringify(ctrl.toUpdate)); - } - } - - - ctrl.save = function(script) { - $http.post('/admin/api/scripting', { - path: script.path, - name: script.name, - enabled: script.enabled, - script: script.script - }).then(function() { - ctrl.close({$script: script}); - }); - } - } -})(); \ No newline at end of file diff --git a/src/main/webapp/resources/js/admin/feature/scripting/scripting.html b/src/main/webapp/resources/js/admin/feature/scripting/scripting.html deleted file mode 100644 index e6d42fccec..0000000000 --- a/src/main/webapp/resources/js/admin/feature/scripting/scripting.html +++ /dev/null @@ -1,31 +0,0 @@ -
      -

      Scripting

      -
      -
      - -
      - - - - - - - - - - - - - - - - - - - - -
      pathnameenabledactions
      no scripts have been found.
      {{script.path}}{{script.name}}{{script.enabled}} - - -
      -
      diff --git a/src/main/webapp/resources/js/admin/feature/scripting/scripting.js b/src/main/webapp/resources/js/admin/feature/scripting/scripting.js deleted file mode 100644 index 5d64b26bec..0000000000 --- a/src/main/webapp/resources/js/admin/feature/scripting/scripting.js +++ /dev/null @@ -1,56 +0,0 @@ -(function() { - 'use strict'; - - angular.module('adminApplication').component('scripting', { - controller: ['$http', '$uibModal', ScriptingCtrl], - templateUrl: '../resources/js/admin/feature/scripting/scripting.html' - }); - - function ScriptingCtrl($http, $uibModal) { - var ctrl = this; - - this.$onInit = function() { - load(); - }; - - this.addNewOrUpdate = addNewOrUpdate; - this.deleteScript = deleteScript; - - - function load() { - $http.get('/admin/api/scripting').then(function(res) { - ctrl.scripts = res.data; - }) - } - - function deleteScript(script) { - if(window.confirm('Delete script ' + script.name+'?')) { - $http.delete('/admin/api/scripting/' + script.path + '/' + script.name).then(function () { - load(); - }); - } - } - - - function addNewOrUpdate(script) { - var modal = $uibModal.open({ - template: '', - controller: function() { - var ctrl = this; - - ctrl.toUpdate = script; - - ctrl.dismiss = function() { - modal.dismiss(); - } - - ctrl.close = function(script) { - modal.close(); - load(); - } - }, - controllerAs: 'ctrl' - }); - } - } -})(); \ No newline at end of file diff --git a/src/main/webapp/resources/js/admin/ng-app/admin-application.js b/src/main/webapp/resources/js/admin/ng-app/admin-application.js index 8c5c2a511d..5b8aac5100 100644 --- a/src/main/webapp/resources/js/admin/ng-app/admin-application.js +++ b/src/main/webapp/resources/js/admin/ng-app/admin-application.js @@ -277,9 +277,23 @@ return AdminReservationService.load($stateParams.eventName, $stateParams.reservationId); } } - }).state('scripting', { - url: '/scripting/', - template: '' + }).state('extension', { + url: '/extension', + abstract: true, + template: '
      ' + }).state('extension.list', { + url: '/list', + template: '' + }).state('extension.new', { + url: '/new', + template: '' + }).state('extension.edit', { + url: '/:path/:name/edit', + template: '', + controllerAs: 'ctrl', + controller: ['$stateParams', function($stateParams) { + this.toUpdate = {path: $stateParams.path, name: $stateParams.name}; + }] }); growlProvider.globalPosition('bottom-right'); From 1409ba001c98270a7d9059eefee145844c9d49e0 Mon Sep 17 00:00:00 2001 From: Sylvain Jermini Date: Fri, 5 Jan 2018 14:52:40 +0100 Subject: [PATCH 18/31] #349 refactor script -> extension --- .../alfio/config/DataSourceConfiguration.java | 2 +- .../api/admin/ExtensionApiController.java | 28 +++++------ .../Script.java => extension/Extension.java} | 6 +-- .../ExtensionMetadata.java} | 4 +- .../ExtensionService.java} | 48 +++++++++---------- .../ScriptingExecutionService.java | 2 +- .../java/alfio/manager/ExtensionManager.java | 8 ++-- ...riptSupport.java => ExtensionSupport.java} | 14 +++--- ...pository.java => ExtensionRepository.java} | 38 +++++++-------- ...TING.sql => V22_1.14.0__ADD_EXTENSION.sql} | 10 ++-- ...TING.sql => V22_1.14.0__ADD_EXTENSION.sql} | 10 ++-- ...TING.sql => V22_1.14.0__ADD_EXTENSION.sql} | 10 ++-- src/main/resources/alfio/extension/sample.js | 5 +- 13 files changed, 92 insertions(+), 93 deletions(-) rename src/main/java/alfio/{scripting/Script.java => extension/Extension.java} (92%) rename src/main/java/alfio/{scripting/ScriptMetadata.java => extension/ExtensionMetadata.java} (93%) rename src/main/java/alfio/{scripting/ScriptingService.java => extension/ExtensionService.java} (71%) rename src/main/java/alfio/{scripting => extension}/ScriptingExecutionService.java (99%) rename src/main/java/alfio/model/{ScriptSupport.java => ExtensionSupport.java} (80%) rename src/main/java/alfio/repository/{ScriptRepository.java => ExtensionRepository.java} (54%) rename src/main/resources/alfio/db/HSQLDB/{V22_1.14.0__ADD_SCRIPTING.sql => V22_1.14.0__ADD_EXTENSION.sql} (73%) rename src/main/resources/alfio/db/MYSQL/{V22_1.14.0__ADD_SCRIPTING.sql => V22_1.14.0__ADD_EXTENSION.sql} (73%) rename src/main/resources/alfio/db/PGSQL/{V22_1.14.0__ADD_SCRIPTING.sql => V22_1.14.0__ADD_EXTENSION.sql} (73%) diff --git a/src/main/java/alfio/config/DataSourceConfiguration.java b/src/main/java/alfio/config/DataSourceConfiguration.java index c2184d4328..6ee6790eb4 100644 --- a/src/main/java/alfio/config/DataSourceConfiguration.java +++ b/src/main/java/alfio/config/DataSourceConfiguration.java @@ -70,7 +70,7 @@ @EnableTransactionManagement @EnableScheduling @EnableAsync -@ComponentScan(basePackages = {"alfio.manager", "alfio.scripting"}) +@ComponentScan(basePackages = {"alfio.manager", "alfio.extension"}) @Log4j2 public class DataSourceConfiguration implements ResourceLoaderAware { diff --git a/src/main/java/alfio/controller/api/admin/ExtensionApiController.java b/src/main/java/alfio/controller/api/admin/ExtensionApiController.java index bdff7db81c..1eb8a50123 100644 --- a/src/main/java/alfio/controller/api/admin/ExtensionApiController.java +++ b/src/main/java/alfio/controller/api/admin/ExtensionApiController.java @@ -18,9 +18,9 @@ package alfio.controller.api.admin; import alfio.manager.user.UserManager; -import alfio.model.ScriptSupport; -import alfio.scripting.Script; -import alfio.scripting.ScriptingService; +import alfio.model.ExtensionSupport; +import alfio.extension.Extension; +import alfio.extension.ExtensionService; import lombok.AllArgsConstructor; import org.apache.commons.lang3.Validate; import org.springframework.http.ResponseEntity; @@ -50,44 +50,44 @@ public class ExtensionApiController { } } - private final ScriptingService scriptingService; + private final ExtensionService extensionService; private final UserManager userManager; @RequestMapping(value = "", method = RequestMethod.GET) - public List listAll(Principal principal) { + public List listAll(Principal principal) { ensureAdmin(principal); - return scriptingService.listAll(); + return extensionService.listAll(); } @RequestMapping(value = "/sample", method = RequestMethod.GET) - public ScriptSupport getSample() { - return new ScriptSupport("/", "", null, true, true, SAMPLE_JS); + public ExtensionSupport getSample() { + return new ExtensionSupport("", "", null, true, true, SAMPLE_JS); } @RequestMapping(value = "", method = RequestMethod.POST) - public void createOrUpdate(@RequestBody Script script, Principal principal) { + public void createOrUpdate(@RequestBody Extension script, Principal principal) { ensureAdmin(principal); - scriptingService.createOrUpdate(script); + extensionService.createOrUpdate(script); } @RequestMapping(value = "/{name}", method = RequestMethod.GET) - public ResponseEntity loadSingle(@RequestParam("path") String path, @PathVariable("name") String name, Principal principal) throws UnsupportedEncodingException { + public ResponseEntity loadSingle(@RequestParam("path") String path, @PathVariable("name") String name, Principal principal) throws UnsupportedEncodingException { ensureAdmin(principal); - return scriptingService.getSingle(URLDecoder.decode(path, "UTF-8"), name).map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.notFound().build()); + return extensionService.getSingle(URLDecoder.decode(path, "UTF-8"), name).map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.notFound().build()); } @RequestMapping(value = "/{name}", method = RequestMethod.DELETE) public void delete(@RequestParam("path") String path, @PathVariable("name") String name, Principal principal) { ensureAdmin(principal); - scriptingService.delete(path, name); + extensionService.delete(path, name); } @RequestMapping(value = "/{path}/{name}/toggle/{enable}", method = RequestMethod.POST) public void toggle(@PathVariable("path") String path, @PathVariable("name") String name, @PathVariable("enable") boolean enable, Principal principal) { ensureAdmin(principal); - scriptingService.toggle(path, name, enable); + extensionService.toggle(path, name, enable); } private void ensureAdmin(Principal principal) { diff --git a/src/main/java/alfio/scripting/Script.java b/src/main/java/alfio/extension/Extension.java similarity index 92% rename from src/main/java/alfio/scripting/Script.java rename to src/main/java/alfio/extension/Extension.java index f60671ed5f..83cadab69b 100644 --- a/src/main/java/alfio/scripting/Script.java +++ b/src/main/java/alfio/extension/Extension.java @@ -15,16 +15,14 @@ * along with alf.io. If not, see . */ -package alfio.scripting; +package alfio.extension; import lombok.AllArgsConstructor; import lombok.Getter; -import java.util.Map; - @Getter @AllArgsConstructor -public class Script { +public class Extension { private final String path; private final String name; diff --git a/src/main/java/alfio/scripting/ScriptMetadata.java b/src/main/java/alfio/extension/ExtensionMetadata.java similarity index 93% rename from src/main/java/alfio/scripting/ScriptMetadata.java rename to src/main/java/alfio/extension/ExtensionMetadata.java index 273e86eb2a..3f0681c16f 100644 --- a/src/main/java/alfio/scripting/ScriptMetadata.java +++ b/src/main/java/alfio/extension/ExtensionMetadata.java @@ -15,7 +15,7 @@ * along with alf.io. If not, see . */ -package alfio.scripting; +package alfio.extension; import lombok.AllArgsConstructor; import lombok.Getter; @@ -24,7 +24,7 @@ @Getter @AllArgsConstructor -public class ScriptMetadata { +public class ExtensionMetadata { boolean async; List events; } diff --git a/src/main/java/alfio/scripting/ScriptingService.java b/src/main/java/alfio/extension/ExtensionService.java similarity index 71% rename from src/main/java/alfio/scripting/ScriptingService.java rename to src/main/java/alfio/extension/ExtensionService.java index 84fe15534f..a3a6ec0fa5 100644 --- a/src/main/java/alfio/scripting/ScriptingService.java +++ b/src/main/java/alfio/extension/ExtensionService.java @@ -15,11 +15,11 @@ * along with alf.io. If not, see . */ -package alfio.scripting; +package alfio.extension; -import alfio.model.ScriptSupport; -import alfio.model.ScriptSupport.ScriptPathNameHash; -import alfio.repository.ScriptRepository; +import alfio.model.ExtensionSupport; +import alfio.model.ExtensionSupport.ScriptPathNameHash; +import alfio.repository.ExtensionRepository; import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; import org.apache.commons.codec.digest.DigestUtils; @@ -32,49 +32,49 @@ @Service @Log4j2 @AllArgsConstructor -public class ScriptingService { +public class ExtensionService { private final ScriptingExecutionService scriptingExecutionService; - private final ScriptRepository scriptRepository; + private final ExtensionRepository extensionRepository; @Transactional - public void createOrUpdate(Script script) { + public void createOrUpdate(Extension script) { String hash = DigestUtils.sha256Hex(script.getScript()); - ScriptMetadata scriptMetadata = ScriptingExecutionService.executeScript( + ExtensionMetadata extensionMetadata = ScriptingExecutionService.executeScript( script.getName(), script.getScript() + "\n;GSON.fromJson(JSON.stringify(getScriptMetadata()), returnClass);", //<- ugly hack, but the interop java<->js is simpler that way... Collections.emptyMap(), - ScriptMetadata.class); + ExtensionMetadata.class); - if (scriptRepository.hasPath(script.getPath(), script.getName()) > 0) { - scriptRepository.deleteEventsForPath(script.getPath(), script.getName()); - scriptRepository.deleteScriptForPath(script.getPath(), script.getName()); + if (extensionRepository.hasPath(script.getPath(), script.getName()) > 0) { + extensionRepository.deleteEventsForPath(script.getPath(), script.getName()); + extensionRepository.deleteScriptForPath(script.getPath(), script.getName()); } - scriptRepository.insert(script.getPath(), script.getName(), hash, script.isEnabled(), scriptMetadata.async, script.getScript()); - for (String event : scriptMetadata.events) { - scriptRepository.insertEvent(script.getPath(), script.getName(), event); + extensionRepository.insert(script.getPath(), script.getName(), hash, script.isEnabled(), extensionMetadata.async, script.getScript()); + for (String event : extensionMetadata.events) { + extensionRepository.insertEvent(script.getPath(), script.getName(), event); } } @Transactional public void toggle(String path, String name, boolean status) { - scriptRepository.toggle(path, name, status); + extensionRepository.toggle(path, name, status); } @Transactional public void delete(String path, String name) { - scriptRepository.deleteEventsForPath(path, name); - scriptRepository.deleteScriptForPath(path, name); + extensionRepository.deleteEventsForPath(path, name); + extensionRepository.deleteScriptForPath(path, name); } public String getScript(String path, String name) { - return scriptRepository.getScript(path, name); + return extensionRepository.getScript(path, name); } - public Optional getSingle(String path, String name) { - return scriptRepository.getSingle(path, name); + public Optional getSingle(String path, String name) { + return extensionRepository.getSingle(path, name); } public T executeScriptsForEvent(String event, String basePath, Map payload, Class clazz) { @@ -119,10 +119,10 @@ private List getActiveScriptsForEvent(String event, String b paths.add(StringUtils.join(Arrays.copyOfRange(splitted, 0, i + 1), '.')); } - return scriptRepository.findActive(paths, async, event); + return extensionRepository.findActive(paths, async, event); } - public List listAll() { - return scriptRepository.listAll(); + public List listAll() { + return extensionRepository.listAll(); } } diff --git a/src/main/java/alfio/scripting/ScriptingExecutionService.java b/src/main/java/alfio/extension/ScriptingExecutionService.java similarity index 99% rename from src/main/java/alfio/scripting/ScriptingExecutionService.java rename to src/main/java/alfio/extension/ScriptingExecutionService.java index baa10d0d3c..7e3ef822e9 100644 --- a/src/main/java/alfio/scripting/ScriptingExecutionService.java +++ b/src/main/java/alfio/extension/ScriptingExecutionService.java @@ -15,7 +15,7 @@ * along with alf.io. If not, see . */ -package alfio.scripting; +package alfio.extension; import alfio.util.Json; import com.github.benmanes.caffeine.cache.Cache; diff --git a/src/main/java/alfio/manager/ExtensionManager.java b/src/main/java/alfio/manager/ExtensionManager.java index 95ec373b2f..b1531a8935 100644 --- a/src/main/java/alfio/manager/ExtensionManager.java +++ b/src/main/java/alfio/manager/ExtensionManager.java @@ -21,7 +21,7 @@ import alfio.model.extension.InvoiceGeneration; import alfio.repository.EventRepository; import alfio.repository.TicketCategoryRepository; -import alfio.scripting.ScriptingService; +import alfio.extension.ExtensionService; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; @@ -31,7 +31,7 @@ @AllArgsConstructor public class ExtensionManager { - private final ScriptingService scriptingService; + private final ExtensionService extensionService; private final EventRepository eventRepository; private final TicketCategoryRepository ticketCategoryRepository; @@ -95,7 +95,7 @@ private void asyncCall(ExtensionEvent event, int eventId, int organizationId, Ma payloadCopy.put("eventId", eventId); payloadCopy.put("organizationId", organizationId); - scriptingService.executeScriptAsync(event.name(), + extensionService.executeScriptAsync(event.name(), toPath(organizationId, eventId), payload); } @@ -103,7 +103,7 @@ private T syncCall(ExtensionEvent event, int eventId, int organizationId, Ma Map payloadCopy = new HashMap<>(payload); payloadCopy.put("eventId", eventId); payloadCopy.put("organizationId", organizationId); - return scriptingService.executeScriptsForEvent(event.name(), toPath(eventId, organizationId), payload, clazz); + return extensionService.executeScriptsForEvent(event.name(), toPath(eventId, organizationId), payload, clazz); } diff --git a/src/main/java/alfio/model/ScriptSupport.java b/src/main/java/alfio/model/ExtensionSupport.java similarity index 80% rename from src/main/java/alfio/model/ScriptSupport.java rename to src/main/java/alfio/model/ExtensionSupport.java index a46255b94a..6d8f65a6b5 100644 --- a/src/main/java/alfio/model/ScriptSupport.java +++ b/src/main/java/alfio/model/ExtensionSupport.java @@ -20,7 +20,7 @@ import lombok.Getter; @Getter -public class ScriptSupport { +public class ExtensionSupport { private final String path; private final String name; @@ -30,12 +30,12 @@ public class ScriptSupport { private final String script; - public ScriptSupport(@Column("path") String path, - @Column("name") String name, - @Column("hash") String hash, - @Column("enabled") boolean enabled, - @Column("async") boolean async, - @Column("script") String script) { + public ExtensionSupport(@Column("path") String path, + @Column("name") String name, + @Column("hash") String hash, + @Column("enabled") boolean enabled, + @Column("async") boolean async, + @Column("script") String script) { this.path = path; this.name = name; this.hash = hash; diff --git a/src/main/java/alfio/repository/ScriptRepository.java b/src/main/java/alfio/repository/ExtensionRepository.java similarity index 54% rename from src/main/java/alfio/repository/ScriptRepository.java rename to src/main/java/alfio/repository/ExtensionRepository.java index 719f9b6dab..e54756c170 100644 --- a/src/main/java/alfio/repository/ScriptRepository.java +++ b/src/main/java/alfio/repository/ExtensionRepository.java @@ -17,7 +17,7 @@ package alfio.repository; -import alfio.model.ScriptSupport; +import alfio.model.ExtensionSupport; import ch.digitalfondue.npjt.Bind; import ch.digitalfondue.npjt.Query; import ch.digitalfondue.npjt.QueryRepository; @@ -27,9 +27,9 @@ import java.util.Set; @QueryRepository -public interface ScriptRepository { +public interface ExtensionRepository { - @Query("insert into script_support(path, name, hash, enabled, async, script) values " + + @Query("insert into extension_support(path, name, hash, enabled, async, script) values " + " (:path, :name, :hash, :enabled, :async, :script)") int insert(@Bind("path") String path, @Bind("name") String name, @@ -38,39 +38,39 @@ int insert(@Bind("path") String path, @Bind("async") boolean async, @Bind("script") String script); - @Query("update script_support set enabled = :enabled where path = :path and name = :name") + @Query("update extension_support set enabled = :enabled where path = :path and name = :name") int toggle(@Bind("path") String path, @Bind("name") String name, @Bind("enabled") boolean enabled); - @Query("insert into script_event(path_fk, name_fk, event) values " + + @Query("insert into extension_event(path_fk, name_fk, event) values " + " (:path, :name, :event)") int insertEvent(@Bind("path") String path, @Bind("name") String name, @Bind("event") String event); - @Query("select count(*) from script_support where path = :path and name = :name") + @Query("select count(*) from extension_support where path = :path and name = :name") int hasPath(@Bind("path") String path, @Bind("name") String name); - @Query("select script from script_support where path = :path and name = :name") + @Query("select script from extension_support where path = :path and name = :name") String getScript(@Bind("path") String path, @Bind("name") String name); - @Query("select * from script_support where path = :path and name = :name") - Optional getSingle(@Bind("path") String path, @Bind("name") String name); + @Query("select * from extension_support where path = :path and name = :name") + Optional getSingle(@Bind("path") String path, @Bind("name") String name); - @Query("delete from script_event where path_fk = :path and name_fk = :name") + @Query("delete from extension_event where path_fk = :path and name_fk = :name") int deleteEventsForPath(@Bind("path") String path, @Bind("name") String name); - @Query("delete from script_support where path = :path and name = :name") + @Query("delete from extension_support where path = :path and name = :name") int deleteScriptForPath(@Bind("path") String path, @Bind("name") String name); - @Query("select * from script_support order by name, path") - List listAll(); + @Query("select * from extension_support order by name, path") + List listAll(); @Query("select a3.path, a3.name, a3.hash from " + " (select a1.* from " + - " (select path, name, hash from script_support where enabled = true and async = :async and (path in (:possiblePaths))) a1 " + - " left outer join (select path, name from script_support where enabled = true and async = :async and (path in (:possiblePaths))) a2 on " + + " (select path, name, hash from extension_support where enabled = true and async = :async and (path in (:possiblePaths))) a1 " + + " left outer join (select path, name from extension_support where enabled = true and async = :async and (path in (:possiblePaths))) a2 on " + " (a1.name = a2.name) and length(a1.path) < length(a2.path) where a2.path is null) a3 " + " " + - " inner join script_event on path_fk = a3.path and name_fk = a3.name where event = :event order by a3.name, a3.path") - List findActive(@Bind("possiblePaths") Set possiblePaths, - @Bind("async") boolean async, - @Bind("event") String event); + " inner join extension_event on path_fk = a3.path and name_fk = a3.name where event = :event order by a3.name, a3.path") + List findActive(@Bind("possiblePaths") Set possiblePaths, + @Bind("async") boolean async, + @Bind("event") String event); } diff --git a/src/main/resources/alfio/db/HSQLDB/V22_1.14.0__ADD_SCRIPTING.sql b/src/main/resources/alfio/db/HSQLDB/V22_1.14.0__ADD_EXTENSION.sql similarity index 73% rename from src/main/resources/alfio/db/HSQLDB/V22_1.14.0__ADD_SCRIPTING.sql rename to src/main/resources/alfio/db/HSQLDB/V22_1.14.0__ADD_EXTENSION.sql index 5c8ed3830b..78d1f72fcb 100644 --- a/src/main/resources/alfio/db/HSQLDB/V22_1.14.0__ADD_SCRIPTING.sql +++ b/src/main/resources/alfio/db/HSQLDB/V22_1.14.0__ADD_EXTENSION.sql @@ -15,7 +15,7 @@ -- along with alf.io. If not, see . -- -create table script_support ( +create table extension_support ( path varchar(128) not null, name varchar(64) not null, hash varchar(256) not null, @@ -23,13 +23,13 @@ create table script_support ( async boolean not null, script clob not null ); -alter table script_support add constraint "unique_script_support" unique(path, name); +alter table extension_support add constraint "unique_extension_support" unique(path, name); -create table script_event ( +create table extension_event ( path_fk varchar(128) not null, name_fk varchar(64 ) not null, event varchar(128) not null ); -alter table script_event add constraint "unique_script_event" unique(path_fk, name_fk); -alter table script_event add foreign key(path_fk, name_fk) references script_support(path, name); \ No newline at end of file +alter table extension_event add constraint "unique_extension_event" unique(path_fk, name_fk); +alter table extension_event add foreign key(path_fk, name_fk) references extension_support(path, name); \ No newline at end of file diff --git a/src/main/resources/alfio/db/MYSQL/V22_1.14.0__ADD_SCRIPTING.sql b/src/main/resources/alfio/db/MYSQL/V22_1.14.0__ADD_EXTENSION.sql similarity index 73% rename from src/main/resources/alfio/db/MYSQL/V22_1.14.0__ADD_SCRIPTING.sql rename to src/main/resources/alfio/db/MYSQL/V22_1.14.0__ADD_EXTENSION.sql index 8bbdc8adf0..b8b53673a0 100644 --- a/src/main/resources/alfio/db/MYSQL/V22_1.14.0__ADD_SCRIPTING.sql +++ b/src/main/resources/alfio/db/MYSQL/V22_1.14.0__ADD_EXTENSION.sql @@ -15,7 +15,7 @@ -- along with alf.io. If not, see . -- -create table script_support ( +create table extension_support ( path varchar(128) not null, name varchar(64) not null, hash varchar(256) not null, @@ -23,13 +23,13 @@ create table script_support ( async boolean not null, script mediumtext not null ); -alter table script_support add constraint unique_script_support unique(path, name); +alter table extension_support add constraint unique_extension_support unique(path, name); -create table script_event ( +create table extension_event ( path_fk varchar(128) not null, name_fk varchar(64) not null, event varchar(128) not null ); -alter table script_event add constraint unique_script_event unique(path_fk, name_fk); -alter table script_event add foreign key(path_fk, name_fk) references script_support(path, name); \ No newline at end of file +alter table extension_event add constraint unique_extension_event unique(path_fk, name_fk); +alter table extension_event add foreign key(path_fk, name_fk) references extension_support(path, name); \ No newline at end of file diff --git a/src/main/resources/alfio/db/PGSQL/V22_1.14.0__ADD_SCRIPTING.sql b/src/main/resources/alfio/db/PGSQL/V22_1.14.0__ADD_EXTENSION.sql similarity index 73% rename from src/main/resources/alfio/db/PGSQL/V22_1.14.0__ADD_SCRIPTING.sql rename to src/main/resources/alfio/db/PGSQL/V22_1.14.0__ADD_EXTENSION.sql index c7c0b13923..34908f1483 100644 --- a/src/main/resources/alfio/db/PGSQL/V22_1.14.0__ADD_SCRIPTING.sql +++ b/src/main/resources/alfio/db/PGSQL/V22_1.14.0__ADD_EXTENSION.sql @@ -15,7 +15,7 @@ -- along with alf.io. If not, see . -- -create table script_support ( +create table extension_support ( path varchar(128) not null, name varchar(64) not null, hash varchar(256) not null, @@ -23,13 +23,13 @@ create table script_support ( async boolean not null, script text not null ); -alter table script_support add constraint "unique_script_support" unique(path, name); +alter table extension_support add constraint "unique_extension_support" unique(path, name); -create table script_event ( +create table extension_event ( path_fk varchar(128) not null, name_fk varchar(64) not null, event varchar(128) not null ); -alter table script_event add constraint "unique_script_event" unique(path_fk, name_fk); -alter table script_event add foreign key(path_fk, name_fk) references script_support(path, name); \ No newline at end of file +alter table extension_event add constraint "unique_extension_event" unique(path_fk, name_fk); +alter table extension_event add foreign key(path_fk, name_fk) references extension_support(path, name); \ No newline at end of file diff --git a/src/main/resources/alfio/extension/sample.js b/src/main/resources/alfio/extension/sample.js index 7303f34b38..bf7b71a617 100644 --- a/src/main/resources/alfio/extension/sample.js +++ b/src/main/resources/alfio/extension/sample.js @@ -23,8 +23,9 @@ function getScriptMetadata() { function executeScript(scriptEvent) { log.warn('hello from script with event: ' + scriptEvent); //this sample calls the https://csrng.net/ website and generates a random invoice number - var symbol = restTemplate.getForObject('https://csrng.net/csrng/csrng.php?min=0&max=100', Java.type('java.util.ArrayList').class)[0].random; + var randomNumber = restTemplate.getForObject('https://csrng.net/csrng/csrng.php?min=0&max=100', Java.type('java.util.ArrayList').class)[0].random; + log.warn('the invoice number will be ' + randomNumber) return { - invoiceNumber: symbol + invoiceNumber: randomNumber }; } \ No newline at end of file From 75fd9b37efddb57b82855387415785de9422241c Mon Sep 17 00:00:00 2001 From: Sylvain Jermini Date: Fri, 5 Jan 2018 15:36:44 +0100 Subject: [PATCH 19/31] #349 support global script too --- .../api/admin/ExtensionApiController.java | 2 +- .../alfio/extension/ExtensionService.java | 21 ++++++++++++------- .../extension/ScriptingExecutionService.java | 12 ++++------- .../java/alfio/manager/ExtensionManager.java | 2 +- 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/src/main/java/alfio/controller/api/admin/ExtensionApiController.java b/src/main/java/alfio/controller/api/admin/ExtensionApiController.java index 1eb8a50123..334992b3e7 100644 --- a/src/main/java/alfio/controller/api/admin/ExtensionApiController.java +++ b/src/main/java/alfio/controller/api/admin/ExtensionApiController.java @@ -62,7 +62,7 @@ public List listAll(Principal principal) { @RequestMapping(value = "/sample", method = RequestMethod.GET) public ExtensionSupport getSample() { - return new ExtensionSupport("", "", null, true, true, SAMPLE_JS); + return new ExtensionSupport(".", "", null, true, true, SAMPLE_JS); } @RequestMapping(value = "", method = RequestMethod.POST) diff --git a/src/main/java/alfio/extension/ExtensionService.java b/src/main/java/alfio/extension/ExtensionService.java index a3a6ec0fa5..2c7074a335 100644 --- a/src/main/java/alfio/extension/ExtensionService.java +++ b/src/main/java/alfio/extension/ExtensionService.java @@ -106,19 +106,26 @@ public void executeScriptAsync(String event, String basePath, Map getActiveScriptsForEvent(String event, String basePath, boolean async) { // fetch all active scripts // to handle override: - // if there are active two scripts with the same name + // if there are active tree scripts with the same name // with path: - // - org.event - // - org + // - .org.event + // - .org + // - . // the one with the longest path win //generate all the paths + // given ".0.0" it will generate + // ".", ".0", ".0.0" + Set paths = new TreeSet<>(); - String[] splitted = basePath.split("\\."); - for (int i = 0; i < splitted.length; i++) { - paths.add(StringUtils.join(Arrays.copyOfRange(splitted, 0, i + 1), '.')); + int basePathLength = basePath.length(); + for (int i = 1; i < basePathLength; i++) { + if (basePath.charAt(i) == '.') { + paths.add(basePath.substring(0, i)); + } } - + paths.add("."); //handle first and last case + paths.add(basePath); return extensionRepository.findActive(paths, async, event); } diff --git a/src/main/java/alfio/extension/ScriptingExecutionService.java b/src/main/java/alfio/extension/ScriptingExecutionService.java index 7e3ef822e9..032747f6d2 100644 --- a/src/main/java/alfio/extension/ScriptingExecutionService.java +++ b/src/main/java/alfio/extension/ScriptingExecutionService.java @@ -34,16 +34,12 @@ import java.util.function.Supplier; -// // table {path, name, hash, script content, params} -// where path is unique, in our case can be: -// -// /name -// /organization/name -// /organization/event/name -// /organization/event/ticket_category/name +// where (path, name) is unique, in our case can be: // -// for async execution -> for each path make a queue +// . +// .organizationId +// .organizationId.eventId @Service @Log4j2 diff --git a/src/main/java/alfio/manager/ExtensionManager.java b/src/main/java/alfio/manager/ExtensionManager.java index b1531a8935..db3fa9bf8a 100644 --- a/src/main/java/alfio/manager/ExtensionManager.java +++ b/src/main/java/alfio/manager/ExtensionManager.java @@ -108,7 +108,7 @@ private T syncCall(ExtensionEvent event, int eventId, int organizationId, Ma public static String toPath(int organizationId, int eventId) { - return organizationId + "." + eventId; + return "." + organizationId + "." + eventId; } } From a3b04488f78d84689097264ff18ea56c9d75c703 Mon Sep 17 00:00:00 2001 From: Sylvain Jermini Date: Fri, 5 Jan 2018 15:58:14 +0100 Subject: [PATCH 20/31] #349 refactor: deleteReservations -> deleteReservation, add new events for the extensions --- src/main/java/alfio/manager/ExtensionManager.java | 2 ++ .../java/alfio/manager/TicketReservationManager.java | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/alfio/manager/ExtensionManager.java b/src/main/java/alfio/manager/ExtensionManager.java index db3fa9bf8a..2530f2a36a 100644 --- a/src/main/java/alfio/manager/ExtensionManager.java +++ b/src/main/java/alfio/manager/ExtensionManager.java @@ -37,6 +37,8 @@ public class ExtensionManager { public enum ExtensionEvent { RESERVATION_CONFIRMATION, + RESERVATION_CANCELLED, + RESERVATION_EXPIRED, TICKET_ASSIGNMENT, WAITING_QUEUE_SUBSCRIPTION, INVOICE_GENERATION diff --git a/src/main/java/alfio/manager/TicketReservationManager.java b/src/main/java/alfio/manager/TicketReservationManager.java index 478dfeed76..42b7214200 100644 --- a/src/main/java/alfio/manager/TicketReservationManager.java +++ b/src/main/java/alfio/manager/TicketReservationManager.java @@ -926,14 +926,14 @@ private void cancelReservation(String reservationId, boolean expired) { int updatedTickets = ticketRepository.findTicketsInReservation(reservationId).stream().mapToInt(t -> ticketRepository.releaseExpiredTicket(reservationId, event.getId(), t.getId())).sum(); Validate.isTrue(updatedTickets + updatedAS > 0, "no items have been updated"); waitingQueueManager.fireReservationExpired(reservationId); - deleteReservations(reservationIdsToRemove); + deleteReservation(reservationId); auditingRepository.insert(reservationId, null, event.getId(), expired ? Audit.EventType.CANCEL_RESERVATION_EXPIRED : Audit.EventType.CANCEL_RESERVATION, new Date(), Audit.EntityType.RESERVATION, reservationId); } - private void deleteReservations(List reservationIdsToRemove) { + private void deleteReservation(String reservationIdToRemove) { //handle removal of ticket - waitingQueueManager.cleanExpiredReservations(reservationIdsToRemove); - int removedReservation = ticketReservationRepository.remove(reservationIdsToRemove); + waitingQueueManager.cleanExpiredReservations(Collections.singletonList(reservationIdToRemove)); + int removedReservation = ticketReservationRepository.remove(Collections.singletonList(reservationIdToRemove)); Validate.isTrue(removedReservation == 1, "expected exactly one removed reservation, got " + removedReservation); } @@ -1294,7 +1294,7 @@ public void releaseTicket(Event event, TicketReservation ticketReservation, Tick auditingRepository.insert(reservationId, null, event.getId(), Audit.EventType.CANCEL_TICKET, new Date(), Audit.EntityType.TICKET, Integer.toString(ticket.getId())); if(ticketRepository.countTicketsInReservation(reservationId) == 0 && !transactionRepository.loadOptionalByReservationId(reservationId).isPresent()) { - deleteReservations(singletonList(reservationId)); + deleteReservation(reservationId); auditingRepository.insert(reservationId, null, event.getId(), Audit.EventType.CANCEL_RESERVATION, new Date(), Audit.EntityType.RESERVATION, reservationId); } } From 9f906e22fe717a44ff67ad178f4433458d5b356c Mon Sep 17 00:00:00 2001 From: Celestino Bellone Date: Fri, 5 Jan 2018 17:44:47 +0100 Subject: [PATCH 21/31] #349 - UI refinements --- src/main/webapp/resources/css/admin.css | 4 ++ .../add-update/extension-add-update.html | 19 ++++--- .../add-update/extension-add-update.js | 50 ++++++++++++++++--- .../js/admin/feature/extension/extension.html | 10 ++-- .../js/admin/feature/extension/extension.js | 21 ++++++-- 5 files changed, 83 insertions(+), 21 deletions(-) diff --git a/src/main/webapp/resources/css/admin.css b/src/main/webapp/resources/css/admin.css index e2927d2db0..bf27dd19b8 100644 --- a/src/main/webapp/resources/css/admin.css +++ b/src/main/webapp/resources/css/admin.css @@ -632,4 +632,8 @@ only screen and (min-device-pixel-ratio: 1.5) { .stripe-connect.light-blue span:before { background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAC4AAAAwCAYAAABuZUjcAAAKRGlDQ1BJQ0MgUHJvZmlsZQAASA2dlndUFNcXx9/MbC+0XZYiZem9twWkLr1IlSYKy+4CS1nWZRewN0QFIoqICFYkKGLAaCgSK6JYCAgW7AEJIkoMRhEVlczGHPX3Oyf5/U7eH3c+8333nnfn3vvOGQAoASECYQ6sAEC2UCKO9PdmxsUnMPG9AAZEgAM2AHC4uaLQKL9ogK5AXzYzF3WS8V8LAuD1LYBaAK5bBIQzmX/p/+9DkSsSSwCAwtEAOx4/l4tyIcpZ+RKRTJ9EmZ6SKWMYI2MxmiDKqjJO+8Tmf/p8Yk8Z87KFPNRHlrOIl82TcRfKG/OkfJSREJSL8gT8fJRvoKyfJc0WoPwGZXo2n5MLAIYi0yV8bjrK1ihTxNGRbJTnAkCgpH3FKV+xhF+A5gkAO0e0RCxIS5cwjbkmTBtnZxYzgJ+fxZdILMI53EyOmMdk52SLOMIlAHz6ZlkUUJLVlokW2dHG2dHRwtYSLf/n9Y+bn73+GWS9/eTxMuLPnkGMni/al9gvWk4tAKwptDZbvmgpOwFoWw+A6t0vmv4+AOQLAWjt++p7GLJ5SZdIRC5WVvn5+ZYCPtdSVtDP6386fPb8e/jqPEvZeZ9rx/Thp3KkWRKmrKjcnKwcqZiZK+Jw+UyL/x7ifx34VVpf5WEeyU/li/lC9KgYdMoEwjS03UKeQCLIETIFwr/r8L8M+yoHGX6aaxRodR8BPckSKPTRAfJrD8DQyABJ3IPuQJ/7FkKMAbKbF6s99mnuUUb3/7T/YeAy9BXOFaQxZTI7MprJlYrzZIzeCZnBAhKQB3SgBrSAHjAGFsAWOAFX4Al8QRAIA9EgHiwCXJAOsoEY5IPlYA0oAiVgC9gOqsFeUAcaQBM4BtrASXAOXARXwTVwE9wDQ2AUPAOT4DWYgSAID1EhGqQGaUMGkBlkC7Egd8gXCoEioXgoGUqDhJAUWg6tg0qgcqga2g81QN9DJ6Bz0GWoH7oDDUPj0O/QOxiBKTAd1oQNYSuYBXvBwXA0vBBOgxfDS+FCeDNcBdfCR+BW+Bx8Fb4JD8HP4CkEIGSEgeggFggLYSNhSAKSioiRlUgxUonUIk1IB9KNXEeGkAnkLQaHoWGYGAuMKyYAMx/DxSzGrMSUYqoxhzCtmC7MdcwwZhLzEUvFamDNsC7YQGwcNg2bjy3CVmLrsS3YC9ib2FHsaxwOx8AZ4ZxwAbh4XAZuGa4UtxvXjDuL68eN4KbweLwa3gzvhg/Dc/ASfBF+J/4I/gx+AD+Kf0MgE7QJtgQ/QgJBSFhLqCQcJpwmDBDGCDNEBaIB0YUYRuQRlxDLiHXEDmIfcZQ4Q1IkGZHcSNGkDNIaUhWpiXSBdJ/0kkwm65KdyRFkAXk1uYp8lHyJPEx+S1GimFLYlESKlLKZcpBylnKH8pJKpRpSPakJVAl1M7WBep76kPpGjiZnKRcox5NbJVcj1yo3IPdcnihvIO8lv0h+qXyl/HH5PvkJBaKCoQJbgaOwUqFG4YTCoMKUIk3RRjFMMVuxVPGw4mXFJ0p4JUMlXyWeUqHSAaXzSiM0hKZHY9O4tHW0OtoF2igdRzeiB9Iz6CX07+i99EllJWV75RjlAuUa5VPKQwyEYcgIZGQxyhjHGLcY71Q0VbxU+CqbVJpUBlSmVeeoeqryVYtVm1Vvqr5TY6r5qmWqbVVrU3ugjlE3VY9Qz1ffo35BfWIOfY7rHO6c4jnH5tzVgDVMNSI1lmkc0OjRmNLU0vTXFGnu1DyvOaHF0PLUytCq0DqtNa5N03bXFmhXaJ/RfspUZnoxs5hVzC7mpI6GToCOVGe/Tq/OjK6R7nzdtbrNug/0SHosvVS9Cr1OvUl9bf1Q/eX6jfp3DYgGLIN0gx0G3QbThkaGsYYbDNsMnxipGgUaLTVqNLpvTDX2MF5sXGt8wwRnwjLJNNltcs0UNnUwTTetMe0zg80czQRmu836zbHmzuZC81rzQQuKhZdFnkWjxbAlwzLEcq1lm+VzK32rBKutVt1WH60drLOs66zv2SjZBNmstemw+d3W1JZrW2N7w45q52e3yq7d7oW9mT3ffo/9bQeaQ6jDBodOhw+OTo5ixybHcSd9p2SnXU6DLDornFXKuuSMdfZ2XuV80vmti6OLxOWYy2+uFq6Zroddn8w1msufWzd3xE3XjeO2323Ineme7L7PfchDx4PjUevxyFPPk+dZ7znmZeKV4XXE67m3tbfYu8V7mu3CXsE+64P4+PsU+/T6KvnO9632fein65fm1+g36e/gv8z/bAA2IDhga8BgoGYgN7AhcDLIKWhFUFcwJTgquDr4UYhpiDikIxQODQrdFnp/nsE84by2MBAWGLYt7EG4Ufji8B8jcBHhETURjyNtIpdHdkfRopKiDke9jvaOLou+N994vnR+Z4x8TGJMQ8x0rE9seexQnFXcirir8erxgvj2BHxCTEJ9wtQC3wXbF4wmOiQWJd5aaLSwYOHlReqLshadSpJP4iQdT8YmxyYfTn7PCePUcqZSAlN2pUxy2dwd3Gc8T14Fb5zvxi/nj6W6pZanPklzS9uWNp7ukV6ZPiFgC6oFLzICMvZmTGeGZR7MnM2KzWrOJmQnZ58QKgkzhV05WjkFOf0iM1GRaGixy+LtiyfFweL6XCh3YW67hI7+TPVIjaXrpcN57nk1eW/yY/KPFygWCAt6lpgu2bRkbKnf0m+XYZZxl3Uu11m+ZvnwCq8V+1dCK1NWdq7SW1W4anS1/+pDa0hrMtf8tNZ6bfnaV+ti13UUahauLhxZ77++sUiuSFw0uMF1w96NmI2Cjb2b7Dbt3PSxmFd8pcS6pLLkfSm39Mo3Nt9UfTO7OXVzb5lj2Z4tuC3CLbe2emw9VK5YvrR8ZFvottYKZkVxxavtSdsvV9pX7t1B2iHdMVQVUtW+U3/nlp3vq9Orb9Z41zTv0ti1adf0bt7ugT2ee5r2au4t2ftun2Df7f3++1trDWsrD+AO5B14XBdT1/0t69uGevX6kvoPB4UHhw5FHupqcGpoOKxxuKwRbpQ2jh9JPHLtO5/v2pssmvY3M5pLjoKj0qNPv0/+/tax4GOdx1nHm34w+GFXC62luBVqXdI62ZbeNtQe395/IuhEZ4drR8uPlj8ePKlzsuaU8qmy06TThadnzyw9M3VWdHbiXNq5kc6kznvn487f6Iro6r0QfOHSRb+L57u9us9ccrt08rLL5RNXWFfarjpebe1x6Gn5yeGnll7H3tY+p772a87XOvrn9p8e8Bg4d93n+sUbgTeu3px3s//W/Fu3BxMHh27zbj+5k3Xnxd28uzP3Vt/H3i9+oPCg8qHGw9qfTX5uHnIcOjXsM9zzKOrRvRHuyLNfcn95P1r4mPq4ckx7rOGJ7ZOT437j154ueDr6TPRsZqLoV8Vfdz03fv7Db56/9UzGTY6+EL+Y/b30pdrLg6/sX3VOhU89fJ39ema6+I3am0NvWW+738W+G5vJf49/X/XB5EPHx+CP92ezZ2f/AAOY8/wRDtFgAAAHH0lEQVRoBdVZ628UVRS/857dme3strvblpaXCiI+WkCkpFAoECAgr0oqxASjiAZMiF9MiI80/AfqB+WD3/xABOMrKCgRJCBSLCACQUEIEai8ywJ97GNm/J3ZbizM7C7trpG9m7N39t5z7/2dM+eec+5dzrZtVoqFL0XQhLlkgYulpnGOYxxhLjngW7Zsdayk5IB3RyJSSWrcMP1aSQJPJfnwoIA3LFhTy3hrAdx+IzbIOMbsGkQAR3pM1Icdcxv1ZZtxf+D5OGPm3vbJo4/YbW0WLVSswglCLc3F5QtAzyx6ZbbA7Hc5jp8hCAIj4nmecTy2NyRwCqShOEZzWZbFTMtkpmky27Ku2Da36cC2j9vSjIV/b93RsZpmybo5n2htlct6yz6SReFlWZaZIitMURRGz6IkMoEXHPAOFAewnQacSrFkMsUSiTgoEU0kk4vBUzTgHM87GvcE3traKgTjxleyT5mvaTrTdY2pqo9JBNjReBp0v0sFLtI4tA2ClqFtIpPF43EIEdcd4Yr0hSWy23hnIvi2T/PPDwaDLBAIMFVRmSACbMY0XCDSImTCsOOvYDr0hqxUQnGxF9AA4/T2Ks2LXwsD9Iby8nIWNIJMVmTGZwWcAwFW4AWIYmfEycE7mC6OZfHjqviCYZT5gobhaIw24VALjRz6aO9Vsdm9I6eu6XN1mIcC8+ALAO0sS28qvY43iiG0csxydOHanJqm1ZFNk8vLp67hVeHjLfMbvx9ZHY7Fbvco17pi2vlL1youXemKXLh8Y8SV610jelPJIcDLP8QFXJHlELm77BsxPaltW6xx4vgDo2uiN6klZOh9RGNG1VzHz1Ogn6j99LkLcaqLXVzA4acRnIS82k6lTLbjx/aqhgmPvglQMZAMItcXAkVAw4nGjKq9hbroxQVcVeVenuN9//po7zUpQp44ffbZOSvWb48nEhv3fr5pBzhJu6TxP0E/g6iUpavifrt8VUXIuEC27eyrHDVFTtoLiqo2SKK4vem5tQebWl5dwW3ceO+c/4nG712EwUaPIhDmRU5RtMwoY5FwhIXg83VNmyxJ6uamY5ePNbWsXVFc/bpncwFfMnvqN4oi3iRTyfXh+zVO0bUyGmXRykpWXkEC6ONlWdo8c/m6L+atWpXJHt0rF9jiAq7rvpPzGuu/hqlYjjskr5mFKDiRB/Ijtw8FQywaibJKCEBvwOf3L032lf0wbcnqQIEYPYe7gIPrRPPU+kONk8Z/jVAPb38fH0gpiiLA+lgwaDgCRMJhJGf6FFXV3vNcucBGL+Am5ty2dM6UjkWzp3ziU+Vb+TZqpp9yGhLADwFCoXKYTgVD3vPSrBXr6wrE6RruBZyYzoK+nT7psdMb1rS8P+Hxh3bKstiT19X0S4CcGSmDzAzkO9gDHHL5510rF9jg8uMD5juC55jfry5aubBpb+xOz8Fd+3+rO3bqr6ndvX0VA/i8HyEEHT4CeoAl4/GFYHrLm3Fordk0npmNNP8haJeh+7uWzW04+M665R9MmzT+S0kU+jImkq2mJE1RFab6fA9nJixWnUvjmTUoS6K84xfQU0i+piya9fRhjrftfR2/L3M8TobToxYFEScnqehu0QW8ufX1eoGXJPNy6Mju3W2pAVgSeO4AHQLV+SR5pIVES+CQ1+QolPeoqlr0RMsFXJTkpXDbbVxVV/eclW+04wjTDod4HGe907aQuiImOV7RfbXVVdWNeqCMCUpu4ORM4Zl6csg2pC4X8GHRsNbdl6BrBs1MpWbh4DuLrhvoEGzZODVJHA7GPOuLJ5iG0ELAchUcn5mh63/n4hlKnwt4bW11uCvW65x+cLXAkgkQDgMpXDtQRkhAydXRKQnJVTqq5liZTv/V0dDJHCyD6rIZT5mU+15Fgk36/X7n/oQ0beGawQTgtMZxT4UP2a1zt4I6n8bxPlLNU+u+GxS6HMwch43lBZzu+tHpXPaIPDRKWi2gPDKi6sDo2sqjBUxx91CbOWdBN6r+hCqfJu+ezfuXEfCdX7lw+k70nvDmGHwr7KSbRrmA9+POa7v5lgwHA2debJn5KSIvxQBnsXxj7qcfwe4a8bmAD4tWnLp6s7uzN2lWw33kdhkeK/lUpat+3Kg9C2ZMPIzuC6A9HmxDbsJeozndwNesXLCf2mO376gnz3TW4Jph2I3Y7cidnr7ynt54MJky/ZZli8jFTZHnE7Ikdmt+9Ua0wjg/bvSwM0+OHXER0ZV2PqULn4EGBjH8LKzgJH+OZnBpHG3kczuNgF7dUD/2DJ6JBlO6wLwP9OtgBt0vr22a3hrHBHQnQkSXlTWgahBlg+WgIMgHIoEpb6cdTvZ7A3QRRFruBDm+FnXRiyhZ3jY+YCXKLwgI0QNTYkKPt1d5YBBmAaJdver48bx/pWQZ/781wx06nq7kgGc0lu8ElOF74OqSBf4P9hj31KSAw4AAAAAASUVORK5CYII="); } +} + +span.path { + margin-right: 5px; } \ No newline at end of file diff --git a/src/main/webapp/resources/js/admin/feature/extension/add-update/extension-add-update.html b/src/main/webapp/resources/js/admin/feature/extension/add-update/extension-add-update.html index 03be8cd4ca..29312a7003 100644 --- a/src/main/webapp/resources/js/admin/feature/extension/add-update/extension-add-update.html +++ b/src/main/webapp/resources/js/admin/feature/extension/add-update/extension-add-update.html @@ -4,16 +4,23 @@

      {{$ctrl.edit ? 'Update' : 'Add'}} Extension

      -
      +
      - - - + +
      + + / + +
      - +
      @@ -32,6 +39,6 @@

      {{$ctrl.edit ? 'Update' : 'Add'}} Extension

      - +
      diff --git a/src/main/webapp/resources/js/admin/feature/extension/add-update/extension-add-update.js b/src/main/webapp/resources/js/admin/feature/extension/add-update/extension-add-update.js index 7ef381b2ad..ce3e6e4575 100644 --- a/src/main/webapp/resources/js/admin/feature/extension/add-update/extension-add-update.js +++ b/src/main/webapp/resources/js/admin/feature/extension/add-update/extension-add-update.js @@ -2,19 +2,25 @@ 'use strict'; angular.module('adminApplication').component('extensionAddUpdate', { - controller: ['$http', '$q', '$state', ExtensionAddUpdateCtrl], + controller: ['$http', '$q', '$state', 'OrganizationService', 'EventService', ExtensionAddUpdateCtrl], templateUrl: '../resources/js/admin/feature/extension/add-update/extension-add-update.html', bindings: { dismiss:'&', close:'&', toUpdate:'<' } + }).filter('belongsToOrganization', function() { + return function(events, orgId) { + return events.filter(function(ev) { + return ev.organizationId === orgId; + }) + } }); - function ExtensionAddUpdateCtrl($http, $q, $state) { + function ExtensionAddUpdateCtrl($http, $q, $state, OrganizationService, EventService) { var ctrl = this; ctrl.extension = null; - ctrl.extensionLoader = null; + ctrl.dataLoader = null; ctrl.$onInit = function() { ctrl.edit = ctrl.toUpdate; @@ -23,11 +29,39 @@ } else { ctrl.extensionLoader = $http.get('/admin/api/extensions/sample'); } - ctrl.extensionLoader.then(function(res) { - ctrl.extension = res.data; + ctrl.dataLoader = $q.all([ctrl.extensionLoader, OrganizationService.getAllOrganizations(), EventService.getAllEvents()]).then(function(results) { + ctrl.organizations = results[1].data; + ctrl.allEvents = results[2].data; + var extension = results[0].data; + var splitPath = extension.path.split('/').filter(function(x) { return x.length > 0 }); + var path = { + organization: undefined, + event: undefined + }; + if(splitPath.length > 1) { + path.organization = parseInt(splitPath[0]); + if(splitPath.length === 2) { + path.event = parseInt(splitPath[1]); + } + } + ctrl.extension = angular.extend({}, extension, {translatedPath: path}); }); }; + ctrl.updatePath = function() { + if(!ctrl.extension.translatedPath.organization) { + delete ctrl.extension.translatedPath.event; + } + ctrl.extension.path = generatePath(ctrl.extension.translatedPath); + }; + + function generatePath(translated) { + var path = "/"; + if(translated.organization) { + path += translated.organization + (translated.event ? ("/" + translated.event) : ""); + } + return path; + } ctrl.save = function(extension) { $http.post('/admin/api/extensions', { @@ -40,6 +74,10 @@ }); }; + ctrl.cancel = function() { + $state.go('extension.list'); + }; + ctrl.initLoadListener = function() { return function(editor) { var session = editor.getSession(); @@ -55,7 +93,7 @@ } }); - ctrl.extensionLoader.then(function() { + ctrl.dataLoader.then(function() { editor.setValue(ctrl.extension.script, 0); editor.clearSelection(); }); diff --git a/src/main/webapp/resources/js/admin/feature/extension/extension.html b/src/main/webapp/resources/js/admin/feature/extension/extension.html index f103175a13..01c160ee40 100644 --- a/src/main/webapp/resources/js/admin/feature/extension/extension.html +++ b/src/main/webapp/resources/js/admin/feature/extension/extension.html @@ -14,13 +14,15 @@

      Extension

      - + no extensions have been found. - - {{ext.path}} + + + System> {{path}} + {{ext.name}} - {{ext.enabled}} + edit diff --git a/src/main/webapp/resources/js/admin/feature/extension/extension.js b/src/main/webapp/resources/js/admin/feature/extension/extension.js index a437f5286b..56248bd0f3 100644 --- a/src/main/webapp/resources/js/admin/feature/extension/extension.js +++ b/src/main/webapp/resources/js/admin/feature/extension/extension.js @@ -2,11 +2,11 @@ 'use strict'; angular.module('adminApplication').component('extension', { - controller: ['$http', ExtensionCtrl], + controller: ['$http', '$q', 'OrganizationService', ExtensionCtrl], templateUrl: '../resources/js/admin/feature/extension/extension.html' }); - function ExtensionCtrl($http) { + function ExtensionCtrl($http, $q, OrganizationService) { var ctrl = this; this.$onInit = function() { @@ -17,9 +17,20 @@ function load() { - $http.get('/admin/api/extensions').then(function(res) { - ctrl.scripts = res.data; - }) + $q.all([$http.get('/admin/api/extensions'), OrganizationService.getAllOrganizations()]).then(function(results) { + var organizations = results[1].data; + ctrl.extensions = results[0].data.map(function(ext) { + var splitPath = ext.path.split('/').filter(function(x) { return x.length > 0 }); + var translatedPath = splitPath; + if(splitPath.length > 1) { + var org = organizations.filter(function(o) { return o.id === parseInt(splitPath[0])}); + if(org.length > 0) { + translatedPath.splice(0, 1, org[0].name); + } + } + return angular.extend({}, ext, {translatedPath: translatedPath}) + }); + }); } function deleteExtension(extension) { From ffdcff04d91721ccac6d8ca865935e0772a3cc36 Mon Sep 17 00:00:00 2001 From: Celestino Bellone Date: Fri, 5 Jan 2018 17:52:45 +0100 Subject: [PATCH 22/31] #349 - UI refinements --- .../feature/extension/add-update/extension-add-update.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/resources/js/admin/feature/extension/add-update/extension-add-update.js b/src/main/webapp/resources/js/admin/feature/extension/add-update/extension-add-update.js index ce3e6e4575..f9ed3d9d2f 100644 --- a/src/main/webapp/resources/js/admin/feature/extension/add-update/extension-add-update.js +++ b/src/main/webapp/resources/js/admin/feature/extension/add-update/extension-add-update.js @@ -33,7 +33,7 @@ ctrl.organizations = results[1].data; ctrl.allEvents = results[2].data; var extension = results[0].data; - var splitPath = extension.path.split('/').filter(function(x) { return x.length > 0 }); + var splitPath = extension.path.split('\\.').filter(function(x) { return x.length > 0 }); var path = { organization: undefined, event: undefined @@ -56,9 +56,9 @@ }; function generatePath(translated) { - var path = "/"; + var path = "."; if(translated.organization) { - path += translated.organization + (translated.event ? ("/" + translated.event) : ""); + path += translated.organization + (translated.event ? ("." + translated.event) : ""); } return path; } From 8fe25e432695947db9e2d7c00828eea7a4019531 Mon Sep 17 00:00:00 2001 From: Celestino Bellone Date: Fri, 5 Jan 2018 17:53:53 +0100 Subject: [PATCH 23/31] #349 - UI refinements --- .../webapp/resources/js/admin/feature/extension/extension.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/resources/js/admin/feature/extension/extension.js b/src/main/webapp/resources/js/admin/feature/extension/extension.js index 56248bd0f3..d29b3020b8 100644 --- a/src/main/webapp/resources/js/admin/feature/extension/extension.js +++ b/src/main/webapp/resources/js/admin/feature/extension/extension.js @@ -20,7 +20,7 @@ $q.all([$http.get('/admin/api/extensions'), OrganizationService.getAllOrganizations()]).then(function(results) { var organizations = results[1].data; ctrl.extensions = results[0].data.map(function(ext) { - var splitPath = ext.path.split('/').filter(function(x) { return x.length > 0 }); + var splitPath = ext.path.split('\\.').filter(function(x) { return x.length > 0 }); var translatedPath = splitPath; if(splitPath.length > 1) { var org = organizations.filter(function(o) { return o.id === parseInt(splitPath[0])}); From f58811ff5ffbd84ec54903213cf27aa1be6003ca Mon Sep 17 00:00:00 2001 From: Celestino Bellone Date: Fri, 5 Jan 2018 17:55:31 +0100 Subject: [PATCH 24/31] #349 - split --- .../admin/feature/extension/add-update/extension-add-update.js | 2 +- .../webapp/resources/js/admin/feature/extension/extension.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/resources/js/admin/feature/extension/add-update/extension-add-update.js b/src/main/webapp/resources/js/admin/feature/extension/add-update/extension-add-update.js index f9ed3d9d2f..adcf62c789 100644 --- a/src/main/webapp/resources/js/admin/feature/extension/add-update/extension-add-update.js +++ b/src/main/webapp/resources/js/admin/feature/extension/add-update/extension-add-update.js @@ -33,7 +33,7 @@ ctrl.organizations = results[1].data; ctrl.allEvents = results[2].data; var extension = results[0].data; - var splitPath = extension.path.split('\\.').filter(function(x) { return x.length > 0 }); + var splitPath = extension.path.split('.').filter(function(x) { return x.length > 0 }); var path = { organization: undefined, event: undefined diff --git a/src/main/webapp/resources/js/admin/feature/extension/extension.js b/src/main/webapp/resources/js/admin/feature/extension/extension.js index d29b3020b8..dbda19e616 100644 --- a/src/main/webapp/resources/js/admin/feature/extension/extension.js +++ b/src/main/webapp/resources/js/admin/feature/extension/extension.js @@ -20,7 +20,7 @@ $q.all([$http.get('/admin/api/extensions'), OrganizationService.getAllOrganizations()]).then(function(results) { var organizations = results[1].data; ctrl.extensions = results[0].data.map(function(ext) { - var splitPath = ext.path.split('\\.').filter(function(x) { return x.length > 0 }); + var splitPath = ext.path.split('.').filter(function(x) { return x.length > 0 }); var translatedPath = splitPath; if(splitPath.length > 1) { var org = organizations.filter(function(o) { return o.id === parseInt(splitPath[0])}); From 20b62c9ee24bc8e1904f95f96931e48bda6e8799 Mon Sep 17 00:00:00 2001 From: Sylvain Jermini Date: Fri, 5 Jan 2018 19:41:33 +0100 Subject: [PATCH 25/31] #349 fix ui --- .../add-update/extension-add-update.html | 2 +- .../add-update/extension-add-update.js | 13 +++++++++--- .../js/admin/feature/extension/extension.js | 20 ++++++++++++++----- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/src/main/webapp/resources/js/admin/feature/extension/add-update/extension-add-update.html b/src/main/webapp/resources/js/admin/feature/extension/add-update/extension-add-update.html index 29312a7003..945a6454ae 100644 --- a/src/main/webapp/resources/js/admin/feature/extension/add-update/extension-add-update.html +++ b/src/main/webapp/resources/js/admin/feature/extension/add-update/extension-add-update.html @@ -12,7 +12,7 @@

      {{$ctrl.edit ? 'Update' : 'Add'}} Extension

      / - diff --git a/src/main/webapp/resources/js/admin/feature/extension/add-update/extension-add-update.js b/src/main/webapp/resources/js/admin/feature/extension/add-update/extension-add-update.js index adcf62c789..5e4ee2e570 100644 --- a/src/main/webapp/resources/js/admin/feature/extension/add-update/extension-add-update.js +++ b/src/main/webapp/resources/js/admin/feature/extension/add-update/extension-add-update.js @@ -49,7 +49,14 @@ }; ctrl.updatePath = function() { - if(!ctrl.extension.translatedPath.organization) { + if(ctrl.extension.translatedPath.organization === undefined) { + delete ctrl.extension.translatedPath.event; + } + if(ctrl.extension.translatedPath.organization === null) { + delete ctrl.extension.translatedPath.organization; + delete ctrl.extension.translatedPath.event; + } + if(ctrl.extension.translatedPath.event === null) { delete ctrl.extension.translatedPath.event; } ctrl.extension.path = generatePath(ctrl.extension.translatedPath); @@ -57,8 +64,8 @@ function generatePath(translated) { var path = "."; - if(translated.organization) { - path += translated.organization + (translated.event ? ("." + translated.event) : ""); + if(translated.organization !== undefined) { + path += translated.organization + (translated.event !== undefined ? ("." + translated.event) : ""); } return path; } diff --git a/src/main/webapp/resources/js/admin/feature/extension/extension.js b/src/main/webapp/resources/js/admin/feature/extension/extension.js index dbda19e616..fdafa01230 100644 --- a/src/main/webapp/resources/js/admin/feature/extension/extension.js +++ b/src/main/webapp/resources/js/admin/feature/extension/extension.js @@ -2,11 +2,11 @@ 'use strict'; angular.module('adminApplication').component('extension', { - controller: ['$http', '$q', 'OrganizationService', ExtensionCtrl], + controller: ['$http', '$q', 'OrganizationService', 'EventService', ExtensionCtrl], templateUrl: '../resources/js/admin/feature/extension/extension.html' }); - function ExtensionCtrl($http, $q, OrganizationService) { + function ExtensionCtrl($http, $q, OrganizationService, EventService) { var ctrl = this; this.$onInit = function() { @@ -17,17 +17,27 @@ function load() { - $q.all([$http.get('/admin/api/extensions'), OrganizationService.getAllOrganizations()]).then(function(results) { + $q.all([$http.get('/admin/api/extensions'), OrganizationService.getAllOrganizations(), EventService.getAllEvents()]).then(function(results) { var organizations = results[1].data; + var events = results[2].data; ctrl.extensions = results[0].data.map(function(ext) { var splitPath = ext.path.split('.').filter(function(x) { return x.length > 0 }); var translatedPath = splitPath; - if(splitPath.length > 1) { + if(splitPath.length >= 1) { var org = organizations.filter(function(o) { return o.id === parseInt(splitPath[0])}); - if(org.length > 0) { + if (org.length > 0) { translatedPath.splice(0, 1, org[0].name); } } + + if(splitPath.length >=2) { + var service = events.filter(function(e) {return e.id === parseInt(splitPath[1])}) + if (service.length>0) { + translatedPath.splice(1,1, service[0].shortName); + } + } + + return angular.extend({}, ext, {translatedPath: translatedPath}) }); }); From 18a9af8592947958cdb653c82acd46ecc4af05ee Mon Sep 17 00:00:00 2001 From: Sylvain Jermini Date: Fri, 5 Jan 2018 20:21:49 +0100 Subject: [PATCH 26/31] #349 switch from . to - as a path separator, handle correctly update, fix ui --- .../api/admin/ExtensionApiController.java | 20 ++++++++++------ .../alfio/extension/ExtensionService.java | 8 +++---- .../java/alfio/manager/ExtensionManager.java | 2 +- .../add-update/extension-add-update.js | 24 ++++++++++++++----- .../js/admin/feature/extension/extension.js | 4 ++-- 5 files changed, 38 insertions(+), 20 deletions(-) diff --git a/src/main/java/alfio/controller/api/admin/ExtensionApiController.java b/src/main/java/alfio/controller/api/admin/ExtensionApiController.java index 334992b3e7..4e536c13fa 100644 --- a/src/main/java/alfio/controller/api/admin/ExtensionApiController.java +++ b/src/main/java/alfio/controller/api/admin/ExtensionApiController.java @@ -62,24 +62,30 @@ public List listAll(Principal principal) { @RequestMapping(value = "/sample", method = RequestMethod.GET) public ExtensionSupport getSample() { - return new ExtensionSupport(".", "", null, true, true, SAMPLE_JS); + return new ExtensionSupport("-", "", null, true, true, SAMPLE_JS); } @RequestMapping(value = "", method = RequestMethod.POST) - public void createOrUpdate(@RequestBody Extension script, Principal principal) { + public void create(@RequestBody Extension script, Principal principal) { ensureAdmin(principal); - extensionService.createOrUpdate(script); + extensionService.createOrUpdate(null, null, script); } - @RequestMapping(value = "/{name}", method = RequestMethod.GET) - public ResponseEntity loadSingle(@RequestParam("path") String path, @PathVariable("name") String name, Principal principal) throws UnsupportedEncodingException { + @RequestMapping(value = "{path}/{name}", method = RequestMethod.POST) + public void update(@PathVariable("path") String path, @PathVariable("name") String name, @RequestBody Extension script, Principal principal) { + ensureAdmin(principal); + extensionService.createOrUpdate(path, name, script); + } + + @RequestMapping(value = "{path}/{name}", method = RequestMethod.GET) + public ResponseEntity loadSingle(@PathVariable("path") String path, @PathVariable("name") String name, Principal principal) throws UnsupportedEncodingException { ensureAdmin(principal); return extensionService.getSingle(URLDecoder.decode(path, "UTF-8"), name).map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.notFound().build()); } - @RequestMapping(value = "/{name}", method = RequestMethod.DELETE) - public void delete(@RequestParam("path") String path, @PathVariable("name") String name, Principal principal) { + @RequestMapping(value = "{path}/{name}", method = RequestMethod.DELETE) + public void delete(@PathVariable("path") String path, @PathVariable("name") String name, Principal principal) { ensureAdmin(principal); extensionService.delete(path, name); } diff --git a/src/main/java/alfio/extension/ExtensionService.java b/src/main/java/alfio/extension/ExtensionService.java index 2c7074a335..0f1e5c5908 100644 --- a/src/main/java/alfio/extension/ExtensionService.java +++ b/src/main/java/alfio/extension/ExtensionService.java @@ -39,7 +39,7 @@ public class ExtensionService { private final ExtensionRepository extensionRepository; @Transactional - public void createOrUpdate(Extension script) { + public void createOrUpdate(String previousPath, String previousName, Extension script) { String hash = DigestUtils.sha256Hex(script.getScript()); ExtensionMetadata extensionMetadata = ScriptingExecutionService.executeScript( script.getName(), @@ -47,9 +47,9 @@ public void createOrUpdate(Extension script) { Collections.emptyMap(), ExtensionMetadata.class); - if (extensionRepository.hasPath(script.getPath(), script.getName()) > 0) { - extensionRepository.deleteEventsForPath(script.getPath(), script.getName()); - extensionRepository.deleteScriptForPath(script.getPath(), script.getName()); + if (previousPath != null && previousName != null && extensionRepository.hasPath(previousPath, previousName) > 0) { + extensionRepository.deleteEventsForPath(previousPath, previousName); + extensionRepository.deleteScriptForPath(previousPath, previousName); } extensionRepository.insert(script.getPath(), script.getName(), hash, script.isEnabled(), extensionMetadata.async, script.getScript()); diff --git a/src/main/java/alfio/manager/ExtensionManager.java b/src/main/java/alfio/manager/ExtensionManager.java index 2530f2a36a..a6e555994f 100644 --- a/src/main/java/alfio/manager/ExtensionManager.java +++ b/src/main/java/alfio/manager/ExtensionManager.java @@ -110,7 +110,7 @@ private T syncCall(ExtensionEvent event, int eventId, int organizationId, Ma public static String toPath(int organizationId, int eventId) { - return "." + organizationId + "." + eventId; + return "-" + organizationId + "-" + eventId; } } diff --git a/src/main/webapp/resources/js/admin/feature/extension/add-update/extension-add-update.js b/src/main/webapp/resources/js/admin/feature/extension/add-update/extension-add-update.js index 5e4ee2e570..ddabbf2b24 100644 --- a/src/main/webapp/resources/js/admin/feature/extension/add-update/extension-add-update.js +++ b/src/main/webapp/resources/js/admin/feature/extension/add-update/extension-add-update.js @@ -25,7 +25,7 @@ ctrl.$onInit = function() { ctrl.edit = ctrl.toUpdate; if(ctrl.toUpdate) { - ctrl.extensionLoader = $http.get('/admin/api/extensions/' + ctrl.toUpdate.name, {params: {path: ctrl.toUpdate.path}}); + ctrl.extensionLoader = $http.get('/admin/api/extensions/' + encodeURIComponent(ctrl.toUpdate.path) + '/' + encodeURIComponent(ctrl.toUpdate.name)); } else { ctrl.extensionLoader = $http.get('/admin/api/extensions/sample'); } @@ -33,18 +33,27 @@ ctrl.organizations = results[1].data; ctrl.allEvents = results[2].data; var extension = results[0].data; - var splitPath = extension.path.split('.').filter(function(x) { return x.length > 0 }); + var splitPath = extension.path.split('-').filter(function(x) { return x.length > 0 }); var path = { organization: undefined, event: undefined }; - if(splitPath.length > 1) { + if(splitPath.length >= 1) { path.organization = parseInt(splitPath[0]); if(splitPath.length === 2) { path.event = parseInt(splitPath[1]); } } + + console.log(path); + ctrl.extension = angular.extend({}, extension, {translatedPath: path}); + + if(ctrl.toUpdate) { + ctrl.previousPath = extension.path; + ctrl.previousName = extension.name; + } + }); }; @@ -63,15 +72,18 @@ }; function generatePath(translated) { - var path = "."; + var path = "-"; if(translated.organization !== undefined) { - path += translated.organization + (translated.event !== undefined ? ("." + translated.event) : ""); + path += translated.organization + (translated.event !== undefined ? ("-" + translated.event) : ""); } return path; } ctrl.save = function(extension) { - $http.post('/admin/api/extensions', { + + var url = ctrl.toUpdate ? ('/admin/api/extensions/'+encodeURIComponent(ctrl.previousPath)+'/'+encodeURIComponent(ctrl.previousName)) : '/admin/api/extensions'; + + $http.post(url, { path: extension.path, name: extension.name, enabled: extension.enabled, diff --git a/src/main/webapp/resources/js/admin/feature/extension/extension.js b/src/main/webapp/resources/js/admin/feature/extension/extension.js index fdafa01230..3085dc2bd6 100644 --- a/src/main/webapp/resources/js/admin/feature/extension/extension.js +++ b/src/main/webapp/resources/js/admin/feature/extension/extension.js @@ -21,7 +21,7 @@ var organizations = results[1].data; var events = results[2].data; ctrl.extensions = results[0].data.map(function(ext) { - var splitPath = ext.path.split('.').filter(function(x) { return x.length > 0 }); + var splitPath = ext.path.split('-').filter(function(x) { return x.length > 0 }); var translatedPath = splitPath; if(splitPath.length >= 1) { var org = organizations.filter(function(o) { return o.id === parseInt(splitPath[0])}); @@ -45,7 +45,7 @@ function deleteExtension(extension) { if(window.confirm('Delete ' + extension.name+'?')) { - $http.delete('/admin/api/extensions/'+ extension.name, {params: {path: extension.path}}).then(function () { + $http.delete('/admin/api/extensions/'+ encodeURIComponent(extension.path) + '/' + encodeURIComponent(extension.name)).then(function () { load(); }); } From 9088ddd943cd63c86543b2ff7f92c5f0d96fbef2 Mon Sep 17 00:00:00 2001 From: Sylvain Jermini Date: Sat, 6 Jan 2018 16:54:15 +0100 Subject: [PATCH 27/31] #349 wire up RESERVATION_EXPIRED and RESERVATION_CANCELLED events --- .../java/alfio/manager/ExtensionManager.java | 23 +++++++++++-- .../manager/TicketReservationManager.java | 29 ++++++++++++++--- .../alfio/model/ReservationIdAndEventId.java | 32 +++++++++++++++++++ .../TicketReservationRepository.java | 11 ++++--- .../manager/TicketReservationManagerTest.java | 1 + 5 files changed, 85 insertions(+), 11 deletions(-) create mode 100644 src/main/java/alfio/model/ReservationIdAndEventId.java diff --git a/src/main/java/alfio/manager/ExtensionManager.java b/src/main/java/alfio/manager/ExtensionManager.java index a6e555994f..d0642bd158 100644 --- a/src/main/java/alfio/manager/ExtensionManager.java +++ b/src/main/java/alfio/manager/ExtensionManager.java @@ -20,8 +20,8 @@ import alfio.model.*; import alfio.model.extension.InvoiceGeneration; import alfio.repository.EventRepository; -import alfio.repository.TicketCategoryRepository; import alfio.extension.ExtensionService; +import alfio.repository.TicketReservationRepository; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; @@ -33,7 +33,7 @@ public class ExtensionManager { private final ExtensionService extensionService; private final EventRepository eventRepository; - private final TicketCategoryRepository ticketCategoryRepository; + private final TicketReservationRepository ticketReservationRepository; public enum ExtensionEvent { RESERVATION_CONFIRMATION, @@ -73,6 +73,25 @@ public void handleWaitingQueueSubscription(WaitingQueueSubscription waitingQueue Collections.singletonMap("waitingQueueSubscription", waitingQueueSubscription)); } + public void handleReservationsExpiredForEvent(Event event, Collection reservationIdsToRemove) { + handleReservationRemoval(event, reservationIdsToRemove, ExtensionEvent.RESERVATION_EXPIRED); + } + + public void handleReservationsCancelledForEvent(Event event, Collection reservationIdsToRemove) { + handleReservationRemoval(event, reservationIdsToRemove, ExtensionEvent.RESERVATION_CANCELLED); + } + + private void handleReservationRemoval(Event event, Collection reservationIds, ExtensionEvent extensionEvent) { + int organizationId = event.getOrganizationId(); + int eventId = event.getId(); + + Map payload = new HashMap<>(); + payload.put("event", event); + payload.put("reservationIds", reservationIds); + + syncCall(extensionEvent, eventId, organizationId, payload, Boolean.class); + } + public Optional handleInvoiceGeneration(Event event, String reservationId, String email, CustomerName customerName, Locale userLanguage, String billingAddress, TotalPrice reservationCost, boolean invoiceRequested, String vatCountryCode, String vatNr, PriceContainer.VatStatus vatStatus) { diff --git a/src/main/java/alfio/manager/TicketReservationManager.java b/src/main/java/alfio/manager/TicketReservationManager.java index 42b7214200..b40a3bad68 100644 --- a/src/main/java/alfio/manager/TicketReservationManager.java +++ b/src/main/java/alfio/manager/TicketReservationManager.java @@ -702,6 +702,17 @@ void cleanupExpiredReservations(Date expirationDate) { ticketFieldRepository.deleteAllValuesForReservations(expiredReservationIds); ticketRepository.freeFromReservation(expiredReservationIds); waitingQueueManager.cleanExpiredReservations(expiredReservationIds); + + // + Map> reservationIdsByEvent = ticketReservationRepository + .getReservationIdAndEventId(expiredReservationIds) + .stream() + .collect(Collectors.groupingBy(ReservationIdAndEventId::getEventId)); + reservationIdsByEvent.forEach((eventId, reservations) -> { + Event event = eventRepository.findById(eventId); + extensionManager.handleReservationsExpiredForEvent(event, reservations.stream().map(ReservationIdAndEventId::getId).collect(Collectors.toList())); + }); + // ticketReservationRepository.remove(expiredReservationIds); } @@ -926,14 +937,22 @@ private void cancelReservation(String reservationId, boolean expired) { int updatedTickets = ticketRepository.findTicketsInReservation(reservationId).stream().mapToInt(t -> ticketRepository.releaseExpiredTicket(reservationId, event.getId(), t.getId())).sum(); Validate.isTrue(updatedTickets + updatedAS > 0, "no items have been updated"); waitingQueueManager.fireReservationExpired(reservationId); - deleteReservation(reservationId); + deleteReservation(event, reservationId, expired); auditingRepository.insert(reservationId, null, event.getId(), expired ? Audit.EventType.CANCEL_RESERVATION_EXPIRED : Audit.EventType.CANCEL_RESERVATION, new Date(), Audit.EntityType.RESERVATION, reservationId); } - private void deleteReservation(String reservationIdToRemove) { + private void deleteReservation(Event event, String reservationIdToRemove, boolean expired) { //handle removal of ticket - waitingQueueManager.cleanExpiredReservations(Collections.singletonList(reservationIdToRemove)); - int removedReservation = ticketReservationRepository.remove(Collections.singletonList(reservationIdToRemove)); + List wrappedReservationIdToRemove = Collections.singletonList(reservationIdToRemove); + waitingQueueManager.cleanExpiredReservations(wrappedReservationIdToRemove); + // + if(expired) { + extensionManager.handleReservationsExpiredForEvent(event, wrappedReservationIdToRemove); + } else { + extensionManager.handleReservationsCancelledForEvent(event, wrappedReservationIdToRemove); + } + // + int removedReservation = ticketReservationRepository.remove(wrappedReservationIdToRemove); Validate.isTrue(removedReservation == 1, "expected exactly one removed reservation, got " + removedReservation); } @@ -1294,7 +1313,7 @@ public void releaseTicket(Event event, TicketReservation ticketReservation, Tick auditingRepository.insert(reservationId, null, event.getId(), Audit.EventType.CANCEL_TICKET, new Date(), Audit.EntityType.TICKET, Integer.toString(ticket.getId())); if(ticketRepository.countTicketsInReservation(reservationId) == 0 && !transactionRepository.loadOptionalByReservationId(reservationId).isPresent()) { - deleteReservation(reservationId); + deleteReservation(event, reservationId, false); auditingRepository.insert(reservationId, null, event.getId(), Audit.EventType.CANCEL_RESERVATION, new Date(), Audit.EntityType.RESERVATION, reservationId); } } diff --git a/src/main/java/alfio/model/ReservationIdAndEventId.java b/src/main/java/alfio/model/ReservationIdAndEventId.java new file mode 100644 index 0000000000..c0389d0738 --- /dev/null +++ b/src/main/java/alfio/model/ReservationIdAndEventId.java @@ -0,0 +1,32 @@ +/** + * This file is part of alf.io. + * + * alf.io is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * alf.io is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with alf.io. If not, see . + */ +package alfio.model; + +import ch.digitalfondue.npjt.ConstructorAnnotationRowMapper.Column; +import lombok.Getter; + +@Getter +public class ReservationIdAndEventId { + private final String id; + private final int eventId; + + public ReservationIdAndEventId(@Column("id") String id, + @Column("event_id_fk") int eventId) { + this.id = id; + this.eventId = eventId; + } +} diff --git a/src/main/java/alfio/repository/TicketReservationRepository.java b/src/main/java/alfio/repository/TicketReservationRepository.java index c05128d67c..6daad5ce25 100644 --- a/src/main/java/alfio/repository/TicketReservationRepository.java +++ b/src/main/java/alfio/repository/TicketReservationRepository.java @@ -16,14 +16,12 @@ */ package alfio.repository; -import alfio.model.PriceContainer; -import alfio.model.TicketReservation; -import alfio.model.TicketReservationInfo; -import alfio.model.TicketSoldStatistic; +import alfio.model.*; import ch.digitalfondue.npjt.*; import java.math.BigDecimal; import java.time.ZonedDateTime; +import java.util.Collection; import java.util.Date; import java.util.List; import java.util.Optional; @@ -168,4 +166,9 @@ int updateBillingData(@Bind("vatStatus") PriceContainer.VatStatus vatStatus, "confirmation_ts >= :from and " + "confirmation_ts <= :to group by day order by day asc", db = "MYSQL")}) List getSoldStatistic(@Bind("eventId") int eventId, @Bind("from") Date from, @Bind("to") Date to); + + + + @Query("select id, event_id_fk from tickets_reservation where id in (:ids)") + List getReservationIdAndEventId(@Bind("ids") Collection ids); } diff --git a/src/test/java/alfio/manager/TicketReservationManagerTest.java b/src/test/java/alfio/manager/TicketReservationManagerTest.java index 0e4daed55a..c4565c07e3 100644 --- a/src/test/java/alfio/manager/TicketReservationManagerTest.java +++ b/src/test/java/alfio/manager/TicketReservationManagerTest.java @@ -586,6 +586,7 @@ public void cancelExpiredReservations() throws Exception { verify(ticketRepository).freeFromReservation(eq(reservationIds)); verify(ticketReservationRepository).remove(eq(reservationIds)); verify(waitingQueueManager).cleanExpiredReservations(eq(reservationIds)); + verify(ticketReservationRepository).getReservationIdAndEventId(eq(reservationIds)); verifyNoMoreInteractions(ticketReservationRepository, specialPriceRepository, ticketRepository); } From ba05cc71ed74f7e5348eef6d64e50213799850cd Mon Sep 17 00:00:00 2001 From: Celestino Bellone Date: Sat, 6 Jan 2018 22:14:46 +0100 Subject: [PATCH 28/31] #349 - display event name --- .../webapp/resources/js/admin/feature/extension/extension.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/resources/js/admin/feature/extension/extension.js b/src/main/webapp/resources/js/admin/feature/extension/extension.js index 3085dc2bd6..2626d72d5c 100644 --- a/src/main/webapp/resources/js/admin/feature/extension/extension.js +++ b/src/main/webapp/resources/js/admin/feature/extension/extension.js @@ -31,9 +31,9 @@ } if(splitPath.length >=2) { - var service = events.filter(function(e) {return e.id === parseInt(splitPath[1])}) + var service = events.filter(function(e) {return e.id === parseInt(splitPath[1])}); if (service.length>0) { - translatedPath.splice(1,1, service[0].shortName); + translatedPath.splice(1,1, service[0].displayName); } } From 663ecc919c555f7bceec49eb6f0f7fbe8da18d2a Mon Sep 17 00:00:00 2001 From: Celestino Bellone Date: Sun, 7 Jan 2018 19:10:20 +0100 Subject: [PATCH 29/31] #349 - rename events --- src/main/java/alfio/manager/ExtensionManager.java | 14 +++++++------- src/main/resources/alfio/extension/sample.js | 6 ++++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/main/java/alfio/manager/ExtensionManager.java b/src/main/java/alfio/manager/ExtensionManager.java index d0642bd158..3c9efca6dd 100644 --- a/src/main/java/alfio/manager/ExtensionManager.java +++ b/src/main/java/alfio/manager/ExtensionManager.java @@ -17,10 +17,10 @@ package alfio.manager; +import alfio.extension.ExtensionService; import alfio.model.*; import alfio.model.extension.InvoiceGeneration; import alfio.repository.EventRepository; -import alfio.extension.ExtensionService; import alfio.repository.TicketReservationRepository; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; @@ -36,11 +36,11 @@ public class ExtensionManager { private final TicketReservationRepository ticketReservationRepository; public enum ExtensionEvent { - RESERVATION_CONFIRMATION, + RESERVATION_CONFIRMED, RESERVATION_CANCELLED, RESERVATION_EXPIRED, - TICKET_ASSIGNMENT, - WAITING_QUEUE_SUBSCRIPTION, + TICKET_ASSIGNED, + WAITING_QUEUE_SUBSCRIBED, INVOICE_GENERATION } @@ -48,7 +48,7 @@ public enum ExtensionEvent { public void handleReservationConfirmation(TicketReservation reservation, int eventId) { int organizationId = eventRepository.findOrganizationIdByEventId(eventId); - asyncCall(ExtensionEvent.RESERVATION_CONFIRMATION, + asyncCall(ExtensionEvent.RESERVATION_CONFIRMED, eventId, organizationId, Collections.singletonMap("reservation", reservation)); @@ -58,7 +58,7 @@ public void handleTicketAssignment(Ticket ticket) { int eventId = ticket.getEventId(); int organizationId = eventRepository.findOrganizationIdByEventId(eventId); - asyncCall(ExtensionEvent.TICKET_ASSIGNMENT, + asyncCall(ExtensionEvent.TICKET_ASSIGNED, eventId, organizationId, Collections.singletonMap("ticket", ticket)); @@ -67,7 +67,7 @@ public void handleTicketAssignment(Ticket ticket) { public void handleWaitingQueueSubscription(WaitingQueueSubscription waitingQueueSubscription) { int organizationId = eventRepository.findOrganizationIdByEventId(waitingQueueSubscription.getEventId()); - asyncCall(ExtensionEvent.WAITING_QUEUE_SUBSCRIPTION, + asyncCall(ExtensionEvent.WAITING_QUEUE_SUBSCRIBED, waitingQueueSubscription.getEventId(), organizationId, Collections.singletonMap("waitingQueueSubscription", waitingQueueSubscription)); diff --git a/src/main/resources/alfio/extension/sample.js b/src/main/resources/alfio/extension/sample.js index bf7b71a617..03a6961494 100644 --- a/src/main/resources/alfio/extension/sample.js +++ b/src/main/resources/alfio/extension/sample.js @@ -7,8 +7,10 @@ function getScriptMetadata() { async: false, events: [ //supported values: - //'RESERVATION_CONFIRMATION', //fired on reservation confirmation. No results expected. - //'TICKET_ASSIGNMENT', //fired on ticket assignment. No results expected. + //'RESERVATION_CONFIRMED', //fired on reservation confirmation. No results expected. + //'RESERVATION_EXPIRED', //fired when reservation(s) expired + //'RESERVATION_CANCELLED', //fired when reservation(s) are cancelled + //'TICKET_ASSIGNED', //fired on ticket assignment. No results expected. //'WAITING_QUEUE_SUBSCRIPTION', //fired on waiting queue subscription. No results expected. 'INVOICE_GENERATION' //fired on invoice generation. Returns the invoice model. ] From c4d1eebfa125e1a866926e364a134310d81e3c51 Mon Sep 17 00:00:00 2001 From: Celestino Bellone Date: Sun, 7 Jan 2018 21:31:52 +0100 Subject: [PATCH 30/31] #349 - basic documentation --- docs/extensions-howto.md | 149 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 149 insertions(+) create mode 100644 docs/extensions-howto.md diff --git a/docs/extensions-howto.md b/docs/extensions-howto.md new file mode 100644 index 0000000000..6a4c6ad212 --- /dev/null +++ b/docs/extensions-howto.md @@ -0,0 +1,149 @@ +#How to write an extension + +Extensions allows you to link alf.io with your existing tools, such as: + +* Billing/Accounting systems +* CRMs +* Additional Email marketing services (Mailjet, ...) +* Custom notifications (Slack, Telegram, etc.) + +## how it works + +Extensions can be added and modified only by the Administrator. +For security and stability reasons, it is not possible to do that with less privileged users. + +Each extension consists of a JavaScript script, you can find a sample below: + +```javascript +/** + * The script metadata object describes whether or not your extension should be invoked asynchronously, and which events it supports + * @returns {{ async: boolean, events: string[] }} + */ +function getScriptMetadata() { + return { + async: false, + events: [ + //supported values: + //'RESERVATION_CONFIRMED', //fired on reservation confirmation. No results expected. + //'RESERVATION_EXPIRED', //fired when reservation(s) expired + //'RESERVATION_CANCELLED', //fired when reservation(s) are cancelled + //'TICKET_ASSIGNED', //fired on ticket assignment. No results expected. + //'WAITING_QUEUE_SUBSCRIPTION', //fired on waiting queue subscription. No results expected. + 'INVOICE_GENERATION' //fired on invoice generation. Returns the invoice model. + ] + }; +} + +/** + * Executes the extension. + * @param scriptEvent + * @returns Object + */ +function executeScript(scriptEvent) { + log.warn('hello from script with event: ' + scriptEvent); + //this sample calls the https://csrng.net/ website and generates a random invoice number + var randomNumber = restTemplate.getForObject('https://csrng.net/csrng/csrng.php?min=0&max=100', Java.type('java.util.ArrayList').class)[0].random; + log.warn('the invoice number will be ' + randomNumber) + return { + invoiceNumber: randomNumber + }; +} +``` + +each extension is registered to one or more Application Events, and is fired as soon as the Application Event occurs. + +## Scope Variables + +alf.io provides some objects and properties to the script in the script scope: + +* **log** Log4j logger +* **restTemplate** Spring Framework's [RestTemplate](https://docs.spring.io/spring/docs/4.3.13.RELEASE/javadoc-api/org/springframework/web/client/RestTemplate.html) +* **GSON** Google's [JSON parser/generator](http://static.javadoc.io/com.google.code.gson/gson/2.8.2/com/google/gson/Gson.html) +* **returnClass** `java.lang.Class` the expected result type + +other event-related variables are also injected in the scope + +## Supported Application Events + +#### RESERVATION_CONFIRMED + +extensions will be invoked **asynchronously** once a reservation has been confirmed. + +##### params + +* **reservation**: [TicketReservation](https://github.com/alfio-event/alf.io/blob/master/src/main/java/alfio/model/TicketReservation.java) + + +#### RESERVATION_EXPIRED + +extensions will be invoked **synchronously** once one or more reservations have expired. + +##### params +* **event**: [Event](https://github.com/alfio-event/alf.io/blob/master/src/main/java/alfio/model/Event.java) +* **reservationIds**: String[] - the reservation IDs + +##### expected result type +boolean + +#### RESERVATION_CANCELLED + +extensions will be invoked **synchronously** once one or more reservations have been cancelled. + +##### params +* **event**: [Event](https://github.com/alfio-event/alf.io/blob/master/src/main/java/alfio/model/Event.java) +* **reservationIds**: String[] - the reservation IDs + +##### expected result type +boolean + +#### TICKET_ASSIGNED + +extensions will be invoked **asynchronously** once a ticket has been assigned. + +##### params + +* **ticket**: [Ticket](https://github.com/alfio-event/alf.io/blob/master/src/main/java/alfio/model/Ticket.java) + +#### WAITING_QUEUE_SUBSCRIBED + +extensions will be invoked **asynchronously** once someone subscribes to the waiting queue. + +##### params + +* **waitingQueueSubscription**: [WaitingQueueSubscription](https://github.com/alfio-event/alf.io/blob/master/src/main/java/alfio/model/WaitingQueueSubscription.java) + +#### INVOICE_GENERATION + +extensions will be invoked **synchronously** while generating an invoice. + +##### params +* **event**: [Event](https://github.com/alfio-event/alf.io/blob/master/src/main/java/alfio/model/Event.java) +* **reservationId**: String - the reservation ID +* **email**: String - contact email +* **customerName**: String +* **userLanguage**: String - ISO 639-1 2-letters language code +* **billingAddress**: String - the billing Address +* **reservationCost**: [TotalPrice](https://github.com/alfio-event/alf.io/blob/master/src/main/java/alfio/model/TotalPrice.java) +* **invoiceRequested**: boolean - whether or not the user has requested an invoice or just a receipt +* **vatCountryCode**: String - the EU country of business of the customer, if any +* **vatNr**: String - Customer's VAT Number +* **vatStatus**: [VatStatus](https://github.com/alfio-event/alf.io/blob/master/src/main/java/alfio/model/PriceContainer.java#L37), see [#278](https://github.com/alfio-event/alf.io/issues/278) + +##### expected result type + +[InvoiceGeneration](https://github.com/alfio-event/alf.io/blob/master/src/main/java/alfio/model/extension/InvoiceGeneration.java) - The invoice content, currently limited to the invoice number. + +## Methods + +#### getScriptMetadata + +This methods returns the actual configuration options and capabilities of the extension. +It **must** return a JSON object with the following properties: + +* async *boolean*: whether or not the script should be invoked asynchronously. +* events *string[]*: list of supported events +* configuration *{(key: string): string}*: the extension configuration (WIP) + +#### executeScript + +the actual event handling. Parameters and return types are event-dependent. \ No newline at end of file From 5b45644229faedae46105b879cc680f286ca5cdf Mon Sep 17 00:00:00 2001 From: Celestino Bellone Date: Sun, 7 Jan 2018 21:35:43 +0100 Subject: [PATCH 31/31] #349 - fix typo --- docs/extensions-howto.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/extensions-howto.md b/docs/extensions-howto.md index 6a4c6ad212..a06b25f3c4 100644 --- a/docs/extensions-howto.md +++ b/docs/extensions-howto.md @@ -1,4 +1,4 @@ -#How to write an extension +# How to write an extension Extensions allows you to link alf.io with your existing tools, such as: