diff --git a/src/datasources/locking-api/locking-api.service.spec.ts b/src/datasources/locking-api/locking-api.service.spec.ts index d8574bf03d..04b1673a3d 100644 --- a/src/datasources/locking-api/locking-api.service.spec.ts +++ b/src/datasources/locking-api/locking-api.service.spec.ts @@ -10,12 +10,12 @@ import { lockEventItemBuilder, unlockEventItemBuilder, withdrawEventItemBuilder, -} from '@/domain/locking/entities/__tests__/locking-event.builder'; +} from '@/domain/community/entities/__tests__/locking-event.builder'; import { getAddress } from 'viem'; -import { rankBuilder } from '@/domain/locking/entities/__tests__/rank.builder'; -import { campaignBuilder } from '@/domain/locking/entities/__tests__/campaign.builder'; -import { campaignRankBuilder } from '@/domain/locking/entities/__tests__/campaign-rank.builder'; -import { CampaignRank } from '@/domain/locking/entities/campaign-rank.entity'; +import { rankBuilder } from '@/domain/community/entities/__tests__/rank.builder'; +import { campaignBuilder } from '@/domain/community/entities/__tests__/campaign.builder'; +import { campaignRankBuilder } from '@/domain/community/entities/__tests__/campaign-rank.builder'; +import { CampaignRank } from '@/domain/community/entities/campaign-rank.entity'; const networkService = { get: jest.fn(), diff --git a/src/datasources/locking-api/locking-api.service.ts b/src/datasources/locking-api/locking-api.service.ts index 6c03a8c3e8..d15e94fc42 100644 --- a/src/datasources/locking-api/locking-api.service.ts +++ b/src/datasources/locking-api/locking-api.service.ts @@ -6,10 +6,10 @@ import { } from '@/datasources/network/network.service.interface'; import { Page } from '@/domain/entities/page.entity'; import { ILockingApi } from '@/domain/interfaces/locking-api.interface'; -import { Campaign } from '@/domain/locking/entities/campaign.entity'; -import { CampaignRank } from '@/domain/locking/entities/campaign-rank.entity'; -import { LockingEvent } from '@/domain/locking/entities/locking-event.entity'; -import { Rank } from '@/domain/locking/entities/rank.entity'; +import { Campaign } from '@/domain/community/entities/campaign.entity'; +import { CampaignRank } from '@/domain/community/entities/campaign-rank.entity'; +import { LockingEvent } from '@/domain/community/entities/locking-event.entity'; +import { Rank } from '@/domain/community/entities/rank.entity'; import { Inject } from '@nestjs/common'; export class LockingApi implements ILockingApi { diff --git a/src/domain/community/community.domain.module.ts b/src/domain/community/community.domain.module.ts new file mode 100644 index 0000000000..f139e797d7 --- /dev/null +++ b/src/domain/community/community.domain.module.ts @@ -0,0 +1,11 @@ +import { Module } from '@nestjs/common'; +import { LockingApiModule } from '@/datasources/locking-api/locking-api.module'; +import { ICommunityRepository } from '@/domain/community/community.repository.interface'; +import { CommunityRepository } from '@/domain/community/community.repository'; + +@Module({ + imports: [LockingApiModule], + providers: [{ provide: ICommunityRepository, useClass: CommunityRepository }], + exports: [ICommunityRepository], +}) +export class CommunityDomainModule {} diff --git a/src/domain/locking/locking.repository.interface.ts b/src/domain/community/community.repository.interface.ts similarity index 60% rename from src/domain/locking/locking.repository.interface.ts rename to src/domain/community/community.repository.interface.ts index bf4290e8f6..e5726624ca 100644 --- a/src/domain/locking/locking.repository.interface.ts +++ b/src/domain/community/community.repository.interface.ts @@ -1,12 +1,12 @@ import { Page } from '@/domain/entities/page.entity'; -import { Campaign } from '@/domain/locking/entities/campaign.entity'; -import { CampaignRank } from '@/domain/locking/entities/campaign-rank.entity'; -import { LockingEvent } from '@/domain/locking/entities/locking-event.entity'; -import { Rank } from '@/domain/locking/entities/rank.entity'; +import { Campaign } from '@/domain/community/entities/campaign.entity'; +import { CampaignRank } from '@/domain/community/entities/campaign-rank.entity'; +import { LockingEvent } from '@/domain/community/entities/locking-event.entity'; +import { Rank } from '@/domain/community/entities/rank.entity'; -export const ILockingRepository = Symbol('ILockingRepository'); +export const ICommunityRepository = Symbol('ICommunityRepository'); -export interface ILockingRepository { +export interface ICommunityRepository { getCampaignById(campaignId: string): Promise; getCampaigns(args: { diff --git a/src/domain/locking/locking.repository.ts b/src/domain/community/community.repository.ts similarity index 75% rename from src/domain/locking/locking.repository.ts rename to src/domain/community/community.repository.ts index 5329192047..b04261ac96 100644 --- a/src/domain/locking/locking.repository.ts +++ b/src/domain/community/community.repository.ts @@ -4,23 +4,23 @@ import { Campaign, CampaignPageSchema, CampaignSchema, -} from '@/domain/locking/entities/campaign.entity'; +} from '@/domain/community/entities/campaign.entity'; import { CampaignRank, CampaignRankPageSchema, -} from '@/domain/locking/entities/campaign-rank.entity'; -import { LockingEvent } from '@/domain/locking/entities/locking-event.entity'; -import { Rank } from '@/domain/locking/entities/rank.entity'; -import { LockingEventPageSchema } from '@/domain/locking/entities/schemas/locking-event.schema'; +} from '@/domain/community/entities/campaign-rank.entity'; +import { LockingEvent } from '@/domain/community/entities/locking-event.entity'; +import { Rank } from '@/domain/community/entities/rank.entity'; +import { LockingEventPageSchema } from '@/domain/community/entities/schemas/locking-event.schema'; import { RankPageSchema, RankSchema, -} from '@/domain/locking/entities/schemas/rank.schema'; -import { ILockingRepository } from '@/domain/locking/locking.repository.interface'; +} from '@/domain/community/entities/schemas/rank.schema'; +import { ICommunityRepository } from '@/domain/community/community.repository.interface'; import { Inject, Injectable } from '@nestjs/common'; @Injectable() -export class LockingRepository implements ILockingRepository { +export class CommunityRepository implements ICommunityRepository { constructor( @Inject(ILockingApi) private readonly lockingApi: ILockingApi, diff --git a/src/domain/locking/entities/__tests__/activity-metadata.builder.ts b/src/domain/community/entities/__tests__/activity-metadata.builder.ts similarity index 81% rename from src/domain/locking/entities/__tests__/activity-metadata.builder.ts rename to src/domain/community/entities/__tests__/activity-metadata.builder.ts index 1b500f0e4d..04f6e8e01f 100644 --- a/src/domain/locking/entities/__tests__/activity-metadata.builder.ts +++ b/src/domain/community/entities/__tests__/activity-metadata.builder.ts @@ -1,5 +1,5 @@ import { Builder, IBuilder } from '@/__tests__/builder'; -import { ActivityMetadata } from '@/domain/locking/entities/activity-metadata.entity'; +import { ActivityMetadata } from '@/domain/community/entities/activity-metadata.entity'; import { faker } from '@faker-js/faker'; export function activityMetadataBuilder(): IBuilder { diff --git a/src/domain/locking/entities/__tests__/campaign-rank.builder.ts b/src/domain/community/entities/__tests__/campaign-rank.builder.ts similarity index 85% rename from src/domain/locking/entities/__tests__/campaign-rank.builder.ts rename to src/domain/community/entities/__tests__/campaign-rank.builder.ts index 7b3b2cced9..4bc1825a5b 100644 --- a/src/domain/locking/entities/__tests__/campaign-rank.builder.ts +++ b/src/domain/community/entities/__tests__/campaign-rank.builder.ts @@ -1,5 +1,5 @@ import { Builder, IBuilder } from '@/__tests__/builder'; -import { CampaignRank } from '@/domain/locking/entities/campaign-rank.entity'; +import { CampaignRank } from '@/domain/community/entities/campaign-rank.entity'; import { faker } from '@faker-js/faker'; import { getAddress } from 'viem'; diff --git a/src/domain/locking/entities/__tests__/campaign.builder.ts b/src/domain/community/entities/__tests__/campaign.builder.ts similarity index 82% rename from src/domain/locking/entities/__tests__/campaign.builder.ts rename to src/domain/community/entities/__tests__/campaign.builder.ts index 04eb3d543e..5deeca3b05 100644 --- a/src/domain/locking/entities/__tests__/campaign.builder.ts +++ b/src/domain/community/entities/__tests__/campaign.builder.ts @@ -1,6 +1,6 @@ import { IBuilder, Builder } from '@/__tests__/builder'; -import { activityMetadataBuilder } from '@/domain/locking/entities/__tests__/activity-metadata.builder'; -import { Campaign } from '@/domain/locking/entities/campaign.entity'; +import { activityMetadataBuilder } from '@/domain/community/entities/__tests__/activity-metadata.builder'; +import { Campaign } from '@/domain/community/entities/campaign.entity'; import { faker } from '@faker-js/faker'; export function campaignBuilder(): IBuilder { diff --git a/src/domain/locking/entities/__tests__/locking-event.builder.ts b/src/domain/community/entities/__tests__/locking-event.builder.ts similarity index 94% rename from src/domain/locking/entities/__tests__/locking-event.builder.ts rename to src/domain/community/entities/__tests__/locking-event.builder.ts index d412c6d43d..e39f7d4757 100644 --- a/src/domain/locking/entities/__tests__/locking-event.builder.ts +++ b/src/domain/community/entities/__tests__/locking-event.builder.ts @@ -3,13 +3,13 @@ import { LockEventItem, UnlockEventItem, WithdrawEventItem, -} from '@/domain/locking/entities/locking-event.entity'; +} from '@/domain/community/entities/locking-event.entity'; import { LockEventItemSchema, LockingEventType, UnlockEventItemSchema, WithdrawEventItemSchema, -} from '@/domain/locking/entities/schemas/locking-event.schema'; +} from '@/domain/community/entities/schemas/locking-event.schema'; import { faker } from '@faker-js/faker'; import { Hex, getAddress } from 'viem'; import { z } from 'zod'; diff --git a/src/domain/locking/entities/__tests__/rank.builder.ts b/src/domain/community/entities/__tests__/rank.builder.ts similarity index 88% rename from src/domain/locking/entities/__tests__/rank.builder.ts rename to src/domain/community/entities/__tests__/rank.builder.ts index bf766210e2..b9ad11fff7 100644 --- a/src/domain/locking/entities/__tests__/rank.builder.ts +++ b/src/domain/community/entities/__tests__/rank.builder.ts @@ -1,5 +1,5 @@ import { IBuilder, Builder } from '@/__tests__/builder'; -import { Rank } from '@/domain/locking/entities/rank.entity'; +import { Rank } from '@/domain/community/entities/rank.entity'; import { faker } from '@faker-js/faker'; import { getAddress } from 'viem'; diff --git a/src/domain/locking/entities/activity-metadata.entity.ts b/src/domain/community/entities/activity-metadata.entity.ts similarity index 100% rename from src/domain/locking/entities/activity-metadata.entity.ts rename to src/domain/community/entities/activity-metadata.entity.ts diff --git a/src/domain/locking/entities/campaign-rank.entity.ts b/src/domain/community/entities/campaign-rank.entity.ts similarity index 100% rename from src/domain/locking/entities/campaign-rank.entity.ts rename to src/domain/community/entities/campaign-rank.entity.ts diff --git a/src/domain/locking/entities/campaign.entity.ts b/src/domain/community/entities/campaign.entity.ts similarity index 85% rename from src/domain/locking/entities/campaign.entity.ts rename to src/domain/community/entities/campaign.entity.ts index 52a02d54b0..eddd4ed12c 100644 --- a/src/domain/locking/entities/campaign.entity.ts +++ b/src/domain/community/entities/campaign.entity.ts @@ -1,5 +1,5 @@ import { buildPageSchema } from '@/domain/entities/schemas/page.schema.factory'; -import { ActivityMetadataSchema } from '@/domain/locking/entities/activity-metadata.entity'; +import { ActivityMetadataSchema } from '@/domain/community/entities/activity-metadata.entity'; import { z } from 'zod'; export type Campaign = z.infer; diff --git a/src/domain/locking/entities/locking-event.entity.ts b/src/domain/community/entities/locking-event.entity.ts similarity index 85% rename from src/domain/locking/entities/locking-event.entity.ts rename to src/domain/community/entities/locking-event.entity.ts index af08cd6708..019e9b98d9 100644 --- a/src/domain/locking/entities/locking-event.entity.ts +++ b/src/domain/community/entities/locking-event.entity.ts @@ -3,7 +3,7 @@ import { LockingEventSchema, UnlockEventItemSchema, WithdrawEventItemSchema, -} from '@/domain/locking/entities/schemas/locking-event.schema'; +} from '@/domain/community/entities/schemas/locking-event.schema'; import { z } from 'zod'; export type LockEventItem = z.infer; diff --git a/src/domain/community/entities/rank.entity.ts b/src/domain/community/entities/rank.entity.ts new file mode 100644 index 0000000000..63cd33cbae --- /dev/null +++ b/src/domain/community/entities/rank.entity.ts @@ -0,0 +1,4 @@ +import { RankSchema } from '@/domain/community/entities/schemas/rank.schema'; +import { z } from 'zod'; + +export type Rank = z.infer; diff --git a/src/domain/locking/entities/schemas/__tests__/activity-metadata.schema.spec.ts b/src/domain/community/entities/schemas/__tests__/activity-metadata.schema.spec.ts similarity index 90% rename from src/domain/locking/entities/schemas/__tests__/activity-metadata.schema.spec.ts rename to src/domain/community/entities/schemas/__tests__/activity-metadata.schema.spec.ts index 0b1e3272e7..3c37694aea 100644 --- a/src/domain/locking/entities/schemas/__tests__/activity-metadata.schema.spec.ts +++ b/src/domain/community/entities/schemas/__tests__/activity-metadata.schema.spec.ts @@ -1,5 +1,5 @@ -import { activityMetadataBuilder } from '@/domain/locking/entities/__tests__/activity-metadata.builder'; -import { ActivityMetadataSchema } from '@/domain/locking/entities/activity-metadata.entity'; +import { activityMetadataBuilder } from '@/domain/community/entities/__tests__/activity-metadata.builder'; +import { ActivityMetadataSchema } from '@/domain/community/entities/activity-metadata.entity'; import { faker } from '@faker-js/faker'; import { ZodError } from 'zod'; diff --git a/src/domain/locking/entities/schemas/__tests__/campaign-rank.schema.spec.ts b/src/domain/community/entities/schemas/__tests__/campaign-rank.schema.spec.ts similarity index 91% rename from src/domain/locking/entities/schemas/__tests__/campaign-rank.schema.spec.ts rename to src/domain/community/entities/schemas/__tests__/campaign-rank.schema.spec.ts index e6ed4f8fa8..7c7c7b015a 100644 --- a/src/domain/locking/entities/schemas/__tests__/campaign-rank.schema.spec.ts +++ b/src/domain/community/entities/schemas/__tests__/campaign-rank.schema.spec.ts @@ -1,5 +1,5 @@ -import { campaignRankBuilder } from '@/domain/locking/entities/__tests__/campaign-rank.builder'; -import { CampaignRankSchema } from '@/domain/locking/entities/campaign-rank.entity'; +import { campaignRankBuilder } from '@/domain/community/entities/__tests__/campaign-rank.builder'; +import { CampaignRankSchema } from '@/domain/community/entities/campaign-rank.entity'; import { faker } from '@faker-js/faker'; import { getAddress } from 'viem'; import { ZodError } from 'zod'; diff --git a/src/domain/locking/entities/schemas/__tests__/campaign.schema.spec.ts b/src/domain/community/entities/schemas/__tests__/campaign.schema.spec.ts similarity index 93% rename from src/domain/locking/entities/schemas/__tests__/campaign.schema.spec.ts rename to src/domain/community/entities/schemas/__tests__/campaign.schema.spec.ts index a171e6c59a..5c3efb6e0e 100644 --- a/src/domain/locking/entities/schemas/__tests__/campaign.schema.spec.ts +++ b/src/domain/community/entities/schemas/__tests__/campaign.schema.spec.ts @@ -1,5 +1,5 @@ -import { campaignBuilder } from '@/domain/locking/entities/__tests__/campaign.builder'; -import { CampaignSchema } from '@/domain/locking/entities/campaign.entity'; +import { campaignBuilder } from '@/domain/community/entities/__tests__/campaign.builder'; +import { CampaignSchema } from '@/domain/community/entities/campaign.entity'; import { faker } from '@faker-js/faker'; import { ZodError } from 'zod'; diff --git a/src/domain/locking/entities/schemas/__tests__/locking-event.schema.spec.ts b/src/domain/community/entities/schemas/__tests__/locking-event.schema.spec.ts similarity index 99% rename from src/domain/locking/entities/schemas/__tests__/locking-event.schema.spec.ts rename to src/domain/community/entities/schemas/__tests__/locking-event.schema.spec.ts index ad74f0cdb4..3cf3d81447 100644 --- a/src/domain/locking/entities/schemas/__tests__/locking-event.schema.spec.ts +++ b/src/domain/community/entities/schemas/__tests__/locking-event.schema.spec.ts @@ -3,14 +3,14 @@ import { lockEventItemBuilder, unlockEventItemBuilder, withdrawEventItemBuilder, -} from '@/domain/locking/entities/__tests__/locking-event.builder'; +} from '@/domain/community/entities/__tests__/locking-event.builder'; import { LockEventItemSchema, LockingEventPageSchema, LockingEventSchema, UnlockEventItemSchema, WithdrawEventItemSchema, -} from '@/domain/locking/entities/schemas/locking-event.schema'; +} from '@/domain/community/entities/schemas/locking-event.schema'; import { faker } from '@faker-js/faker'; import { getAddress } from 'viem'; import { ZodError } from 'zod'; diff --git a/src/domain/locking/entities/schemas/__tests__/rank.schema.spec.ts b/src/domain/community/entities/schemas/__tests__/rank.schema.spec.ts similarity index 92% rename from src/domain/locking/entities/schemas/__tests__/rank.schema.spec.ts rename to src/domain/community/entities/schemas/__tests__/rank.schema.spec.ts index 6020b16354..67abe8fbd8 100644 --- a/src/domain/locking/entities/schemas/__tests__/rank.schema.spec.ts +++ b/src/domain/community/entities/schemas/__tests__/rank.schema.spec.ts @@ -1,5 +1,5 @@ -import { rankBuilder } from '@/domain/locking/entities/__tests__/rank.builder'; -import { RankSchema } from '@/domain/locking/entities/schemas/rank.schema'; +import { rankBuilder } from '@/domain/community/entities/__tests__/rank.builder'; +import { RankSchema } from '@/domain/community/entities/schemas/rank.schema'; import { faker } from '@faker-js/faker'; import { getAddress } from 'viem'; import { ZodError } from 'zod'; diff --git a/src/domain/locking/entities/schemas/locking-event.schema.ts b/src/domain/community/entities/schemas/locking-event.schema.ts similarity index 100% rename from src/domain/locking/entities/schemas/locking-event.schema.ts rename to src/domain/community/entities/schemas/locking-event.schema.ts diff --git a/src/domain/locking/entities/schemas/rank.schema.ts b/src/domain/community/entities/schemas/rank.schema.ts similarity index 100% rename from src/domain/locking/entities/schemas/rank.schema.ts rename to src/domain/community/entities/schemas/rank.schema.ts diff --git a/src/domain/interfaces/locking-api.interface.ts b/src/domain/interfaces/locking-api.interface.ts index fff606ef68..66a9c2a12e 100644 --- a/src/domain/interfaces/locking-api.interface.ts +++ b/src/domain/interfaces/locking-api.interface.ts @@ -1,8 +1,8 @@ import { Page } from '@/domain/entities/page.entity'; -import { Campaign } from '@/domain/locking/entities/campaign.entity'; -import { CampaignRank } from '@/domain/locking/entities/campaign-rank.entity'; -import { LockingEvent } from '@/domain/locking/entities/locking-event.entity'; -import { Rank } from '@/domain/locking/entities/rank.entity'; +import { Campaign } from '@/domain/community/entities/campaign.entity'; +import { CampaignRank } from '@/domain/community/entities/campaign-rank.entity'; +import { LockingEvent } from '@/domain/community/entities/locking-event.entity'; +import { Rank } from '@/domain/community/entities/rank.entity'; export const ILockingApi = Symbol('ILockingApi'); diff --git a/src/domain/locking/entities/rank.entity.ts b/src/domain/locking/entities/rank.entity.ts deleted file mode 100644 index 2610eb892b..0000000000 --- a/src/domain/locking/entities/rank.entity.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { RankSchema } from '@/domain/locking/entities/schemas/rank.schema'; -import { z } from 'zod'; - -export type Rank = z.infer; diff --git a/src/domain/locking/locking.domain.module.ts b/src/domain/locking/locking.domain.module.ts deleted file mode 100644 index 5cea9e3d88..0000000000 --- a/src/domain/locking/locking.domain.module.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { Module } from '@nestjs/common'; -import { LockingApiModule } from '@/datasources/locking-api/locking-api.module'; -import { ILockingRepository } from '@/domain/locking/locking.repository.interface'; -import { LockingRepository } from '@/domain/locking/locking.repository'; - -@Module({ - imports: [LockingApiModule], - providers: [{ provide: ILockingRepository, useClass: LockingRepository }], - exports: [ILockingRepository], -}) -// TODO: Convert to CommunityDomainModule -export class LockingDomainModule {} diff --git a/src/routes/community/community.controller.spec.ts b/src/routes/community/community.controller.spec.ts index 93cd44c788..63932ebce7 100644 --- a/src/routes/community/community.controller.spec.ts +++ b/src/routes/community/community.controller.spec.ts @@ -23,22 +23,22 @@ import { unlockEventItemBuilder, withdrawEventItemBuilder, toJson as lockingEventToJson, -} from '@/domain/locking/entities/__tests__/locking-event.builder'; -import { LockingEvent } from '@/domain/locking/entities/locking-event.entity'; +} from '@/domain/community/entities/__tests__/locking-event.builder'; +import { LockingEvent } from '@/domain/community/entities/locking-event.entity'; import { TestAccountDataSourceModule } from '@/datasources/account/__tests__/test.account.datasource.module'; import { AccountDataSourceModule } from '@/datasources/account/account.datasource.module'; import { getAddress } from 'viem'; -import { rankBuilder } from '@/domain/locking/entities/__tests__/rank.builder'; +import { rankBuilder } from '@/domain/community/entities/__tests__/rank.builder'; import { PaginationData } from '@/routes/common/pagination/pagination.data'; import { TestQueuesApiModule } from '@/datasources/queues/__tests__/test.queues-api.module'; import { QueuesApiModule } from '@/datasources/queues/queues-api.module'; import { campaignBuilder, toJson as campaignToJson, -} from '@/domain/locking/entities/__tests__/campaign.builder'; -import { Campaign } from '@/domain/locking/entities/campaign.entity'; -import { CampaignRank } from '@/domain/locking/entities/campaign-rank.entity'; -import { campaignRankBuilder } from '@/domain/locking/entities/__tests__/campaign-rank.builder'; +} from '@/domain/community/entities/__tests__/campaign.builder'; +import { Campaign } from '@/domain/community/entities/campaign.entity'; +import { CampaignRank } from '@/domain/community/entities/campaign-rank.entity'; +import { campaignRankBuilder } from '@/domain/community/entities/__tests__/campaign-rank.builder'; describe('Community (Unit)', () => { let app: INestApplication; diff --git a/src/routes/community/community.module.ts b/src/routes/community/community.module.ts index 6177b7e238..feafd52c01 100644 --- a/src/routes/community/community.module.ts +++ b/src/routes/community/community.module.ts @@ -1,10 +1,10 @@ import { Module } from '@nestjs/common'; -import { LockingDomainModule } from '@/domain/locking/locking.domain.module'; +import { CommunityDomainModule } from '@/domain/community/community.domain.module'; import { CommunityService } from '@/routes/community/community.service'; import { CommunityController } from '@/routes/community/community.controller'; @Module({ - imports: [LockingDomainModule], + imports: [CommunityDomainModule], providers: [CommunityService], controllers: [CommunityController], }) diff --git a/src/routes/community/community.service.ts b/src/routes/community/community.service.ts index 850c73c606..b746a1457d 100644 --- a/src/routes/community/community.service.ts +++ b/src/routes/community/community.service.ts @@ -1,9 +1,9 @@ import { Page } from '@/domain/entities/page.entity'; -import { Campaign } from '@/domain/locking/entities/campaign.entity'; -import { CampaignRank } from '@/domain/locking/entities/campaign-rank.entity'; -import { LockingEvent } from '@/domain/locking/entities/locking-event.entity'; -import { Rank } from '@/domain/locking/entities/rank.entity'; -import { ILockingRepository } from '@/domain/locking/locking.repository.interface'; +import { Campaign } from '@/domain/community/entities/campaign.entity'; +import { CampaignRank } from '@/domain/community/entities/campaign-rank.entity'; +import { LockingEvent } from '@/domain/community/entities/locking-event.entity'; +import { Rank } from '@/domain/community/entities/rank.entity'; +import { ICommunityRepository } from '@/domain/community/community.repository.interface'; import { PaginationData, cursorUrlFromLimitAndOffset, @@ -13,15 +13,15 @@ import { Inject, Injectable } from '@nestjs/common'; @Injectable() export class CommunityService { constructor( - @Inject(ILockingRepository) - private readonly lockingRepository: ILockingRepository, + @Inject(ICommunityRepository) + private readonly communityRepository: ICommunityRepository, ) {} async getCampaigns(args: { routeUrl: URL; paginationData: PaginationData; }): Promise> { - const result = await this.lockingRepository.getCampaigns( + const result = await this.communityRepository.getCampaigns( args.paginationData, ); @@ -40,7 +40,7 @@ export class CommunityService { } async getCampaignById(campaignId: string): Promise { - return this.lockingRepository.getCampaignById(campaignId); + return this.communityRepository.getCampaignById(campaignId); } async getCampaignLeaderboard(args: { @@ -48,7 +48,7 @@ export class CommunityService { routeUrl: URL; paginationData: PaginationData; }): Promise> { - const result = await this.lockingRepository.getCampaignLeaderboard({ + const result = await this.communityRepository.getCampaignLeaderboard({ campaignId: args.campaignId, limit: args.paginationData.limit, offset: args.paginationData.offset, @@ -72,7 +72,7 @@ export class CommunityService { routeUrl: URL; paginationData: PaginationData; }): Promise> { - const result = await this.lockingRepository.getLeaderboard( + const result = await this.communityRepository.getLeaderboard( args.paginationData, ); @@ -91,7 +91,7 @@ export class CommunityService { } async getLockingRank(safeAddress: `0x${string}`): Promise { - return this.lockingRepository.getRank(safeAddress); + return this.communityRepository.getRank(safeAddress); } async getLockingHistory(args: { @@ -99,7 +99,7 @@ export class CommunityService { routeUrl: URL; paginationData: PaginationData; }): Promise> { - const result = await this.lockingRepository.getLockingHistory({ + const result = await this.communityRepository.getLockingHistory({ safeAddress: args.safeAddress, limit: args.paginationData.limit, offset: args.paginationData.offset, diff --git a/src/routes/locking/entities/activity-metadata.entity.ts b/src/routes/locking/entities/activity-metadata.entity.ts index cbce0edacf..84e3250118 100644 --- a/src/routes/locking/entities/activity-metadata.entity.ts +++ b/src/routes/locking/entities/activity-metadata.entity.ts @@ -1,4 +1,4 @@ -import { ActivityMetadata as DomainActivityMetadata } from '@/domain/locking/entities/activity-metadata.entity'; +import { ActivityMetadata as DomainActivityMetadata } from '@/domain/community/entities/activity-metadata.entity'; import { ApiProperty } from '@nestjs/swagger'; export class ActivityMetadata implements DomainActivityMetadata { diff --git a/src/routes/locking/entities/campaign-rank.entity.ts b/src/routes/locking/entities/campaign-rank.entity.ts index e8f33666f3..a136abd3cd 100644 --- a/src/routes/locking/entities/campaign-rank.entity.ts +++ b/src/routes/locking/entities/campaign-rank.entity.ts @@ -1,4 +1,4 @@ -import { CampaignRank as DomainCampaignRank } from '@/domain/locking/entities/campaign-rank.entity'; +import { CampaignRank as DomainCampaignRank } from '@/domain/community/entities/campaign-rank.entity'; import { ApiProperty } from '@nestjs/swagger'; export class CampaignRank implements DomainCampaignRank { diff --git a/src/routes/locking/entities/campaign.entity.ts b/src/routes/locking/entities/campaign.entity.ts index ac83ca6cb0..2ca5930c43 100644 --- a/src/routes/locking/entities/campaign.entity.ts +++ b/src/routes/locking/entities/campaign.entity.ts @@ -1,4 +1,4 @@ -import { Campaign as DomainCampaign } from '@/domain/locking/entities/campaign.entity'; +import { Campaign as DomainCampaign } from '@/domain/community/entities/campaign.entity'; import { ActivityMetadata } from '@/routes/locking/entities/activity-metadata.entity'; import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; diff --git a/src/routes/locking/entities/locking-event.page.entity.ts b/src/routes/locking/entities/locking-event.page.entity.ts index c6bedcf1cd..c1ecc1b062 100644 --- a/src/routes/locking/entities/locking-event.page.entity.ts +++ b/src/routes/locking/entities/locking-event.page.entity.ts @@ -2,8 +2,8 @@ import { LockEventItem as DomainLockEventItem, UnlockEventItem as DomainUnlockEventItem, WithdrawEventItem as DomainWithdrawEventItem, -} from '@/domain/locking/entities/locking-event.entity'; -import { LockingEventType } from '@/domain/locking/entities/schemas/locking-event.schema'; +} from '@/domain/community/entities/locking-event.entity'; +import { LockingEventType } from '@/domain/community/entities/schemas/locking-event.schema'; import { Page } from '@/routes/common/entities/page.entity'; import { ApiExtraModels, ApiProperty, getSchemaPath } from '@nestjs/swagger'; diff --git a/src/routes/locking/entities/rank.entity.ts b/src/routes/locking/entities/rank.entity.ts index 61a539e08d..62b7713601 100644 --- a/src/routes/locking/entities/rank.entity.ts +++ b/src/routes/locking/entities/rank.entity.ts @@ -1,4 +1,4 @@ -import { Rank as DomainRank } from '@/domain/locking/entities/rank.entity'; +import { Rank as DomainRank } from '@/domain/community/entities/rank.entity'; import { ApiProperty } from '@nestjs/swagger'; export class Rank implements DomainRank { diff --git a/src/routes/locking/locking.module.ts b/src/routes/locking/locking.module.ts index 502f896d7d..6b384f2c8d 100644 --- a/src/routes/locking/locking.module.ts +++ b/src/routes/locking/locking.module.ts @@ -1,9 +1,7 @@ import { Module } from '@nestjs/common'; import { LockingController } from '@/routes/locking/locking.controller'; -import { LockingDomainModule } from '@/domain/locking/locking.domain.module'; @Module({ - imports: [LockingDomainModule], controllers: [LockingController], }) export class LockingModule {}