Merge branch 'master' into production

Author: bodnara

package-lock.json

@@ -8,11 +8,11 @@
 		"@semantic-release/changelog": "6.0.3",
 		"@semantic-release/exec": "6.0.3",
 		"@semantic-release/git": "10.0.1",
-		"@semantic-release/github": "9.0.4",
+		"@semantic-release/github": "9.0.7",
 		"commitizen": "4.3.0",
 		"conventional-changelog-conventionalcommits": "6.1.0",
 		"inquirer": "8.2.6",
-		"semantic-release": "21.1.1"
+		"semantic-release": "21.1.2"
 	},
 	"config": {
 		"commitizen": {

package.json

@@ -36,13 +36,13 @@ public void startProcessingEvents() {
 		eventProcessorThread = new Thread(eventLogger);
 		eventProcessorThread.start();
 
-		log.debug("Event processor thread started.");
+		log.info("Event processor thread started.");
 		System.out.println("Event processor thread started.");
 	}
 
 	public void stopProcessingEvents() {
 		eventProcessorThread.interrupt();
-		log.debug("Event processor thread interrupted.");
+		log.info("Event processor thread interrupted.");
 		System.out.println("Event processor thread interrupted.");
 	}
 

perun-auditlogger/src/main/java/cz/metacentrum/perun/auditlogger/service/impl/AuditLoggerManagerImpl.java

@@ -26,7 +26,7 @@
 		<appender-ref ref="perun-auditlogger"/>
 	</root>
 
-	<logger name="cz.metacentrum.perun.auditlogger" level="debug"/>
+	<logger name="cz.metacentrum.perun.auditlogger" level="info"/>
 
 	<!-- keep Spring quiet -->
 	<logger name="org.springframework" level="warn"/>
@@ -35,7 +35,6 @@
 	<appender class="org.gnieh.logback.SystemdJournalAppender" name="journal-audit">
 		<syslogIdentifier>perun_audit</syslogIdentifier>
 		<logLoggerName>true</logLoggerName>
-		<logStacktrace>false</logStacktrace>
 		<encoder>
 			<pattern>%msg</pattern>
 		</encoder>

perun-auditlogger/src/main/resources/logback.xml

@@ -2,6 +2,10 @@
 
 import cz.metacentrum.perun.core.api.Group;
 import cz.metacentrum.perun.core.api.Vo;
+import org.springframework.util.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Application form of a VO. Use {@link cz.metacentrum.perun.registrar.RegistrarManager#getFormItems} for items.
@@ -16,7 +20,7 @@ public class ApplicationForm {
 	private boolean automaticApproval;
 	private boolean automaticApprovalExtension;
 	private boolean automaticApprovalEmbedded;
-	private String moduleClassName;
+	private final List<String> moduleClassNames = new ArrayList<>();
 
 	public ApplicationForm() {
 	}
@@ -69,12 +73,29 @@ public void setAutomaticApprovalEmbedded(boolean automaticApprovalEmbedded) {
 		this.automaticApprovalEmbedded = automaticApprovalEmbedded;
 	}
 
-	public String getModuleClassName() {
-		return moduleClassName;
+	public List<String> getModuleClassNames() {
+		return new ArrayList<>(moduleClassNames);
+	}
+
+	public void setModuleClassNames(List<String> moduleClassNames) {
+		this.moduleClassNames.clear();
+		for (String moduleClassName : moduleClassNames) {
+			if (StringUtils.hasText(moduleClassName)) {
+				this.moduleClassNames.add(moduleClassName);
+			}
+		}
+	}
+
+	public void addModuleClassName(String moduleClassName) {
+		if (StringUtils.hasText(moduleClassName)) {
+			this.moduleClassNames.add(moduleClassName);
+		}
 	}
 
-	public void setModuleClassName(String moduleClassName) {
-		this.moduleClassName = moduleClassName;
+	public void removeModuleClassName(String moduleClassName) {
+		if (StringUtils.hasText(moduleClassName)) {
+			this.moduleClassNames.remove(moduleClassName);
+		}
 	}
 
 	/**
@@ -94,7 +115,7 @@ public String toString() {
 			", group='" + getGroup() + '\'' +
 			", automaticApproval='" + isAutomaticApproval() + '\'' +
 			", automaticApprovalExtension='" + isAutomaticApprovalExtension() + '\'' +
-			", moduleClassName='" + getModuleClassName() + '\'' +
+			", moduleClassNames='" + getModuleClassNames() + '\'' +
 			"]";
 	}
 

perun-base/src/main/java/cz/metacentrum/perun/registrar/model/ApplicationForm.java

@@ -8310,6 +8310,9 @@ perun_roles_management:
       - GROUPOBSERVER: Group
       - GROUPMEMBERSHIPMANAGER: Group
       - SPREGAPPLICATION:
+      - RESOURCEADMIN: Vo
+      - RESOURCEOBSERVER: Vo
+      - TRUSTEDFACILITYADMIN: Vo
     associated_read_roles:
       - GROUPOBSERVER
     assignable_to_attributes: true
@@ -8371,6 +8374,9 @@ perun_roles_management:
       - GROUPADMIN: Group
       - GROUPOBSERVER: Group
       - GROUPMEMBERSHIPMANAGER: Group
+      - RESOURCEADMIN: Vo
+      - RESOURCEOBSERVER: Vo
+      - TRUSTEDFACILITYADMIN: Vo
     associated_read_roles: []
     assignable_to_attributes: true
     display_name: "Group membership manager"

perun-base/src/main/resources/perun-roles.yml

@@ -1,4 +1,4 @@
--- database version 3.2.17 (don't forget to update insert statement at the end of file)
+-- database version 3.2.18 (don't forget to update insert statement at the end of file)
 CREATE EXTENSION IF NOT EXISTS "unaccent";
 CREATE EXTENSION IF NOT EXISTS "pgcrypto";
 
@@ -539,7 +539,7 @@ create table application_form (
 								   automatic_approval boolean default false not null, --approval of application is automatic
 								   automatic_approval_extension boolean default false not null, --approval of extension is automatic
 								   automatic_approval_embedded boolean default false not null, --approval of embedded application is automatic
-								   module_name varchar,  --name of module which processes application
+								   module_names varchar,      --name of modules (separated by comma) which are called when processing application
 								   group_id integer,          --identifier of group (groups.id) if application is for group
 								   created_by_uid integer,
 								   modified_by_uid integer,
@@ -1908,7 +1908,7 @@ create index idx_fk_attr_critops ON attribute_critical_actions(attr_id);
 create index app_state_idx ON application (state);
 
 -- set initial Perun DB version
-insert into configurations values ('DATABASE VERSION','3.2.17');
+insert into configurations values ('DATABASE VERSION','3.2.18');
 -- insert membership types
 insert into membership_types (id, membership_type, description) values (1, 'DIRECT', 'Member is directly added into group');
 insert into membership_types (id, membership_type, description) values (2, 'INDIRECT', 'Member is added indirectly through UNION relation');

perun-base/src/test/resources/test-schema.sql

@@ -58,6 +58,11 @@ sub getRichMembers
 	return Perun::Common::callManagerMethod('getRichMembers', '[]RichMember', @_);
 }
 
+sub getRichMember
+{
+	return Perun::Common::callManagerMethod('getRichMember', 'RichMember', @_);
+}
+
 sub getRichMembersWithAttributes
 {
 	return Perun::Common::callManagerMethod('getRichMembersWithAttributes', '[]RichMember', @_);