#4 #5 #6 added models and interfaces for TrackHistory

src/controllers/usersController.ts

@@ -24,7 +24,7 @@ export class UsersController {
     }
 
     public loginUser = async(req: Request, res: Response): Promise<void> => {
-        const response: IResponse<IUser | null> = await this.service.loginUser(req.body)
+        const response: IResponse<{token: string} | null> = await this.service.loginUser(req.body)
         res.status(200).send(response)
     }
 }

src/interfaces/ITrackHistory.ts

+import ITrack from "./ITrack";
+import IUser from "./IUser";
+
+export default interface ITrackHistory {
+    user: IUser['_id']
+    track: ITrack['_id']
+    datetime: Date
+}
\ No newline at end of file

src/interfaces/ITrackHistoryDto.ts

+import ITrack from "./ITrack";
+import IUser from "./IUser";
+
+export default interface ITrackHistoryDto{
+    token: IUser['token']
+    track: ITrack['_id']
+}
\ No newline at end of file

src/interfaces/IUser.ts

-import {Document} from "mongoose"
+import {Document, Types} from "mongoose"
 
 export default interface IUser extends Document {
-    _id: string
+    _id: Types.ObjectId
     username: string
     password: string
     token: string

src/models/TrackHistory.ts

+import mongoose, {Schema} from "mongoose";
+import ITrackHistory from "../interfaces/ITrackHistory";
+
+
+const TrackHistorySchema: Schema = new Schema<ITrackHistory>({
+    user:{
+        type: Schema.Types.ObjectId,
+        ref: 'User',
+        required: true
+    },
+    track:{
+        type: Schema.Types.ObjectId,
+        ref: 'Track',
+        required: true
+    },
+    datetime:{
+        type: Date,
+        timestamps: true
+    }
+})
+
+export const TrackHistory = mongoose.model<ITrackHistory>('TrackHistory', TrackHistorySchema)
+

src/models/User.ts

@@ -16,7 +16,7 @@ const UserSchema: Schema = new Schema<IUser>({
     },
     token: {
         type: String,
-        required: true
+        required: false
     }
 },{versionKey: false})
 

src/repository/mongooseDB.ts

@@ -197,7 +197,7 @@ export class MongooseDB {
         }
     }
 
-    public loginUser = async(userDto: IUserDto): Promise<IResponse<IUser | null>> => {
+    public loginUser = async(userDto: IUserDto): Promise<IResponse<{token: string} | null>> => {
         try{
             const user = await User.findOne({username: userDto.username})
             if (!user) throw new Error('User not found')
@@ -206,9 +206,10 @@ export class MongooseDB {
             if (!isMatch) throw new Error('Wrong password')
              // @ts-ignore
             user.generateToken()
-            const response: IResponse<IUser> = {
+            const data = await user.save()
+            const response: IResponse<{token: string}> = {
                 status: EStatuses.SUCCESS,
-                result: user,
+                result: {token: data.token},
                 message: 'Access granted'
             }
             return response

src/services/usersService.ts

@@ -14,7 +14,7 @@ export class UsersService {
         return await this.repository.addUser(userDto)
     }
 
-    public loginUser = async (userDto: IUserDto): Promise<IResponse<IUser | null>> => {
+    public loginUser = async (userDto: IUserDto): Promise<IResponse<{token: string} | null>> => {
         return await this.repository.loginUser(userDto)
     }
 }