devops/encoach_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactored /api/users

Browse Source
This commit is contained in:
Carlos Mesquita
2024-09-07 21:50:29 +01:00
parent cab469007b
commit c2b4bb29d6
4 changed files with 73 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/pages/api/users/[id].ts
View File

@@ -1,17 +1,10 @@
// Next.js API route support: https://nextjs.org/docs/api-routes/introduction // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
import type { NextApiRequest, NextApiResponse } from "next"; import type { NextApiRequest, NextApiResponse } from "next";
import { app } from "@/firebase"; import client from "@/lib/mongodb";
import {
getFirestore,
collection,
getDocs,
getDoc,
doc,
} from "firebase/firestore";
import { withIronSessionApiRoute } from "iron-session/next"; import { withIronSessionApiRoute } from "iron-session/next";
import { sessionOptions } from "@/lib/session"; import { sessionOptions } from "@/lib/session";
const db = getFirestore(app); const db = client.db(process.env.MONGODB_DB);
export default withIronSessionApiRoute(handler, sessionOptions); export default withIronSessionApiRoute(handler, sessionOptions);
@@ -22,8 +15,8 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
} }
const { id } = req.query as { id: string }; const { id } = req.query as { id: string };
const snapshot = await getDoc(doc(db, "users", id)); const snapshot = await db.collection("users").findOne({ id: id });
if (!snapshot.exists()) return res.status(404).json({ ok: false });
res.status(200).json({ ...snapshot.data(), id: snapshot.id }); if (!snapshot) return res.status(404).json({ ok: false });
res.status(200).json(snapshot);
} }

25
src/pages/api/users/agents/[code].ts
View File

@@ -1,19 +1,12 @@
import { app, adminApp } from "@/firebase"; import { app, adminApp } from "@/firebase";
import { AgentUser } from "@/interfaces/user"; import { AgentUser } from "@/interfaces/user";
import { sessionOptions } from "@/lib/session"; import { sessionOptions } from "@/lib/session";
import { import client from "@/lib/mongodb";
collection,
getDocs,
getFirestore,
query,
where,
} from "firebase/firestore";
import { getAuth } from "firebase-admin/auth";
import { withIronSessionApiRoute } from "iron-session/next"; import { withIronSessionApiRoute } from "iron-session/next";
import { NextApiRequest, NextApiResponse } from "next"; import { NextApiRequest, NextApiResponse } from "next";
import countryCodes from "country-codes-list"; import countryCodes from "country-codes-list";
const db = getFirestore(app);
const auth = getAuth(adminApp); const db = client.db(process.env.MONGODB_DB);
export default withIronSessionApiRoute(user, sessionOptions); export default withIronSessionApiRoute(user, sessionOptions);
@@ -28,14 +21,10 @@ async function get(req: NextApiRequest, res: NextApiResponse) {
language: string; language: string;
}; };
const usersQuery = query( const docs = await db.collection("users").find<AgentUser>({
collection(db, "users"), type: "agent",
where("type", "==", "agent"), "demographicInformation.country": code
where("demographicInformation.country", "==", code), }).toArray();
);
const docsUser = await getDocs(usersQuery);
const docs = docsUser.docs.map((doc) => doc.data() as AgentUser);
const entries = docs.map((user: AgentUser) => { const entries = docs.map((user: AgentUser) => {
const newUser = { const newUser = {

23
src/pages/api/users/agents/index.ts
View File

@@ -1,19 +1,12 @@
import { app, adminApp } from "@/firebase";
import { AgentUser } from "@/interfaces/user"; import { AgentUser } from "@/interfaces/user";
import { sessionOptions } from "@/lib/session"; import { sessionOptions } from "@/lib/session";
import { import client from "@/lib/mongodb";
collection,
getDocs,
getFirestore,
query,
where,
} from "firebase/firestore";
import { getAuth } from "firebase-admin/auth";
import { withIronSessionApiRoute } from "iron-session/next"; import { withIronSessionApiRoute } from "iron-session/next";
import { NextApiRequest, NextApiResponse } from "next"; import { NextApiRequest, NextApiResponse } from "next";
import countryCodes from "country-codes-list"; import countryCodes from "country-codes-list";
const db = getFirestore(app);
const auth = getAuth(adminApp); const db = client.db(process.env.MONGODB_DB);
export default withIronSessionApiRoute(user, sessionOptions); export default withIronSessionApiRoute(user, sessionOptions);
@@ -25,13 +18,7 @@ interface Contact {
async function get(req: NextApiRequest, res: NextApiResponse) { async function get(req: NextApiRequest, res: NextApiResponse) {
const { language = "en" } = req.query as { language: string }; const { language = "en" } = req.query as { language: string };
const usersQuery = query( const docs = await db.collection("users").find<AgentUser>({type: "agent"}).toArray();
collection(db, "users"),
where("type", "==", "agent"),
);
const docsUser = await getDocs(usersQuery);
const docs = docsUser.docs.map((doc) => doc.data() as AgentUser);
const data = docs.reduce( const data = docs.reduce(
(acc: Record<string, Contact[]>, user: AgentUser) => { (acc: Record<string, Contact[]>, user: AgentUser) => {

64
src/pages/api/users/update.ts
View File

@@ -13,8 +13,9 @@ import ShortUniqueId from "short-unique-id";
import { Payment } from "@/interfaces/paypal"; import { Payment } from "@/interfaces/paypal";
import { toFixedNumber } from "@/utils/number"; import { toFixedNumber } from "@/utils/number";
import { propagateExpiryDateChanges, propagateStatusChange } from "@/utils/propagate.user.changes"; import { propagateExpiryDateChanges, propagateStatusChange } from "@/utils/propagate.user.changes";
import client from "@/lib/mongodb";
const db = getFirestore(app); const db = client.db(process.env.MONGODB_DB);
const auth = getAuth(app); const auth = getAuth(app);
export default withIronSessionApiRoute(handler, sessionOptions); export default withIronSessionApiRoute(handler, sessionOptions);
@@ -23,7 +24,7 @@ export default withIronSessionApiRoute(handler, sessionOptions);
// because the id is not a par of the hash and payment expects date to be of type Date // because the id is not a par of the hash and payment expects date to be of type Date
// but if it is not inserted as a string, some UI components will not work (Invalid Date) // but if it is not inserted as a string, some UI components will not work (Invalid Date)
const addPaymentRecord = async (data: any) => { const addPaymentRecord = async (data: any) => {
await setDoc(doc(db, "payments", data.id), data); await db.collection("payments").insertOne(data);
}; };
const managePaymentRecords = async (user: User, userId: string | undefined): Promise<boolean> => { const managePaymentRecords = async (user: User, userId: string | undefined): Promise<boolean> => {
try { try {
@@ -41,16 +42,15 @@ const managePaymentRecords = async (user: User, userId: string | undefined): Pro
date: new Date().toISOString(), date: new Date().toISOString(),
}; };
const corporatePayments = await getDocs(query(collection(db, "payments"), where("corporate", "==", userId))); const corporatePayments = await db.collection("payments").find({ corporate: userId }).toArray();
if (corporatePayments.docs.length === 0) { if (corporatePayments.length === 0) {
await addPaymentRecord(data); await addPaymentRecord(data);
return true; return true;
} }
const hasPaymentPaidAndExpiring = corporatePayments.docs.filter((doc) => { const hasPaymentPaidAndExpiring = corporatePayments.filter((doc) => {
const data = doc.data();
return ( return (
data.isPaid && doc.isPaid &&
moment().isAfter(moment(user.subscriptionExpirationDate).subtract(30, "days")) && moment().isAfter(moment(user.subscriptionExpirationDate).subtract(30, "days")) &&
moment().isBefore(moment(user.subscriptionExpirationDate)) moment().isBefore(moment(user.subscriptionExpirationDate))
); );
@@ -78,19 +78,20 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
const queryId = req.query.id as string; const queryId = req.query.id as string;
const userRef = doc(db, "users", queryId ? (queryId as string) : req.session.user.id); let user = await db.collection("users").findOne<User>({ id: queryId ? (queryId as string) : req.session.user.id });
const userSnapshot = await getDoc(userRef);
const updatedUser = req.body as User & { password?: string; newPassword?: string }; const updatedUser = req.body as User & { password?: string; newPassword?: string };
if (!!queryId) { if (!!queryId) {
await setDoc(userRef, updatedUser, {merge: true}); await db.collection("users").updateOne(
await managePaymentRecords(updatedUser, updatedUser.id); { id: queryId },
const user = {...userSnapshot.data(), id: userSnapshot.id} as User; { $set: updatedUser }
);
await managePaymentRecords(updatedUser, updatedUser.id);
if (updatedUser.status || updatedUser.type === "corporate") { if (updatedUser.status || updatedUser.type === "corporate") {
// there's no await as this does not affect the user // there's no await as this does not affect the user
propagateStatusChange(queryId, updatedUser.status); propagateStatusChange(queryId, updatedUser.status);
propagateExpiryDateChanges(queryId, user.subscriptionExpirationDate, updatedUser.subscriptionExpirationDate || null); propagateExpiryDateChanges(queryId, user?.subscriptionExpirationDate, updatedUser.subscriptionExpirationDate || null);
} }
res.status(200).json({ ok: true }); res.status(200).json({ ok: true });
@@ -120,8 +121,9 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
if (updatedUser.email !== req.session.user.email && updatedUser.password) { if (updatedUser.email !== req.session.user.email && updatedUser.password) {
try { try {
const usersWithSameEmail = await getDocs(query(collection(db, "users"), where("email", "==", updatedUser.email.toLowerCase()))); const usersWithSameEmail = await db.collection("users").find({ email: updatedUser.email.toLowerCase() }).toArray();
if (usersWithSameEmail.docs.length > 0) {
if (usersWithSameEmail.length > 0) {
res.status(400).json({ error: "E003", message: errorMessages.E003 }); res.status(400).json({ error: "E003", message: errorMessages.E003 });
return; return;
} }
@@ -130,18 +132,17 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
await updateEmail(credential.user, updatedUser.email); await updateEmail(credential.user, updatedUser.email);
if (req.session.user.type === "student") { if (req.session.user.type === "student") {
const corporateAdmins = ((await getDocs(collection(db, "users"))).docs.map((x) => ({...x.data(), id: x.id})) as User[]) const corporateAdmins = (await db.collection("users").find<User>({ type: "corporate" }).toArray()).map((x) => x.id);
.filter((x) => x.type === "corporate")
.map((x) => x.id); const groups = await db.collection("groups").find<Group>({
const groups = ((await getDocs(collection(db, "groups"))).docs.map((x) => ({...x.data(), id: x.id})) as Group[]).filter( participants: req.session.user!.id,
(x) => x.participants.includes(req.session.user!.id) && corporateAdmins.includes(x.admin), admin: { $in: corporateAdmins }
); }).toArray();
groups.forEach(async (group) => { groups.forEach(async (group) => {
await setDoc( await db.collection("groups").updateOne(
doc(db, "groups", group.id), { id: group.id },
{participants: group.participants.filter((x) => x !== req.session.user!.id)}, { $set: { participants: group.participants.filter((x) => x !== req.session.user!.id) } }
{merge: true},
); );
}); });
} }
@@ -159,18 +160,21 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
delete updatedUser.password; delete updatedUser.password;
delete updatedUser.newPassword; delete updatedUser.newPassword;
await setDoc(userRef, updatedUser, {merge: true}); await db.collection("users").updateOne(
{ id: queryId },
{ $set: updatedUser }
);
const docUser = await getDoc(doc(db, "users", req.session.user.id)); user = await db.collection("users").findOne<User>({ id: req.session.user.id });
const user = docUser.data() as User;
if (!queryId) { if (!queryId) {
req.session.user = {...user, id: req.session.user.id}; req.session.user = user ? user : null;
await req.session.save(); await req.session.save();
} }
if (user) {
await managePaymentRecords(user, queryId); await managePaymentRecords(user, queryId);
}
res.status(200).json({ user }); res.status(200).json({ user });
} }