Kuan Ting Lin 5 年 前
コミット
832cb7468f
2 ファイル変更14 行追加11 行削除
  1. 1 1
      src/controllers/EquipmentController.ts
  2. 13 10
      src/firebase.ts

+ 1 - 1
src/controllers/EquipmentController.ts

@@ -88,7 +88,7 @@ class EquipmentController {
     ) {
       sendAlarm(equipment.name, String(req.body.Alarm[0]));
     } else {
-      sendUpdateRequest();
+      // sendUpdateRequest();
     }
 
     equipment.update({

+ 13 - 10
src/firebase.ts

@@ -5,25 +5,25 @@ import admin from "firebase-admin";
 export function initializeFirebase() {
   admin.initializeApp({
     credential: admin.credential.cert(config),
-    databaseURL: "https://maa-client.firebaseio.com"
+    databaseURL: "https://maa-client.firebaseio.com",
   });
 }
 
 export function sendUpdateRequest() {
   var message: admin.messaging.Message = {
     data: {
-      type: "update request"
+      type: "update request",
     },
-    topic: "maa"
+    topic: "maa",
   };
 
   admin
     .messaging()
     .send(message)
-    .then(response => {
+    .then((response) => {
       console.log("Message sent", response);
     })
-    .catch(error => {
+    .catch((error) => {
       console.log("Message error ", error);
     });
 }
@@ -32,22 +32,25 @@ export function sendAlarm(equipmentName: string, alarmType: string) {
   var message: admin.messaging.Message = {
     data: {
       name: equipmentName,
-      type: alarmType
+      type: alarmType,
     },
     android: {
       priority: "high",
-      ttl: 0
+      ttl: 0,
+    },
+    topic: "maa",
+    fcmOptions: {
+      analyticsLabel: "Alarm",
     },
-    topic: "maa"
   };
 
   admin
     .messaging()
     .send(message)
-    .then(response => {
+    .then((response) => {
       console.log("Message sent", response);
     })
-    .catch(error => {
+    .catch((error) => {
       console.log("Message error ", error);
     });
 }