格式化代码

Author: ityifan

src/services/MysqlCache.ts

@@ -15,51 +15,49 @@ export class MysqlCache<Scheme> extends MysqlNative<Scheme> {
   }
 
   async insert(data: CoaMysql.SafePartial<Scheme>, trx?: CoaMysql.Transaction) {
-    const id = await super.insert(data, trx)
+    const id = await super.insert(data, trx);
     trx && (trx as any).trxUpdateCacheTaskList ? await (trx as any).trxUpdateCacheTaskList(this, [id], [data]) : await this.deleteCache([id], [data])
     return id
   }
 
   async mInsert(dataList: Array<CoaMysql.SafePartial<Scheme>>, trx?: CoaMysql.Transaction) {
-    const ids = await super.mInsert(dataList, trx)
+    const ids = await super.mInsert(dataList, trx);
     trx && (trx as any).trxUpdateCacheTaskList ? await (trx as any).trxUpdateCacheTaskList(this, ids, dataList) : await this.deleteCache(ids, dataList)
     return ids
   }
 
   async updateById(id: string, data: CoaMysql.SafePartial<Scheme>, trx?: CoaMysql.Transaction) {
     const dataList = await this.getCacheChangedDataList([id], data, trx)
-    const result = await super.updateById(id, data, trx)
+    const result = await super.updateById(id, data, trx);
     trx && (trx as any).trxUpdateCacheTaskList ? await (trx as any).trxUpdateCacheTaskList(this, [id], dataList) : await this.deleteCache([id], dataList)
     return result
   }
 
   async updateByIds(ids: string[], data: CoaMysql.SafePartial<Scheme>, trx?: CoaMysql.Transaction) {
     const dataList = await this.getCacheChangedDataList(ids, data, trx)
-    const result = await super.updateByIds(ids, data, trx)
+    const result = await super.updateByIds(ids, data, trx);
     trx && (trx as any).trxUpdateCacheTaskList ? await (trx as any).trxUpdateCacheTaskList(this, ids, dataList) : await this.deleteCache(ids, dataList)
     return result
   }
 
   async updateForQueryById(id: string, query: CoaMysql.Query, data: CoaMysql.SafePartial<Scheme>, trx?: CoaMysql.Transaction) {
     const dataList = await this.getCacheChangedDataList([id], data, trx)
-    const result = await super.updateForQueryById(id, query, data, trx)
+    const result = await super.updateForQueryById(id, query, data, trx);
     trx && (trx as any).trxUpdateCacheTaskList ? await (trx as any).trxUpdateCacheTaskList(this, [id], dataList) : await this.deleteCache([id], dataList)
     return result
   }
 
   async upsertById(id: string, data: CoaMysql.SafePartial<Scheme>, trx?: CoaMysql.Transaction) {
     const dataList = await this.getCacheChangedDataList([id], data, trx)
-    const result = await super.upsertById(id, data, trx)
+    const result = await super.upsertById(id, data, trx);
     trx && (trx as any).trxUpdateCacheTaskList ? await (trx as any).trxUpdateCacheTaskList(this, [id], dataList) : await this.deleteCache([id], dataList)
     return result
   }
 
   async deleteByIds(ids: string[], trx?: CoaMysql.Transaction) {
     const dataList = await this.getCacheChangedDataList(ids, undefined, trx)
-    const result = await super.deleteByIds(ids, trx)
-    if (result) {
-      (trx && (trx as any).trxUpdateCacheTaskList) ? await (trx as any).trxUpdateCacheTaskList(this, ids, dataList) : await this.deleteCache(ids, dataList)
-    }
+    const result = await super.deleteByIds(ids, trx);
+    trx && (trx as any).trxUpdateCacheTaskList ? await (trx as any).trxUpdateCacheTaskList(this, ids, dataList) : await this.deleteCache(ids, dataList)
     return result
   }
 
@@ -117,12 +115,8 @@ export class MysqlCache<Scheme> extends MysqlNative<Scheme> {
       _.forEach(rows, ({ id, count }) => (result[id] = count))
       return result
     }
-
-    if (trx) {
-      return await queryFunction()
-    } else {
-      return await this.redisCache.mWarp(this.getCacheNsp('count', field), ids, queryFunction)
-    }
+    const result = trx ? await queryFunction() : await this.redisCache.mWarp(this.getCacheNsp('count', field), ids, queryFunction)
+    return result
   }
 
   protected async getCountBy(field: string, value: string, query?: CoaMysql.Query, trx?: CoaMysql.Transaction) {
@@ -132,14 +126,8 @@ export class MysqlCache<Scheme> extends MysqlNative<Scheme> {
       const rows = await qb
       return (rows[0]?.count as number) || 0
     }
-
-    if (trx) {
-      // 事务内直接查询数据库，不走缓存
-      return await queryFunction()
-    } else {
-      // 非事务走缓存
-      return await this.redisCache.warp(this.getCacheNsp('count', field), value, queryFunction)
-    }
+    const result = trx ? await queryFunction() : await this.redisCache.warp(this.getCacheNsp('count', field), value, queryFunction)
+    return result
   }
 
   protected pickResult<T>(data: T, pick: string[]) {