v.1.4.3/api update

functions/modules/createRoom.js

@@ -4,16 +4,26 @@ module.exports = async (req, res) => {
   const bodydata = JSON.parse(req.body);
   console.log('Requested Create - UID - ', bodydata.uid);
   if (!bodydata.userName) res.status(400).send({ message: 'Missing user name' });
-  const roomId = await admin
+  if (!bodydata.partyName) res.status(400).send({ message: 'Missing party name' });
+  if (!bodydata.partyPin) res.status(400).send({ message: 'Missing party pin' });
+  const roomNameTaken = await admin
     .firestore()
     .collection('rooms')
-    .add({
-      name: bodydata.roomName,
+    .doc(bodydata.partyName.replace('/', '\\'))
+    .get()
+    .then((docSnap) => docSnap.exists);
+  if (roomNameTaken) return res.status(409).send({ message: 'That party name is already taken' });
+  await admin
+    .firestore()
+    .collection('rooms')
+    .doc(bodydata.partyName)
+    .set({
+      name: bodydata.partyName,
+      pin: bodydata.partyPin,
       player: bodydata.player,
       createdAt: new Date(),
       updatedAt: new Date(),
     })
-    .then((ref) => ref.id)
     .catch((err) => {
       res.status(500).send({ message: 'Unable to start party.' });
       console.error(err);
@@ -21,7 +31,7 @@ module.exports = async (req, res) => {
   await admin
     .firestore()
     .collection('rooms')
-    .doc(roomId)
+    .doc(bodydata.partyName)
     .collection('messages')
     .add({
       uid: '<system>',
@@ -30,12 +40,15 @@ module.exports = async (req, res) => {
       time: new Date(),
     })
     .catch((err) => {
-      console.error(`Failed to add system create party message : \n\t Room: ${roomId}`, err);
+      console.error(
+        `Failed to add system create party message : \n\t Room: ${bodydata.partyName}`,
+        err
+      );
     });
   await admin
     .firestore()
     .collection('rooms')
-    .doc(roomId)
+    .doc(bodydata.partyName)
     .collection('users')
     .doc(bodydata.uid)
     .set({
@@ -44,9 +57,9 @@ module.exports = async (req, res) => {
     })
     .catch((err) => {
       console.error(
-        `Failed to set admin when creating party : \n\t Room: ${roomId} \n\t User: ${bodydata.uid}`,
+        `Failed to set admin when creating party : \n\t Room: ${bodydata.partyName} \n\t User: ${bodydata.uid}`,
         err
       );
     });
-  res.status(201).send({ roomId, message: 'Started a party!' });
+  res.status(201).send({ roomId: bodydata.partyName, message: 'Started a party!' });
 };