diff --git a/packages/api/routes/search.ts b/packages/api/routes/search.ts index 63d75fc..9b8c7fc 100644 --- a/packages/api/routes/search.ts +++ b/packages/api/routes/search.ts @@ -1,9 +1,9 @@ -import { JwtClaims, authCheck } from "../middleware/auth"; -import express, { Application, Request, Response } from "express"; +import { JwtClaims, authCheck } from '../middleware/auth'; +import express, { Application, Request, Response } from 'express'; -import { User } from "@nirvana/core/models"; -import UserSearchResponse from "../../core/responses/userSearch.response"; -import { UserService } from "../services/user.service"; +import User from '@nirvana/core/models/user.model'; +import UserSearchResponse from '../../core/responses/userSearch.response'; +import { UserService } from '../services/user.service'; export default function getSearchRoutes() { const router = express.Router(); @@ -11,7 +11,7 @@ export default function getSearchRoutes() { router.use(express.json()); // get user details based on id token - router.get("/users", authCheck, handleUserSearch); + router.get('/users', authCheck, handleUserSearch); return router; } @@ -23,18 +23,14 @@ async function handleUserSearch(req: Request, res: Response) { const { query } = req.query; if (!query) { - res.status(400).send("No search query provided!"); + res.status(400).send('No search query provided!'); return; } // text search on users - const users: User[] | null = await UserService.getUsersLikeEmailAndName( - query as string - ); + const users: User[] | null = await UserService.getUsersLikeEmailAndName(query as string); - const filteredUsers = users?.filter( - (currUser) => currUser._id?.toString() !== userInfo.userId - ); + const filteredUsers = users?.filter((currUser) => currUser._id?.toString() !== userInfo.userId); const resObj = new UserSearchResponse(filteredUsers ?? []); diff --git a/packages/api/services/user.service.ts b/packages/api/services/user.service.ts index d2fdb43..52cd135 100644 --- a/packages/api/services/user.service.ts +++ b/packages/api/services/user.service.ts @@ -1,7 +1,6 @@ -import User, { GoogleUserInfo } from '@nirvana/core/models/user.model'; +import User, { GoogleUserInfo, UserStatus } from '@nirvana/core/models/user.model'; import { ObjectId } from 'mongodb'; -import { UserStatus } from '../../core/models/user.model'; import axios from 'axios'; import { collections } from './database.service'; diff --git a/packages/core/responses/error.response.ts b/packages/core/responses/error.response.ts deleted file mode 100644 index 04c61d2..0000000 --- a/packages/core/responses/error.response.ts +++ /dev/null @@ -1,5 +0,0 @@ -export default class ErrorResponse { - status: number; - message: string; - detail: string; -} diff --git a/packages/core/responses/getContacts.response.ts b/packages/core/responses/getContacts.response.ts deleted file mode 100644 index d9b2523..0000000 --- a/packages/core/responses/getContacts.response.ts +++ /dev/null @@ -1,14 +0,0 @@ -import Relationship from "../models/relationship.model"; -import { User } from "../models/user.model"; - -export default class GetContactsResponse { - contactsDetails: ContactDetails[] = []; - - constructor() {} -} - -export class ContactDetails { - isSpeaking: boolean = false; - - constructor(public otherUser: User, public relationship: Relationship) {} -} diff --git a/packages/core/responses/getConversationDetails.response.ts b/packages/core/responses/getConversationDetails.response.ts deleted file mode 100644 index 732cf1f..0000000 --- a/packages/core/responses/getConversationDetails.response.ts +++ /dev/null @@ -1,14 +0,0 @@ -import Content from "../models/content.model"; -import Relationship from "../models/relationship.model"; -import { User } from "@nirvana/core/models"; - -export default class GetConversationDetailsResponse { - // get the messages for this conversation for like last 7 days or just a count of them until we paginate? - - constructor( - public contactUser: User, - public isLiveOrPinned: boolean, - public ourRelationship?: Relationship, - public latestContent?: Content[] - ) {} -} diff --git a/packages/core/responses/getDmConversationByOtherUserId.response.ts b/packages/core/responses/getDmConversationByOtherUserId.response.ts deleted file mode 100644 index fcb38a9..0000000 --- a/packages/core/responses/getDmConversationByOtherUserId.response.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { Line } from "../models/line.model"; - -export default class GetDmConversationByOtherUserIdResponse { - constructor(public conversation: Conversation) {} -} diff --git a/packages/core/responses/getUserLines.response.ts b/packages/core/responses/getUserLines.response.ts deleted file mode 100644 index 06ddf6a..0000000 --- a/packages/core/responses/getUserLines.response.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { Line } from "../models/line.model"; -import MasterLineData from "../models/masterLineData.model"; - -export default class GetUserLinesResponse { - constructor(public masterLines: MasterLineData[]) {} -} diff --git a/packages/core/responses/login.response.ts b/packages/core/responses/login.response.ts index 7654118..b73c48f 100644 --- a/packages/core/responses/login.response.ts +++ b/packages/core/responses/login.response.ts @@ -1,4 +1,4 @@ -import { User } from "../models/user.model"; +import User from '../models/user.model'; export default class LoginResponse { constructor(public jwtToken: string, public userDetails: User) {} diff --git a/packages/core/responses/userDetails.response.ts b/packages/core/responses/userDetails.response.ts index 92cb73f..a37fdfd 100644 --- a/packages/core/responses/userDetails.response.ts +++ b/packages/core/responses/userDetails.response.ts @@ -1,4 +1,4 @@ -import { User } from "@nirvana/core/models"; +import User from '../models/user.model'; export default class UserDetailsResponse { constructor(public user: User) {} diff --git a/packages/core/responses/userSearch.response.ts b/packages/core/responses/userSearch.response.ts index 85b248a..34fe339 100644 --- a/packages/core/responses/userSearch.response.ts +++ b/packages/core/responses/userSearch.response.ts @@ -1,12 +1,9 @@ -import { User } from "@nirvana/core/models"; +import User from '../models/user.model'; /** * Full results from the global search */ export default class UserSearchResponse { - // all friends/contacts matching search - contacts?: User[]; - // all public users constructor(public users: User[]) {} }