remove unnecessary async/awaits

Author: Resul Avan

src/components/profile/header/ProfileFollow.vue

@@ -101,7 +101,7 @@ export default class ProfileFollow extends Vue {
   @Prop({ type: Object, required: true }) user: User
 
   loading = true
-  following = false
+  followedByMe = false
   followerCount = 0
   followingCount = 0
 
@@ -111,12 +111,14 @@ export default class ProfileFollow extends Vue {
     await Promise.resolve()
       .then(async () => {
         if (!this.isMyProfile) {
+          // am i following the user?
           await getFollowingByFollowerAndFollowing(this.authUser.userId, this.user.id)
             .then((existingFollowing) => {
-              this.following = !!existingFollowing
+              this.followedByMe = !!existingFollowing
             })
         }
 
+        // get followers and followings counts
         const [
           followerCount,
           followingCount
@@ -157,22 +159,22 @@ export default class ProfileFollow extends Vue {
   }
 
   get icon () {
-    return this.following ? 'account-remove-outline' : 'account-star'
+    return this.followedByMe ? 'account-remove-outline' : 'account-star'
   }
 
   get buttonText () {
-    return this.following ? this.$t('common.unfollow') : this.$t('common.follow')
+    return this.followedByMe ? this.$t('common.unfollow') : this.$t('common.follow')
   }
 
   get buttonType () {
-    return this.following ? 'is-light' : 'is-primary'
+    return this.followedByMe ? 'is-light' : 'is-primary'
   }
 
   followCalled () {
     this.loading = true
     Promise.resolve()
       .then(async () => {
-        this.following ? await this.unfollow() : await this.follow()
+        this.followedByMe ? await this.unfollow() : await this.follow()
       })
       .finally(() => {
         this.loading = false
@@ -183,7 +185,7 @@ export default class ProfileFollow extends Vue {
     await getFollowingByFollowerAndFollowing(this.authUser.userId, this.user.id as string)
       .then(async (existingFollowing) => {
         if (existingFollowing) {
-          this.following = true
+          this.followedByMe = true
           return showInfoToaster(this.$t('notification.follow.alreadyFollowing', { username: this.user.username }))
         }
 
@@ -198,7 +200,7 @@ export default class ProfileFollow extends Vue {
             status: PushNotificationStatus.NEW
           })
         }).then(() => {
-          this.following = true
+          this.followedByMe = true
           this.followerCount++
         })
       })
@@ -210,13 +212,13 @@ export default class ProfileFollow extends Vue {
     await getFollowingByFollowerAndFollowing(this.authUser.userId, this.user.id as string)
       .then(async (existingFollowing) => {
         if (!existingFollowing) {
-          this.following = false
+          this.followedByMe = false
           return showInfoToaster(this.$t('notification.follow.alreadyUnfollowing', { username: this.user.username }))
         }
 
         await deleteFollowing(existingFollowing)
           .then(() => {
-            this.following = false
+            this.followedByMe = false
             this.followerCount--
           })
       })

src/service/firebase/firestore/collection-base-service.ts

@@ -44,12 +44,12 @@ const updateBaseModel = <T extends BaseModel> (model: T) => {
   model.updatedBy = auth.currentUser?.uid
 }
 
-const set = async <T extends BaseModel> (collection: string, model: T) => {
+const set = <T extends BaseModel> (collection: string, model: T) => {
   updateBaseModel(model)
 
   const docRef = firestore.collection(collection).doc(model.id)
 
-  return await docRef.set(model, {
+  return docRef.set(model, {
     merge: true
   })
     .then(() => {
@@ -63,65 +63,65 @@ const set = async <T extends BaseModel> (collection: string, model: T) => {
     })
 }
 
-const add = async <T extends BaseModel> (collection: string, model: T) => {
+const add = <T extends BaseModel> (collection: string, model: T) => {
   const docRef = firestore.collection(collection).doc()
   model.id = docRef.id
 
-  return await set(collection, model)
+  return set(collection, model)
 }
 
-export const saveModel = async <T extends BaseModel> (collection: string, model: T) => {
+export const saveModel = <T extends BaseModel> (collection: string, model: T) => {
   return model.id
-    ? await set(collection, model)
-    : await add(collection, model)
+    ? set(collection, model)
+    : add(collection, model)
 }
 
-export const deleteModel = async (collection: string, model: BaseModel) => {
-  return await firestore.collection(collection).doc(model.id).delete()
+export const deleteModel = (collection: string, model: BaseModel) => {
+  return firestore.collection(collection).doc(model.id).delete()
 }
 
-export const getCount = async (collection: string): Promise<number> => {
-  return await firestore.collection(collection)
+export const getCount = (collection: string): Promise<number> => {
+  return firestore.collection(collection)
     .get()
     .then((querySnapshot) => {
       return querySnapshot.size
     })
 }
 
-export const getCountByWhereClauses = async (
+export const getCountByWhereClauses = (
   collection: string,
   whereClause: WhereClause,
   ...whereClauses: WhereClause[]): Promise<number> => {
   const query = getQueryByWhereClauses(collection, whereClause, ...whereClauses)
 
-  return await query.get()
+  return query.get()
     .then((querySnapshot) => {
       return querySnapshot.size
     })
 }
 
-export const getModelById = async (collection: string, id: string): Promise<BaseModel> => {
-  return await firestore.collection(collection).doc(id).get().then((doc) => {
+export const getModelById = (collection: string, id: string): Promise<BaseModel> => {
+  return firestore.collection(collection).doc(id).get().then((doc) => {
     return doc.data() as BaseModel
   })
 }
 
-export const getModels = async <T extends BaseModel> (collection: string): Promise<T[]> => {
-  return await firestore.collection(collection).get()
+export const getModels = <T extends BaseModel> (collection: string): Promise<T[]> => {
+  return firestore.collection(collection).get()
     .then(querySnapshot => toBaseModelArray(querySnapshot))
 }
 
-export const getModelsByWhereClauses = async <T extends BaseModel> (
+export const getModelsByWhereClauses = <T extends BaseModel> (
   collection: string,
   whereClause: WhereClause,
   ...whereClauses: WhereClause[]): Promise<T[]> => {
   const query = getQueryByWhereClauses(collection, whereClause, ...whereClauses)
 
-  return await query.get()
+  return query.get()
     .then(querySnapshot => toBaseModelArray(querySnapshot))
 }
 
-export const getModelsByWhereClausesAndOrderBy = async <T extends BaseModel> (
+export const getModelsByWhereClausesAndOrderBy = <T extends BaseModel> (
   collection: string,
   orderBy: OrderBy,
   whereClause: WhereClause,
@@ -132,11 +132,11 @@ export const getModelsByWhereClausesAndOrderBy = async <T extends BaseModel> (
     query = query.orderBy(orderBy.field, orderBy.direction)
   }
 
-  return await query.get()
+  return query.get()
     .then(querySnapshot => toBaseModelArray(querySnapshot))
 }
 
-export const getModelsByWhereClausesAndLimitAndOrderBy = async <T extends BaseModel> (
+export const getModelsByWhereClausesAndLimitAndOrderBy = <T extends BaseModel> (
   collection: string,
   lastVisible: any,
   limit: number,
@@ -156,14 +156,14 @@ export const getModelsByWhereClausesAndLimitAndOrderBy = async <T extends BaseMo
 
   query = query.limit(limit)
 
-  return await query.get()
+  return query.get()
     .then(querySnapshot => toBaseModelArray(querySnapshot))
 }
 
-export const getModelsByFieldAndPaging = async (
+export const getModelsByFieldAndPaging = (
   collection: string, field: string, value: any, page: number, limit: number
 ): Promise<PagingResponse<BaseModel>> => {
-  return await firestore.collection(collection).get()
+  return firestore.collection(collection).get()
     .then((querySnapshot) => {
       const docs: BaseModel[] = []
 

src/service/firebase/firestore/following-collection.ts

@@ -24,12 +24,12 @@ const followersWhereClause = (user: User): WhereClause => {
   }
 }
 
-export const saveFollowing = async (following: Following): Promise<Following> => {
-  return await saveModel(collection.FOLLOWING, following)
+export const saveFollowing = (following: Following): Promise<Following> => {
+  return saveModel(collection.FOLLOWING, following)
 }
 
-export const deleteFollowing = async (following: Following) => {
-  return await deleteModel(collection.FOLLOWING, following)
+export const deleteFollowing = (following: Following) => {
+  return deleteModel(collection.FOLLOWING, following)
 }
 
 export const getFollowingByFollowerAndFollowing = async (follower: string, following: string) => {
@@ -50,13 +50,11 @@ export const getFollowingByFollowerAndFollowing = async (follower: string, follo
 
 export const getCountOfFollowers = (user: User) => {
   const whereClause = followingWhereClause(user)
-
   return getCountByWhereClauses(collection.FOLLOWING, whereClause)
 }
 
 export const getCountOfFollowing = (user: User) => {
   const whereClause = followersWhereClause(user)
-
   return getCountByWhereClauses(collection.FOLLOWING, whereClause)
 }
 
@@ -87,7 +85,6 @@ export const searchFollowings = async (user: User, query: string, page: number,
   const whereClauseForFollowers = followersWhereClause(user)
 
   const followingList: Following[] = await getModelsByWhereClauses(collection.FOLLOWING, whereClauseForFollowers)
-
   const users: User[] = []
 
   let loadedUser: User|null = null