smarthut/backend
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed POST /room (Git merge I will avenge you)

Browse source
This commit is contained in:
Tommaso Rodolfo Masera 2020-03-04 17:01:09 +01:00
parent bff433e954
commit 3dfcd30f4e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RoomController.java
View file

@ -9,7 +9,6 @@ import java.util.*;
import javax.validation.Valid; import javax.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.*; import org.springframework.boot.autoconfigure.*;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@RestController @RestController
@ -36,12 +35,13 @@ public class RoomController {
private Room save(final RoomSaveRequest r, final Principal principal, boolean setWhenNull) { private Room save(final RoomSaveRequest r, final Principal principal, boolean setWhenNull) {
Room newRoom = new Room(); Room newRoom = new Room();
final String username = ((UserDetails) principal).getUsername(); final String username = principal.getName();
final Long userId = userRepository.findByUsername(username).getId(); final Long userId = userRepository.findByUsername(username).getId();
final String img = r.getImage(); final String img = r.getImage();
final String icon = r.getIcon(); final String icon = r.getIcon();
newRoom.setUserId(userId); newRoom.setUserId(userId);
newRoom.setName(r.getName());
if (img != null) { if (img != null) {
newRoom.setImage(img.getBytes()); newRoom.setImage(img.getBytes());
} else if (setWhenNull) { } else if (setWhenNull) {