From a9e08775d110f5e190b8b0b38099375545c5fc5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Ha=C3=9Fel?= Date: Wed, 6 Nov 2024 13:16:29 +0100 Subject: [PATCH] removed Group.initial --- src/main/angular/src/app/api/group/Group.ts | 4 +--- src/main/java/de/ph87/tools/group/Group.java | 4 ---- src/main/java/de/ph87/tools/group/dto/GroupDto.java | 3 --- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/main/angular/src/app/api/group/Group.ts b/src/main/angular/src/app/api/group/Group.ts index b225a2a..ca977e8 100644 --- a/src/main/angular/src/app/api/group/Group.ts +++ b/src/main/angular/src/app/api/group/Group.ts @@ -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']), ); } diff --git a/src/main/java/de/ph87/tools/group/Group.java b/src/main/java/de/ph87/tools/group/Group.java index 41bfdb8..17ec5ca 100644 --- a/src/main/java/de/ph87/tools/group/Group.java +++ b/src/main/java/de/ph87/tools/group/Group.java @@ -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; diff --git a/src/main/java/de/ph87/tools/group/dto/GroupDto.java b/src/main/java/de/ph87/tools/group/dto/GroupDto.java index 8d6d998..2cf1227 100644 --- a/src/main/java/de/ph87/tools/group/dto/GroupDto.java +++ b/src/main/java/de/ph87/tools/group/dto/GroupDto.java @@ -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 users, @NonNull final Set 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(); } }