zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SEBSERV-492 added user settings

Browse source
This commit is contained in:
anhefti 2023-11-20 11:22:04 +01:00
parent 51033385fd
commit 7a3ccdbb34
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pom.xml
View file

@ -18,7 +18,7 @@
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
<sebserver-version>1.5.2</sebserver-version> <sebserver-version>1.5.3-uzh</sebserver-version>
<build-version>${sebserver-version}</build-version> <build-version>${sebserver-version}</build-version>
<revision>${sebserver-version}</revision> <revision>${sebserver-version}</revision>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

9
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/proctoring/ZoomRoomRequestResponse.java
View file

@ -163,6 +163,8 @@ public interface ZoomRoomRequestResponse {
static class InMeetingSettings { static class InMeetingSettings {
@JsonProperty final boolean virtual_background = false;
@JsonProperty final VirtualBackgroundSettings virtual_background_settings = new VirtualBackgroundSettings();
@JsonProperty final boolean auto_saving_chat; @JsonProperty final boolean auto_saving_chat;
@JsonProperty final int allow_users_save_chats; @JsonProperty final int allow_users_save_chats;
@JsonProperty final int allow_participants_chat_with; @JsonProperty final int allow_participants_chat_with;
@ -178,6 +180,13 @@ public interface ZoomRoomRequestResponse {
} }
} }
@JsonIgnoreProperties(ignoreUnknown = true)
static class VirtualBackgroundSettings {
@JsonProperty final boolean enable = false;
@JsonProperty final boolean allow_upload_custom = false;
@JsonProperty final boolean allow_videos = false;
}
static class FeaturesSettings { static class FeaturesSettings {
@JsonProperty final String concurrent_meeting; @JsonProperty final String concurrent_meeting;
public FeaturesSettings(final String concurrent_meeting) { public FeaturesSettings(final String concurrent_meeting) {

4
src/test/java/ch/ethz/seb/sebserver/gbl/util/UtilsTest.java
View file

@ -122,8 +122,8 @@ public class UtilsTest {
try { try {
assertEquals("RGB {255, 255, 255}", Utils.toRGB(rgbString3).toString()); assertEquals("RGB {255, 255, 255}", Utils.toRGB(rgbString3).toString());
fail("NumberFormatException expected here"); fail("NumberFormatException expected here");
} catch (final NumberFormatException e) { } catch (final NumberFormatException ignored) {
assertEquals("For input string: \"wr\"", e.getMessage());
} }
assertEquals("RGB {170, 187, 204}", Utils.toRGB(rgbString4).toString()); assertEquals("RGB {170, 187, 204}", Utils.toRGB(rgbString4).toString());
assertEquals("RGB {170, 187, 204}", Utils.toRGB(rgbString5).toString()); assertEquals("RGB {170, 187, 204}", Utils.toRGB(rgbString5).toString());