Jelajahi Sumber

fix(server): Object detection query and get server stats (#1823)

* fix(server): Object detection query has incorrect value

* fix: get stats for user using the wrong property id from response

* chore: update openapi version
Alex 2 tahun lalu
induk
melakukan
9ebed3c1b4

+ 1 - 1
mobile/openapi/README.md

@@ -3,7 +3,7 @@ Immich API
 
 This Dart package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
-- API version: 1.47.3
+- API version: 1.48.0
 - Build package: org.openapitools.codegen.languages.DartClientCodegen
 
 ## Requirements

+ 1 - 1
server/apps/immich/src/api-v1/asset/asset-repository.ts

@@ -80,7 +80,7 @@ export class AssetRepository implements IAssetRepository {
       .createQueryBuilder('asset')
       .leftJoinAndSelect('asset.smartInfo', 'si')
       .where('asset.resizePath IS NOT NULL')
-      .andWhere('si.id IS NULL')
+      .andWhere('si.assetId IS NULL')
       .andWhere('asset.isVisible = true')
       .getMany();
   }

+ 3 - 4
server/apps/immich/src/api-v1/server-info/server-info.service.ts

@@ -39,7 +39,7 @@ export class ServerInfoService {
       assetType: string;
       assetCount: string;
       totalSizeInBytes: string;
-      userId: string;
+      ownerId: string;
     };
 
     const userStatsQueryResponse: UserStatsQueryResponse[] = await this.assetRepository
@@ -56,9 +56,8 @@ export class ServerInfoService {
 
     const tmpMap = new Map<string, UsageByUserDto>();
     const getUsageByUser = (id: string) => tmpMap.get(id) || new UsageByUserDto(id);
-
     userStatsQueryResponse.forEach((r) => {
-      const usageByUser = getUsageByUser(r.userId);
+      const usageByUser = getUsageByUser(r.ownerId);
       usageByUser.photos += r.assetType === 'IMAGE' ? parseInt(r.assetCount) : 0;
       usageByUser.videos += r.assetType === 'VIDEO' ? parseInt(r.assetCount) : 0;
       usageByUser.usageRaw += parseInt(r.totalSizeInBytes);
@@ -68,7 +67,7 @@ export class ServerInfoService {
       serverStats.videos += r.assetType === 'VIDEO' ? parseInt(r.assetCount) : 0;
       serverStats.usageRaw += parseInt(r.totalSizeInBytes);
       serverStats.usage = asHumanReadable(serverStats.usageRaw);
-      tmpMap.set(r.userId, usageByUser);
+      tmpMap.set(r.ownerId, usageByUser);
     });
 
     serverStats.usageByUser = Array.from(tmpMap.values());

+ 1 - 1
web/src/api/open-api/api.ts

@@ -4,7 +4,7 @@
  * Immich
  * Immich API
  *
- * The version of the OpenAPI document: 1.47.3
+ * The version of the OpenAPI document: 1.48.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

+ 1 - 1
web/src/api/open-api/base.ts

@@ -4,7 +4,7 @@
  * Immich
  * Immich API
  *
- * The version of the OpenAPI document: 1.47.3
+ * The version of the OpenAPI document: 1.48.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

+ 1 - 1
web/src/api/open-api/common.ts

@@ -4,7 +4,7 @@
  * Immich
  * Immich API
  *
- * The version of the OpenAPI document: 1.47.3
+ * The version of the OpenAPI document: 1.48.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

+ 1 - 1
web/src/api/open-api/configuration.ts

@@ -4,7 +4,7 @@
  * Immich
  * Immich API
  *
- * The version of the OpenAPI document: 1.47.3
+ * The version of the OpenAPI document: 1.48.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

+ 1 - 1
web/src/api/open-api/index.ts

@@ -4,7 +4,7 @@
  * Immich
  * Immich API
  *
- * The version of the OpenAPI document: 1.47.3
+ * The version of the OpenAPI document: 1.48.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).