removed Group.initial
This commit is contained in:
parent
8a28acc6dc
commit
a9e08775d1
@ -1,5 +1,5 @@
|
||||
import {UserPublic} from "../User/UserPublic";
|
||||
import {validateBoolean, validateDate, validateList, validateString} from "../common/validators";
|
||||
import {validateDate, validateList, validateString} from "../common/validators";
|
||||
import {UserPrivate} from "../User/UserPrivate";
|
||||
import {GroupUuid} from "./GroupUuid";
|
||||
|
||||
@ -13,7 +13,6 @@ export class Group extends GroupUuid {
|
||||
readonly password: string,
|
||||
readonly users: UserPublic[],
|
||||
readonly banned: UserPublic[],
|
||||
readonly initial: boolean,
|
||||
) {
|
||||
super(uuid);
|
||||
}
|
||||
@ -31,7 +30,6 @@ export class Group extends GroupUuid {
|
||||
validateString(json['password']),
|
||||
validateList(json['users'], UserPublic.fromJson),
|
||||
validateList(json['banned'], UserPublic.fromJson),
|
||||
validateBoolean(json['initial']),
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@ -75,10 +75,6 @@ public class Group extends GroupAbstract implements IWebSocketMessage {
|
||||
@Column(nullable = false)
|
||||
private String password = UUID.randomUUID().toString().substring(0, 4);
|
||||
|
||||
@Setter
|
||||
@Column(nullable = false)
|
||||
private boolean initial = true;
|
||||
|
||||
@NonNull
|
||||
@Column(nullable = false)
|
||||
private ZonedDateTime lastAccess = created;
|
||||
|
||||
@ -62,8 +62,6 @@ public class GroupDto {
|
||||
return banned.size();
|
||||
}
|
||||
|
||||
public final boolean initial;
|
||||
|
||||
public GroupDto(@NonNull final Group group, @NonNull final UserPublicDto owner, @NonNull final Set<UserPublicDto> users, @NonNull final Set<UserPublicDto> banned) {
|
||||
this.uuid = group.getUuid();
|
||||
this.title = group.getTitle();
|
||||
@ -72,7 +70,6 @@ public class GroupDto {
|
||||
this.owner = owner;
|
||||
this.users = users;
|
||||
this.banned = banned;
|
||||
this.initial = group.isInitial();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user