瀏覽代碼

fix lint error

Yuki Takei 3 年之前
父節點
當前提交
37b675a2a3

+ 7 - 5
packages/app/src/server/middlewares/inject-user-ui-settings-to-localvars.ts

@@ -5,16 +5,18 @@ import UserUISettings from '../models/user-ui-settings';
 
 
 const logger = loggerFactory('growi:middleware:inject-user-ui-settings-to-localvars');
 const logger = loggerFactory('growi:middleware:inject-user-ui-settings-to-localvars');
 
 
-async function getSettings(userId: string): Promise<Partial<IUserUISettings> | null> {
+async function getSettings(userId: string): Promise<IUserUISettings | null> {
   const doc = await UserUISettings.findOne({ user: userId }).exec();
   const doc = await UserUISettings.findOne({ user: userId }).exec();
 
 
-  let partialDoc: Partial<IUserUISettings> | null = null;
+  let userUISettings: IUserUISettings | null = null;
   if (doc != null) {
   if (doc != null) {
-    partialDoc = doc.toObject();
-    delete partialDoc.user;
+    const obj = doc.toObject();
+    // omit user property
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    userUISettings = (({ user, ...rest }) => rest)(obj);
   }
   }
 
 
-  return partialDoc;
+  return userUISettings;
 }
 }
 
 
 module.exports = () => {
 module.exports = () => {

+ 2 - 2
packages/app/src/server/models/user-ui-settings.ts

@@ -1,4 +1,4 @@
-import { getOrCreateModel, IUser } from '@growi/core';
+import { getOrCreateModel, Ref, IUser } from '@growi/core';
 import {
 import {
   Schema, Model, Document,
   Schema, Model, Document,
 } from 'mongoose';
 } from 'mongoose';
@@ -9,7 +9,7 @@ import { IUserUISettings } from '~/interfaces/user-ui-settings';
 
 
 
 
 export interface UserUISettingsDocument extends IUserUISettings, Document {
 export interface UserUISettingsDocument extends IUserUISettings, Document {
-  user: IUser,
+  user: Ref<IUser>,
 }
 }
 export type UserUISettingsModel = Model<UserUISettingsDocument>
 export type UserUISettingsModel = Model<UserUISettingsDocument>