Merge pull request #2342 from hashgraph/feature/auto-fill-suggestions…

…-config auto fill suggestions config
hashgraph · Jun 28, 2023 · a379a24 · a379a24
2 parents ba94808 + 58b2aff
commit a379a24
Show file tree

Hide file tree

Showing 5 changed files with 74 additions and 4 deletions.
diff --git a/common/src/database-modules/database-server.ts b/common/src/database-modules/database-server.ts
@@ -2500,7 +2500,7 @@ export class DatabaseServer {
      * @returns config
      */
     public static async setSuggestionsConfig(
-        config: SuggestionsConfig
+        config: Partial<SuggestionsConfig>
     ): Promise<SuggestionsConfig> {
         const existingConfig = await DatabaseServer.getSuggestionsConfig(
             config.user

diff --git a/guardian-service/src/api/suggestions.service.ts b/guardian-service/src/api/suggestions.service.ts
@@ -224,7 +224,7 @@ export async function suggestionsAPI(): Promise<void> {
             const config = await DatabaseServer.setSuggestionsConfig({
                 user: user.did,
                 items,
-            } as any);
+            });
             return new MessageResponse(config.items);
         } catch (error) {
             return new MessageError(error);

diff --git a/guardian-service/src/app.ts b/guardian-service/src/app.ts
@@ -85,7 +85,8 @@ Promise.all([
         'v2-7-0',
         'v2-9-0',
         'v2-11-0',
-        'v2-12-0'
+        'v2-12-0',
+        'v2-13-0',
     ]),
     MessageBrokerChannel.connect('GUARDIANS_SERVICE'),
     NestFactory.createMicroservice<MicroserviceOptions>(AppModule,{

diff --git a/guardian-service/src/migrations/v2-13-0.ts b/guardian-service/src/migrations/v2-13-0.ts
@@ -0,0 +1,47 @@
+import { ConfigType } from '@guardian/interfaces';
+import { Migration } from '@mikro-orm/migrations-mongodb';
+
+/**
+ * Migration to version 2.13.0
+ */
+export class ReleaseMigration extends Migration {
+    /**
+     * Up migration
+     */
+    async up(): Promise<void> {
+        await this.setupSuggestionsConfig();
+    }
+
+    /**
+     * Setup suggestions config
+     */
+    async setupSuggestionsConfig() {
+        const suggestionsConfigCollection =
+            this.getCollection('SuggestionsConfig');
+        const policyCollection = this.getCollection('Policy');
+        const policiesByUsers = await policyCollection
+            .aggregate([
+                {
+                    $group: {
+                        _id: '$owner',
+                        policyIds: {
+                            $push: '$_id',
+                        },
+                    },
+                },
+            ])
+            .toArray();
+        for (const policiesByUser of policiesByUsers) {
+            await suggestionsConfigCollection.insertOne({
+                user: policiesByUser._id,
+                items: policiesByUser.policyIds
+                    .slice(0, 5)
+                    .map((id, index) => ({
+                        id,
+                        index,
+                        type: ConfigType.POLICY,
+                    })),
+            });
+        }
+    }
+}
diff --git a/guardian-service/src/policy-engine/helpers/policy-import-export-helper.ts b/guardian-service/src/policy-engine/helpers/policy-import-export-helper.ts
@@ -1,5 +1,11 @@
 import JSZip from 'jszip';
-import { GenerateUUIDv4, SchemaEntity, TagType, TopicType } from '@guardian/interfaces';
+import {
+    ConfigType,
+    GenerateUUIDv4,
+    SchemaEntity,
+    TagType,
+    TopicType,
+} from '@guardian/interfaces';
 import { publishSystemSchemas } from '@api/helpers/schema-publish-helper';
 import { importSchemaByFiles } from '@api/helpers/schema-import-export-helper';
 import { PolicyConverterUtils } from '@policy-engine/policy-converter-utils';
@@ -356,6 +362,22 @@ export class PolicyImportExportHelper {
             await DatabaseServer.saveArtifact(addedArtifact);
         }
 
+        const suggestionsConfig = await DatabaseServer.getSuggestionsConfig(
+            policyOwner
+        );
+        if (!suggestionsConfig) {
+            await DatabaseServer.setSuggestionsConfig({
+                user: policyOwner,
+                items: [
+                    {
+                        id: result.id,
+                        type: ConfigType.POLICY,
+                        index: 0,
+                    },
+                ],
+            });
+        }
+
         notifier.completed();
         return { policy: result, errors };
     }