Merge branch 'develop' of Software_Engineering_I/greenvironment-server into master

src/lib/models/Event.ts

@@ -86,7 +86,7 @@ export class Event extends Model<Event> {
         if (userId) {
             const group = await this.$get<Group>("rGroup") as Group;
             const user = await User.findByPk(userId);
-            return group.$has("rAdmins", user);
+            return (await group.$has("rAdmins", user)) || user.isAdmin;
         } else {
             return false;
         }

src/lib/models/Group.ts

@@ -153,7 +153,8 @@ export class Group extends Model<Group> {
     public async deletable({userId}: { userId?: number }, request: any): Promise<boolean> {
         userId = userId ?? request.session.userId;
         if (userId) {
-            return this.creatorId === userId;
+            const user = await User.findByPk(userId);
+            return this.creatorId === userId || user.isAdmin;
         } else {
             return false;
         }