Merge pull request #9 from devcord/point-type

Point type
devcord · Jun 7, 2020 · c1c8c4e · c1c8c4e
2 parents 0447e62 + 94c1af0
commit c1c8c4e
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 13 deletions.
diff --git a/backend/src/controller/user.ts b/backend/src/controller/user.ts
@@ -95,8 +95,6 @@ class UserController {
 
     const body: InputUpdateBodyType = ctx.request.body;
 
-
-
     const user: UserDocument | null = await UserModel.findOneAndUpdate({
       id: body.id,
     }, {
@@ -109,6 +107,7 @@ class UserController {
       PointModel.create({
         amount: body.totalPoints,
         userID: user.id,
+        type: ctx.params.type,
       }).catch(() => ctx.throw(400, Responses.CANT_CREATE_POINT)).then(res => {
         user.points.push(res._id.toString());
         user.save();

diff --git a/backend/src/model/point.ts b/backend/src/model/point.ts
@@ -4,24 +4,27 @@ type toNormalizationFunction = () => PointType;
 type mapFunction = () => PointType[];
 
 export type PointDocument = MONGOOSE.Document & {
-  amount: number;
   userID: string;
+  amount: number;
+  type: string;
   toNormalization: toNormalizationFunction;
   date: string;
 };
 
 export type PointType = {
   id: string;
   userID: string;
+  type: string;
   amount: number;
   date: string;
 };
 
 const pointSchema = new MONGOOSE.Schema(
   {
-    amount: { type: Number, required: true },
     date: { type: Date, default: Date.now },
-    userID: {type: String, required: true}
+    userID: { type: String, required: true },
+    type: { type: String, required: true},
+    amount: { type: Number, required: true },
   },
   { timestamps: true }
 );
@@ -32,6 +35,7 @@ const toNormalization: toNormalizationFunction = function () {
   const PointObject: PointType = {
     id: _userObject._id.toString(),
     userID: _userObject.userID,
+    type: _userObject.type,
     amount: _userObject.amount,
     date: _userObject.date,
   };

diff --git a/backend/src/router/user.ts b/backend/src/router/user.ts
@@ -13,7 +13,7 @@ class UserRouter {
 
   public static points: Spec = {
     method: HELPER.methods.POST || HELPER.methods.PUT,
-    path: "/user/:id/points/",
+    path: "/user/:id/points/:type",
     validate: {
       continueOnError: true,
       type: HELPER.contentType.JSON,

diff --git a/bot/package.json b/bot/package.json
@@ -5,6 +5,7 @@
   "license": "MIT",
   "scripts": {
     "dev": "ts-node-dev ./src/server.ts",
+    "dev-db": "NODE_ENV=db ts-node-dev ./src/server.ts",
     "build": "tsc",
     "watch": "tsc -w",
     "serve": "node ./dist/server.js"

diff --git a/bot/src/utils/points_handler.ts b/bot/src/utils/points_handler.ts
@@ -3,7 +3,6 @@ import { config } from "../config/config";
 import { UserType } from "../types"
 import * as jwt from "jsonwebtoken";
 import axios from "axios";
-import { resolve } from "path";
 
 
 const API_URL = config.apiUrl;
@@ -30,7 +29,7 @@ export class PointsHandler {
     } else {
       // Give points based off of location
       if(!config.debug){
-        this.givePoints(message.author, this.getMultiplier(message)).catch(err => console.log(err));
+        this.givePoints(message.author, this.getMultiplier(message), 'message').catch(err => console.log(err));
       }
     }
   }
@@ -92,11 +91,11 @@ export class PointsHandler {
     }
   }
 
-  private async updateUser(user: UserType): Promise<UserType> {
+  private async updateUser(user: UserType, type: string): Promise<UserType> {
     const token = this.getToken(user.id);
 
     try {
-      const resp = await axios(config.apiUrl + '/user/' + user.id + '/points', { method: "POST", data: user, headers: { 'Content-Type': 'application/json', 'Authorization': 'Bearer ' + token } });
+      const resp = await axios(config.apiUrl + '/user/' + user.id + '/points/' + type, { method: "POST", data: user, headers: { 'Content-Type': 'application/json', 'Authorization': 'Bearer ' + token } });
       return resp.data.data;
     } catch (e) {
       if (e && e.response) console.error(e.response.data);
@@ -133,7 +132,7 @@ export class PointsHandler {
 
       if (thankeesArray.length != 0){
         thankees.forEach(thankee => {
-          this.givePoints(thankee.user, config.multipliers['thanks']).catch(err => console.log(err));
+          this.givePoints(thankee.user, config.multipliers['thanks'], 'thanks').catch(err => console.log(err));
         })
 
 
@@ -166,11 +165,11 @@ export class PointsHandler {
     }
   }
 
-  private async givePoints(u: User, amount: number): Promise<void> {
+  private async givePoints(u: User, amount: number, type: string): Promise<void> {
     const user = await this.getUser(u);
     if (user) {
       user.totalPoints = amount;
-      this.updateUser(user);
+      this.updateUser(user, type);
     } else {
       console.log("User is undefined");
     }