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

fix: enum type fixes in SDL (HBE-183) (#55)

Browse Source 
* fix: added reqType typed in sdl

* fix: updateUserSession type
This commit is contained in:
Mir Arif Hasan
2023-03-28 17:46:41 +06:00
committed by GitHub
parent 9d6a7f709c
commit ccdce37f88
15 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/hoppscotch-backend/src/user-history/user-history.model.ts
View File

@@ -1,4 +1,5 @@
import { Field, ID, ObjectType, registerEnumType } from '@nestjs/graphql';
import { ReqType } from 'src/types/RequestTypes';
@ObjectType()
export class UserHistory {
@@ -39,11 +40,6 @@ export class UserHistory {
executedOn: Date;
}
export enum ReqType {
REST = 'REST',
GQL = 'GQL',
}
registerEnumType(ReqType, {
name: 'ReqType',
});

7
packages/hoppscotch-backend/src/user-history/user-history.resolver.ts
View File

@@ -2,6 +2,7 @@ import { Args, ID, Mutation, Resolver, Subscription } from '@nestjs/graphql';
import { UserHistoryService } from './user-history.service';
import { PubSubService } from '../pubsub/pubsub.service';
import { UserHistory } from './user-history.model';
import { ReqType } from 'src/types/RequestTypes';
import { UseGuards } from '@nestjs/common';
import { GqlAuthGuard } from '../guards/gql-auth.guard';
import { GqlUser } from '../decorators/gql-user.decorator';
@@ -40,8 +41,9 @@ export class UserHistoryResolver {
@Args({
name: 'reqType',
description: 'Request type, REST or GQL',
type: () => ReqType,
})
reqType: string,
reqType: ReqType,
): Promise<UserHistory> {
const createdHistory = await this.userHistoryService.createUserHistory(
user.uid,
@@ -101,8 +103,9 @@ export class UserHistoryResolver {
@Args({
name: 'reqType',
description: 'Request type, REST or GQL',
type: () => ReqType,
})
reqType: string,
reqType: ReqType,
): Promise<number> {
const deletedHistory = await this.userHistoryService.deleteAllUserHistory(
user.uid,

4
packages/hoppscotch-backend/src/user-history/user-history.service.spec.ts
View File

@@ -2,12 +2,12 @@ import { UserHistoryService } from './user-history.service';
import { PrismaService } from '../prisma/prisma.service';
import { PubSubService } from '../pubsub/pubsub.service';
import { mockDeep, mockReset } from 'jest-mock-extended';
import { ReqType, UserHistory } from './user-history.model';
import { UserHistory } from './user-history.model';
import { ReqType } from 'src/types/RequestTypes';
import {
USER_HISTORY_INVALID_REQ_TYPE,
USER_HISTORY_NOT_FOUND,
} from '../errors';
import { ReqType as DBReqType } from '@prisma/client';
const mockPrisma = mockDeep<PrismaService>();
const mockPubSub = mockDeep<PubSubService>();

3
packages/hoppscotch-backend/src/user-history/user-history.service.ts
View File

@@ -1,7 +1,8 @@
import { Injectable } from '@nestjs/common';
import { PrismaService } from '../prisma/prisma.service';
import { PubSubService } from '../pubsub/pubsub.service';
import { ReqType, UserHistory } from './user-history.model';
import { UserHistory } from './user-history.model';
import { ReqType } from 'src/types/RequestTypes';
import * as E from 'fp-ts/Either';
import * as O from 'fp-ts/Option';
import {

3
packages/hoppscotch-backend/src/user-history/user.resolver.ts
View File

@@ -1,7 +1,8 @@
import { Args, Parent, ResolveField, Resolver } from '@nestjs/graphql';
import { User } from '../user/user.model';
import { UserHistoryService } from './user-history.service';
import { ReqType, UserHistory } from './user-history.model';
import { UserHistory } from './user-history.model';
import { ReqType } from 'src/types/RequestTypes';
import { PaginationArgs } from '../types/input-types.args';
@Resolver(() => User)