Revert "Addingadvertisement" oops

api/main_endpoints/models/Advertisement.js

@@ -10,11 +10,6 @@ const AdvertisementSchema = new Schema(
     },
     expireDate: {
       type: Date,
-    },
-    expireAt: {
-      type: Date,
-      default: undefined,
-      index: {expireAfterSeconds: 0}, // TTL only kicks in when expireAt is set 
     }
   },
   { collection: 'Advertisements' }

api/main_endpoints/routes/Advertisement.js

@@ -20,7 +20,6 @@ router.get('/', async (req, res) => {
     });
 });
 
-
 router.get('/getAllAdvertisements', async (req, res) => {
   if (!checkIfTokenSent(req)) {
     return res.sendStatus(FORBIDDEN);
@@ -40,16 +39,9 @@ router.post('/createAdvertisement', async (req, res) => {
   } else if (!await decodeToken(req)) {
     return res.sendStatus(UNAUTHORIZED);
   }
-  const now = new Date();
-  // const expireInOneMinute = new Date(now.getTime() + 60 * 1000);
-
   const newAd = new Advertisement({
-    // message: req.body.message,
-    // expireDate: expireInOneMinute, // testing and it doesn't work
-    // expireAt: expireInOneMinute 
     message: req.body.message,
-    expireDate: req.body.expireDate,
-    expireAt: req.body.expireDate
+    expireDate: req.body.expireDate
   });
 
   Advertisement.create(newAd)
@@ -67,11 +59,9 @@ router.post('/deleteAdvertisement', async (req, res) => {
   } else if (!await decodeToken(req)) {
     return res.sendStatus(UNAUTHORIZED);
   }
-  console.log("expire date in delete " + expireDate);
-
   Advertisement.deleteOne({ _id: req.body._id })
     .then(result => {
-      if (result.deletedCount < 1) { // used to be result.n
+      if (result.n < 1) {
         res.sendStatus(NOT_FOUND);
       } else {
         res.sendStatus(OK);

src/APIFunctions/Advertisement.js

@@ -66,7 +66,6 @@ export async function createAd(newAd, token) {
     status.responseData = err;
     status.error = true;
   }
-  console.log("STATUS " + JSON.stringify(status.responseData));
   return status;
 }
 

src/Enums.js

@@ -48,7 +48,7 @@ function membershipStateToString(accessLevel) {
   return membershipStatusArray[accessLevel + 2];
 }
 
-const BASE_API_URL = process.env.REACT_APP_BASE_API_URL || 'http://localhost:8080';
+const BASE_API_URL = process.env.REACT_APP_BASE_API_URL || 'http://localhost:8080/';
 
 module.exports = {
   memberApplicationState,

src/Pages/Advertisement/AdvertisementAdmin.js

@@ -3,18 +3,14 @@ import { createAd, getAds, deleteAd } from '../../APIFunctions/Advertisement.js'
 import { useState, useEffect } from 'react';
 import { useUser } from '../../Components/context/UserContext';
 
-   // createAd returns a value - what is it?
-    // how do we know if createAd() works or not?
-    // is there a field we can check?^
-
-    // if createAd worked, how can we update the array without calling the backend again?
-
 export default function AdvertisementAdmin() {
   const { user } = useUser();
-  const [errorMesssage, setErrorMessage] = useState('');
+
   const [ads, setAds] = useState([]);
   const [message, setMessage] = useState('');
-  const [expireDate, setExpireDate] = useState();
+  const [year, setYear] = useState();
+  const [month, setMonth] = useState();
+  const [day, setDay] = useState();
 
   async function getAdsFromDB() {
     const adsFromDB = await getAds(user.token);
@@ -24,43 +20,60 @@ export default function AdvertisementAdmin() {
   }
 
   async function createAdHandler() {
-    if(expireDate === null){
-      setExpireDate(undefined);
+    // make sure empty inputs are properly set as undefined if empty
+    if (year === '') {
+      setYear(undefined);
+    }
+    if (month === '') {
+      setMonth(undefined);
     }
-    // expireDate is a string so we need to turn into date object
-
-    if(isExpired(expireDate)){
-      setErrorMessage("Date is in the past or the present, unable to create ad!!!");
-      return;
-    }else{
-      setErrorMessage("");
+    if (day === '') {
+      setDay(undefined);
     }
+
+    let expireDate = new Date(year, month - 1, day);
+    if (isNaN(expireDate.getTime())) {
+      expireDate = undefined;
+    }
+
     await createAd({
       message,
       expireDate,
     }, user.token);
 
     await getAdsFromDB();
-
   }
 
-  function isExpired(expireDate){
-    const currDate = new Date();
-    console.log("current date" + currDate);
-    const expireDateObject = new Date(expireDate);
-    return expireDateObject < currDate;
+  async function deleteExpiredAds() {
+    const adsFromDB = await getAds(user.token);
+    if (!adsFromDB.error) {
+      const currentDate = new Date();
+      const expiredAds = adsFromDB.responseData.filter(ad => {
+        if (ad.expireDate === undefined) return false;
+        return new Date(ad.expireDate) < currentDate;
+      });
+
+      for (const ad of expiredAds) {
+        await deleteAd(ad, user.token);
+      }
+    }
   }
 
   useEffect(() => {
     getAdsFromDB();
+
+    const intervalId = setInterval(async () => {
+      await deleteExpiredAds();
+      await getAdsFromDB();
+    }, 20);
+
   }, []);
 
   return (
     <div className='m-10'>
       <h1 className="text-4xl font-extrabold leading-none tracking-tight text-gray-900 md:text-5xl lg:text-6xl dark:text-white">
         Welcome to the Advertisement Admin Page!!
       </h1>
-      <h2 style={{fontWeight: 'bold', color: 'red'}} >{errorMesssage}</h2>
       <div className="relative overflow-x-auto">
         <div className='py-6'>
           <label className="w-full form-control">
@@ -89,10 +102,27 @@ export default function AdvertisementAdmin() {
         </div>
         <div className="flex items-center space-x-4 mb-6">
           <input
-            className='flex-1 text-sm input input-bordered sm:text-base'
-            type='datetime-local'
-            onChange={ event => {
-              setExpireDate(event.target.value);
+            className="flex-1 text-sm input input-bordered sm:text-base"
+            type="text"
+            placeholder="Year"
+            onChange={event => {
+              setYear(event.target.value);
+            }}
+          />
+          <input
+            className="flex-1 text-sm input input-bordered sm:text-base"
+            type="text"
+            placeholder="Month"
+            onChange={event => {
+              setMonth(event.target.value);
+            }}
+          />
+          <input
+            className="flex-1 text-sm input input-bordered sm:text-base"
+            type="text"
+            placeholder="Day"
+            onChange={event => {
+              setDay(event.target.value);
             }}
           />
           <button
@@ -111,7 +141,7 @@ export default function AdvertisementAdmin() {
                 Advertisement Message
               </th>
               <th scope="col" className="px-6 py-3">
-                Expiration Date
+                Expiriation Date
               </th>
               <th scope="col" className="px-6 py-3">
                 Delete