MembersRestのマスター決定処理を修正しました。
1 parent 741e388 commit 18fbb345c3be1fe3701b14e922fd8d0171b365d1
r-kuraoka authored on 10 Jun 2022
Showing 1 changed file
View
24
src/main/java/com/ntlab/irisserver/resources/MembersRest.java
//各Memberの情報取ってくる
Member info = m.get(i);
 
//Listの0番目と1番目をチームマスターにする
if(i==0 || i==1){
if(i==0){
info.setMaster(true);
room.changeTeamAndMaster(info.getNickname(), "r", true);
}else if(i==1){
info.setMaster(true);
room.changeTeamAndMaster(info.getNickname(), "b", true);
}else{
info.setMaster(false);
}
 
//Listの偶数番目を"r"(赤)に、奇数番目を"b"(青)にする
if(i % 2 == 0){
info.setBelongs("r");
room.setRedMaster(info);
 
}else{
info.setBelongs("b");
room.setBlueMaster(info);
}
 
}
}
 
}
 
@Produces(MediaType.APPLICATION_JSON)
public Room postMembers(@PathParam("rid") String rid, @FormParam("nickname") String nickname) {
RoomManager rm = RoomManager.getInstance();
Room room = rm.getRoom(rid);
List<Member> gm = room.getMembers();
 
//引数で取ってきたnicknameがListに存在しているか確認
if(room.getMember(nickname)==null)room.addMember(nickname);
if(room.getMember(nickname)==null && gm.size() < 10 ){
room.addMember(nickname);
} else {
var response = Response.status(401).entity("満席です");
throw new WebApplicationException(response.build());
}
 
return room;
 
}