Merge branch 'julius-dev' of Software_Engineering_I/greenvironment-server into develop

src/lib/models/User.ts

@@ -44,7 +44,7 @@ export class User extends Model<User> {
     public rankpoints: number;
 
     @BelongsToMany(() => User, () => Friendship)
-    public friends: User[];
+    public rFriends: User[];
 
     @BelongsToMany(() => Post, () => PostVote)
     public votes: Array<Post & {PostVote: PostVote}>;
@@ -78,6 +78,10 @@ export class User extends Model<User> {
         return this.getDataValue("createdAt");
     }
 
+    public async friends(): Promise<User[]> {
+        return await this.$get("rFriends") as User[];
+    }
+
     public async chats(): Promise<ChatRoom[]> {
         return await this.$get("rChats") as ChatRoom[];
     }