btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

refactor: removing unused import, commented codes, improved cursor query (#69)

Browse Source 
* chore: refactor code in some modules

* refactor: getTeamsOfUser functino

* chore: remove unused import

* chore: revert some changes
This commit is contained in:
Mir Arif Hasan
2023-04-06 20:24:10 +06:00
committed by GitHub
parent ffc08227dd
commit 696cf8490b
14 changed files with 22 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/hoppscotch-backend/src/user-settings/user-settings.service.spec.ts
View File

@@ -4,7 +4,6 @@ import { PubSubService } from 'src/pubsub/pubsub.service';
import { UserSettingsService } from './user-settings.service';
import { JSON_INVALID, USER_SETTINGS_NULL_SETTINGS } from 'src/errors';
import { UserSettings } from './user-settings.model';
import { User } from 'src/user/user.model';
import { AuthUser } from 'src/types/AuthUser';
const mockPrisma = mockDeep<PrismaService>();

23
packages/hoppscotch-backend/src/user-settings/user-settings.service.ts
View File

@@ -4,6 +4,7 @@ import { PubSubService } from 'src/pubsub/pubsub.service';
import { User } from 'src/user/user.model';
import * as E from 'fp-ts/Either';
import { stringToJson } from 'src/utils';
import { UserSettings as DbUserSettings } from '@prisma/client';
import { UserSettings } from './user-settings.model';
import {
USER_SETTINGS_ALREADY_EXISTS,
@@ -19,6 +20,13 @@ export class UserSettingsService {
private readonly pubsub: PubSubService,
) {}
private castToUserSettings(userSettings: DbUserSettings): UserSettings {
return {
...userSettings,
properties: JSON.stringify(userSettings.properties),
};
}
/**
* Fetch user settings for a given user
* @param user User object
@@ -30,10 +38,7 @@ export class UserSettingsService {
where: { userUid: user.uid },
});
const settings: UserSettings = {
...userSettings,
properties: JSON.stringify(userSettings.properties),
};
const settings = this.castToUserSettings(userSettings);
return E.right(settings);
} catch (e) {
@@ -61,10 +66,7 @@ export class UserSettingsService {
},
});
const settings: UserSettings = {
...userSettings,
properties: JSON.stringify(userSettings.properties),
};
const settings = this.castToUserSettings(userSettings);
// Publish subscription for user settings creation
await this.pubsub.publish(`user_settings/${user.uid}/created`, settings);
@@ -95,10 +97,7 @@ export class UserSettingsService {
},
});
const settings: UserSettings = {
...updatedUserSettings,
properties: JSON.stringify(updatedUserSettings.properties),
};
const settings = this.castToUserSettings(updatedUserSettings);
// Publish subscription for user settings update
await this.pubsub.publish(`user_settings/${user.uid}/updated`, settings);