Merge pull request #1406 from betagouv/fix/1190-territory-commands

Commandes géo

api/db/migrations/20210618155305-territory_surface_bigint.js

@@ -0,0 +1,13 @@
+'use strict';
+/**
+ * Cast all foreign keys *_id as integer to match PostgreSQL types
+ * Current type is 'varchar' as fkeys were migrated from MongoDB
+ * as a toString() of ObjectID objects.
+ */
+var { createMigration } = require('../helpers/createMigration');
+
+var { setup, up, down } = createMigration(['territory/20210618155305_bigint_surface'], __dirname);
+
+exports.setup = setup;
+exports.up = up;
+exports.down = down;

api/db/migrations/territory/20210618155305_bigint_surface.down.sql

@@ -0,0 +1,226 @@
+-- ERROR:  cannot alter type of a column used by a view or rule
+-- DETAIL:  rule _RETURN on view trip.list_view depends on column "surface"
+
+DROP VIEW IF EXISTS trip.list_view;
+
+ALTER TABLE territory.territories ALTER COLUMN surface TYPE int USING surface::int;
+
+CREATE VIEW trip.list_view AS (
+  SELECT
+
+  -- THIS IS FOR AUTH AND SEARCH ONLY --
+    cpp.operator_id as operator_id,
+    cpp.start_territory_id as start_territory_id,
+    cpp.end_territory_id as end_territory_id,
+    COALESCE((pip.policy_id || pid.policy_id)::int[], ARRAY[]::int[]) as applied_policies,
+
+    -- DATA --
+    cpp.acquisition_id as journey_id,
+    cpp.trip_id as trip_id,
+
+    ts_ceil(cpp.datetime, 600) as journey_start_datetime,
+    extract(isodow from cpp.datetime) as journey_start_weekday,
+    extract(hour from cpp.datetime) as journey_start_dayhour,
+
+    trunc(
+      ST_X(cpp.start_position::geometry)::numeric,
+      CASE WHEN (
+        tts.surface > 0 AND 
+        (tts.population::float / (tts.surface::float / 100)) > 40
+      )
+      THEN 3 
+      ELSE 2
+      END
+    ) as journey_start_lon,
+    trunc(
+      ST_Y(cpp.start_position::geometry)::numeric,
+      CASE WHEN (
+        tts.surface > 0 AND 
+        (tts.population::float / (tts.surface::float / 100)) > 40
+      )
+      THEN 3 
+      ELSE 2
+      END
+    ) as journey_start_lat,
+
+    cts.insee[1] as journey_start_insee,
+    cts.postcode[1] as journey_start_postalcode,
+    substring(cts.postcode[1] from 1 for 2) as journey_start_department,
+    bts.town::varchar as journey_start_town,
+    bts.towngroup::varchar as journey_start_towngroup,
+    bts.country::varchar as journey_start_country,
+
+    ts_ceil((cpp.datetime + (cpp.duration || ' seconds')::interval), 600) as journey_end_datetime,
+
+    trunc(
+      ST_X(cpp.end_position::geometry)::numeric,
+      CASE WHEN (
+        tte.surface > 0 AND 
+        (tte.population::float / (tte.surface::float / 100)) > 40
+      )
+      THEN 3 
+      ELSE 2
+      END
+    ) as journey_end_lon,
+    trunc(
+      ST_Y(cpp.end_position::geometry)::numeric,
+      CASE WHEN (
+        tte.surface > 0 AND 
+        (tte.population::float / (tte.surface::float / 100)) > 40
+      )
+      THEN 3 
+      ELSE 2
+      END
+    ) as journey_end_lat,
+
+    cte.insee[1] as journey_end_insee,
+    cte.postcode[1] as journey_end_postalcode,
+    substring(cte.postcode[1] from 1 for 2) as journey_end_department,
+    bte.town::varchar as journey_end_town,
+    bte.towngroup::varchar as journey_end_towngroup,
+    bte.country::varchar as journey_end_country,
+
+    (CASE WHEN cpp.distance IS NOT NULL THEN cpp.distance ELSE (cpp.meta::json->>'calc_distance')::int END) as journey_distance,
+    cpp.distance as journey_distance_anounced,
+    (cpp.meta::json->>'calc_distance')::int as journey_distance_calculated,
+
+    (CASE WHEN cpp.duration IS NOT NULL THEN cpp.duration ELSE (cpp.meta::json->>'calc_duration')::int END) as journey_duration,
+    cpp.duration as journey_duration_anounced,
+    (cpp.meta::json->>'calc_duration')::int as journey_duration_calculated,
+
+    ope.name as operator,
+    cpp.operator_class as operator_class,
+
+    cip.uuid as passenger_id,
+    (CASE WHEN cip.travel_pass_name IS NOT NULL THEN '1' ELSE '0' END)::boolean as passenger_card,
+    cip.over_18 as passenger_over_18,
+    cpp.seats as passenger_seats,
+
+    abs(cpp.cost) as passenger_contribution,
+    cpip.incentive::trip.incentive[] as passenger_incentive_raw,
+    pip.incentive_raw::trip.incentive[] as passenger_incentive_rpc_raw,
+    pip.incentive_financial_sum as passenger_incentive_rpc_financial_sum,
+    pip.incentive_sum as passenger_incentive_rpc_sum,
+
+    cid.uuid as driver_id,
+    (CASE WHEN cid.travel_pass_name IS NOT NULL THEN '1' ELSE '0' END)::boolean as driver_card,
+
+    abs(cpd.cost) as driver_revenue,
+    cpid.incentive::trip.incentive[] as driver_incentive_raw,
+    pid.incentive_raw::trip.incentive[] as driver_incentive_rpc_raw,
+    pid.incentive_financial_sum as driver_incentive_rpc_financial_sum,
+    pid.incentive_sum as driver_incentive_rpc_sum,
+
+    cpp.status as status
+    -- status_message
+
+  FROM carpool.carpools as cpp
+  JOIN operator.operators as ope ON ope._id = cpp.operator_id::int
+
+  LEFT JOIN territory.territories AS tts ON tts._id = cpp.start_territory_id
+  LEFT JOIN territory.territories AS tte ON tte._id = cpp.end_territory_id
+  LEFT JOIN carpool.carpools AS cpd ON cpd.acquisition_id = cpp.acquisition_id AND cpd.is_driver = true AND cpd.status = 'ok'::carpool.carpool_status_enum
+  LEFT JOIN carpool.identities AS cip ON cip._id = cpp.identity_id
+  LEFT JOIN carpool.identities AS cid ON cid._id = cpd.identity_id
+  LEFT JOIN territory.get_codes(cpp.start_territory_id, ARRAY[]::int[]) AS cts ON TRUE
+  LEFT JOIN territory.get_codes(cpp.end_territory_id, ARRAY[]::int[]) AS cte ON TRUE
+  LEFT JOIN territory.get_breadcrumb(
+    cpp.start_territory_id,
+    territory.get_ancestors(ARRAY[cpp.start_territory_id])
+  ) AS bts ON TRUE
+  LEFT JOIN territory.get_breadcrumb(
+    cpp.end_territory_id,
+    territory.get_ancestors(ARRAY[cpp.end_territory_id])
+  ) AS bte ON TRUE,
+  LATERAL (
+    WITH data AS (
+      SELECT
+        pi.policy_id,
+        sum(pi.amount) as amount
+      FROM policy.incentives as pi
+      WHERE pi.carpool_id = cpp._id
+      AND pi.status = 'validated'::policy.incentive_status_enum
+      AND pi.amount > 0
+      GROUP BY pi.policy_id
+    ),
+    incentive AS (
+      SELECT
+        data.policy_id as policy_id,
+        ROW(
+          cc.siret,
+          data.amount,
+          pp.unit::varchar,
+          data.policy_id,
+          pp.name::varchar,
+          'incentive'
+        )::trip.incentive as value,
+        data.amount as amount,
+        CASE WHEN pp.unit = 'point'::policy.policy_unit_enum THEN false ELSE true END as financial
+      FROM data
+      LEFT JOIN policy.policies as pp on pp._id = data.policy_id
+      LEFT JOIN territory.territories as tt on pp.territory_id = tt._id
+      LEFT JOIN company.companies as cc on cc._id = tt.company_id
+    )
+    SELECT
+      array_agg(
+        incentive.value
+      ) as incentive_raw,
+      sum(incentive.amount) as incentive_sum,
+      sum(incentive.amount) FILTER (WHERE incentive.financial IS true) as incentive_financial_sum,
+      array_agg(incentive.policy_id) as policy_id
+    FROM incentive
+  ) as pip,
+  LATERAL (
+    WITH data AS (
+      SELECT
+        pi.policy_id,
+        sum(pi.amount) as amount
+      FROM policy.incentives as pi
+      WHERE pi.carpool_id = cpd._id
+      AND pi.status = 'validated'::policy.incentive_status_enum
+      AND pi.amount > 0
+      GROUP BY pi.policy_id
+    ),
+    incentive AS (
+      SELECT
+        data.policy_id as policy_id,
+        ROW(
+          cc.siret,
+          data.amount,
+          pp.unit::varchar,
+          data.policy_id,
+          pp.name::varchar,
+          'incentive'
+        )::trip.incentive as value,
+        data.amount as amount,
+        CASE WHEN pp.unit = 'point'::policy.policy_unit_enum THEN false ELSE true END as financial
+      FROM data
+      LEFT JOIN policy.policies as pp on pp._id = data.policy_id
+      LEFT JOIN territory.territories as tt on pp.territory_id = tt._id
+      LEFT JOIN company.companies as cc on cc._id = tt.company_id
+    )
+    SELECT
+      array_agg(
+        incentive.value
+      ) as incentive_raw,
+      sum(incentive.amount) as incentive_sum,
+      sum(incentive.amount) FILTER (WHERE incentive.financial IS true) as incentive_financial_sum,
+      array_agg(incentive.policy_id) as policy_id
+    FROM incentive
+  ) as pid,
+  LATERAL (
+    SELECT
+      array_agg(
+        value::trip.incentive
+      ) as incentive
+    FROM json_array_elements(cpp.meta->'payments')
+  ) as cpip,
+  LATERAL (
+      SELECT
+      array_agg(
+        value::trip.incentive
+      ) as incentive
+    FROM json_array_elements(cpd.meta->'payments')
+  ) as cpid
+  WHERE cpp.is_driver = false AND cpp.status = 'ok'::carpool.carpool_status_enum
+);