|
|
@ -42,7 +42,7 @@ export class SymbolProfileService { |
|
|
|
}) { |
|
|
|
return this.prismaService.symbolProfile.findMany({ |
|
|
|
include: { |
|
|
|
Order: { |
|
|
|
activities: { |
|
|
|
include: { |
|
|
|
User: true |
|
|
|
} |
|
|
@ -50,8 +50,7 @@ export class SymbolProfileService { |
|
|
|
}, |
|
|
|
orderBy: [{ symbol: 'asc' }], |
|
|
|
where: { |
|
|
|
isActive: true, |
|
|
|
Order: withUserSubscription |
|
|
|
activities: withUserSubscription |
|
|
|
? { |
|
|
|
some: { |
|
|
|
User: { |
|
|
@ -65,7 +64,8 @@ export class SymbolProfileService { |
|
|
|
subscriptions: { none: { expiresAt: { gt: new Date() } } } |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
isActive: true |
|
|
|
} |
|
|
|
}); |
|
|
|
} |
|
|
@ -77,9 +77,9 @@ export class SymbolProfileService { |
|
|
|
.findMany({ |
|
|
|
include: { |
|
|
|
_count: { |
|
|
|
select: { Order: true } |
|
|
|
select: { activities: true } |
|
|
|
}, |
|
|
|
Order: { |
|
|
|
activities: { |
|
|
|
orderBy: { |
|
|
|
date: 'asc' |
|
|
|
}, |
|
|
@ -109,7 +109,7 @@ export class SymbolProfileService { |
|
|
|
.findMany({ |
|
|
|
include: { |
|
|
|
_count: { |
|
|
|
select: { Order: true } |
|
|
|
select: { activities: true } |
|
|
|
}, |
|
|
|
SymbolProfileOverrides: true |
|
|
|
}, |
|
|
@ -184,8 +184,8 @@ export class SymbolProfileService { |
|
|
|
|
|
|
|
private enhanceSymbolProfiles( |
|
|
|
symbolProfiles: (SymbolProfile & { |
|
|
|
_count: { Order: number }; |
|
|
|
Order?: { |
|
|
|
_count: { activities: number }; |
|
|
|
activities?: { |
|
|
|
date: Date; |
|
|
|
}[]; |
|
|
|
SymbolProfileOverrides: SymbolProfileOverrides; |
|
|
@ -209,11 +209,11 @@ export class SymbolProfileService { |
|
|
|
symbolMapping: this.getSymbolMapping(symbolProfile) |
|
|
|
}; |
|
|
|
|
|
|
|
item.activitiesCount = symbolProfile._count.Order; |
|
|
|
item.activitiesCount = symbolProfile._count.activities; |
|
|
|
delete item._count; |
|
|
|
|
|
|
|
item.dateOfFirstActivity = symbolProfile.Order?.[0]?.date; |
|
|
|
delete item.Order; |
|
|
|
item.dateOfFirstActivity = symbolProfile.activities?.[0]?.date; |
|
|
|
delete item.activities; |
|
|
|
|
|
|
|
if (item.SymbolProfileOverrides) { |
|
|
|
item.assetClass = |
|
|
|