patrick/Tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed Group.initial

Browse Source
This commit is contained in:
Patrick Haßel 2024-11-06 13:16:29 +01:00
parent 8a28acc6dc
commit a9e08775d1
3 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/angular/src/app/api/group/Group.ts
View File

@ -1,5 +1,5 @@
import {UserPublic} from "../User/UserPublic"; 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 {UserPrivate} from "../User/UserPrivate";
import {GroupUuid} from "./GroupUuid"; import {GroupUuid} from "./GroupUuid";
@ -13,7 +13,6 @@ export class Group extends GroupUuid {
readonly password: string, readonly password: string,
readonly users: UserPublic[], readonly users: UserPublic[],
readonly banned: UserPublic[], readonly banned: UserPublic[],
readonly initial: boolean,
) { ) {
super(uuid); super(uuid);
} }
@ -31,7 +30,6 @@ export class Group extends GroupUuid {
validateString(json['password']), validateString(json['password']),
validateList(json['users'], UserPublic.fromJson), validateList(json['users'], UserPublic.fromJson),
validateList(json['banned'], UserPublic.fromJson), validateList(json['banned'], UserPublic.fromJson),
validateBoolean(json['initial']),
); );
} }

4
src/main/java/de/ph87/tools/group/Group.java
View File

@ -75,10 +75,6 @@ public class Group extends GroupAbstract implements IWebSocketMessage {
@Column(nullable = false) @Column(nullable = false)
private String password = UUID.randomUUID().toString().substring(0, 4); private String password = UUID.randomUUID().toString().substring(0, 4);
@Setter
@Column(nullable = false)
private boolean initial = true;
@NonNull @NonNull
@Column(nullable = false) @Column(nullable = false)
private ZonedDateTime lastAccess = created; private ZonedDateTime lastAccess = created;

3
src/main/java/de/ph87/tools/group/dto/GroupDto.java
View File

@ -62,8 +62,6 @@ public class GroupDto {
return banned.size(); 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) { 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.uuid = group.getUuid();
this.title = group.getTitle(); this.title = group.getTitle();
@ -72,7 +70,6 @@ public class GroupDto {
this.owner = owner; this.owner = owner;
this.users = users; this.users = users;
this.banned = banned; this.banned = banned;
this.initial = group.isInitial();
} }
} }