fix(classes): update announcement details

sws2apps · Dec 3, 2022 · ec7ebf6 · ec7ebf6
1 parent 998ec2a
commit ec7ebf6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/src/classes/Announcement.js b/src/classes/Announcement.js
@@ -1,22 +1,30 @@
-import { getFirestore } from "firebase-admin/firestore";
+import { getFirestore } from 'firebase-admin/firestore';
 
 const db = getFirestore(); //get default database
 
 export class Announcement {
   id;
   data;
+  appTarget;
+  expiredDate;
+  isDraft;
+  publishedDate;
 
   constructor() {}
 
   loadDetails = async (id) => {
-    const announcementRef = db.collection("announcements").doc(id);
+    const announcementRef = db.collection('announcements').doc(id);
     const announcementSnap = await announcementRef.get();
 
     const dbItem = announcementSnap.data();
 
     const announcement = new Announcement();
     announcement.id = id;
-    announcement.data = { ...dbItem };
+    announcement.data = dbItem.data;
+    announcement.appTarget = dbItem.appTarget;
+    announcement.expiredDate = dbItem.expiredDate;
+    announcement.isDraft = dbItem.isDraft;
+    announcement.publishedDate = dbItem.publishedDate;
 
     return announcement;
   };

diff --git a/src/classes/Users.js b/src/classes/Users.js
@@ -1,13 +1,13 @@
-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 { User } from "./User.js";
+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 { User } from './User.js';
 
 const db = getFirestore(); //get default database
 
 const getUsers = async () => {
-  const userRef = db.collection("users");
+  const userRef = db.collection('users');
   const snapshot = await userRef.get();
 
   const tmpUsers = [];
@@ -110,18 +110,18 @@ class clsUsers {
     const data = {
       about: {
         name: fullname,
-        role: "vip",
+        role: 'vip',
         user_uid: userEmail,
       },
     };
 
-    await db.collection("users").add(data);
+    await db.collection('users').add(data);
 
     await this.loadAll();
   };
 
   delete = async (userId, authId) => {
-    await db.collection("users").doc(userId).delete();
+    await db.collection('users').doc(userId).delete();
 
     // remove from auth if qualified
     if (authId) await getAuth().deleteUser(authId);