diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0c62f0bf..9e9aba0b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ concurrency: env: TZ: 'America/Los_Angeles' - SQRL_VERSION: '0.10.4' + SQRL_VERSION: '0.10.6' jobs: build-and-push: diff --git a/.gitignore b/.gitignore index 3ff07544..2d906009 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .idea +*.iml */build target h2.db.mv.db @@ -228,4 +229,4 @@ py-venv ##performance benchmarking node_modules/ iceberg-data/ -sqrl-iceberg-data/ \ No newline at end of file +sqrl-iceberg-data/ diff --git a/finance-credit-card-chatbot/credit-card-analytics/creditcard-testdata/card_assignment.jsonl b/finance-credit-card-chatbot/credit-card-analytics/creditcard-testdata/card_assignment.jsonl index 02d34de9..dafc8e13 100644 --- a/finance-credit-card-chatbot/credit-card-analytics/creditcard-testdata/card_assignment.jsonl +++ b/finance-credit-card-chatbot/credit-card-analytics/creditcard-testdata/card_assignment.jsonl @@ -11,4 +11,3 @@ {"customerId":9,"cardNo":"6771890227771464","timestamp":"2024-02-25T00:00:00Z","cardType":""} {"customerId":9,"cardNo":"6771894392571071","timestamp":"2024-02-25T00:00:00Z","cardType":"travel"} {"customerId":10,"cardNo":"4692437372010768","timestamp":"2024-02-25T00:00:00Z","cardType":""} -{"customerId":11,"cardNo":"0000000000000000","timestamp":"2024-06-05T00:00:00.00Z","cardType":""} diff --git a/finance-credit-card-chatbot/credit-card-analytics/creditcard-testdata/merchant.jsonl b/finance-credit-card-chatbot/credit-card-analytics/creditcard-testdata/merchant.jsonl index 4e7d8518..d21df067 100644 --- a/finance-credit-card-chatbot/credit-card-analytics/creditcard-testdata/merchant.jsonl +++ b/finance-credit-card-chatbot/credit-card-analytics/creditcard-testdata/merchant.jsonl @@ -98,4 +98,3 @@ {"merchantId":86,"name":"Towne, Renner and Murphy","category":"Miscellaneous","updatedTime":"2024-02-25T00:00:00Z"} {"merchantId":18,"name":"Beier Group","category":"Clothing & Apparel","updatedTime":"2024-02-25T00:00:00Z"} {"merchantId":76,"name":"Mann-Bahringer","category":"Housing & Utilities","updatedTime":"2024-02-25T00:00:00Z"} -{"merchantId":101,"name":"Advance Watermark","category":"","updatedTime":"2024-06-05T00:00:00.000Z"} diff --git a/finance-credit-card-chatbot/credit-card-analytics/creditcard-testdata/merchant_reward.jsonl b/finance-credit-card-chatbot/credit-card-analytics/creditcard-testdata/merchant_reward.jsonl index 58e192f1..76bde723 100644 --- a/finance-credit-card-chatbot/credit-card-analytics/creditcard-testdata/merchant_reward.jsonl +++ b/finance-credit-card-chatbot/credit-card-analytics/creditcard-testdata/merchant_reward.jsonl @@ -465,4 +465,3 @@ {"merchantId":48,"rewardsByCard":[{"cardType":"travel","rewardPercentage":5,"startTimestamp":1717459200,"expirationTimestamp":1718496000},{"cardType":"sports","rewardPercentage":5,"startTimestamp":1717459200,"expirationTimestamp":1719100800}],"updatedTime":"2024-02-25T00:00:00Z"} {"merchantId":34,"rewardsByCard":[{"cardType":"travel","rewardPercentage":10,"startTimestamp":1717459200,"expirationTimestamp":1719360000},{"cardType":"sports","rewardPercentage":10,"startTimestamp":1717459200,"expirationTimestamp":1719187200},{"cardType":"business","rewardPercentage":10,"startTimestamp":1717459200,"expirationTimestamp":1718582400}],"updatedTime":"2024-02-25T00:00:00Z"} {"merchantId":78,"rewardsByCard":[{"cardType":"travel","rewardPercentage":5,"startTimestamp":1717459200,"expirationTimestamp":1719014400},{"cardType":"sports","rewardPercentage":10,"startTimestamp":1717459200,"expirationTimestamp":1719187200}],"updatedTime":"2024-02-25T00:00:00Z"} -{"merchantId":101,"rewardsByCard":[{"cardType":"travel","rewardPercentage":0,"startTimestamp":0,"expirationTimestamp":0}],"updatedTime":"2024-06-05T00:00:00.000Z"} \ No newline at end of file diff --git a/finance-credit-card-chatbot/credit-card-analytics/creditcard_analytics.sqrl b/finance-credit-card-chatbot/credit-card-analytics/creditcard_analytics.sqrl index 03731cf5..973e9a99 100644 --- a/finance-credit-card-chatbot/credit-card-analytics/creditcard_analytics.sqrl +++ b/finance-credit-card-chatbot/credit-card-analytics/creditcard_analytics.sqrl @@ -46,7 +46,7 @@ NewCustomerTransaction(customerId BIGINT) := SUBSCRIBE SELECT * FROM CustomerTra /* ==== TEST CASES ==== */ /*+test */ -CustomerTransactionTest := SELECT * FROM CustomerTransaction ORDER BY `time` DESC limit 5; +CustomerTransactionTest := SELECT * FROM CustomerTransaction ORDER BY `time` DESC LIMIT 5; /*+test */ -SpendingByCategoryTest := SELECT * FROM SpendingByCategory ORDER BY customerId DESC, timeWeek DESC, category ASC limit 5; +SpendingByCategoryTest := SELECT * FROM SpendingByCategory ORDER BY customerId DESC, timeWeek DESC, category ASC LIMIT 5; diff --git a/finance-credit-card-chatbot/credit-card-analytics/snapshots-jwt/SpendingByCategoryTest.snapshot b/finance-credit-card-chatbot/credit-card-analytics/snapshots-jwt/SpendingByCategoryTest.snapshot index 676ba395..e2c2652e 100644 --- a/finance-credit-card-chatbot/credit-card-analytics/snapshots-jwt/SpendingByCategoryTest.snapshot +++ b/finance-credit-card-chatbot/credit-card-analytics/snapshots-jwt/SpendingByCategoryTest.snapshot @@ -2,29 +2,29 @@ "data" : { "SpendingByCategoryTest" : [ { "customerId" : 10, - "timeWeek" : "2024-05-30T13:59:59.999Z", - "category" : "Clothing & Apparel", - "spending" : 976.09 + "timeWeek" : "2024-06-06T13:59:59.999Z", + "category" : "Childcare", + "spending" : 1374.08 }, { "customerId" : 10, - "timeWeek" : "2024-05-30T13:59:59.999Z", - "category" : "Communication", - "spending" : 198.98 + "timeWeek" : "2024-06-06T13:59:59.999Z", + "category" : "Clothing & Apparel", + "spending" : 436.45 }, { "customerId" : 10, - "timeWeek" : "2024-05-30T13:59:59.999Z", - "category" : "Entertainment", - "spending" : 263.24 + "timeWeek" : "2024-06-06T13:59:59.999Z", + "category" : "Communication", + "spending" : 389.06 }, { "customerId" : 10, - "timeWeek" : "2024-05-30T13:59:59.999Z", - "category" : "Groceries", - "spending" : 1529.74 + "timeWeek" : "2024-06-06T13:59:59.999Z", + "category" : "Education", + "spending" : 974.29 }, { "customerId" : 10, - "timeWeek" : "2024-05-30T13:59:59.999Z", - "category" : "Health & Wellness", - "spending" : 493.13 + "timeWeek" : "2024-06-06T13:59:59.999Z", + "category" : "Entertainment", + "spending" : 101.84 } ] } } \ No newline at end of file diff --git a/finance-credit-card-chatbot/credit-card-analytics/snapshots/SpendingByCategoryTest.snapshot b/finance-credit-card-chatbot/credit-card-analytics/snapshots/SpendingByCategoryTest.snapshot index 676ba395..e2c2652e 100644 --- a/finance-credit-card-chatbot/credit-card-analytics/snapshots/SpendingByCategoryTest.snapshot +++ b/finance-credit-card-chatbot/credit-card-analytics/snapshots/SpendingByCategoryTest.snapshot @@ -2,29 +2,29 @@ "data" : { "SpendingByCategoryTest" : [ { "customerId" : 10, - "timeWeek" : "2024-05-30T13:59:59.999Z", - "category" : "Clothing & Apparel", - "spending" : 976.09 + "timeWeek" : "2024-06-06T13:59:59.999Z", + "category" : "Childcare", + "spending" : 1374.08 }, { "customerId" : 10, - "timeWeek" : "2024-05-30T13:59:59.999Z", - "category" : "Communication", - "spending" : 198.98 + "timeWeek" : "2024-06-06T13:59:59.999Z", + "category" : "Clothing & Apparel", + "spending" : 436.45 }, { "customerId" : 10, - "timeWeek" : "2024-05-30T13:59:59.999Z", - "category" : "Entertainment", - "spending" : 263.24 + "timeWeek" : "2024-06-06T13:59:59.999Z", + "category" : "Communication", + "spending" : 389.06 }, { "customerId" : 10, - "timeWeek" : "2024-05-30T13:59:59.999Z", - "category" : "Groceries", - "spending" : 1529.74 + "timeWeek" : "2024-06-06T13:59:59.999Z", + "category" : "Education", + "spending" : 974.29 }, { "customerId" : 10, - "timeWeek" : "2024-05-30T13:59:59.999Z", - "category" : "Health & Wellness", - "spending" : 493.13 + "timeWeek" : "2024-06-06T13:59:59.999Z", + "category" : "Entertainment", + "spending" : 101.84 } ] } } \ No newline at end of file diff --git a/finance-credit-card-chatbot/credit-card-rewards/creditcard-testdata/card_assignment.jsonl b/finance-credit-card-chatbot/credit-card-rewards/creditcard-testdata/card_assignment.jsonl index 02d34de9..dafc8e13 100644 --- a/finance-credit-card-chatbot/credit-card-rewards/creditcard-testdata/card_assignment.jsonl +++ b/finance-credit-card-chatbot/credit-card-rewards/creditcard-testdata/card_assignment.jsonl @@ -11,4 +11,3 @@ {"customerId":9,"cardNo":"6771890227771464","timestamp":"2024-02-25T00:00:00Z","cardType":""} {"customerId":9,"cardNo":"6771894392571071","timestamp":"2024-02-25T00:00:00Z","cardType":"travel"} {"customerId":10,"cardNo":"4692437372010768","timestamp":"2024-02-25T00:00:00Z","cardType":""} -{"customerId":11,"cardNo":"0000000000000000","timestamp":"2024-06-05T00:00:00.00Z","cardType":""} diff --git a/finance-credit-card-chatbot/credit-card-rewards/creditcard-testdata/merchant.jsonl b/finance-credit-card-chatbot/credit-card-rewards/creditcard-testdata/merchant.jsonl index 4e7d8518..d21df067 100644 --- a/finance-credit-card-chatbot/credit-card-rewards/creditcard-testdata/merchant.jsonl +++ b/finance-credit-card-chatbot/credit-card-rewards/creditcard-testdata/merchant.jsonl @@ -98,4 +98,3 @@ {"merchantId":86,"name":"Towne, Renner and Murphy","category":"Miscellaneous","updatedTime":"2024-02-25T00:00:00Z"} {"merchantId":18,"name":"Beier Group","category":"Clothing & Apparel","updatedTime":"2024-02-25T00:00:00Z"} {"merchantId":76,"name":"Mann-Bahringer","category":"Housing & Utilities","updatedTime":"2024-02-25T00:00:00Z"} -{"merchantId":101,"name":"Advance Watermark","category":"","updatedTime":"2024-06-05T00:00:00.000Z"} diff --git a/finance-credit-card-chatbot/credit-card-rewards/creditcard-testdata/merchant_reward.jsonl b/finance-credit-card-chatbot/credit-card-rewards/creditcard-testdata/merchant_reward.jsonl index 58e192f1..76bde723 100644 --- a/finance-credit-card-chatbot/credit-card-rewards/creditcard-testdata/merchant_reward.jsonl +++ b/finance-credit-card-chatbot/credit-card-rewards/creditcard-testdata/merchant_reward.jsonl @@ -465,4 +465,3 @@ {"merchantId":48,"rewardsByCard":[{"cardType":"travel","rewardPercentage":5,"startTimestamp":1717459200,"expirationTimestamp":1718496000},{"cardType":"sports","rewardPercentage":5,"startTimestamp":1717459200,"expirationTimestamp":1719100800}],"updatedTime":"2024-02-25T00:00:00Z"} {"merchantId":34,"rewardsByCard":[{"cardType":"travel","rewardPercentage":10,"startTimestamp":1717459200,"expirationTimestamp":1719360000},{"cardType":"sports","rewardPercentage":10,"startTimestamp":1717459200,"expirationTimestamp":1719187200},{"cardType":"business","rewardPercentage":10,"startTimestamp":1717459200,"expirationTimestamp":1718582400}],"updatedTime":"2024-02-25T00:00:00Z"} {"merchantId":78,"rewardsByCard":[{"cardType":"travel","rewardPercentage":5,"startTimestamp":1717459200,"expirationTimestamp":1719014400},{"cardType":"sports","rewardPercentage":10,"startTimestamp":1717459200,"expirationTimestamp":1719187200}],"updatedTime":"2024-02-25T00:00:00Z"} -{"merchantId":101,"rewardsByCard":[{"cardType":"travel","rewardPercentage":0,"startTimestamp":0,"expirationTimestamp":0}],"updatedTime":"2024-06-05T00:00:00.000Z"} \ No newline at end of file diff --git a/finance-credit-card-chatbot/credit-card-rewards/snapshots/CustomerRewardsTest.snapshot b/finance-credit-card-chatbot/credit-card-rewards/snapshots/CustomerRewardsTest.snapshot index 7fd6f76b..079734d5 100644 --- a/finance-credit-card-chatbot/credit-card-rewards/snapshots/CustomerRewardsTest.snapshot +++ b/finance-credit-card-chatbot/credit-card-rewards/snapshots/CustomerRewardsTest.snapshot @@ -1,15 +1,6 @@ { "data" : { "CustomerRewardsTest" : [ { - "transactionId" : 8571358, - "customerId" : 2, - "cardNo" : "6771897352274545", - "cardType" : "travel", - "time" : "2024-06-05T06:42:05.106Z", - "amount" : 48.73, - "reward" : 7.3095, - "merchantName" : "Hayes Group" - }, { "transactionId" : 8571374, "customerId" : 9, "cardNo" : "6771894392571071", @@ -45,6 +36,15 @@ "amount" : 165.07, "reward" : 33.014, "merchantName" : "VonRueden, Donnelly and Gleason" + }, { + "transactionId" : 8571377, + "customerId" : 9, + "cardNo" : "6771894392571071", + "cardType" : "travel", + "time" : "2024-06-04T22:17:51.860Z", + "amount" : 221.26, + "reward" : 22.126, + "merchantName" : "Wolff Inc" } ] } } \ No newline at end of file diff --git a/finance-credit-card-chatbot/credit-card-rewards/snapshots/PotentialRewards.snapshot b/finance-credit-card-chatbot/credit-card-rewards/snapshots/PotentialRewards.snapshot index 785ef4a8..585edbac 100644 --- a/finance-credit-card-chatbot/credit-card-rewards/snapshots/PotentialRewards.snapshot +++ b/finance-credit-card-chatbot/credit-card-rewards/snapshots/PotentialRewards.snapshot @@ -1,6 +1,11 @@ { "data" : { "PotentialRewardsByDay" : [ { + "customerId" : 9, + "cardType" : "sports", + "timeDay" : "2024-06-05T13:59:59.999Z", + "total_reward" : 135.775 + }, { "customerId" : 9, "cardType" : "business", "timeDay" : "2024-06-04T13:59:59.999Z", @@ -20,11 +25,6 @@ "cardType" : "business", "timeDay" : "2024-06-03T13:59:59.999Z", "total_reward" : 85.588 - }, { - "customerId" : 9, - "cardType" : "sports", - "timeDay" : "2024-06-03T13:59:59.999Z", - "total_reward" : 151.689 } ] } } \ No newline at end of file diff --git a/finance-credit-card-chatbot/credit-card-rewards/snapshots/RewardsByDay.snapshot b/finance-credit-card-chatbot/credit-card-rewards/snapshots/RewardsByDay.snapshot index 89908c8f..3761af4b 100644 --- a/finance-credit-card-chatbot/credit-card-rewards/snapshots/RewardsByDay.snapshot +++ b/finance-credit-card-chatbot/credit-card-rewards/snapshots/RewardsByDay.snapshot @@ -1,6 +1,10 @@ { "data" : { "RewardsByDay" : [ { + "customerId" : 9, + "timeDay" : "2024-06-05T13:59:59.999Z", + "total_reward" : 270.092 + }, { "customerId" : 9, "timeDay" : "2024-06-04T13:59:59.999Z", "total_reward" : 166.3725 @@ -16,10 +20,6 @@ "customerId" : 9, "timeDay" : "2024-06-01T13:59:59.999Z", "total_reward" : 594.77 - }, { - "customerId" : 9, - "timeDay" : "2024-05-31T13:59:59.999Z", - "total_reward" : 10.0575 } ] } } \ No newline at end of file diff --git a/finance-credit-card-chatbot/credit-card-rewards/snapshots/test-customerId-2.snapshot b/finance-credit-card-chatbot/credit-card-rewards/snapshots/test-customerId-2.snapshot index b926797d..62f93dfc 100644 --- a/finance-credit-card-chatbot/credit-card-rewards/snapshots/test-customerId-2.snapshot +++ b/finance-credit-card-chatbot/credit-card-rewards/snapshots/test-customerId-2.snapshot @@ -1,6 +1,10 @@ { "data" : { "RewardsByDay" : [ { + "customerId" : 2, + "timeDay" : "2024-06-05T13:59:59.999Z", + "total_reward" : 86.121 + }, { "customerId" : 2, "timeDay" : "2024-06-04T13:59:59.999Z", "total_reward" : 332.3525 @@ -16,12 +20,18 @@ "customerId" : 2, "timeDay" : "2024-05-30T13:59:59.999Z", "total_reward" : 273.6605 - }, { - "customerId" : 2, - "timeDay" : "2024-05-27T13:59:59.999Z", - "total_reward" : 111.336 } ], "PotentialRewardsByDay" : [ { + "customerId" : 2, + "cardType" : "sports", + "timeDay" : "2024-06-05T13:59:59.999Z", + "total_reward" : 184.119 + }, { + "customerId" : 2, + "cardType" : "travel", + "timeDay" : "2024-06-05T13:59:59.999Z", + "total_reward" : 205.124 + }, { "customerId" : 2, "cardType" : "business", "timeDay" : "2024-06-04T13:59:59.999Z", @@ -36,16 +46,6 @@ "cardType" : "travel", "timeDay" : "2024-06-04T13:59:59.999Z", "total_reward" : 362.2605 - }, { - "customerId" : 2, - "cardType" : "sports", - "timeDay" : "2024-06-03T13:59:59.999Z", - "total_reward" : 294.743 - }, { - "customerId" : 2, - "cardType" : "travel", - "timeDay" : "2024-06-03T13:59:59.999Z", - "total_reward" : 422.233 } ], "TotalPotentialReward" : [ { "customerId" : 2, diff --git a/finance-credit-card-chatbot/credit-card-views/creditcard-testdata/card_assignment.jsonl b/finance-credit-card-chatbot/credit-card-views/creditcard-testdata/card_assignment.jsonl index 02d34de9..dafc8e13 100644 --- a/finance-credit-card-chatbot/credit-card-views/creditcard-testdata/card_assignment.jsonl +++ b/finance-credit-card-chatbot/credit-card-views/creditcard-testdata/card_assignment.jsonl @@ -11,4 +11,3 @@ {"customerId":9,"cardNo":"6771890227771464","timestamp":"2024-02-25T00:00:00Z","cardType":""} {"customerId":9,"cardNo":"6771894392571071","timestamp":"2024-02-25T00:00:00Z","cardType":"travel"} {"customerId":10,"cardNo":"4692437372010768","timestamp":"2024-02-25T00:00:00Z","cardType":""} -{"customerId":11,"cardNo":"0000000000000000","timestamp":"2024-06-05T00:00:00.00Z","cardType":""} diff --git a/finance-credit-card-chatbot/credit-card-views/creditcard-testdata/merchant.jsonl b/finance-credit-card-chatbot/credit-card-views/creditcard-testdata/merchant.jsonl index 4e7d8518..d21df067 100644 --- a/finance-credit-card-chatbot/credit-card-views/creditcard-testdata/merchant.jsonl +++ b/finance-credit-card-chatbot/credit-card-views/creditcard-testdata/merchant.jsonl @@ -98,4 +98,3 @@ {"merchantId":86,"name":"Towne, Renner and Murphy","category":"Miscellaneous","updatedTime":"2024-02-25T00:00:00Z"} {"merchantId":18,"name":"Beier Group","category":"Clothing & Apparel","updatedTime":"2024-02-25T00:00:00Z"} {"merchantId":76,"name":"Mann-Bahringer","category":"Housing & Utilities","updatedTime":"2024-02-25T00:00:00Z"} -{"merchantId":101,"name":"Advance Watermark","category":"","updatedTime":"2024-06-05T00:00:00.000Z"} diff --git a/finance-credit-card-chatbot/credit-card-views/creditcard-testdata/merchant_reward.jsonl b/finance-credit-card-chatbot/credit-card-views/creditcard-testdata/merchant_reward.jsonl index 58e192f1..76bde723 100644 --- a/finance-credit-card-chatbot/credit-card-views/creditcard-testdata/merchant_reward.jsonl +++ b/finance-credit-card-chatbot/credit-card-views/creditcard-testdata/merchant_reward.jsonl @@ -465,4 +465,3 @@ {"merchantId":48,"rewardsByCard":[{"cardType":"travel","rewardPercentage":5,"startTimestamp":1717459200,"expirationTimestamp":1718496000},{"cardType":"sports","rewardPercentage":5,"startTimestamp":1717459200,"expirationTimestamp":1719100800}],"updatedTime":"2024-02-25T00:00:00Z"} {"merchantId":34,"rewardsByCard":[{"cardType":"travel","rewardPercentage":10,"startTimestamp":1717459200,"expirationTimestamp":1719360000},{"cardType":"sports","rewardPercentage":10,"startTimestamp":1717459200,"expirationTimestamp":1719187200},{"cardType":"business","rewardPercentage":10,"startTimestamp":1717459200,"expirationTimestamp":1718582400}],"updatedTime":"2024-02-25T00:00:00Z"} {"merchantId":78,"rewardsByCard":[{"cardType":"travel","rewardPercentage":5,"startTimestamp":1717459200,"expirationTimestamp":1719014400},{"cardType":"sports","rewardPercentage":10,"startTimestamp":1717459200,"expirationTimestamp":1719187200}],"updatedTime":"2024-02-25T00:00:00Z"} -{"merchantId":101,"rewardsByCard":[{"cardType":"travel","rewardPercentage":0,"startTimestamp":0,"expirationTimestamp":0}],"updatedTime":"2024-06-05T00:00:00.000Z"} \ No newline at end of file diff --git a/finance-credit-card-chatbot/credit-card-views/snapshots/SpendingByCategoryTest.snapshot b/finance-credit-card-chatbot/credit-card-views/snapshots/SpendingByCategoryTest.snapshot index 629f1d84..c0cec28d 100644 --- a/finance-credit-card-chatbot/credit-card-views/snapshots/SpendingByCategoryTest.snapshot +++ b/finance-credit-card-chatbot/credit-card-views/snapshots/SpendingByCategoryTest.snapshot @@ -2,29 +2,29 @@ "data" : { "SpendingByCategoryTest" : [ { "customerId" : 10, - "timeWeek" : "2024-05-30T06:59:59.999Z", + "timeWeek" : "2024-06-06T06:59:59.999Z", "category" : "Housing & Utilities", - "spending" : 4767.13 + "spending" : 4104.57 }, { "customerId" : 10, - "timeWeek" : "2024-05-30T06:59:59.999Z", + "timeWeek" : "2024-06-06T06:59:59.999Z", "category" : "Miscellaneous", - "spending" : 2431.46 + "spending" : 1941.07 }, { "customerId" : 10, - "timeWeek" : "2024-05-30T06:59:59.999Z", - "category" : "Travel & Vacations", - "spending" : 2088.6 + "timeWeek" : "2024-06-06T06:59:59.999Z", + "category" : "Childcare", + "spending" : 1374.08 }, { "customerId" : 10, - "timeWeek" : "2024-05-30T06:59:59.999Z", - "category" : "Groceries", - "spending" : 1529.74 + "timeWeek" : "2024-06-06T06:59:59.999Z", + "category" : "Education", + "spending" : 974.29 }, { "customerId" : 10, - "timeWeek" : "2024-05-30T06:59:59.999Z", - "category" : "Restaurants & Dining", - "spending" : 1478.88 + "timeWeek" : "2024-06-06T06:59:59.999Z", + "category" : "Travel & Vacations", + "spending" : 438.78 } ] } } \ No newline at end of file diff --git a/law-enforcement/snapshots/BolosWATest.snapshot b/law-enforcement/snapshots/BolosWATest.snapshot index 1e66a88c..af801cfa 100644 --- a/law-enforcement/snapshots/BolosWATest.snapshot +++ b/law-enforcement/snapshots/BolosWATest.snapshot @@ -1,6 +1,10 @@ { "data" : { "BolosWATest" : [ { + "week" : "2024-11-14T15:59:59.999Z", + "state" : "WA", + "num_bolos" : 2 + }, { "week" : "2024-11-07T15:59:59.999Z", "state" : "WA", "num_bolos" : 6 @@ -36,10 +40,6 @@ "week" : "2024-08-29T13:59:59.999Z", "state" : "WA", "num_bolos" : 1 - }, { - "week" : "2024-08-22T13:59:59.999Z", - "state" : "WA", - "num_bolos" : 2 } ] } } \ No newline at end of file diff --git a/oil-gas-agent-automation/oil-gas-agent-operations/snapshots/RecentPressureTest.snapshot b/oil-gas-agent-automation/oil-gas-agent-operations/snapshots/RecentPressureTest.snapshot index 1ee256aa..2bdabe51 100644 --- a/oil-gas-agent-automation/oil-gas-agent-operations/snapshots/RecentPressureTest.snapshot +++ b/oil-gas-agent-automation/oil-gas-agent-operations/snapshots/RecentPressureTest.snapshot @@ -1,6 +1,31 @@ { "data" : { "RecentPressureTest" : [ { + "assetId" : 12221, + "timestamp_normalized" : "2025-02-11T12:21:39.999Z", + "pressure_psi" : 3399.73, + "temperature_f" : 190.05 + }, { + "assetId" : 21112, + "timestamp_normalized" : "2025-02-11T12:21:39.999Z", + "pressure_psi" : 1799.69, + "temperature_f" : 189.58 + }, { + "assetId" : 34443, + "timestamp_normalized" : "2025-02-11T12:21:39.999Z", + "pressure_psi" : 3766.92, + "temperature_f" : 190.05 + }, { + "assetId" : 45555, + "timestamp_normalized" : "2025-02-11T12:21:39.999Z", + "pressure_psi" : 2025.31, + "temperature_f" : 189.91 + }, { + "assetId" : 59995, + "timestamp_normalized" : "2025-02-11T12:21:39.999Z", + "pressure_psi" : 2998.74, + "temperature_f" : 189.72 + }, { "assetId" : 12221, "timestamp_normalized" : "2025-02-11T12:21:29.999Z", "pressure_psi" : 3399.59, @@ -25,31 +50,6 @@ "timestamp_normalized" : "2025-02-11T12:21:29.999Z", "pressure_psi" : 2999.76, "temperature_f" : 189.9 - }, { - "assetId" : 12221, - "timestamp_normalized" : "2025-02-11T12:21:19.999Z", - "pressure_psi" : 3397.36, - "temperature_f" : 189.41 - }, { - "assetId" : 21112, - "timestamp_normalized" : "2025-02-11T12:21:19.999Z", - "pressure_psi" : 1808.38, - "temperature_f" : 190.25 - }, { - "assetId" : 34443, - "timestamp_normalized" : "2025-02-11T12:21:19.999Z", - "pressure_psi" : 3603.5, - "temperature_f" : 190.15 - }, { - "assetId" : 45555, - "timestamp_normalized" : "2025-02-11T12:21:19.999Z", - "pressure_psi" : 2127.65, - "temperature_f" : 189.54 - }, { - "assetId" : 59995, - "timestamp_normalized" : "2025-02-11T12:21:19.999Z", - "pressure_psi" : 3000.97, - "temperature_f" : 190.4 } ] } } \ No newline at end of file diff --git a/usage-analytics/snapshots/UserTokenTest.snapshot b/usage-analytics/snapshots/UserTokenTest.snapshot index 9f5a10ea..1a5a6a12 100644 --- a/usage-analytics/snapshots/UserTokenTest.snapshot +++ b/usage-analytics/snapshots/UserTokenTest.snapshot @@ -2,15 +2,15 @@ "data" : { "UserTokenTest" : [ { "userid" : 1, - "window_time" : "2025-05-22T23:01:29.999Z", - "total_tokens" : 8 + "window_time" : "2025-05-22T23:59:59.999Z", + "total_tokens" : 11 }, { "userid" : 2, - "window_time" : "2025-05-22T23:01:29.999Z", + "window_time" : "2025-05-22T23:59:59.999Z", "total_tokens" : 11 }, { "userid" : 3, - "window_time" : "2025-05-22T23:01:29.999Z", + "window_time" : "2025-05-22T23:59:59.999Z", "total_tokens" : 19 } ] } diff --git a/usage-analytics/usertokens-testdata/user_tokens.sqrl b/usage-analytics/usertokens-testdata/user_tokens.sqrl index 5a737b66..36ff7c8b 100644 --- a/usage-analytics/usertokens-testdata/user_tokens.sqrl +++ b/usage-analytics/usertokens-testdata/user_tokens.sqrl @@ -1,11 +1,5 @@ CREATE TABLE UserTokens ( - `userid` BIGINT NOT NULL, - `tokens` BIGINT NOT NULL, - `request_time` TIMESTAMP(3) WITH LOCAL TIME ZONE NOT NULL, WATERMARK FOR `request_time` AS `request_time` - INTERVAL '0.001' SECOND ) WITH ( - 'connector' = 'filesystem', - 'format' = 'flexible-json', - 'path' = '${DATA_PATH}/user_tokens.jsonl', - 'source.monitor-interval' = '10 sec' -); + 'source.monitor-interval' = '10s' +) LIKE `user_tokens.jsonl`;