refactor: ensure detect install is consistently named

This commit is contained in:
izzy
2025-12-03 11:10:33 +00:00
parent f9d2a9707d
commit 305bf60f97
7 changed files with 44 additions and 44 deletions

View File

@@ -613,7 +613,7 @@
"content": { "content": {
"application/json": { "application/json": {
"schema": { "schema": {
"$ref": "#/components/schemas/MaintenanceIntegrityResponseDto" "$ref": "#/components/schemas/MaintenanceDetectInstallResponseDto"
} }
} }
}, },
@@ -17218,11 +17218,11 @@
], ],
"type": "object" "type": "object"
}, },
"MaintenanceIntegrityResponseDto": { "MaintenanceDetectInstallResponseDto": {
"properties": { "properties": {
"storage": { "storage": {
"items": { "items": {
"$ref": "#/components/schemas/MaintenanceStorageFolderIntegrityDto" "$ref": "#/components/schemas/MaintenanceDetectInstallStorageFolderDto"
}, },
"type": "array" "type": "array"
} }
@@ -17232,6 +17232,33 @@
], ],
"type": "object" "type": "object"
}, },
"MaintenanceDetectInstallStorageFolderDto": {
"properties": {
"files": {
"type": "number"
},
"folder": {
"allOf": [
{
"$ref": "#/components/schemas/StorageFolder"
}
]
},
"readable": {
"type": "boolean"
},
"writable": {
"type": "boolean"
}
},
"required": [
"files",
"folder",
"readable",
"writable"
],
"type": "object"
},
"MaintenanceListBackupsResponseDto": { "MaintenanceListBackupsResponseDto": {
"properties": { "properties": {
"backups": { "backups": {
@@ -17282,33 +17309,6 @@
], ],
"type": "object" "type": "object"
}, },
"MaintenanceStorageFolderIntegrityDto": {
"properties": {
"files": {
"type": "number"
},
"folder": {
"allOf": [
{
"$ref": "#/components/schemas/StorageFolder"
}
]
},
"readable": {
"type": "boolean"
},
"writable": {
"type": "boolean"
}
},
"required": [
"files",
"folder",
"readable",
"writable"
],
"type": "object"
},
"MaintenanceUploadBackupDto": { "MaintenanceUploadBackupDto": {
"properties": { "properties": {
"file": { "file": {

View File

@@ -5,7 +5,7 @@ import { Endpoint, HistoryBuilder } from 'src/decorators';
import { AuthDto } from 'src/dtos/auth.dto'; import { AuthDto } from 'src/dtos/auth.dto';
import { import {
MaintenanceAuthDto, MaintenanceAuthDto,
MaintenanceIntegrityResponseDto, MaintenanceDetectInstallResponseDto,
MaintenanceLoginDto, MaintenanceLoginDto,
MaintenanceStatusResponseDto, MaintenanceStatusResponseDto,
SetMaintenanceModeDto, SetMaintenanceModeDto,
@@ -37,7 +37,7 @@ export class MaintenanceController {
description: 'Collect integrity checks and other heuristics about local data.', description: 'Collect integrity checks and other heuristics about local data.',
history: new HistoryBuilder().added('v2.4.0').alpha('v2.4.0'), history: new HistoryBuilder().added('v2.4.0').alpha('v2.4.0'),
}) })
detectPriorInstall(): Promise<MaintenanceIntegrityResponseDto> { detectPriorInstall(): Promise<MaintenanceDetectInstallResponseDto> {
return this.service.detectPriorInstall(); return this.service.detectPriorInstall();
} }

View File

@@ -30,7 +30,7 @@ export class MaintenanceStatusResponseDto {
error?: string; error?: string;
} }
export class MaintenanceStorageFolderIntegrityDto { export class MaintenanceDetectInstallStorageFolderDto {
@ValidateEnum({ enum: StorageFolder, name: 'StorageFolder' }) @ValidateEnum({ enum: StorageFolder, name: 'StorageFolder' })
folder!: StorageFolder; folder!: StorageFolder;
readable!: boolean; readable!: boolean;
@@ -38,8 +38,8 @@ export class MaintenanceStorageFolderIntegrityDto {
files!: number; files!: number;
} }
export class MaintenanceIntegrityResponseDto { export class MaintenanceDetectInstallResponseDto {
storage!: MaintenanceStorageFolderIntegrityDto[]; storage!: MaintenanceDetectInstallStorageFolderDto[];
} }
export class MaintenanceListBackupsResponseDto { export class MaintenanceListBackupsResponseDto {

View File

@@ -15,7 +15,7 @@ import { FileInterceptor } from '@nestjs/platform-express';
import { NextFunction, Request, Response } from 'express'; import { NextFunction, Request, Response } from 'express';
import { import {
MaintenanceAuthDto, MaintenanceAuthDto,
MaintenanceIntegrityResponseDto, MaintenanceDetectInstallResponseDto,
MaintenanceListBackupsResponseDto, MaintenanceListBackupsResponseDto,
MaintenanceLoginDto, MaintenanceLoginDto,
MaintenanceStatusResponseDto, MaintenanceStatusResponseDto,
@@ -49,8 +49,8 @@ export class MaintenanceWorkerController {
return this.service.status(request.cookies[ImmichCookie.MaintenanceToken]); return this.service.status(request.cookies[ImmichCookie.MaintenanceToken]);
} }
@Get('admin/maintenance/integrity') @Get('admin/maintenance/detect-install')
detectPriorInstall(): Promise<MaintenanceIntegrityResponseDto> { detectPriorInstall(): Promise<MaintenanceDetectInstallResponseDto> {
return this.service.detectPriorInstall(); return this.service.detectPriorInstall();
} }

View File

@@ -8,7 +8,7 @@ import { join } from 'node:path';
import { StorageCore } from 'src/cores/storage.core'; import { StorageCore } from 'src/cores/storage.core';
import { import {
MaintenanceAuthDto, MaintenanceAuthDto,
MaintenanceIntegrityResponseDto, MaintenanceDetectInstallResponseDto,
MaintenanceStatusResponseDto, MaintenanceStatusResponseDto,
SetMaintenanceModeDto, SetMaintenanceModeDto,
} from 'src/dtos/maintenance.dto'; } from 'src/dtos/maintenance.dto';
@@ -258,7 +258,7 @@ export class MaintenanceWorkerService {
} }
} }
detectPriorInstall(): Promise<MaintenanceIntegrityResponseDto> { detectPriorInstall(): Promise<MaintenanceDetectInstallResponseDto> {
return detectPriorInstall(this.storageRepository); return detectPriorInstall(this.storageRepository);
} }

View File

@@ -2,7 +2,7 @@ import { BadRequestException, Injectable } from '@nestjs/common';
import { OnEvent } from 'src/decorators'; import { OnEvent } from 'src/decorators';
import { import {
MaintenanceAuthDto, MaintenanceAuthDto,
MaintenanceIntegrityResponseDto, MaintenanceDetectInstallResponseDto,
MaintenanceStatusResponseDto, MaintenanceStatusResponseDto,
SetMaintenanceModeDto, SetMaintenanceModeDto,
} from 'src/dtos/maintenance.dto'; } from 'src/dtos/maintenance.dto';
@@ -35,7 +35,7 @@ export class MaintenanceService extends BaseService {
}; };
} }
detectPriorInstall(): Promise<MaintenanceIntegrityResponseDto> { detectPriorInstall(): Promise<MaintenanceDetectInstallResponseDto> {
return detectPriorInstall(this.storageRepository); return detectPriorInstall(this.storageRepository);
} }

View File

@@ -5,7 +5,7 @@ import { randomBytes } from 'node:crypto';
import { join } from 'node:path'; import { join } from 'node:path';
import { Server as SocketIO } from 'socket.io'; import { Server as SocketIO } from 'socket.io';
import { StorageCore } from 'src/cores/storage.core'; import { StorageCore } from 'src/cores/storage.core';
import { MaintenanceAuthDto, MaintenanceIntegrityResponseDto } from 'src/dtos/maintenance.dto'; import { MaintenanceAuthDto, MaintenanceDetectInstallResponseDto } from 'src/dtos/maintenance.dto';
import { StorageFolder } from 'src/enum'; import { StorageFolder } from 'src/enum';
import { ConfigRepository } from 'src/repositories/config.repository'; import { ConfigRepository } from 'src/repositories/config.repository';
import { AppRestartEvent } from 'src/repositories/event.repository'; import { AppRestartEvent } from 'src/repositories/event.repository';
@@ -79,7 +79,7 @@ export function generateMaintenanceSecret(): string {
export async function detectPriorInstall( export async function detectPriorInstall(
storageRepository: StorageRepository, storageRepository: StorageRepository,
): Promise<MaintenanceIntegrityResponseDto> { ): Promise<MaintenanceDetectInstallResponseDto> {
return { return {
storage: await Promise.all( storage: await Promise.all(
Object.values(StorageFolder).map(async (folder) => { Object.values(StorageFolder).map(async (folder) => {