Merge pull request #1811 from leggedrobotics/feat/1790_show_n_files_list_mission

feat: missions get command returns files count and files size

Author: wp99cp

backend/src/serialization.ts

@@ -62,12 +62,8 @@ export const missionEntityToDtoWithCreator = (
 export const missionEntityToFlatDto = (mission: Mission): FlatMissionDto => {
     return {
         ...missionEntityToDtoWithCreator(mission),
-        filesCount: mission.files?.length || 0,
-        size:
-            mission.files?.reduce(
-                (accumulator, file) => accumulator + (file.size ?? 0),
-                0,
-            ) || 0,
+        filesCount: mission.fileCount ?? 0,
+        size: mission.size ?? 0,
     };
 };
 

backend/src/services/mission.service.ts

@@ -32,7 +32,12 @@ import {
 } from '../serialization';
 import { TagService } from './tag.service';
 import { UserService } from './user.service';
-import { addMissionFilters, addProjectFilters, addSort } from './utilities';
+import {
+    addFileStats,
+    addMissionFilters,
+    addProjectFilters,
+    addSort,
+} from './utilities';
 
 import { SortOrder } from '@common/api/types/pagination';
 
@@ -162,36 +167,104 @@ export class MissionService {
         take: number,
         userUuid: string,
     ): Promise<MissionsDto> {
-        let query = this.missionRepository
+        let idQuery = this.missionRepository
             .createQueryBuilder('mission')
-            .leftJoinAndSelect('mission.project', 'project')
-            .leftJoinAndSelect('mission.creator', 'creator')
-            .leftJoinAndSelect('mission.tags', 'tag')
-            .leftJoinAndSelect('tag.tagType', 'tagType');
+            .select('mission.uuid')
+            .leftJoin('mission.project', 'project')
+            .leftJoin('mission.creator', 'creator')
+            .leftJoin('mission.tags', 'tag')
+            .leftJoin('tag.tagType', 'tagType');
 
-        query = addAccessConstraintsToMissionQuery(query, userUuid);
+        idQuery = addAccessConstraintsToMissionQuery(idQuery, userUuid);
 
-        query = addProjectFilters(
-            query,
+        idQuery = addProjectFilters(
+            idQuery,
             this.projectRepository,
             projectUuids,
             projectPatterns,
         );
 
-        query = addMissionFilters(
-            query,
+        idQuery = addMissionFilters(
+            idQuery,
             this.missionRepository,
             missionUuids,
             missionPatterns,
             missionMetadata,
         );
 
         if (sortBy !== undefined) {
-            query = addSort(query, FIND_MANY_SORT_KEYS, sortBy, sortOrder);
+            idQuery = addSort(idQuery, FIND_MANY_SORT_KEYS, sortBy, sortOrder);
         }
 
-        query.take(take).skip(skip);
-        const [missions, count] = await query.getManyAndCount();
+        // Get distinct mission UUIDs
+        idQuery.groupBy('mission.uuid');
+
+        // Get count before pagination
+        const count = await idQuery.getCount();
+        idQuery.take(take).skip(skip);
+
+        const missionIds = await idQuery.getRawMany();
+
+        if (missionIds.length === 0) {
+            return {
+                data: [],
+                count,
+                skip,
+                take,
+            };
+        }
+
+        let dataQuery = this.missionRepository
+            .createQueryBuilder('mission')
+            .leftJoinAndSelect('mission.project', 'project')
+            .leftJoinAndSelect('mission.creator', 'creator')
+            .leftJoinAndSelect('mission.tags', 'tag')
+            .leftJoinAndSelect('tag.tagType', 'tagType')
+            .where('mission.uuid IN (:...missionIds)', {
+                missionIds: missionIds.map((m) => m.mission_uuid),
+            });
+
+        if (sortBy !== undefined) {
+            dataQuery = addSort(
+                dataQuery,
+                FIND_MANY_SORT_KEYS,
+                sortBy,
+                sortOrder,
+            );
+        }
+
+        dataQuery = addFileStats(dataQuery);
+
+        const result = await dataQuery.getRawAndEntities();
+        const missions = result.entities;
+        const rawResults = result.raw;
+
+        // Create a map for quick lookup of file stats by mission UUID
+        const statsMap = new Map<
+            string,
+            { fileCount: number; fileSize: number }
+        >();
+        for (const raw of rawResults) {
+            const missionUuid = raw.mission_uuid;
+            if (!statsMap.has(missionUuid)) {
+                statsMap.set(missionUuid, {
+                    fileCount: Number.parseInt(raw.fileCount) || 0,
+                    fileSize: Number.parseInt(raw.fileSize) || 0,
+                });
+            }
+        }
+
+        // Assign file stats to missions
+        for (const mission of missions) {
+            const stats = statsMap.get(mission.uuid);
+            if (stats) {
+                mission.fileCount = stats.fileCount;
+                mission.size = stats.fileSize;
+            } else {
+                mission.fileCount = 0;
+                mission.size = 0;
+            }
+        }
 
         return {
             data: missions.map((element) => missionEntityToFlatDto(element)),

backend/src/services/utilities.ts

@@ -204,6 +204,26 @@ export const addMissionCount = (
     return query;
 };
 
+export const addFileStats = (
+    query: SelectQueryBuilder<Mission>,
+): SelectQueryBuilder<Mission> => {
+    query
+        .addSelect((subQuery) => {
+            return subQuery
+                .select('COUNT(file.uuid)', 'count')
+                .from('file_entity', 'file')
+                .where('file."missionUuid" = mission.uuid');
+        }, 'fileCount')
+        .addSelect((subQuery) => {
+            return subQuery
+                .select('COALESCE(SUM(file.size), 0)', 'sum')
+                .from('file_entity', 'file')
+                .where('file."missionUuid" = mission.uuid');
+        }, 'fileSize');
+
+    return query;
+};
+
 export const addProjectCreatorFilter = (
     query: SelectQueryBuilder<any>,
     creatorUuid: string | undefined,

cli/kleinkram/api/deser.py

@@ -54,6 +54,8 @@ class MissionObjectKeys(str, Enum):
     CREATED_AT = "createdAt"
     UPDATED_AT = "updatedAt"
     TAGS = "tags"
+    FILESIZE = "size"
+    FILECOUNT = "filesCount"
 
 
 class ProjectObjectKeys(str, Enum):
@@ -135,6 +137,8 @@ def _parse_mission(mission: MissionObject) -> Mission:
         created_at = _parse_datetime(mission[MissionObjectKeys.CREATED_AT])
         updated_at = _parse_datetime(mission[MissionObjectKeys.UPDATED_AT])
         metadata = _parse_metadata(mission[MissionObjectKeys.TAGS])
+        file_count = mission[MissionObjectKeys.FILECOUNT]
+        filesize = mission[MissionObjectKeys.FILESIZE]
 
         project_id, project_name = _get_nested_info(mission, PROJECT)
 
@@ -146,6 +150,8 @@ def _parse_mission(mission: MissionObject) -> Mission:
             metadata=metadata,
             project_id=project_id,
             project_name=project_name,
+            number_of_files=file_count,
+            size=filesize,
         )
     except Exception as e:
         raise ParsingError(f"error parsing mission: {mission}") from e

common/entities/mission/mission.entity.ts

@@ -40,4 +40,7 @@ export default class Mission extends BaseEntity {
 
     @OneToMany(() => Tag, (tag) => tag.mission)
     tags?: Tag[];
+
+    fileCount?: number;
+    size?: number;
 }