Merge pull request #11 from muneebhashone/notifications-chauffeur

Notifications chauffeur

Author: ShakirYasin

.env.sample

@@ -33,3 +33,12 @@ SESSION_EXPIRES_IN=""
 PASSWORD_RESET_TOKEN_EXPIRES_IN=""
 
 SET_PASSWORD_TOKEN_EXPIRES_IN=""
+
+# false in development
+SET_SESSION=
+
+GOOGLE_CLIENT_ID=""
+
+GOOGLE_CLIENT_SECRET=''
+
+REDIRECT_URI = ''

city-link-application-firebase-adminsdk-npczq-e379ddb065.json

@@ -0,0 +1,13 @@
+{
+  "type": "service_account",
+  "project_id": "city-link-application",
+  "private_key_id": "e379ddb0654b4fbe7e0315310e0ccc60aa1ce9a8",
+  "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDApQ7ViezYSedR\nFMeEHwS7SEA5stGaSI/xdw8IUcbZ47mB5LEEsNdUu95JaHSdSZnaGfm+ZFN/k8SM\n06G09EWLnbCAZvukGh1YnbrGMIE2IV5iRX54vPYNCrGziXkOhBjybw40ppFzBHBH\nlcLJKGUCDd0yk8IXnFEvjlmajygGHJj/xtFX0j9kHJn/UAly/fXgW1YF66DcNBiP\n8CXhFhKW1NXv2wISHZItY6PGgenNW/jJ4sJM/5/CvZ/GvI8FRF7KBa6Ol5lEdmrk\ntxH1N4nkIBu80CMaiObvUasA5fFxPVoRQKsouEUm4ZluI8MFSeCF4/qCh+AiBChx\n1Qt4g5cXAgMBAAECggEAGsAw3aUv7t7gUKmGhQm7ofgH9xsmMPrnhhvGyhx09PfC\n4E8t551Y4WrPFLl9DARW6WrW+8G5uIr/7aBLobGT4K3Ofx4Nzn1T2uTYNUIyBx6+\nGP5WcBSpRClagLhTx5i/UBbszZHdu69/mekpab6CvDTJpQbQmm+59FUbizNa1vIu\nmTvhFAtOZ0SPp9ULVKYDtBw8JEaVvrl0MXyaFoI254tbt527Qs5HlrbKJT5pMW5c\nez+V6Z+8hjXt26GilIBF7nk0W8+9Lz1Q2c9W2UCeeUU8ISjrMd5SltWFAvPfRtAw\n7CXvBPZFMB6jxJvUuM1Ap3w1zZrAfgLcGwZIxygReQKBgQD4l2kvJ3j4fI6m+mRz\n9lDTBx4kuMaOZpc5XsNOj9JTqU1MoyEa+nQhBPwPgFnrLDOrNKjcLk06oJgPk3Y3\nLwd0Rot3Z2ElcIUJF5r1pYInhnStvJR3m3bswaVU7+4pVK6woRWhB0IZgepKhTvV\nDF983tfHToJq+kahy9tAkBY9SQKBgQDGYs+GQfKPgbzfcYo0zDSA3uUcBTzB23ss\njVmUjAjQsu00vZ1W/mntPakVqJUn+LKNTx+e41ZyaZIokQTvJWMBpNJzb54OeZaa\nWosxWarmOto9ydsWqjGKaYgNa6Y2HCZ5fppf6sSiw+2mDPAplz9xSf8RsO62KDHQ\nPZK6iakRXwKBgQCqpWVzFSmZigdy4Fesst1wv2YV1zGV9x7AJyjy+Q9slr+VaDYF\niv/E2uMc0QLoyQL+97siyjYBlNRNfPCdmQ8I5pQ+dxzc0ozAXQ/mqKLb9xSJXvab\n1ICirZuM3tciUBtK7IkobQ8W63OljCgya7fwxBhjnKUyQnPSBVqQy1g44QKBgQCT\nVxvOGPivwKmoQkllQSzVcbYzg2hGil4HDswzWXXKmrk17IYI8Fd3zc3guh5dW4Yx\nEUzo0uuHegUFf/9sJhZMSD/NYF7BXWiPJyQt+OzGpXslXOANC0ZUCGD1prgBhBLH\nNVIuXszAHkhIhV9xZFXILC720rPYMi4c/T4WsNsSfQKBgQCdDjWcvf3yMGoEu/4+\ntrUrOiNVM/WIiYERDcxHzEdGlMxKvfwfABNK74w9WXBkUY9bfYxqX/C2iUdhvi3P\nL0F28DAn19oqv2oPSkvsYbFwIxWIzUYcBOqzMAKxn5L5pJaaH1pnwl6WRi3rEGQJ\nnP2DptDdPnDF7HWjqQSBxJ1hsA==\n-----END PRIVATE KEY-----\n",
+  "client_email": "firebase-adminsdk-npczq@city-link-application.iam.gserviceaccount.com",
+  "client_id": "112652304365380801917",
+  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+  "token_uri": "https://oauth2.googleapis.com/token",
+  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/firebase-adminsdk-npczq%40city-link-application.iam.gserviceaccount.com",
+  "universe_domain": "googleapis.com"
+}

docker-compose.yml

@@ -10,14 +10,14 @@ services:
       MONGO_INITDB_ROOT_USERNAME: root
       MONGO_INITDB_ROOT_PASSWORD: example
     volumes:
-      - mongodb_city_link:/data/db
+      - ./.database/mongodb_city_link:/data/db
 
   redis:
     image: redis:latest
     ports:
       - 6379:6379
     volumes:
-      - redis:/data
+      - ./.databse/redis:/data
 
 volumes:
   mongodb_city_link:

package.json

@@ -56,6 +56,7 @@
     "@types/compression": "^1.7.2",
     "argon2": "^0.30.3",
     "axios": "^1.4.0",
+    "batch": "^0.6.1",
     "bullmq": "^5.7.6",
     "compression": "^1.7.4",
     "connect-redis": "^7.1.1",
@@ -70,6 +71,7 @@
     "express": "^4.19.2",
     "express-async-handler": "^1.2.0",
     "express-session": "^1.18.0",
+    "firebase-admin": "^12.3.0",
     "geolib": "^3.3.4",
     "helmet": "^6.0.1",
     "http-status-codes": "^2.3.0",

pnpm-lock.yaml

@@ -16,6 +16,11 @@ import {
   ConfirmApartmentBookingSchema,
   MyApartmentBookingsSchema,
 } from './apartment-booking.schema';
+import { addNotificationJob } from '../../queues/notification.queue';
+import {
+  NOTIFICATION_MESSAGES,
+  NOTIFICATION_TITLE,
+} from '../../notification/notification.constants';
 
 export const getApartmentBooking = async (): Promise<
   ApartmentBookingsType[]
@@ -64,6 +69,15 @@ export const confirmApartmentBooking = async (
   if (!apartmentBookingConfirmed) {
     throw new Error('Apartment Booking Failed');
   }
+
+  await addNotificationJob({
+    title: NOTIFICATION_TITLE.YOUR_PURCHASE_IS_DONE,
+    message: NOTIFICATION_MESSAGES.YOUR_PURCHASE_IS_DONE,
+    notificationType: 'BOOKING_NOTIFICATION',
+    businessType: 'apartment',
+    bookingId: apartmentBookingConfirmed.id,
+  });
+
   return {
     status: 200,
     message: 'Apartment Successfully Booked',
@@ -144,7 +158,7 @@ export const createApartmentBookingSummary = async (
   user: JwtPayload,
 ): Promise<ApartmentBookingsType> => {
   const apartment = await Apartment.findById(payload.apartment).select(
-    'name address propertyPrice coverPhotoUrl ratingCount totalRating userId',
+    'name address propertyPrice coverPhotoUrl ratingCount totalRating owner',
   );
 
   if (!apartment)
@@ -155,12 +169,10 @@ export const createApartmentBookingSummary = async (
   if (!discount)
     throw new Error('Discount selected for booking does not exist');
 
-  console.log({ apartment, discount });
-
   const booking = await ApartmentBooking.create({
     ...payload,
     confirmed: false,
-    apartmentOwner: apartment.userId,
+    apartmentOwner: apartment.owner,
     status: 'pending',
     paymentStatus: 'unpaid',
     user: user.sub,

src/apartment/apartment-booking/apartment-booking.service.ts

@@ -6,6 +6,7 @@ import {
   deleteApartments,
   getApartment,
   getApartments,
+  getMyApartments,
   updateApartment,
 } from './apartment.service';
 import {
@@ -22,6 +23,15 @@ export const handleGetApartments = async (req: Request, res: Response) => {
     return errorResponse(res, (err as Error).message);
   }
 };
+export const handleGetMyApartments = async (req: Request, res: Response) => {
+  try {
+    const result = await getMyApartments({ id: req.user.sub });
+
+    return successResponse(res, undefined, result);
+  } catch (err) {
+    return errorResponse(res, (err as Error).message);
+  }
+};
 
 export const handleCreateApartment = async (
   req: Request<never, never, ApartmentCreateOrUpdateSchemaType>,
@@ -75,7 +85,8 @@ export const handleDeleteApartment = async (
   res: Response,
 ) => {
   try {
-    await deleteApartment({ id: req.params.id });
+    const userId = req.user?.sub;
+    await deleteApartment({ id: req.params.id }, { id: userId });
 
     return successResponse(res, 'Apartment deleted successfully');
   } catch (err) {

src/apartment/apartment.controller.ts

@@ -26,7 +26,7 @@ export interface IApartment {
   propertySizeUnit: string;
   bookingType: mongoose.Types.ObjectId;
   businessId?: number;
-  userId?: number;
+  owner?: mongoose.Schema.Types.ObjectId;
   propertyType?: mongoose.Types.ObjectId;
   typeOfPlace?: mongoose.Types.ObjectId;
   cancellationPolicies?: mongoose.Types.ObjectId[];
@@ -174,7 +174,7 @@ const ApartmentSchema = new Schema<IApartment>(
       ref: 'Business',
       required: true,
     },
-    userId: {
+    owner: {
       type: mongoose.Schema.Types.ObjectId,
       ref: 'User',
       required: true,

src/apartment/apartment.model.ts

@@ -7,6 +7,7 @@ import {
   handleDeleteApartments,
   handleGetApartment,
   handleGetApartments,
+  handleGetMyApartments,
   handleUpdateApartment,
 } from './apartment.controller';
 import {
@@ -24,6 +25,11 @@ apartmentRouter.get(
   validateZodSchema({ query: apartmentListQueryParamsSchema }),
   handleGetApartments,
 );
+apartmentRouter.get(
+  '/my',
+  canAccess('roles', ['SUPER_ADMIN', 'VENDOR']),
+  handleGetMyApartments,
+);
 
 apartmentRouter.post(
   '/',
@@ -34,7 +40,7 @@ apartmentRouter.post(
 
 apartmentRouter.delete(
   '/',
-  canAccess('roles', ['VENDOR', 'SUPER_ADMIN']),
+  canAccess('roles', ['SUPER_ADMIN']),
   handleDeleteApartments,
 );
 

src/apartment/apartment.router.ts

@@ -1,14 +1,20 @@
 import { FilterQuery } from 'mongoose';
 import { ApartmentType } from '../types';
+import { UserIdSchemaType } from '../user/user.schema';
 import { JwtPayload } from '../utils/auth.utils';
 import { checkRecordForEmptyArrays } from '../utils/common.utils';
 import { getPaginator, GetPaginatorReturnType } from '../utils/getPaginator';
-import { Apartment } from './apartment.model';
+import { Apartment, IApartment } from './apartment.model';
 import {
   ApartmentCreateOrUpdateSchemaType,
   ApartmentIdSchemaType,
   ApartmentListQueryParamsType,
 } from './apartment.schema';
+import { addNotificationJob } from '../queues/notification.queue';
+import {
+  NOTIFICATION_MESSAGES,
+  NOTIFICATION_TITLE,
+} from '../notification/notification.constants';
 
 export interface IGetApartment {
   results: ApartmentType[];
@@ -108,14 +114,42 @@ export const getApartment = async (
 
   return result;
 };
+export const getMyApartments = async (
+  userId: UserIdSchemaType,
+): Promise<IApartment[]> => {
+  const result = await Apartment.find({
+    owner: userId.id,
+  }).populate([
+    'propertyType',
+    'typeOfPlace',
+    'cancellationPolicies',
+    'facilities',
+    'houseRules',
+    'discounts',
+    'bookingType',
+  ]);
+
+  if (!result) {
+    throw new Error('Apartment not found');
+  }
+
+  return result;
+};
 
 export const createApartment = async (
   body: ApartmentCreateOrUpdateSchemaType,
   user: JwtPayload,
 ): Promise<ApartmentType> => {
   const apartment = await Apartment.create({
     ...body,
-    userId: user.sub,
+    owner: user.sub,
+  });
+
+  await addNotificationJob({
+    title: NOTIFICATION_TITLE.NEW_LISTING,
+    message: NOTIFICATION_MESSAGES.NEW_LISTING,
+    notificationType: 'SYSTEM_NOTIFICATION',
+    businessType: 'apartment',
   });
 
   return apartment;
@@ -147,14 +181,18 @@ export const updateApartment = async (
 
 export const deleteApartment = async (
   apartmentId: ApartmentIdSchemaType,
+  userId: UserIdSchemaType,
 ): Promise<void | Error> => {
   const { id } = apartmentId;
-  const deleted = await Apartment.deleteOne({
-    _id: id,
-  });
 
-  if (deleted.deletedCount < 1) {
+  const apartment = await Apartment.findById(id);
+
+  if (!apartment) {
     throw new Error('Apartment does not Exist');
+  } else if (apartment?.owner?.toString() !== userId.id.toString()) {
+    throw new Error('You do not have permission to delete this apartment.');
+  } else {
+    apartment.deleteOne();
   }
 };
 

src/apartment/apartment.service.ts

@@ -1,10 +1,13 @@
 import { Request, Response } from 'express';
 import { StatusCodes } from 'http-status-codes';
+import config from '../config/config.service';
+import { RoleType } from '../enums';
 import {
   ConflictError,
   InvalidCredentialseError,
   NotFoundError,
 } from '../errors/errors.service';
+import { GoogleCallbackQuery } from '../types';
 import { errorResponse, successResponse } from '../utils/api.utils';
 import { JwtPayload, signToken } from '../utils/auth.utils';
 import { AUTH_COOKIE_KEY, COOKIE_CONFIG } from './auth.constants';
@@ -35,10 +38,6 @@ import {
   validateLoginOtp,
   verifyOtp,
 } from './auth.service';
-import { RoleType } from '../enums';
-import { sign } from 'jsonwebtoken';
-import { GoogleCallbackQuery } from '../types';
-import { ISocialAccountInfo } from '../models/users';
 
 export const handleSetPassword = async (
   req: Request<never, never, SetPasswordSchemaType>,
@@ -180,9 +179,10 @@ export const handleLoginByEmail = async (
 ) => {
   try {
     const token = await loginUserByEmail(req.body);
-
-    res.cookie(AUTH_COOKIE_KEY, token, COOKIE_CONFIG);
-
+    console.log(config.SET_SESSION, typeof config.SET_SESSION);
+    if (config.SET_SESSION) {
+      res.cookie(AUTH_COOKIE_KEY, token, COOKIE_CONFIG);
+    }
     return res.json({ token: token });
   } catch (err) {
     if (err instanceof InvalidCredentialseError) {
@@ -268,7 +268,7 @@ export const handleGetCurrentUser = async (req: Request, res: Response) => {
     );
   }
 };
-export const handleGoogleLogin = async (req: Request, res: Response) => {
+export const handleGoogleLogin = async (_: Request, res: Response) => {
   try {
     const googleAuthURL = `https://accounts.google.com/o/oauth2/v2/auth?response_type=code&client_id=${process.env.GOOGLE_CLIENT_ID}&redirect_uri=${process.env.REDIRECT_URI}&scope=email profile`;
     res.redirect(googleAuthURL);
@@ -285,7 +285,7 @@ export const handleGoogleLogin = async (req: Request, res: Response) => {
   }
 };
 export const handleGoogleCallback = async (
-  req: Request<{}, {}, {}, GoogleCallbackQuery>,
+  req: Request<never, never, never, GoogleCallbackQuery>,
   res: Response,
 ) => {
   try {

src/auth/auth.controller.ts

@@ -3,18 +3,17 @@ import {
   InvalidCredentialseError,
   NotFoundError,
 } from '../errors/errors.service';
-import User, { IUser } from '../models/users';
+import User from '../models/users';
 import { SendOtpEmailQueue } from '../queues/email.queue';
 import { GoogleCallbackQuery, UserType } from '../types';
 import { createUser } from '../user/user.services';
 import {
-  GoogleUserInfo,
-  JwtPayload,
   compareHash,
   fetchGoogleTokens,
   getUserInfo,
   hashPassword,
-  signToken,
+  JwtPayload,
+  signToken
 } from '../utils/auth.utils';
 import { generateRandomNumbers } from '../utils/common.utils';
 import {
@@ -477,7 +476,6 @@ export const googleLogin = async (
   payload: GoogleCallbackQuery,
 ): Promise<UserType> => {
   const { code, error } = payload;
-  console.log({ code, error });
   if (error) {
     throw new Error(error);
   }
@@ -490,7 +488,6 @@ export const googleLogin = async (
   const { access_token, refresh_token, expires_in } = tokenResponse;
 
   const userInfoResponse = await getUserInfo(access_token);
-  console.log({ userInfoResponse });
 
   // const userInfo = (await userInfoResponse.) as GoogleUserInfo;
   const { id, email, name, picture } = userInfoResponse;

src/auth/auth.service.ts

@@ -25,6 +25,8 @@ export interface ICarBooking {
   bookingType: CarBookingTypesUnion;
   carId: mongoose.Types.ObjectId;
   userId: mongoose.Types.ObjectId;
+  chauffeurId: mongoose.Types.ObjectId;
+  owner: mongoose.Types.ObjectId;
   bookingStatus: BookingStatusUnion;
   paymentStatus: BookingPaymentStatusUnion;
   totalMiles: number;

src/car/car-booking/car-booking-types.ts

@@ -73,6 +73,11 @@ const CarBookingSchema = new mongoose.Schema<ICarBooking>(
       required: true,
       ref: 'User',
     },
+    owner: {
+      type: mongoose.Schema.Types.ObjectId,
+      required: true,
+      ref: 'User',
+    },
     bookingStatus: {
       type: String,
       enum: Object.keys(BookingStatus) as BookingStatusUnion[],