@hed-hog/core 0.0.279 → 0.0.286

package/src/setting/setting.controller.ts

@@ -2,22 +2,22 @@ import { Public, Role, User } from '@hed-hog/api';
 import { Locale } from '@hed-hog/api-locale';
 import { Pagination } from '@hed-hog/api-pagination';
 import {
-  Body,
-  Controller,
-  Delete,
-  forwardRef,
-  Get,
-  Header,
-  Inject,
-  Param,
-  ParseIntPipe,
-  Patch,
-  Post,
-  Put,
-  Query,
-  Res,
-  UploadedFile,
-  UseInterceptors
+    Body,
+    Controller,
+    Delete,
+    forwardRef,
+    Get,
+    Header,
+    Inject,
+    Param,
+    ParseIntPipe,
+    Patch,
+    Post,
+    Put,
+    Query,
+    Res,
+    UploadedFile,
+    UseInterceptors
 } from '@nestjs/common';
 import { FileInterceptor } from '@nestjs/platform-express';
 import { Response } from 'express';
@@ -78,6 +78,11 @@ export class SettingsController {
     return this.settingService.getUserSettings(id);
   }
 
+  @Get('/effective')
+  async getEffectiveSettings(@User() { id }) {
+    return this.settingService.getEffectiveSettings(id);
+  }
+
   @Get()
   async listSettings(@Pagination() paginationParams, @Locale() locale) {
     return this.settingService.listSettings(locale, paginationParams);

package/src/setting/setting.service.ts

@@ -3,12 +3,12 @@ import { getLocaleText, LocaleService } from '@hed-hog/api-locale';
 import { PaginationDTO, PaginationService } from '@hed-hog/api-pagination';
 import { PrismaService, setting_type_enum } from '@hed-hog/api-prisma';
 import {
-  BadRequestException,
-  forwardRef,
-  Inject,
-  Injectable,
-  Logger,
-  NotFoundException
+    BadRequestException,
+    forwardRef,
+    Inject,
+    Injectable,
+    Logger,
+    NotFoundException
 } from '@nestjs/common';
 import * as pako from 'pako';
 import { CreateDTO } from './dto/create.dto';
@@ -190,6 +190,46 @@ export class SettingService {
     return { locales, setting };
   }
 
+  async getEffectiveSettings(userId: number): Promise<any> {
+    const { locales, setting } = await this.getSystemSettings();
+    const userSettings = await this.getUserSettings(userId);
+
+    for (const userSetting of userSettings) {
+      const slug = userSetting.setting?.slug;
+      if (!slug) continue;
+
+      const value = userSetting.value;
+      if (value === undefined || value === null) continue;
+
+      const globalValue = setting?.[slug];
+      const globalType = typeof globalValue;
+
+      if (globalType === 'boolean') {
+        setting[slug] = value === 'true';
+        continue;
+      }
+
+      if (globalType === 'number') {
+        const parsed = Number(value);
+        setting[slug] = Number.isNaN(parsed) ? value : parsed;
+        continue;
+      }
+
+      if (Array.isArray(globalValue) || globalType === 'object') {
+        try {
+          setting[slug] = JSON.parse(value);
+        } catch {
+          setting[slug] = value;
+        }
+        continue;
+      }
+
+      setting[slug] = value;
+    }
+
+    return { locales, setting };
+  }
+
   async setManySettings(data: SettingDTO) {
     this.clearCache();
     const transaction = [];
@@ -621,10 +661,12 @@ export class SettingService {
 
   async getSettingValues(
     slug: string | string[],
+    userId?: number,
   ): Promise<Record<string, any>> {
 
     const slugs = Array.isArray(slug) ? slug : [slug];
     if (
+      userId === undefined &&
       this.cachedSettings &&
       slugs.every(s => Object.prototype.hasOwnProperty.call(this.cachedSettings, s))
     ) {
@@ -659,17 +701,21 @@ export class SettingService {
 
     const slugUserOverride = setting.filter((s) => s.user_override);
 
-    const settingUser = await this.prismaService.setting_user.findMany({
-      where: {
-        setting_id: {
-          in: slugUserOverride.map((setting) => setting?.id),
-        },
-      },
-      select: {
-        value: true,
-        setting_id: true,
-      },
-    });
+    const settingUser =
+      userId === undefined
+        ? []
+        : await this.prismaService.setting_user.findMany({
+            where: {
+              user_id: userId,
+              setting_id: {
+                in: slugUserOverride.map((setting) => setting?.id),
+              },
+            },
+            select: {
+              value: true,
+              setting_id: true,
+            },
+          });
 
     const data: Record<string, any> = {};
     const cacheData: Record<string, any> = {};