From 1a4a106179833c01b7cb4da7bf01b00df5d7c352 Mon Sep 17 00:00:00 2001 From: Rick Carlino Date: Fri, 21 Feb 2020 20:13:29 -0600 Subject: [PATCH] days => days_ago --- app/models/point_group.rb | 2 +- app/mutations/point_groups/helpers.rb | 2 +- frontend/__test_support__/fake_state/resources.ts | 2 +- .../point_groups/criteria/__tests__/apply_test.ts | 6 +++--- .../point_groups/criteria/__tests__/edit_test.ts | 2 +- .../point_groups/criteria/__tests__/show_test.tsx | 2 +- frontend/farm_designer/point_groups/criteria/apply.ts | 4 ++-- .../farm_designer/point_groups/criteria/interfaces.ts | 2 +- frontend/farm_designer/point_groups/criteria/show.tsx | 8 ++++---- package.json | 2 +- spec/controllers/api/point_groups/create_spec.rb | 4 ++-- spec/controllers/api/point_groups/update_spec.rb | 6 +++--- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/app/models/point_group.rb b/app/models/point_group.rb index eef492243..36c56ffd4 100644 --- a/app/models/point_group.rb +++ b/app/models/point_group.rb @@ -4,7 +4,7 @@ class PointGroup < ApplicationRecord BAD_SORT = "%{value} is not valid. Valid options are: " + SORT_TYPES.map(&:inspect).join(", ") DEFAULT_CRITERIA = { - day: { op: "<", days: 0 }, + day: { op: "<", days_ago: 0 }, string_eq: {}, number_eq: {}, number_lt: {}, diff --git a/app/mutations/point_groups/helpers.rb b/app/mutations/point_groups/helpers.rb index 0f5a3d7f5..7d6094e45 100644 --- a/app/mutations/point_groups/helpers.rb +++ b/app/mutations/point_groups/helpers.rb @@ -5,7 +5,7 @@ module PointGroups hash :criteria do hash(:day) do string :op, in: [">", "<"] - integer :days + integer :days_ago end hash(:string_eq) { array :*, class: String } hash(:number_eq) { array :*, class: Integer } diff --git a/frontend/__test_support__/fake_state/resources.ts b/frontend/__test_support__/fake_state/resources.ts index 641cba1bb..cbddcceae 100644 --- a/frontend/__test_support__/fake_state/resources.ts +++ b/frontend/__test_support__/fake_state/resources.ts @@ -460,7 +460,7 @@ export function fakePointGroup(): TaggedPointGroup { sort_type: "xy_ascending", point_ids: [], criteria: { - day: { op: "<", days: 0 }, + day: { op: "<", days_ago: 0 }, number_eq: {}, number_gt: {}, number_lt: {}, diff --git a/frontend/farm_designer/point_groups/criteria/__tests__/apply_test.ts b/frontend/farm_designer/point_groups/criteria/__tests__/apply_test.ts index 48b10dca6..a7ac5efdb 100644 --- a/frontend/farm_designer/point_groups/criteria/__tests__/apply_test.ts +++ b/frontend/farm_designer/point_groups/criteria/__tests__/apply_test.ts @@ -57,7 +57,7 @@ describe("selectPointsByCriteria()", () => { it("matches age greater than 1 day old", () => { const criteria = fakeCriteria(); - criteria.day = { days: 1, op: ">" }; + criteria.day = { days_ago: 1, op: ">" }; const matchingPoint = fakePoint(); matchingPoint.body.created_at = "2020-01-20T20:00:00.000Z"; const otherPoint = fakePoint(); @@ -70,7 +70,7 @@ describe("selectPointsByCriteria()", () => { it("matches age less than 1 day old", () => { const criteria = fakeCriteria(); - criteria.day = { days: 1, op: "<" }; + criteria.day = { days_ago: 1, op: "<" }; const matchingPoint = fakePoint(); matchingPoint.body.created_at = "2020-02-20T20:00:00.000Z"; const otherPoint = fakePoint(); @@ -83,7 +83,7 @@ describe("selectPointsByCriteria()", () => { it("matches planted date less than 1 day old", () => { const criteria = fakeCriteria(); - criteria.day = { days: 1, op: "<" }; + criteria.day = { days_ago: 1, op: "<" }; const matchingPoint = fakePlant(); matchingPoint.body.planted_at = "2020-02-20T20:00:00.000Z"; matchingPoint.body.created_at = "2020-01-20T20:00:00.000Z"; diff --git a/frontend/farm_designer/point_groups/criteria/__tests__/edit_test.ts b/frontend/farm_designer/point_groups/criteria/__tests__/edit_test.ts index 04fc25cf3..572e4ca91 100644 --- a/frontend/farm_designer/point_groups/criteria/__tests__/edit_test.ts +++ b/frontend/farm_designer/point_groups/criteria/__tests__/edit_test.ts @@ -36,7 +36,7 @@ describe("editCriteria()", () => { it("edits criteria: full update", () => { const group = fakePointGroup(); const criteria: PointGroup["criteria"] = { - day: { days: 1, op: "<" }, + day: { days_ago: 1, op: "<" }, string_eq: { openfarm_slug: ["slug"] }, number_eq: { x: [0] }, number_gt: { x: 0 }, diff --git a/frontend/farm_designer/point_groups/criteria/__tests__/show_test.tsx b/frontend/farm_designer/point_groups/criteria/__tests__/show_test.tsx index 4e5550fe9..626fabd24 100644 --- a/frontend/farm_designer/point_groups/criteria/__tests__/show_test.tsx +++ b/frontend/farm_designer/point_groups/criteria/__tests__/show_test.tsx @@ -100,7 +100,7 @@ describe("", () => { currentTarget: { value: "1" } }); const expectedBody = cloneDeep(p.group.body); - expectedBody.criteria.day.days = 1; + expectedBody.criteria.day.days_ago = 1; expect(overwrite).toHaveBeenCalledWith(p.group, expectedBody); }); diff --git a/frontend/farm_designer/point_groups/criteria/apply.ts b/frontend/farm_designer/point_groups/criteria/apply.ts index 87ea058c3..10aa45403 100644 --- a/frontend/farm_designer/point_groups/criteria/apply.ts +++ b/frontend/farm_designer/point_groups/criteria/apply.ts @@ -30,11 +30,11 @@ const checkCriteria = ? point.body.planted_at : point.body.created_at); const compareDate = moment(now) - .subtract(criteria[criteriaKey].days, "days"); + .subtract(criteria[criteriaKey].days_ago, "days"); const matchesDays = criteria[criteriaKey].op == "<" ? pointDate.isAfter(compareDate) : pointDate.isBefore(compareDate); - return matchesDays || !criteria[criteriaKey].days; + return matchesDays || !criteria[criteriaKey].days_ago; } }; diff --git a/frontend/farm_designer/point_groups/criteria/interfaces.ts b/frontend/farm_designer/point_groups/criteria/interfaces.ts index 70c1d90ae..4ca2bd4fc 100644 --- a/frontend/farm_designer/point_groups/criteria/interfaces.ts +++ b/frontend/farm_designer/point_groups/criteria/interfaces.ts @@ -2,7 +2,7 @@ import { TaggedPointGroup } from "farmbot"; import { PointGroup } from "farmbot/dist/resources/api_resources"; export const DEFAULT_CRITERIA: Readonly = { - day: { op: "<", days: 0 }, + day: { op: "<", days_ago: 0 }, number_eq: {}, number_gt: {}, number_lt: {}, diff --git a/frontend/farm_designer/point_groups/criteria/show.tsx b/frontend/farm_designer/point_groups/criteria/show.tsx index bc90265f6..ad79f2326 100644 --- a/frontend/farm_designer/point_groups/criteria/show.tsx +++ b/frontend/farm_designer/point_groups/criteria/show.tsx @@ -105,16 +105,16 @@ export const DaySelection = (props: CriteriaSelectionProps) => { selectedItem={DAY_OPERATOR_DDI_LOOKUP()[dayCriteria.op]} onChange={ddi => dispatch(editCriteria(group, { day: { - days: dayCriteria.days, + days_ago: dayCriteria.days_ago, op: ddi.value as PointGroup["criteria"]["day"]["op"] } }))} /> - { + { const { op } = dayCriteria; - const days = parseInt(e.currentTarget.value); - dispatch(editCriteria(group, { day: { days, op } })); + const days_ago = parseInt(e.currentTarget.value); + dispatch(editCriteria(group, { day: { days_ago, op } })); }} /> diff --git a/package.json b/package.json index d6fa95495..304669d29 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "coveralls": "3.0.9", "enzyme": "3.11.0", "enzyme-adapter-react-16": "1.15.2", - "farmbot": "9.1.0", + "farmbot": "9.1.2", "i18next": "19.0.3", "install": "0.13.0", "lodash": "4.17.15", diff --git a/spec/controllers/api/point_groups/create_spec.rb b/spec/controllers/api/point_groups/create_spec.rb index 2a534624f..6ba7d173d 100644 --- a/spec/controllers/api/point_groups/create_spec.rb +++ b/spec/controllers/api/point_groups/create_spec.rb @@ -70,7 +70,7 @@ describe Api::PointGroupsController do }, day: { op: "<", - days: 0, + days_ago: 0, }, }, } @@ -85,7 +85,7 @@ describe Api::PointGroupsController do expect(hash.dig(:number_gt, :x)).to eq(1) expect(hash.dig(:number_gt, :y)).to eq(1) expect(hash.dig(:day, :op)).to eq("<") - expect(hash.dig(:day, :days)).to eq(0) + expect(hash.dig(:day, :days_ago)).to eq(0) expect(hash.dig(:string_eq, :openfarm_slug)).to eq(["carrot"]) end end diff --git a/spec/controllers/api/point_groups/update_spec.rb b/spec/controllers/api/point_groups/update_spec.rb index 0ea2c04ad..87db51144 100644 --- a/spec/controllers/api/point_groups/update_spec.rb +++ b/spec/controllers/api/point_groups/update_spec.rb @@ -57,7 +57,7 @@ describe Api::PointGroupsController do number_eq: { z: [24, 25, 26] }, number_lt: { x: 4, y: 4 }, number_gt: { x: 1, y: 1 }, - day: { op: "<", days: 0 }, + day: { op: "<", days_ago: 0 }, }, } pg = PointGroups::Create.run!(initial_params) @@ -68,12 +68,12 @@ describe Api::PointGroupsController do number_eq: { x: [42, 52, 62] }, number_lt: { y: 8 }, number_gt: { z: 2 }, - day: { op: ">", days: 10 }, + day: { op: ">", days_ago: 10 }, }, } put :update, body: payload.to_json, format: :json, params: { id: pg.id } expect(response.status).to eq(200) - expect(json.dig(:criteria, :day, :days)).to eq(10) + expect(json.dig(:criteria, :day, :days_ago)).to eq(10) expect(json.dig(:criteria, :day, :op)).to eq(">") expect(json.dig(:criteria, :number_eq, :x)).to eq([42, 52, 62]) expect(json.dig(:criteria, :number_eq, :z)).to eq(nil)