Invite link for presenters

DiegoMzmn · DiegoMzmn · commit 48ac85ba620f · 2020-04-08T13:44:14.000+02:00
diff --git a/backend/src/main/java/urjc/ovteaching/rooms/Room.java b/backend/src/main/java/urjc/ovteaching/rooms/Room.java
@@ -31,6 +31,7 @@ public interface NameOnly {}
 	private Long id;
 	private String codeParticipant;
 	private String codeModerator;
+	private String codePresenter;
 	@JsonView(NameOnly.class)
 	private String name;
 	@Lob
@@ -52,6 +53,7 @@ public Room(String name) {
 		this.presenters = new HashSet<>();
 		this.codeParticipant = UUID.randomUUID().toString();
 		this.codeModerator = UUID.randomUUID().toString();
+		this.codePresenter = UUID.randomUUID().toString();
 		this.handRaisedUsers = new LinkedList<>();
 		this.name = name;
 	}
@@ -64,13 +66,17 @@ public Long getId() {
 	}
 
 	public String getParticipantInviteCode() {
-		return codeParticipant.toString();
+		return codeParticipant;
 	}
 
 	public String getModeratorInviteCode() {
-		return codeModerator.toString();
+		return codeModerator;
 	}
 
+	public String getPresenterInviteCode() {
+		return codePresenter;
+	}
+	
 	public boolean isModerator(User user) {
 		return this.mods.contains(user);
 	}
diff --git a/backend/src/main/java/urjc/ovteaching/rooms/RoomRepository.java b/backend/src/main/java/urjc/ovteaching/rooms/RoomRepository.java
@@ -6,8 +6,10 @@ public interface RoomRepository extends JpaRepository<Room, Long> {
 
 	Room findByName(String name);
 	
-	Room findByCodeParticipant(String uuidParticipant);
+	Room findByCodeParticipant(String inviteCodeParticipant);
 	
-	Room findByCodeModerator(String uuidModerator);
+	Room findByCodeModerator(String inviteCodeModerator);
+	
+	Room findByCodePresenter(String inviteCodePresenter);
 
 }
diff --git a/backend/src/main/java/urjc/ovteaching/rooms/RoomService.java b/backend/src/main/java/urjc/ovteaching/rooms/RoomService.java
@@ -54,6 +54,14 @@ public void addRoomWithMod(Room room, User mod) {
 	public void makeModerator(User user, Room room) {
 		user.addModdedRoom(room);
 		user.removeParticipatedRoom(room);
+		user.removePresentedRoom(room);
+		roomRep.save(room);
+		userServ.save(user);
+	}
+	
+	public void makePresenter(User user, Room room) {
+		user.addPresentedRoom(room);
+		user.removeParticipatedRoom(room);
 		roomRep.save(room);
 		userServ.save(user);
 	}
@@ -69,7 +77,12 @@ public Room findByInviteCode(String code) {
 		if (room != null) {
 			return room;
 		} else {
-			return roomRep.findByCodeParticipant(code);
+			room = roomRep.findByCodeParticipant(code);
+			if (room != null) {
+				return room;
+			} else {
+				return roomRep.findByCodePresenter(code);
+			}
 		}
 	}
 	
diff --git a/backend/src/main/java/urjc/ovteaching/rooms/controllers/RoomController.java b/backend/src/main/java/urjc/ovteaching/rooms/controllers/RoomController.java
@@ -92,6 +92,8 @@ public ResponseEntity<String> getInviteCode(HttpServletRequest request, @PathVar
 					return new ResponseEntity<>(room.getParticipantInviteCode(), HttpStatus.OK);
 				} else if (role.equals("moderator")) {
 					return new ResponseEntity<>(room.getModeratorInviteCode(), HttpStatus.OK);
+				} else if (role.equals("presenter")) {
+					return new ResponseEntity<>(room.getPresenterInviteCode(), HttpStatus.OK);
 				}
 			}
 		}
@@ -134,22 +136,28 @@ public ResponseEntity<User> newUserInRoom(HttpServletRequest request, @PathVaria
 			return new ResponseEntity<>(HttpStatus.NOT_FOUND);
 		}
 		if (room.isModerator(user)) {
-			// Cannot enter a room if already a mod of it
-			return new ResponseEntity<>(HttpStatus.CONFLICT);
+			//Automatically enter if already a mod 
+			return new ResponseEntity<>(HttpStatus.OK);
 		}
-		if (code.equals(room.getParticipantInviteCode()) && (room.isParticipant(user)) || room.isPresenter(user)) {
-			// Cannot enter a room as participant if already in it
-			return new ResponseEntity<>(HttpStatus.CONFLICT);
+		if (code.equals(room.getPresenterInviteCode()) && (room.isModerator(user)) || room.isPresenter(user)) {
+			//Automatically enter as presenter if already a moderator or presenter 
+			return new ResponseEntity<>(HttpStatus.OK);
+		}
+		if (code.equals(room.getParticipantInviteCode()) && room.isInRoom(user)) {
+			//Automatically enter as participant if already in it
+			return new ResponseEntity<>(HttpStatus.OK);
 		}
 		
 		if (code.equals(room.getParticipantInviteCode())) {
 			user.addParticipatedRoom(room);
-		} else {
+		} else if(code.equals(room.getModeratorInviteCode())){
 			roomServ.makeModerator(user, room);
 			if (!user.getRoles().contains("ROLE_ADMIN")) {
 				// Makes user admin if they weren't
 				user.addRole("ROLE_ADMIN");
 			}
+		} else {
+			roomServ.makePresenter(user, room);
 		}
 		roomServ.save(room);
 		userServ.save(user);
diff --git a/backend/src/main/java/urjc/ovteaching/users/User.java b/backend/src/main/java/urjc/ovteaching/users/User.java
@@ -106,6 +106,10 @@ public void addParticipatedRoom(Room room) {
 	public void removeParticipatedRoom(Room room) {
 		this.participatedRooms.remove(room);
 	}
+	
+	public void removePresentedRoom(Room room) {
+		this.presentedRooms.remove(room);
+	}
 
 	public void leaveRoom(Room room) {
 		this.participatedRooms.remove(room);
diff --git a/frontend/src/app/dashboard/dashboard.component.css b/frontend/src/app/dashboard/dashboard.component.css
@@ -66,6 +66,10 @@ login-component {
   margin:5% auto;
 }
 
+.invitePresenter {
+  color: rgb(6, 211, 98);
+}
+
 .addRoomButton {
   background-color: rgb(6, 211, 98);
 }
diff --git a/frontend/src/app/dashboard/dashboard.component.html b/frontend/src/app/dashboard/dashboard.component.html
@@ -35,6 +35,9 @@ <h3 mat-subheader>MODDED ROOMS</h3>
             <button mat-icon-button (click)="getInviteURL(mod.name,'moderator')">
               <mat-icon color="accent" matTooltip="Invite URL for moderators">link</mat-icon>
             </button>
+            <button mat-icon-button (click)="getInviteURL(mod.name,'presenter')">
+              <mat-icon class="invitePresenter" matTooltip="Invite URL for presenters">link</mat-icon>
+            </button>
             <button mat-icon-button (click)="getInviteURL(mod.name,'participant')">
               <mat-icon matTooltip="Invite URL for participants">link</mat-icon>
             </button>
diff --git a/frontend/src/app/shared/components/toolbar/toolbar.component.css b/frontend/src/app/shared/components/toolbar/toolbar.component.css
@@ -83,6 +83,10 @@
     border: 1px solid #ffffff !important;
 }
 
+.invitePresenter {
+    color: rgb(6, 211, 98);
+}
+
 #raise_hand {
     max-width: 50%;
     max-height: 50%;
diff --git a/frontend/src/app/shared/components/toolbar/toolbar.component.html b/frontend/src/app/shared/components/toolbar/toolbar.component.html
@@ -34,6 +34,9 @@
       <button mat-icon-button (click)="getInviteURL('moderator')" *ngIf="localUser && this.userService.isModOfRoom(this.mySessionId)">
         <mat-icon color="accent" matTooltip="Invite URL for moderators">link</mat-icon>
       </button>
+      <button mat-icon-button (click)="getInviteURL('presenter')" *ngIf="localUser && this.userService.isModOfRoom(this.mySessionId)">
+        <mat-icon class="invitePresenter" matTooltip="Invite URL for presenters">link</mat-icon>
+      </button>
       <button mat-icon-button (click)="getInviteURL('participant')" *ngIf="localUser && this.userService.isModOfRoom(this.mySessionId)">
         <mat-icon matTooltip="Invite URL for participants">link</mat-icon>
       </button>

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,10 @@ public interface RoomRepository extends JpaRepository<Room, Long> {`
`6`	`6`
`7`	`7`	`Room findByName(String name);`
`8`	`8`
`9`		`- Room findByCodeParticipant(String uuidParticipant);`
	`9`	`+ Room findByCodeParticipant(String inviteCodeParticipant);`
`10`	`10`
`11`		`- Room findByCodeModerator(String uuidModerator);`
	`11`	`+ Room findByCodeModerator(String inviteCodeModerator);`
	`12`	`+`
	`13`	`+ Room findByCodePresenter(String inviteCodePresenter);`
`12`	`14`
`13`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,8 @@ public ResponseEntity<String> getInviteCode(HttpServletRequest request, @PathVar`
`92`	`92`	`return new ResponseEntity<>(room.getParticipantInviteCode(), HttpStatus.OK);`
`93`	`93`	`} else if (role.equals("moderator")) {`
`94`	`94`	`return new ResponseEntity<>(room.getModeratorInviteCode(), HttpStatus.OK);`
	`95`	`+ } else if (role.equals("presenter")) {`
	`96`	`+ return new ResponseEntity<>(room.getPresenterInviteCode(), HttpStatus.OK);`
`95`	`97`	`}`
`96`	`98`	`}`
`97`	`99`	`}`
`@@ -134,22 +136,28 @@ public ResponseEntity<User> newUserInRoom(HttpServletRequest request, @PathVaria`
`134`	`136`	`return new ResponseEntity<>(HttpStatus.NOT_FOUND);`
`135`	`137`	`}`
`136`	`138`	`if (room.isModerator(user)) {`
`137`		`- // Cannot enter a room if already a mod of it`
`138`		`- return new ResponseEntity<>(HttpStatus.CONFLICT);`
	`139`	`+ //Automatically enter if already a mod`
	`140`	`+ return new ResponseEntity<>(HttpStatus.OK);`
`139`	`141`	`}`
`140`		`- if (code.equals(room.getParticipantInviteCode()) && (room.isParticipant(user)) \|\| room.isPresenter(user)) {`
`141`		`- // Cannot enter a room as participant if already in it`
`142`		`- return new ResponseEntity<>(HttpStatus.CONFLICT);`
	`142`	`+ if (code.equals(room.getPresenterInviteCode()) && (room.isModerator(user)) \|\| room.isPresenter(user)) {`
	`143`	`+ //Automatically enter as presenter if already a moderator or presenter`
	`144`	`+ return new ResponseEntity<>(HttpStatus.OK);`
	`145`	`+ }`
	`146`	`+ if (code.equals(room.getParticipantInviteCode()) && room.isInRoom(user)) {`
	`147`	`+ //Automatically enter as participant if already in it`
	`148`	`+ return new ResponseEntity<>(HttpStatus.OK);`
`143`	`149`	`}`
`144`	`150`
`145`	`151`	`if (code.equals(room.getParticipantInviteCode())) {`
`146`	`152`	`user.addParticipatedRoom(room);`
`147`		`- } else {`
	`153`	`+ } else if(code.equals(room.getModeratorInviteCode())){`
`148`	`154`	`roomServ.makeModerator(user, room);`
`149`	`155`	`if (!user.getRoles().contains("ROLE_ADMIN")) {`
`150`	`156`	`// Makes user admin if they weren't`
`151`	`157`	`user.addRole("ROLE_ADMIN");`
`152`	`158`	`}`
	`159`	`+ } else {`
	`160`	`+ roomServ.makePresenter(user, room);`
`153`	`161`	`}`
`154`	`162`	`roomServ.save(room);`
`155`	`163`	`userServ.save(user);`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,10 @@ login-component {`
`66`	`66`	`margin:5% auto;`
`67`	`67`	`}`
`68`	`68`
	`69`	`+.invitePresenter {`
	`70`	`+ color: rgb(6, 211, 98);`
	`71`	`+}`
	`72`	`+`
`69`	`73`	`.addRoomButton {`
`70`	`74`	`background-color: rgb(6, 211, 98);`
`71`	`75`	`}`