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

src/lib/models/Event.ts

@@ -68,7 +68,11 @@ export class Event extends Model<Event> {
      */
     public async joined({userId}: {userId: number}, request: any): Promise<boolean> {
         userId = userId ?? request.session.userId;
-        const participants = await this.$get("rParticipants", {where: {id: userId}}) as User[];
-        return participants.length !== 0;
+        if (userId) {
+            const participants = await this.$get("rParticipants", {where: {id: userId}}) as User[];
+            return participants.length !== 0;
+        } else {
+            return false;
+        }
     }
 }

src/lib/models/Group.ts

@@ -129,7 +129,11 @@ export class Group extends Model<Group> {
      */
     public async joined({userId}: {userId: number}, request: any): Promise<boolean> {
         userId = userId ?? request.session.userId;
-        const members = await this.$get("rMembers", {where: {id: userId}}) as User[];
-        return members.length !== 0;
+        if (userId) {
+            const members = await this.$get("rMembers", {where: {id: userId}}) as User[];
+            return members.length !== 0;
+        } else {
+            return false;
+        }
     }
 }

src/lib/models/Post.ts

@@ -137,8 +137,12 @@ export class Post extends Model<Post> {
      */
     public async userVote({userId}: {userId: number}, request: any): Promise<VoteType> {
         userId = userId ?? request.session.userId;
-        const votes = await this.$get("rVotes", {where: {id: userId}}) as Array<User & {PostVote: PostVote}>;
-        return votes[0]?.PostVote?.voteType;
+        if (userId) {
+            const votes = await this.$get("rVotes", {where: {id: userId}}) as Array<User & {PostVote: PostVote}>;
+            return votes[0]?.PostVote?.voteType;
+        } else {
+            return undefined;
+        }
     }
 
     /**
@@ -149,7 +153,7 @@ export class Post extends Model<Post> {
     public async deletable({userId}: {userId: number}, request: any): Promise<boolean> {
         userId = userId ?? request.session.userId;
         const isAuthor =  Number(userId) === Number(this.authorId);
-        if (!isAuthor) {
+        if (userId && !isAuthor) {
             return (await User.findOne({where: {id: userId}})).isAdmin;
         }
         return isAuthor;