Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
19 changes: 8 additions & 11 deletions analytics-service/src/analytics/document.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,8 @@ export class AnalyticsDocumentService {
instanceTopicId: instance.instanceTopicId,
timeStamp: data.id,
account: data.payer,
type: DocumentType.ROLE,
issuer: data.issuer,
role: data.role,
group: data.group,
type: DocumentType.DID,
issuer: data.did,
action: data.action,
ipfs: data.getUrlValue(0, UrlType.cid)
};
Expand All @@ -176,14 +174,13 @@ export class AnalyticsDocumentService {
policyUUID: instance.policyUUID,
policyTopicId: instance.policyTopicId,
instanceTopicId: instance.instanceTopicId,
timeStamp: data.id,
account: data.payer,
type: DocumentType.ROLE,
issuer: data.issuer,
role: data.role,
group: data.group,
action: data.action,
ipfs: data.getUrlValue(0, UrlType.cid)
timeStamp: data.id,
topicId: data.childId,
name: data.name,
description: data.description,
owner: data.owner,
action: data.action
};
const databaseServer = new DatabaseServer();

Expand Down
10 changes: 4 additions & 6 deletions analytics-service/src/analytics/policy.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -201,15 +201,13 @@ export class AnalyticsPolicyService {
root: report.root,
account: data.payer,
timeStamp: data.id,
tagUUID: data.uuid,
name: data.name,
description: data.description,
owner: data.owner,
target: data.target,
operation: data.operation,
entity: data.entity,
date: data.date,
action: data.action
version: data.version,
owner: sr.did,
action: data.action,
ipfs: data.getDocumentUrl(UrlType.cid)
};
const databaseServer = new DatabaseServer();

Expand Down
6 changes: 3 additions & 3 deletions analytics-service/src/analytics/report.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -214,9 +214,9 @@ export class ReportService {
const modules = await databaseServer.find(Module, { uuid });
const users = await databaseServer.find(User, { uuid });
const tags = await databaseServer.find(Tag, { uuid, action: MessageAction.PublishTag });
const userTopicCount = await databaseServer.find(Topic, { uuid });
const schemaCount = await databaseServer.find(Schema, { uuid, action: MessageAction.PublishSchema });
const systemSchemaCount = await databaseServer.find(Schema, { uuid, action: MessageAction.PublishSystemSchema });
const userTopicCount = await databaseServer.count(Topic, { uuid });
const schemaCount = await databaseServer.count(Schema, { uuid, action: MessageAction.PublishSchema });
const systemSchemaCount = await databaseServer.count(Schema, { uuid, action: MessageAction.PublishSystemSchema });

const docByPolicy =
await databaseServer.aggregate(Document, databaseServer.getAnalyticsDocAggregationFilters(MAP_REPORT_ANALYTICS_AGGREGATION_FILTERS.DOC_BY_POLICY, uuid) as FilterObject<any>[])
Expand Down