Version 0.51.0

- add functionality to update metadata via CLI (#1712)
- experimental support for `.yaml`, `.svo2`, `.tum`, `.db3` files (#1758)
- dependency updates

Author: wp99cp

.prettierignore

@@ -15,6 +15,10 @@
 # ignore bag and mcap files
 **/*.mcap
 **/*.bag
+**/*.db3
+**/*.tum
+**/*.svo2
+**/*.yaml
 
 # ignore build info file
 frontend/src/build.ts

backend/package.json

@@ -1,6 +1,6 @@
 {
     "name": "kleinkram-backend",
-    "version": "0.50.2",
+    "version": "0.51.0",
     "description": "",
     "author": "",
     "private": true,
@@ -31,15 +31,15 @@
         "@nestjs/swagger": "^8.0.1",
         "@nestjs/typeorm": "^10.0.2",
         "@opentelemetry/api": "^1.9.0",
-        "@opentelemetry/exporter-prometheus": "^0.205.0",
-        "@opentelemetry/exporter-trace-otlp-http": "^0.205.0",
-        "@opentelemetry/instrumentation-express": "^0.54.3",
-        "@opentelemetry/instrumentation-fetch": "^0.205.0",
-        "@opentelemetry/instrumentation-http": "^0.205.0",
-        "@opentelemetry/instrumentation-nestjs-core": "^0.52.2",
-        "@opentelemetry/instrumentation-pg": "^0.58.3",
-        "@opentelemetry/instrumentation-winston": "^0.50.2",
-        "@opentelemetry/sdk-node": "^0.205.0",
+        "@opentelemetry/exporter-prometheus": "^0.206.0",
+        "@opentelemetry/exporter-trace-otlp-http": "^0.206.0",
+        "@opentelemetry/instrumentation-express": "^0.55.0",
+        "@opentelemetry/instrumentation-fetch": "^0.206.0",
+        "@opentelemetry/instrumentation-http": "^0.206.0",
+        "@opentelemetry/instrumentation-nestjs-core": "^0.53.0",
+        "@opentelemetry/instrumentation-pg": "^0.59.0",
+        "@opentelemetry/instrumentation-winston": "^0.51.0",
+        "@opentelemetry/sdk-node": "^0.206.0",
         "@opentelemetry/sdk-trace-base": "^2.0.0",
         "@swc/core": "^1.13.3",
         "@swc/jest": "^0.2.39",
@@ -54,7 +54,7 @@
         "form-data": "^4.0.4",
         "googleapis": "^148.0.0",
         "jsonwebtoken": "^9.0.2",
-        "minio": "8.0.5",
+        "minio": "8.0.6",
         "multer": "^2.0.2",
         "passport": "^0.7.0",
         "passport-github2": "^0.1.12",
@@ -70,7 +70,7 @@
         "vue": "^3.5.21",
         "vue-json-pretty": "^2.4.0",
         "webpack": "^5.99.9",
-        "winston": "^3.17.0",
+        "winston": "^3.18.3",
         "winston-loki": "^6.0.7"
     },
     "devDependencies": {
@@ -80,7 +80,7 @@
         "@nestjs/schematics": "^11.0.4",
         "@nestjs/testing": "^10.0.0",
         "@types/cookie-parser": "^1.4.9",
-        "@types/express": "^5.0.0",
+        "@types/express": "^5.0.3",
         "@types/jest": "^29.5.2",
         "@types/node": "^24.0.7",
         "@types/supertest": "^6.0.3",

backend/src/endpoints/project/project.controller.ts

@@ -8,7 +8,7 @@ import { CreateProject } from '@common/api/types/create-project.dto';
 import { ProjectDto } from '@common/api/types/project/base-project.dto';
 import { DeleteProjectResponseDto } from '@common/api/types/project/delete-project-response.dto';
 import { ProjectQueryDto } from '@common/api/types/project/project-query.dto';
-import { ProjectWithRequiredTags } from '@common/api/types/project/project-with-required-tags';
+import { ProjectWithRequiredTagsDto } from '@common/api/types/project/project-with-required-tags.dto';
 import { ProjectsDto } from '@common/api/types/project/projects.dto';
 import { ResentProjectsDto } from '@common/api/types/project/recent-projects.dto';
 import { RemoveTagTypeDto } from '@common/api/types/remove-tag-type.dto';
@@ -64,11 +64,11 @@ export class ProjectController {
     @CanReadProject()
     @ApiOkResponse({
         description: 'Returns the project',
-        type: ProjectWithRequiredTags,
+        type: ProjectWithRequiredTagsDto,
     })
     async getProjectById(
         @ParameterUID('uuid') uuid: string,
-    ): Promise<ProjectWithRequiredTags> {
+    ): Promise<ProjectWithRequiredTagsDto> {
         return this.projectService.findOne(uuid);
     }
 
@@ -107,6 +107,9 @@ export class ProjectController {
         @Query() query: ProjectQueryDto,
         @AddUser() user: AuthHeader,
     ): Promise<ProjectsDto> {
+        // Convert string 'true'/'false' to boolean
+        const exactMatch = query.exactMatch === 'true';
+
         return await this.projectService.findMany(
             query.projectUuids ?? [],
             query.projectPatterns ?? [],
@@ -116,6 +119,7 @@ export class ProjectController {
             query.take,
             query.creatorUuid,
             user.user.uuid,
+            exactMatch,
         );
     }
 

backend/src/serialization.ts

@@ -27,6 +27,7 @@ import {
 import { ProjectDto } from '@common/api/types/project/base-project.dto';
 import { ProjectWithMissionCountDto } from '@common/api/types/project/project-with-mission-count.dto';
 import { ProjectWithMissionsDto } from '@common/api/types/project/project-with-missions.dto';
+import { ProjectWithRequiredTagsDto } from '@common/api/types/project/project-with-required-tags.dto';
 import { TagDto, TagTypeDto } from '@common/api/types/tags/tags.dto';
 import { TopicDto } from '@common/api/types/topic.dto';
 import { GroupMembershipDto, UserDto } from '@common/api/types/user.dto';
@@ -282,6 +283,21 @@ export const projectEntityToDtoWithRequiredTags = (
     };
 };
 
+export const projectEntityToDtoWithMissionCountAndTags = (
+    project: Project,
+): ProjectWithRequiredTagsDto => {
+    if (project.creator === undefined) {
+        throw new Error('Creator can never be undefined');
+    }
+
+    return {
+        ...(projectEntityToDto(project) as ProjectWithRequiredTagsDto),
+        creator: userEntityToDto(project.creator),
+        missionCount: project.missionCount ?? 0,
+        requiredTags: project.requiredTags?.map(tagTypeEntityToDto) ?? [],
+    };
+};
+
 export const projectEntityToDtoWithMissions = (
     project: Project,
 ): ProjectWithMissionsDto => {

backend/src/services/file.service.ts

@@ -19,6 +19,7 @@ import {
     Injectable,
     NotFoundException,
     OnModuleInit,
+    UnsupportedMediaTypeException,
 } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import jwt from 'jsonwebtoken';
@@ -519,9 +520,9 @@ export class FileService implements OnModuleInit {
 
         return await externalMinio.presignedUrl(
             'GET',
-            file.type === FileType.MCAP
-                ? env.MINIO_MCAP_BUCKET_NAME
-                : env.MINIO_BAG_BUCKET_NAME,
+            file.type === FileType.BAG
+                ? env.MINIO_BAG_BUCKET_NAME
+                : env.MINIO_MCAP_BUCKET_NAME,
             file.uuid, // we use the uuid as the filename in Minio
             expires ? 4 * 60 * 60 : 604_800, // 604800 seconds = 1 week
             {
@@ -792,15 +793,40 @@ export class FileService implements OnModuleInit {
 
                 logger.debug(`Creating temporary access for file: ${filename}`);
 
-                // verify that file has ending .bag or .mcap
-                if (!filename.endsWith('.bag') && !filename.endsWith('.mcap')) {
+                const fileExtensionToFileTypeMap: ReadonlyMap<
+                    string,
+                    FileType
+                > = new Map([
+                    ['.bag', FileType.BAG],
+                    ['.mcap', FileType.MCAP],
+                    ['.yaml', FileType.YAML],
+                    ['.svo2', FileType.SVO2],
+                    ['.tum', FileType.TUM],
+                    ['.db3', FileType.DB3],
+                ]);
+
+                const supported_file_endings = [
+                    ...fileExtensionToFileTypeMap.keys(),
+                ];
+
+                if (
+                    !supported_file_endings.some((ending) =>
+                        filename.endsWith(ending),
+                    )
+                ) {
                     emptyCredentials.error = 'Invalid file ending';
                     return emptyCredentials;
                 }
 
-                const fileType: FileType = filename.endsWith('.bag')
-                    ? FileType.BAG
-                    : FileType.MCAP;
+                const matchingFileType = supported_file_endings.find((ending) =>
+                    filename.endsWith(ending),
+                );
+                if (matchingFileType === undefined)
+                    throw new UnsupportedMediaTypeException();
+                const fileType: FileType | undefined =
+                    fileExtensionToFileTypeMap.get(matchingFileType);
+                if (fileType === undefined)
+                    throw new UnsupportedMediaTypeException();
 
                 // check if file already exists
                 const existingFile = await this.fileRepository.exists({

backend/src/services/mission.service.ts

@@ -165,7 +165,9 @@ export class MissionService {
         let query = this.missionRepository
             .createQueryBuilder('mission')
             .leftJoinAndSelect('mission.project', 'project')
-            .leftJoinAndSelect('mission.creator', 'creator');
+            .leftJoinAndSelect('mission.creator', 'creator')
+            .leftJoinAndSelect('mission.tags', 'tag')
+            .leftJoinAndSelect('tag.tagType', 'tagType');
 
         query = addAccessConstraintsToMissionQuery(query, userUuid);
 

backend/src/services/project.service.ts

@@ -18,7 +18,7 @@ import { DefaultRightDto } from '@common/api/types/access-control/default-right.
 import { DefaultRights } from '@common/api/types/access-control/default-rights';
 import { SortOrder } from '@common/api/types/pagination';
 import { ProjectDto } from '@common/api/types/project/base-project.dto';
-import { ProjectWithRequiredTags } from '@common/api/types/project/project-with-required-tags';
+import { ProjectWithRequiredTagsDto } from '@common/api/types/project/project-with-required-tags.dto';
 import { ProjectsDto } from '@common/api/types/project/projects.dto';
 import { ResentProjectDto } from '@common/api/types/project/recent-projects.dto';
 import AccessGroup from '@common/entities/auth/accessgroup.entity';
@@ -32,7 +32,7 @@ import {
 import { ConfigService } from '@nestjs/config';
 import { AuthHeader } from '../endpoints/auth/parameter-decorator';
 import {
-    projectEntityToDtoWithMissionCount,
+    projectEntityToDtoWithMissionCountAndTags,
     projectEntityToDtoWithRequiredTags,
 } from '../serialization';
 import { AccessGroupConfig } from '../types/access-group-config';
@@ -77,10 +77,12 @@ export class ProjectService {
         take: number,
         creatorUuid: string | undefined,
         userUuid: string,
+        exactMatch = false,
     ): Promise<ProjectsDto> {
         let query = this.projectRepository
             .createQueryBuilder('project')
-            .leftJoinAndSelect('project.creator', 'creator');
+            .leftJoinAndSelect('project.creator', 'creator')
+            .leftJoinAndSelect('project.requiredTags', 'requiredTags');
 
         query = addAccessConstraintsToProjectQuery(query, userUuid);
 
@@ -89,6 +91,7 @@ export class ProjectService {
             this.projectRepository,
             projectUuids,
             projectPatterns,
+            exactMatch,
         );
 
         if (sortBy !== undefined) {
@@ -103,15 +106,15 @@ export class ProjectService {
 
         return {
             data: projects.map((element) =>
-                projectEntityToDtoWithMissionCount(element),
+                projectEntityToDtoWithMissionCountAndTags(element),
             ),
             count,
             skip,
             take,
         };
     }
 
-    async findOne(uuid: string): Promise<ProjectWithRequiredTags> {
+    async findOne(uuid: string): Promise<ProjectWithRequiredTagsDto> {
         const missionPromise = this.projectRepository
             .createQueryBuilder('project')
             .where('project.uuid = :uuid', { uuid })

backend/src/services/tag.service.ts

@@ -291,7 +291,11 @@ export class TagService {
         if (name !== '') {
             where.name = ILike(`%${name}%`);
         }
-        if (type !== undefined && type !== DataType.ANY) {
+        if (
+            type !== undefined &&
+            type !== DataType.ANY &&
+            (type as any) !== ''
+        ) {
             where.datatype = type;
         }
         const [tags, count] = await this.tagTypeRepository.findAndCount({

backend/src/services/utilities.ts

@@ -54,6 +54,7 @@ export const getFilteredProjectIdSubQuery = (
     projectRepository: Repository<Project>,
     projectIds: string[],
     projectPatterns: string[],
+    exactMatch: boolean,
 ): SelectQueryBuilder<{ uuid: string }> => {
     const query = projectRepository
         .createQueryBuilder('project')
@@ -66,14 +67,15 @@ export const getFilteredProjectIdSubQuery = (
     }
 
     if (projectPatterns.length > 0) {
-        query.orWhere(
-            'LOWER(project.name) LIKE ANY(ARRAY[:...projectPatterns])',
-            {
-                projectPatterns: projectPatterns.map(
-                    (pattern) => `%${pattern.toLowerCase()}%`,
-                ),
-            },
-        );
+        const whereStatement = exactMatch
+            ? 'LOWER(project.name) = ANY(ARRAY[:...projectPatterns])'
+            : 'LOWER(project.name) LIKE ANY(ARRAY[:...projectPatterns])';
+
+        query.orWhere(whereStatement, {
+            projectPatterns: projectPatterns.map(
+                (pattern) => `%${pattern.toLowerCase()}%`,
+            ),
+        });
     }
 
     return query;
@@ -220,6 +222,7 @@ export const addProjectFilters = (
     projectRepository: Repository<Project>,
     projectIds: string[],
     projectPatterns: string[],
+    exactMatch = false,
 ): SelectQueryBuilder<any> => {
     if (projectIds.length > 0 || projectPatterns.length > 0) {
         const projectLikePatterns = projectPatterns.map((element) =>
@@ -230,6 +233,7 @@ export const addProjectFilters = (
             projectRepository,
             projectIds,
             projectLikePatterns,
+            exactMatch,
         );
 
         query

backend/src/validation/validation-logic.ts

@@ -2,7 +2,7 @@ export const MISSION_NAME_REGEX = /^[\w\-_]{3,50}$/;
 
 export const PROJECT_NAME_REGEX = /^[\w\-_]{3,50}$/;
 
-export const FILE_NAME_REGEX = /^[\w\-.()]{3,50}.(bag|mcap)$/;
+export const FILE_NAME_REGEX = /^[\w\-.()]{3,50}.(bag|mcap|db3|yaml|svo2|tum)$/;
 
 export const NON_UUID_REGEX =
     /^(?![0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$)/;