Merge pull request #161 from RyoichiNakai/develop

本番反映 リリース v1.0.2

Author: RyoichiNakai

functions/index.js

@@ -195,16 +195,12 @@ exports.sendLoginDataBatch = functions.https.onCall(async (data, context) => {
   })
 
   // メール送信の実行
-  sgMail
-    .send(messages)
-    .then(() => {
-      // eslint-disable-next-line
-      console.log('Email sent')
-    })
-    .catch((err) => {
-      // eslint-disable-next-line
-      console.log(err)
-    })
+  try {
+    await sgMail.send(messages)
+  } catch (err) {
+    // eslint-disable-next-line
+    console.log(err)
+  }
 })
 
 // Excelから認証情報を追加し、DBにユーザ情報を保存

store/users.js

@@ -1,4 +1,4 @@
-import { collection, doc, getDoc, getDocs, updateDoc, onSnapshot, query, where } from 'firebase/firestore'
+import { collection, doc, getDoc, getDocs, updateDoc, onSnapshot, query, where, orderBy } from 'firebase/firestore'
 import { db } from '~/plugins/firebase'
 
 const usersRef = collection(db, 'users')
@@ -63,7 +63,7 @@ export const actions = {
   },
 
   getUsersByYear({ commit }, { year }) {
-    const yearQuery = query(usersRef, where('year', '==', year), where('isActive', '==', true))
+    const yearQuery = query(usersRef, where('year', '==', year), where('isActive', '==', true), orderBy('id'))
     return new Promise((resolve) => {
       getDocs(yearQuery).then((users) => {
         commit('setUsersByYear', { users })