Merge pull request #136 from flickmatch/hvs-flick-patch-1

Add functionality to format message

.github/workflows/whatsapp-deploy.yml

@@ -27,6 +27,7 @@ jobs:
         port: 22
         script: |
           cd ~/flickmatch/home/whatsapp-js
+          git stash
           git pull origin main
           git status
           ~/.nvm/versions/node/v18.15.0/bin/pm2 restart main

platform/src/main/java/com/flickmatch/platform/proxy/WhatsAppProxy.java

@@ -5,6 +5,7 @@
 import com.flickmatch.platform.records.WhatsAppNotification;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -18,10 +19,11 @@ public class WhatsAppProxy {
     // Create a RestTemplate
     @Autowired
     private RestTemplate restTemplate;
+    @Value("${whatsapp.endpoint}")
+    private String nodeServerUrl;
     private final ObjectMapper objectMapper = new ObjectMapper();
 
     public void sendNotification(WhatsAppNotification eventDataForNotification) {
-        String nodeServerUrl = "http://ec2-18-223-205-234.us-east-2.compute.amazonaws.com:3000/";
 
         // Create headers
         HttpHeaders headers = new HttpHeaders();

platform/src/main/resources/application-beta.properties

@@ -7,4 +7,6 @@ amazon.aws.profile=beta
 
 phonepe.merchant.id=M1FPXNBFIGDG
 phonepe.saltkey=e7a5693b-0ccf-47ac-a258-c5d77e701e2c
-phonepe.saltkey.index=2
+phonepe.saltkey.index=2
+
+whatsapp.endpoint=http://localhost:3000/notification

platform/src/main/resources/application-dev.properties

@@ -6,4 +6,6 @@ amazon.aws.profile=dev
 
 phonepe.merchant.id=test
 phonepe.saltkey=test
-phonepe.saltkey.index=1
+phonepe.saltkey.index=1
+
+whatsapp.endpoint=http://localhost:3000/notification

platform/src/main/resources/application-prod.properties

@@ -8,3 +8,5 @@ amazon.aws.profile=prod
 phonepe.merchant.id=M1FPXNBFIGDG
 phonepe.saltkey=e7a5693b-0ccf-47ac-a258-c5d77e701e2c
 phonepe.saltkey.index=2
+
+whatsapp.endpoint=http://ec2-18-223-205-234.us-east-2.compute.amazonaws.com:3000/notification

platform/src/test/java/com/flickmatch/platform/proxy/WhatsAppProxyTest.java

@@ -1,13 +1,15 @@
 package com.flickmatch.platform.proxy;
 
 import com.flickmatch.platform.records.WhatsAppNotification;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.http.ResponseEntity;
+import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.web.client.RestTemplate;
 
 import static org.mockito.ArgumentMatchers.any;
@@ -21,6 +23,11 @@ class WhatsAppProxyTest {
 
     @InjectMocks WhatsAppProxy whatsAppProxy;
 
+    @BeforeEach
+    void setUp() {
+        ReflectionTestUtils.setField(whatsAppProxy, "nodeServerUrl", "");
+    }
+
     @Test
     public void test_WhenCallIsSuccessful() {
         Mockito.when(restTemplate.postForEntity(anyString(), any(), any())).thenReturn(ResponseEntity.accepted().build());

platform/src/test/resources/application-test.properties

@@ -9,3 +9,5 @@ application.local.endpoint=http://localhost:8080/graphql
 phonepe.merchant.id=test
 phonepe.saltkey=test
 phonepe.saltkey.index=1
+
+whatsapp.endpoint=http://localhost:3000/notification

whatsapp-js/main.js

@@ -4,6 +4,7 @@ import qrcode from "qrcode-terminal";
 import pkg from "whatsapp-web.js";
 const { Client, LocalAuth } = pkg;
 import { processGroup } from "./src/inputParser.js";
+import { createMessage } from "./src/notificationRequestParser.js";
 
 export const isProd =
   process.platform !== "win32" && process.platform !== "darwin";
@@ -12,19 +13,16 @@ export const groupName = isProd ? "Online Queue Update" : "Test group ";
 
 import express from "express";
 const app = express();
+app.use(express.json());
 const port = 3000;
 const ggnSouthCityChatId = "[email protected]";
 const hydChatId = "[email protected]";
 
-app.post("/", (req, res) => {
+app.post("/notification", (req, res) => {
   const testGroupChatId = "[email protected]";
-  client.sendMessage(testGroupChatId, "Post Endpoint hit");
-  res.send("Hello World!");
-});
-
-app.get("/", (req, res) => {
-  const testGroupChatId = "[email protected]";
-  client.sendMessage(testGroupChatId, "Get Endpoint hit");
+  const jsonData = req.body;
+  //console.log('Received JSON data:', JSON.stringify(jsonData));
+  client.sendMessage(testGroupChatId, createMessage(jsonData));
   res.send("Hello World!");
 });
 

whatsapp-js/package.json

@@ -14,6 +14,6 @@
     "express": "^4.18.2",
     "isomorphic-fetch": "^3.0.0",
     "qrcode-terminal": "^0.12.0",
-    "whatsapp-web.js": "^1.19.5"
+    "whatsapp-web.js": "^1.23.0"
   }
 }

whatsapp-js/src/notificationRequestParser.js

@@ -0,0 +1,52 @@
+const daysOfWeek = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
+
+// Function to convert timestamps to timeslot
+function convertToTimeSlot(timestamp1, timestamp2) {
+    // Convert timestamps to Date objects
+    const date1 = new Date(timestamp1);
+    const date2 = new Date(timestamp2);
+
+    // Extract hours and minutes from the Date objects
+    const hours1 = date1.getHours();
+    const minutes1 = date1.getMinutes();
+    const date = date1.getDate();
+    const month = date1.getMonth();
+    const year = date1.getFullYear();
+    const fullDate = `${date}-${month}-${year}`
+    const day = date1.getDay();
+
+    const hours2 = date2.getHours();
+    const minutes2 = date2.getMinutes();
+
+    // Format the timeslots
+    const timeSlot1 = `${padZero(hours1)}:${padZero(minutes1)}`;
+    const timeSlot2 = `${padZero(hours2)}:${padZero(minutes2)}`;
+
+    return `${timeSlot1} - ${timeSlot2} ${fullDate} (${daysOfWeek[day]})`;
+  }
+
+  // Function to pad zero for single-digit hours/minutes
+  function padZero(value) {
+    return value < 10 ? `0${value}` : `${value}`;
+  }
+
+export const createMessage = (jsonData) => {
+    //const jsonDataObject = JSON.parse(jsonData);
+    const venueName = jsonData.venueName;
+    const mapLink = jsonData.venueLocationLink;
+    const format = jsonData.reservedPlayersCount/2;
+    const charges = jsonData.charges;
+    const dateTime = convertToTimeSlot(jsonData.startTime, jsonData.endTime);
+
+    var message = `${venueName} (${mapLink})
+${dateTime}
+${format}v${format}
+₹${charges}/- Per Person.
+
+Confirmed Players:`;
+  for (const [index, value] of jsonData.playerNameList.entries()) {
+    message = message + '\n' + `${index+1}. ${value}`;
+  }
+  message = message + '\n\nPlease pay at play.flickmatch.in to confirm your spot.';
+    return message;
+} 

whatsapp-js/test/notificationRequestParserTest.js

@@ -0,0 +1,22 @@
+import { createMessage } from "../src/notificationRequestParser.js";
+
+const jsonData = '{"startTime":1699715640000,"endTime":1699719240000,"venueName":"HotFut GachiBowli","reservedPlayersCount":10,"charges":200,"venueLocationLink":"https://goo.gl/maps/1QzakRkJPHxT8GjRA","localTimeZone":"GMT+5:30","playerNameList":["Player1","Player2","sam","nooo"]}';
+const expected = `HotFut GachiBowli (https://goo.gl/maps/1QzakRkJPHxT8GjRA)
+20:44 - 21:44 11-10-2023 (Saturday)
+5v5
+₹200/- Per Person.
+
+Confirmed Players:
+1. Player1
+2. Player2
+3. sam
+4. nooo
+
+Please pay at play.flickmatch.in to confirm your spot.`;
+
+function assertEqual(actual, expected, label) {
+    const areEqual = JSON.stringify(actual) === JSON.stringify(expected);
+    console.assert(areEqual, `Assertion failed for ${label}:`, actual);
+  };
+
+assertEqual(createMessage(JSON.parse(jsonData)), expected, 'createMessage test');