Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(services-endorsement-system): Disable caching #16223

Merged
merged 7 commits into from
Oct 3, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
import { Field, ObjectType } from '@nestjs/graphql'
import { PageInfoResponse } from './pageInfo.response'
import { Endorsement } from '../models/endorsement.model'
import { CacheField } from '@island.is/nest/graphql'

@ObjectType()
export class PaginatedEndorsementResponse {
@Field()
totalCount!: number

@CacheField(() => [Endorsement])
@Field(() => [Endorsement])
data!: Endorsement[]

@CacheField(() => PageInfoResponse)
@Field(() => PageInfoResponse)
pageInfo!: PageInfoResponse
}
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
import { Field, ObjectType } from '@nestjs/graphql'
import { PageInfoResponse } from './pageInfo.response'
import { EndorsementList } from '../models/endorsementList.model'
import { CacheField } from '@island.is/nest/graphql'

@ObjectType()
export class PaginatedEndorsementListResponse {
@Field()
totalCount!: number

@CacheField(() => [EndorsementList])
@Field(() => [EndorsementList])
data!: EndorsementList[]

@CacheField(() => PageInfoResponse)
@Field(() => PageInfoResponse)
pageInfo!: PageInfoResponse
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,28 +28,23 @@ import { EndorsementPaginationInput } from './dto/endorsementPagination.input'
import { OpenListInput } from './dto/openList.input'
import { sendPdfEmailResponse } from './dto/sendPdfEmail.response'
import { sendPdfEmailInput } from './dto/sendPdfEmail.input'
import { CacheControl, CacheControlOptions } from '@island.is/nest/graphql'
import { CACHE_CONTROL_MAX_AGE } from '@island.is/shared/constants'

import { ExportUrlResponse } from './dto/exportUrl.response'
import { ExportEndorsementListInput } from './dto/exportEndorsementList.input'

const defaultCache: CacheControlOptions = { maxAge: CACHE_CONTROL_MAX_AGE }

@UseGuards(IdsUserGuard)
@Resolver(() => EndorsementList)
export class EndorsementSystemResolver {
constructor(private endorsementSystemService: EndorsementSystemService) {}

@CacheControl({ inheritMaxAge: true })
@ResolveField('ownerName', () => String, { nullable: true })
resolveOwnerName(@Parent() list: EndorsementList): Promise<string | null> {
return this.endorsementSystemService.endorsementListControllerGetOwnerName({
listId: list.id,
})
}

@CacheControl(defaultCache)
// GET /endorsement-list/{listId}/endorsement/exists
@Query(() => ExistsEndorsementResponse)
async endorsementSystemGetSingleEndorsement(
@Args('input') input: FindEndorsementListInput,
Expand All @@ -61,7 +56,7 @@ export class EndorsementSystemResolver {
)
}

@CacheControl(defaultCache)
// GET /endorsement-list/{listId}/endorsement
@Query(() => PaginatedEndorsementResponse, { nullable: true })
async endorsementSystemGetEndorsements(
@Args('input') input: PaginatedEndorsementInput,
Expand All @@ -73,6 +68,7 @@ export class EndorsementSystemResolver {
)
}

// POST /endorsement-list/{listId}/endorsement
@Mutation(() => Endorsement)
async endorsementSystemEndorseList(
@Args('input') input: CreateEndorsementInput,
Expand All @@ -84,6 +80,7 @@ export class EndorsementSystemResolver {
)
}

// DELETE /endorsement-list/{listId}/endorsement
@Mutation(() => Boolean)
async endorsementSystemUnendorseList(
@Args('input') input: FindEndorsementListInput,
Expand All @@ -95,7 +92,7 @@ export class EndorsementSystemResolver {
)
}

@CacheControl(defaultCache)
// GET /endorsement-list ... by tags
@Query(() => PaginatedEndorsementListResponse)
async endorsementSystemFindEndorsementLists(
@Args('input') input: PaginatedEndorsementListInput,
Expand All @@ -107,7 +104,7 @@ export class EndorsementSystemResolver {
)
}

@CacheControl(defaultCache)
// GET /endorsement-list/general-petition-lists
@Query(() => PaginatedEndorsementListResponse)
@BypassAuth()
async endorsementSystemGetGeneralPetitionLists(
Expand All @@ -118,7 +115,7 @@ export class EndorsementSystemResolver {
)
}

@CacheControl(defaultCache)
// GET /endorsement-list/general-petition-list/{listId}
@Query(() => EndorsementList)
@BypassAuth()
async endorsementSystemGetGeneralPetitionList(
Expand All @@ -129,7 +126,7 @@ export class EndorsementSystemResolver {
)
}

@CacheControl(defaultCache)
// GET /endorsement-list/{listId}/endorsement/general-petition
@Query(() => PaginatedEndorsementResponse, { nullable: true })
@BypassAuth()
async endorsementSystemGetGeneralPetitionEndorsements(
Expand All @@ -140,7 +137,7 @@ export class EndorsementSystemResolver {
)
}

@CacheControl(defaultCache)
// GET /endorsement-list/{listId}
@Query(() => EndorsementList, { nullable: true })
async endorsementSystemGetSingleEndorsementList(
@Args('input') input: FindEndorsementListInput,
Expand All @@ -152,7 +149,7 @@ export class EndorsementSystemResolver {
)
}

@CacheControl(defaultCache)
// GET /endorsement-list/endorsements
@Query(() => PaginatedEndorsementResponse)
async endorsementSystemUserEndorsements(
@CurrentUser() user: User,
Expand All @@ -164,7 +161,7 @@ export class EndorsementSystemResolver {
)
}

@CacheControl(defaultCache)
// GET /endorsement-list/endorsementLists
@Query(() => PaginatedEndorsementListResponse)
async endorsementSystemUserEndorsementLists(
@CurrentUser() user: User,
Expand All @@ -176,6 +173,7 @@ export class EndorsementSystemResolver {
)
}

// POST /endorsement-list
@Mutation(() => EndorsementList)
async endorsementSystemCreateEndorsementList(
@Args('input') input: CreateEndorsementListDto,
Expand All @@ -202,7 +200,7 @@ export class EndorsementSystemResolver {
user,
)
}

// PUT /endorsement-list/{listId}/close
@Mutation(() => EndorsementList)
async endorsementSystemCloseEndorsementList(
@Args('input') input: FindEndorsementListInput,
Expand All @@ -214,6 +212,7 @@ export class EndorsementSystemResolver {
)
}

// PUT /endorsement-list/{listId}/open
@Mutation(() => EndorsementList)
async endorsementSystemOpenEndorsementList(
@Args('input') input: OpenListInput,
Expand All @@ -225,6 +224,7 @@ export class EndorsementSystemResolver {
)
}

// PUT /endorsement-list/{listId}/lock
@Mutation(() => EndorsementList)
async endorsementSystemLockEndorsementList(
@Args('input') input: FindEndorsementListInput,
Expand All @@ -236,6 +236,7 @@ export class EndorsementSystemResolver {
)
}

// PUT /endorsement-list/{listId}/unlock
@Mutation(() => EndorsementList)
async endorsementSystemUnlockEndorsementList(
@Args('input') input: FindEndorsementListInput,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { Field, ObjectType, ID } from '@nestjs/graphql'
import { EndorsementListOpen } from './endorsementListOpen.model'
import { EndorsementMetadata } from './endorsementMetadata.model'
import { CacheField } from '@island.is/nest/graphql'

@ObjectType()
export class Endorsement {
Expand All @@ -14,10 +13,10 @@ export class Endorsement {
@Field()
endorsementListId!: string

@CacheField(() => EndorsementListOpen, { nullable: true })
@Field(() => EndorsementListOpen, { nullable: true })
endorsementList?: EndorsementListOpen

@CacheField(() => EndorsementMetadata)
@Field(() => EndorsementMetadata)
meta!: EndorsementMetadata

@Field()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { Field, ObjectType, ID } from '@nestjs/graphql'
import graphqlTypeJson from 'graphql-type-json'
import { EndorsementListTagsEnum } from '../enums/endorsementListTags.enum'
import { CacheField } from '@island.is/nest/graphql'

@ObjectType()
export class EndorsementList {
Expand All @@ -23,10 +22,10 @@ export class EndorsementList {
@Field()
adminLock!: boolean

@CacheField(() => [EndorsementListTagsEnum])
@Field(() => [EndorsementListTagsEnum])
tags!: EndorsementListTagsEnum[]

@CacheField(() => graphqlTypeJson)
@Field(() => graphqlTypeJson)
meta!: object

@Field()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { Field, ObjectType, ID } from '@nestjs/graphql'
import { EndorsementListOpenTagsEnum } from '../enums/endorsementListOpenTagsEnum'
import { CacheField } from '@island.is/nest/graphql'

@ObjectType()
export class EndorsementListOpen {
Expand All @@ -13,7 +12,7 @@ export class EndorsementListOpen {
@Field(() => String, { nullable: true })
description!: string | null

@CacheField(() => [EndorsementListOpenTagsEnum], { nullable: true })
@Field(() => [EndorsementListOpenTagsEnum], { nullable: true })
tags?: EndorsementListOpenTagsEnum[]

@Field(() => Date)
Expand Down
Loading