fix(congregation): issue when congregation update overwrites cloud data

src/classes/Congregation.js

@@ -9,6 +9,7 @@ const db = getFirestore(); //get default database
 export class Congregation {
 	constructor(id) {
 		this.id = id;
+		this.country_code = '';
 		this.cong_name = '';
 		this.cong_number = '';
 		this.cong_persons = '';
@@ -27,6 +28,7 @@ Congregation.prototype.loadDetails = async function () {
 	const congRef = db.collection('congregations').doc(this.id);
 	const congSnap = await congRef.get();
 
+	this.country_code = congSnap.data().country_code;
 	this.cong_name = congSnap.data().cong_name;
 	this.cong_number = congSnap.data().cong_number;
 	this.last_backup = congSnap.data().last_backup;
@@ -61,7 +63,8 @@ Congregation.prototype.loadDetails = async function () {
 };
 
 Congregation.prototype.updateInfo = async function (congInfo) {
-	await db.collection('congregations').doc(this.id).set(congInfo);
+	await db.collection('congregations').doc(this.id).set(congInfo, { merge: true });
+	this.country_code = congInfo.country_code;
 	this.cong_name = congInfo.cong_name;
 	this.cong_number = congInfo.cong_number;
 };
@@ -193,7 +196,7 @@ Congregation.prototype.updateUserRole = async function (userId, userRole) {
 
 Congregation.prototype.createPocketUser = async function (pocketName, pocketId) {
 	const code = randomstring.generate(10).toUpperCase();
-	const secureCode = encryptData(code);
+	const secureCode = encryptData(`${this.country_code}${this.cong_number}-${code}`);
 
 	const ref = await db.collection('users').add({
 		about: { name: pocketName, role: 'pocket' },

src/classes/Congregations.js

@@ -27,7 +27,13 @@ Congregations.prototype.findCongregationById = function (id) {
 };
 
 Congregations.prototype.findByNumber = function (number) {
-	return this.list.find((cong) => cong.cong_number === number);
+	const regex = new RegExp('\\d+');
+
+	const array = regex.exec(number);
+	const cong_country = number.substring(0, array.index);
+	const cong_number = array[0];
+
+	return this.list.find((cong) => cong.country_code === cong_country && cong.cong_number === cong_number);
 };
 
 Congregations.prototype.create = async function (congInfo) {

src/classes/Users.js

@@ -1,6 +1,5 @@
 import { getAuth } from 'firebase-admin/auth';
 import { getFirestore } from 'firebase-admin/firestore';
-import { decryptData } from '../utils/encryption-utils.js';
 import { sendVerificationEmail } from '../utils/sendEmail.js';
 import { dbFetchUsers } from '../utils/user-utils.js';
 import { congregations } from './Congregations.js';
@@ -46,14 +45,17 @@ Users.prototype.findUserById = function (id) {
 
 Users.prototype.findUserByOTPCode = function (code) {
 	let user;
-	for (let i = 0; i < this.list.length; i++) {
-		const item = this.list[i];
-		const otpCode = item.pocket_oCode;
-		if (otpCode !== '') {
-			const pocket_oCode = decryptData(otpCode);
-
-			if (code === pocket_oCode) {
-				user = item;
+
+	// parse otp code
+	const cong_number = code.split('-')[0];
+
+	// get congregation
+	const cong = congregations.findByNumber(cong_number);
+	if (cong) {
+		for (let i = 0; i < cong.cong_members.length; i++) {
+			const item = cong.cong_members[i];
+			if (code === item.pocket_oCode) {
+				user = this.findUserById(item.id);
 				break;
 			}
 		}

src/controllers/congregation-controller.js

@@ -1359,7 +1359,7 @@ export const getCongregations = async (req, res, next) => {
 
 export const createCongregation = async (req, res, next) => {
 	try {
-		const { email, cong_name, cong_number, app_requestor } = req.body;
+		const { email, country_code, cong_name, cong_number, app_requestor } = req.body;
 
 		const errors = validationResult(req);
 
@@ -1391,7 +1391,7 @@ export const createCongregation = async (req, res, next) => {
 		}
 
 		// find congregation
-		const cong = congregations.findByNumber(cong_number);
+		const cong = congregations.findByNumber(`${country_code}${cong_number}`);
 		if (cong) {
 			res.locals.type = 'warn';
 			res.locals.message = 'the congregation requested already exists';
@@ -1401,8 +1401,7 @@ export const createCongregation = async (req, res, next) => {
 		}
 
 		// create congregation
-		const congData = { cong_name, cong_number };
-		const newCong = await congregations.create(congData);
+		const newCong = await congregations.create({ country_code, cong_name, cong_number });
 
 		// add user to congregation
 		const tmpUser = users.findUserByEmail(email);
@@ -1420,7 +1419,7 @@ export const updateCongregationInfo = async (req, res, next) => {
 	try {
 		const { id } = req.params;
 		const { email } = req.headers;
-		const { cong_name, cong_number } = req.body;
+		const { country_code, cong_name, cong_number } = req.body;
 
 		const errors = validationResult(req);
 
@@ -1446,7 +1445,7 @@ export const updateCongregationInfo = async (req, res, next) => {
 				const isValid = cong.isMember(email);
 
 				if (isValid) {
-					const data = { cong_name, cong_number };
+					const data = { country_code, cong_name, cong_number };
 					await cong.updateInfo(data);
 
 					for await (const user of cong.cong_members) {