From 2273fefd27fe41949ca8d5242c3fdd7a2372dadd Mon Sep 17 00:00:00 2001
From: rubikscraft <contact@rubikscraft.nl>
Date: Mon, 18 Apr 2022 14:09:34 +0200
Subject: [PATCH] refactor names in shared

---
 .../preferencesdb/preferencedefaults.service.ts           | 4 ++--
 .../collections/preferencesdb/syspreferencedb.service.ts  | 8 ++++----
 .../collections/preferencesdb/usrpreferencedb.service.ts  | 2 +-
 backend/src/collections/userdb/userdb.service.ts          | 2 +-
 backend/src/layers/httpexception/httpexception.filter.ts  | 4 ++--
 backend/src/models/dto/syspreferences.dto.ts              | 2 +-
 backend/src/models/dto/usrpreferences.dto.ts              | 2 +-
 .../src/routes/api/experiment/experiment.controller.ts    | 2 +-
 backend/src/routes/api/user/usermanage.controller.ts      | 8 ++++----
 frontend/src/app/i18n/syspref.i18n.ts                     | 2 +-
 frontend/src/app/i18n/usrpref.i18n.ts                     | 2 +-
 frontend/src/app/models/forms/updateuser.control.ts       | 2 +-
 frontend/src/app/routes/view/view.component.ts            | 2 +-
 frontend/src/app/services/api/image.service.ts            | 2 +-
 frontend/src/app/services/api/static-info.service.ts      | 2 +-
 frontend/src/app/services/api/usermanage.service.ts       | 2 +-
 .../src/dto/api/{usermanage.dto.ts => user-manage.dto.ts} | 2 +-
 shared/src/dto/{idobject.dto.ts => id-object.dto.ts}      | 0
 shared/src/dto/{imagelinks.dto.ts => image-links.dto.ts}  | 0
 shared/src/dto/mimes.dto.ts                               | 2 +-
 .../dto/{syspreferences.dto.ts => sys-preferences.dto.ts} | 0
 .../dto/{usrpreferences.dto.ts => usr-preferences.dto.ts} | 0
 22 files changed, 26 insertions(+), 26 deletions(-)
 rename shared/src/dto/api/{usermanage.dto.ts => user-manage.dto.ts} (97%)
 rename shared/src/dto/{idobject.dto.ts => id-object.dto.ts} (100%)
 rename shared/src/dto/{imagelinks.dto.ts => image-links.dto.ts} (100%)
 rename shared/src/dto/{syspreferences.dto.ts => sys-preferences.dto.ts} (100%)
 rename shared/src/dto/{usrpreferences.dto.ts => usr-preferences.dto.ts} (100%)

diff --git a/backend/src/collections/preferencesdb/preferencedefaults.service.ts b/backend/src/collections/preferencesdb/preferencedefaults.service.ts
index 39e6c54..37d52b8 100644
--- a/backend/src/collections/preferencesdb/preferencedefaults.service.ts
+++ b/backend/src/collections/preferencesdb/preferencedefaults.service.ts
@@ -1,7 +1,7 @@
 import { Injectable, Logger } from '@nestjs/common';
 import { PrefValueType } from 'picsur-shared/dist/dto/preferences.dto';
-import { SysPreference } from 'picsur-shared/dist/dto/syspreferences.dto';
-import { UsrPreference } from 'picsur-shared/dist/dto/usrpreferences.dto';
+import { SysPreference } from 'picsur-shared/dist/dto/sys-preferences.dto';
+import { UsrPreference } from 'picsur-shared/dist/dto/usr-preferences.dto';
 import { generateRandomString } from 'picsur-shared/dist/util/random';
 import { EarlyJwtConfigService } from '../../config/early/earlyjwt.config.service';
 
diff --git a/backend/src/collections/preferencesdb/syspreferencedb.service.ts b/backend/src/collections/preferencesdb/syspreferencedb.service.ts
index e8be4bd..91605cc 100644
--- a/backend/src/collections/preferencesdb/syspreferencedb.service.ts
+++ b/backend/src/collections/preferencesdb/syspreferencedb.service.ts
@@ -3,18 +3,18 @@ import { InjectRepository } from '@nestjs/typeorm';
 import {
   DecodedSysPref,
   PrefValueType,
-  PrefValueTypeStrings,
+  PrefValueTypeStrings
 } from 'picsur-shared/dist/dto/preferences.dto';
-import { SysPreference } from 'picsur-shared/dist/dto/syspreferences.dto';
+import { SysPreference } from 'picsur-shared/dist/dto/sys-preferences.dto';
 import { AsyncFailable, Fail, HasFailed } from 'picsur-shared/dist/types';
 import { Repository } from 'typeorm';
 import {
   SysPreferenceList,
-  SysPreferenceValueTypes,
+  SysPreferenceValueTypes
 } from '../../models/dto/syspreferences.dto';
 import {
   ESysPreferenceBackend,
-  ESysPreferenceSchema,
+  ESysPreferenceSchema
 } from '../../models/entities/syspreference.entity';
 import { FallBackMutex } from '../../models/util/FallBackMutex';
 import { PreferenceCommonService } from './preferencecommon.service';
diff --git a/backend/src/collections/preferencesdb/usrpreferencedb.service.ts b/backend/src/collections/preferencesdb/usrpreferencedb.service.ts
index 66c8101..5e5f21b 100644
--- a/backend/src/collections/preferencesdb/usrpreferencedb.service.ts
+++ b/backend/src/collections/preferencesdb/usrpreferencedb.service.ts
@@ -5,7 +5,7 @@ import {
   PrefValueType,
   PrefValueTypeStrings
 } from 'picsur-shared/dist/dto/preferences.dto';
-import { UsrPreference } from 'picsur-shared/dist/dto/usrpreferences.dto';
+import { UsrPreference } from 'picsur-shared/dist/dto/usr-preferences.dto';
 import { AsyncFailable, Fail, HasFailed } from 'picsur-shared/dist/types';
 import { Repository } from 'typeorm';
 import {
diff --git a/backend/src/collections/userdb/userdb.service.ts b/backend/src/collections/userdb/userdb.service.ts
index 3a72fa6..915f59b 100644
--- a/backend/src/collections/userdb/userdb.service.ts
+++ b/backend/src/collections/userdb/userdb.service.ts
@@ -1,7 +1,7 @@
 import { Injectable, Logger } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import * as bcrypt from 'bcrypt';
-import { SysPreference } from 'picsur-shared/dist/dto/syspreferences.dto';
+import { SysPreference } from 'picsur-shared/dist/dto/sys-preferences.dto';
 import {
   AsyncFailable,
   Fail,
diff --git a/backend/src/layers/httpexception/httpexception.filter.ts b/backend/src/layers/httpexception/httpexception.filter.ts
index 6cff6e2..c421144 100644
--- a/backend/src/layers/httpexception/httpexception.filter.ts
+++ b/backend/src/layers/httpexception/httpexception.filter.ts
@@ -18,9 +18,9 @@ export class MainExceptionFilter implements ExceptionFilter {
 
   catch(exception: unknown, host: ArgumentsHost) {
     if (exception instanceof Error) {
-      MainExceptionFilter.logger.error(exception.message, exception.stack);
+      MainExceptionFilter.logger.warn(exception.message, exception.stack);
     } else {
-      MainExceptionFilter.logger.error(exception);
+      MainExceptionFilter.logger.warn(exception);
     }
 
     const ctx = host.switchToHttp();
diff --git a/backend/src/models/dto/syspreferences.dto.ts b/backend/src/models/dto/syspreferences.dto.ts
index 3905e9a..b534c4a 100644
--- a/backend/src/models/dto/syspreferences.dto.ts
+++ b/backend/src/models/dto/syspreferences.dto.ts
@@ -1,5 +1,5 @@
 import { PrefValueTypeStrings } from 'picsur-shared/dist/dto/preferences.dto';
-import { SysPreference } from 'picsur-shared/dist/dto/syspreferences.dto';
+import { SysPreference } from 'picsur-shared/dist/dto/sys-preferences.dto';
 
 export type SysPreferences = SysPreference[];
 export const SysPreferenceList: string[] = Object.values(SysPreference);
diff --git a/backend/src/models/dto/usrpreferences.dto.ts b/backend/src/models/dto/usrpreferences.dto.ts
index b5c0c08..e8b97f0 100644
--- a/backend/src/models/dto/usrpreferences.dto.ts
+++ b/backend/src/models/dto/usrpreferences.dto.ts
@@ -1,5 +1,5 @@
 import { PrefValueTypeStrings } from 'picsur-shared/dist/dto/preferences.dto';
-import { UsrPreference } from 'picsur-shared/dist/dto/usrpreferences.dto';
+import { UsrPreference } from 'picsur-shared/dist/dto/usr-preferences.dto';
 
 export type UsrPreferences = UsrPreference[];
 export const UsrPreferenceList: string[] = Object.values(UsrPreference);
diff --git a/backend/src/routes/api/experiment/experiment.controller.ts b/backend/src/routes/api/experiment/experiment.controller.ts
index be89d61..79e2698 100644
--- a/backend/src/routes/api/experiment/experiment.controller.ts
+++ b/backend/src/routes/api/experiment/experiment.controller.ts
@@ -2,7 +2,7 @@ import {
   Controller, Get,
   Request
 } from '@nestjs/common';
-import { UserInfoResponse } from 'picsur-shared/dist/dto/api/usermanage.dto';
+import { UserInfoResponse } from 'picsur-shared/dist/dto/api/user-manage.dto';
 import { Permission } from 'picsur-shared/dist/dto/permissions.dto';
 import { RequiredPermissions } from '../../../decorators/permissions.decorator';
 import { ReqUserID } from '../../../decorators/request-user.decorator';
diff --git a/backend/src/routes/api/user/usermanage.controller.ts b/backend/src/routes/api/user/usermanage.controller.ts
index 840909f..131af96 100644
--- a/backend/src/routes/api/user/usermanage.controller.ts
+++ b/backend/src/routes/api/user/usermanage.controller.ts
@@ -4,7 +4,7 @@ import {
   Get,
   InternalServerErrorException,
   Logger,
-  Post,
+  Post
 } from '@nestjs/common';
 import {
   GetSpecialUsersResponse,
@@ -17,8 +17,8 @@ import {
   UserListRequest,
   UserListResponse,
   UserUpdateRequest,
-  UserUpdateResponse,
-} from 'picsur-shared/dist/dto/api/usermanage.dto';
+  UserUpdateResponse
+} from 'picsur-shared/dist/dto/api/user-manage.dto';
 import { HasFailed } from 'picsur-shared/dist/types';
 import { UsersService } from '../../../collections/userdb/userdb.service';
 import { RequiredPermissions } from '../../../decorators/permissions.decorator';
@@ -27,7 +27,7 @@ import { Permission } from '../../../models/dto/permissions.dto';
 import {
   ImmutableUsersList,
   LockedLoginUsersList,
-  UndeletableUsersList,
+  UndeletableUsersList
 } from '../../../models/dto/specialusers.dto';
 import { EUserBackend2EUser } from '../../../models/transformers/user.transformer';
 
diff --git a/frontend/src/app/i18n/syspref.i18n.ts b/frontend/src/app/i18n/syspref.i18n.ts
index f94bc52..f03137c 100644
--- a/frontend/src/app/i18n/syspref.i18n.ts
+++ b/frontend/src/app/i18n/syspref.i18n.ts
@@ -1,4 +1,4 @@
-import { SysPreference } from 'picsur-shared/dist/dto/syspreferences.dto';
+import { SysPreference } from 'picsur-shared/dist/dto/sys-preferences.dto';
 
 export const SysPreferenceFriendlyNames: {
   [key in SysPreference]: string;
diff --git a/frontend/src/app/i18n/usrpref.i18n.ts b/frontend/src/app/i18n/usrpref.i18n.ts
index fc690d8..a969291 100644
--- a/frontend/src/app/i18n/usrpref.i18n.ts
+++ b/frontend/src/app/i18n/usrpref.i18n.ts
@@ -1,4 +1,4 @@
-import { UsrPreference } from 'picsur-shared/dist/dto/usrpreferences.dto';
+import { UsrPreference } from 'picsur-shared/dist/dto/usr-preferences.dto';
 
 export const UsrPreferenceFriendlyNames: {
   [key in UsrPreference]: string;
diff --git a/frontend/src/app/models/forms/updateuser.control.ts b/frontend/src/app/models/forms/updateuser.control.ts
index c98080d..126770b 100644
--- a/frontend/src/app/models/forms/updateuser.control.ts
+++ b/frontend/src/app/models/forms/updateuser.control.ts
@@ -1,5 +1,5 @@
 import { FormControl } from '@angular/forms';
-import { UserCreateRequest, UserUpdateRequest } from 'picsur-shared/dist/dto/api/usermanage.dto';
+import { UserCreateRequest, UserUpdateRequest } from 'picsur-shared/dist/dto/api/user-manage.dto';
 import {
   CreatePasswordError,
   CreateUsernameError,
diff --git a/frontend/src/app/routes/view/view.component.ts b/frontend/src/app/routes/view/view.component.ts
index f113d2f..4e9782e 100644
--- a/frontend/src/app/routes/view/view.component.ts
+++ b/frontend/src/app/routes/view/view.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { ImageLinks } from 'picsur-shared/dist/dto/imagelinks.dto';
+import { ImageLinks } from 'picsur-shared/dist/dto/image-links.dto';
 import { HasFailed } from 'picsur-shared/dist/types';
 import { UUIDRegex } from 'picsur-shared/dist/util/common-regex';
 import { ImageService } from 'src/app/services/api/image.service';
diff --git a/frontend/src/app/services/api/image.service.ts b/frontend/src/app/services/api/image.service.ts
index 52a49c0..ad1f467 100644
--- a/frontend/src/app/services/api/image.service.ts
+++ b/frontend/src/app/services/api/image.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { ImageMetaResponse } from 'picsur-shared/dist/dto/api/image.dto';
-import { ImageLinks } from 'picsur-shared/dist/dto/imagelinks.dto';
+import { ImageLinks } from 'picsur-shared/dist/dto/image-links.dto';
 import { EImage } from 'picsur-shared/dist/entities/image.entity';
 import { AsyncFailable } from 'picsur-shared/dist/types';
 import { Open } from 'picsur-shared/dist/types/failable';
diff --git a/frontend/src/app/services/api/static-info.service.ts b/frontend/src/app/services/api/static-info.service.ts
index fdc3180..922000f 100644
--- a/frontend/src/app/services/api/static-info.service.ts
+++ b/frontend/src/app/services/api/static-info.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { AllPermissionsResponse } from 'picsur-shared/dist/dto/api/info.dto';
 import { SpecialRolesResponse } from 'picsur-shared/dist/dto/api/roles.dto';
-import { GetSpecialUsersResponse } from 'picsur-shared/dist/dto/api/usermanage.dto';
+import { GetSpecialUsersResponse } from 'picsur-shared/dist/dto/api/user-manage.dto';
 import { Open } from 'picsur-shared/dist/types';
 import { CacheService } from '../storage/cache.service';
 import { ApiService } from './api.service';
diff --git a/frontend/src/app/services/api/usermanage.service.ts b/frontend/src/app/services/api/usermanage.service.ts
index 3443f7c..da950ca 100644
--- a/frontend/src/app/services/api/usermanage.service.ts
+++ b/frontend/src/app/services/api/usermanage.service.ts
@@ -10,7 +10,7 @@ import {
   UserListResponse,
   UserUpdateRequest,
   UserUpdateResponse
-} from 'picsur-shared/dist/dto/api/usermanage.dto';
+} from 'picsur-shared/dist/dto/api/user-manage.dto';
 import { EUser } from 'picsur-shared/dist/entities/user.entity';
 import { AsyncFailable, Open } from 'picsur-shared/dist/types';
 import { ApiService } from './api.service';
diff --git a/shared/src/dto/api/usermanage.dto.ts b/shared/src/dto/api/user-manage.dto.ts
similarity index 97%
rename from shared/src/dto/api/usermanage.dto.ts
rename to shared/src/dto/api/user-manage.dto.ts
index 63104e5..c8e66c8 100644
--- a/shared/src/dto/api/usermanage.dto.ts
+++ b/shared/src/dto/api/user-manage.dto.ts
@@ -5,7 +5,7 @@ import {
 import { createZodDto } from '../../util/create-zod-dto';
 import { IsPosInt } from '../../validators/positive-int.validator';
 import { IsStringList } from '../../validators/string-list.validator';
-import { EntityIDObjectSchema } from '../idobject.dto';
+import { EntityIDObjectSchema } from '../id-object.dto';
 
 // UserList
 export const UserListRequestSchema = z.object({
diff --git a/shared/src/dto/idobject.dto.ts b/shared/src/dto/id-object.dto.ts
similarity index 100%
rename from shared/src/dto/idobject.dto.ts
rename to shared/src/dto/id-object.dto.ts
diff --git a/shared/src/dto/imagelinks.dto.ts b/shared/src/dto/image-links.dto.ts
similarity index 100%
rename from shared/src/dto/imagelinks.dto.ts
rename to shared/src/dto/image-links.dto.ts
diff --git a/shared/src/dto/mimes.dto.ts b/shared/src/dto/mimes.dto.ts
index 0358b91..cf8c673 100644
--- a/shared/src/dto/mimes.dto.ts
+++ b/shared/src/dto/mimes.dto.ts
@@ -6,7 +6,7 @@ export enum ImageMime {
   TIFF = 'image/tiff',
   BMP = 'image/bmp',
   ICO = 'image/x-icon',
-  QOI = 'image/qoi',
+  QOI = 'image/x-qoi',
 }
 
 export enum AnimMime {
diff --git a/shared/src/dto/syspreferences.dto.ts b/shared/src/dto/sys-preferences.dto.ts
similarity index 100%
rename from shared/src/dto/syspreferences.dto.ts
rename to shared/src/dto/sys-preferences.dto.ts
diff --git a/shared/src/dto/usrpreferences.dto.ts b/shared/src/dto/usr-preferences.dto.ts
similarity index 100%
rename from shared/src/dto/usrpreferences.dto.ts
rename to shared/src/dto/usr-preferences.dto.ts