Change amount type to string and update cdk test

consensusnetworks · Dec 5, 2023 · e0d42b5 · e0d42b5
1 parent ba1c6ea
commit e0d42b5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/common/data/src/providers/schema.ts b/common/data/src/providers/schema.ts
@@ -42,7 +42,6 @@ export class Schema {
             let type: GlueType = glue.Schema[typeKey]
 
             if (name == "timestamp") type = glue.Schema.TIMESTAMP
-            if (name === "amount") type = glue.Schema.FLOAT
 
             const comment = property.description
             return { name, type, comment }

diff --git a/common/data/src/schemas/event.schema.json b/common/data/src/schemas/event.schema.json
@@ -39,7 +39,7 @@
             "description": "The sender's address"
         },
         "amount": {
-            "type": "number",
+            "type": "string",
             "description": "The amount transferred in the event"
         }
     }

diff --git a/infrastructure/cdk/src/providers/analytics.ts b/infrastructure/cdk/src/providers/analytics.ts
@@ -13,7 +13,6 @@ import { CfnWorkGroup } from "aws-cdk-lib/aws-athena"
  */
 export class AnalyticsStack extends cdk.Stack {
     public readonly name = pascalCase("analytics")
-    public readonly workGroupName: string
 
     constructor(scope: Construct, id: string, props: AnalyticsStackProps) {
         super(scope, id, props)
@@ -34,8 +33,8 @@ export class AnalyticsStack extends cdk.Stack {
             bucketName: kebabCase(config.getFullStackResourceName(this.name, "output-bucket", config.dataVersion))
         })
 
-        const workGroup = new CfnWorkGroup(this, config.getFullStackResourceName(this.name, "workgroup", config.dataVersion), {
-            name: config.getFullStackResourceName(this.name, "workgroup", config.dataVersion),
+        new CfnWorkGroup(this, config.getFullStackResourceName(this.name, "workGroup", config.dataVersion), {
+            name: config.getFullStackResourceName(this.name, "workGroup", config.dataVersion),
             recursiveDeleteOption: true,
             state: "ENABLED",
             workGroupConfiguration: {
@@ -46,8 +45,6 @@ export class AnalyticsStack extends cdk.Stack {
             tags: [{ key: "version", value: config.dataVersion.toString() }],
         })
 
-        this.workGroupName = workGroup.name
-
         new glue.Table(this, config.getFullStackResourceName(this.name, "event-table", config.dataVersion), {
             database: database,
             tableName: snakeCase(config.getFullStackResourceName(this.name, "event-table", config.dataVersion)),

diff --git a/infrastructure/cdk/test/analytics.test.ts b/infrastructure/cdk/test/analytics.test.ts
@@ -31,6 +31,7 @@ test("Analytics stack created", () => {
     }
 
     const workgroup = analyticsTemplate.findResources("AWS::Athena::WorkGroup")
-
-    expect(workgroup).toBeDefined()
+    const outputBucket = Object.keys(analyticsTemplate.findResources("AWS::S3::Bucket")).filter(key => key.includes("OutputBucket"))[0]
+    const workgroupRef = workgroup[Object.keys(workgroup)[0]].Properties.WorkGroupConfiguration.ResultConfiguration.OutputLocation["Fn::Join"][1][1]["Ref"]
+    expect(workgroupRef).toEqual(outputBucket)
 })