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

src/lib/models/User.ts

@@ -1,5 +1,6 @@
 import * as sqz from "sequelize";
 import {
+    BeforeCreate,
     BeforeUpdate,
     BelongsTo,
     BelongsToMany,
@@ -42,11 +43,14 @@ export class User extends Model<User> {
      * It assigns the corresponding level to the user
      * @param instance
      */
+    @BeforeCreate
     @BeforeUpdate
     public static async assignLevel(instance: User) {
-        const level = await Level.findOne({where: {points: {[sqz.Op.lte]: instance.rankpoints}}, order: [["points", "desc"]]}) as Level;
-        if (level) {
-            instance.$set("rLevel", level);
+        if (instance.changed("rankpoints") || instance.isNewRecord) {
+            const level = await Level.findOne({where: {points: {[sqz.Op.lte]: instance.rankpoints}}, order: [["points", "desc"]]}) as Level;
+            if (level) {
+                instance.$set("rLevel", level);
+            }
         }
     }
 

src/routes/graphql/QueryResolver.ts

@@ -15,7 +15,7 @@ import {
     Group,
     Level,
     Post,
-    Report,
+    Report, ReportReason,
     Request,
     User
 } from "../../lib/models";
@@ -212,6 +212,13 @@ export class QueryResolver extends MutationResolver {
         return Report.findAll({limit: first, offset, order: [["id", "DESC"]]});
     }
 
+    /**
+     * Returns all report reasons
+     */
+    public async getReportReasons(): Promise<ReportReason[]> {
+        return ReportReason.findAll();
+    }
+
     /**
      * Returns the levels that are configured
      * @param first

src/routes/graphql/schema.graphql

@@ -35,7 +35,7 @@ type Query {
     getPosts(first: Int=20, offset: Int=0, sort: SortType = NEW): [Post!]! @complexity(value: 1, multipliers: ["first"])
 
     "returns all activities"
-    getActivities: [Activity]
+    getActivities: [Activity!]!
 
     "Returns an access token for the user that can be used in requests. To user the token in requests, it has to be set in the HTTP header 'Authorization' with the format Bearer <token>."
     getToken(email: String!, passwordHash: String!): Token!
@@ -49,6 +49,9 @@ type Query {
     "Returns all issued reports with pagination"
     getReports(first: Int = 20, offset: Int = 0): [Report!]! @complexity(value: 1, multipliers: ["first"])
 
+    "Returns all report reasons"
+    getReportReasons: [ReportReason!]!
+
     "Returns the levels configured in the backend"
     getLevels(first: Int =20, offset: Int = 0): [Level!]! @complexity(value: 1, multipliers: ["first"])
 }