Upgrade elixir and deps (#496)

* upgrade elixir

* upgrade elixir

* Fix upgrade to ecto

* fix jose deps

* replace ecto atom to enum

* Fix build

* fix migrations

* update deps

* Fix the search integration with the frontend

* use utc for non timestamp fields

* format the code

* use naive date time for date time

.tool-versions

@@ -1 +1,3 @@
-elixir 1.7.2
+elixir 1.13.4-otp-25
+nodejs 8.10.0
+erlang 25.0.3

.travis.yml

@@ -25,7 +25,7 @@ after_script:
 - bash .scripts/inch_report.sh
 matrix:
   include:
-  - elixir: 1.7.2
+  - elixir: 1.13.4
     script:
     - mix coveralls.json --umbrella
 addons:

apps/admin_app/config/config.exs

@@ -13,7 +13,7 @@ config :admin_app, AdminAppWeb.Endpoint,
   url: [host: "localhost"],
   secret_key_base: "o7U+x3aM3mqN1vY+PGIbxEN+QBeMP7rwgCpyrbYfEUkAY6I12cxKvwEt/zJeGjgR",
   render_errors: [view: AdminAppWeb.ErrorView, accepts: ~w(html json json-api)],
-  pubsub: [name: AdminApp.PubSub, adapter: Phoenix.PubSub.PG2],
+  pubsub_server: AdminApp.PubSub,
   token_maximum_age: System.get_env("TOKEN_MAXIMUM_AGE"),
   sendgrid_sender_mail: System.get_env("SENDGRID_SENDER_EMAIL"),
   password_reset_salt: System.get_env("PASSWORD_RESET_SALT"),

apps/admin_app/lib/admin_app/application.ex

@@ -12,7 +12,8 @@ defmodule AdminApp.Application do
     # Define workers and child supervisors to be supervised
     children = [
       # Start the endpoint when the application starts
-      supervisor(AdminAppWeb.Endpoint, [])
+      supervisor(AdminAppWeb.Endpoint, []),
+      {Phoenix.PubSub, [name: AdminApp.PubSub, adapter: Phoenix.PubSub.PG2]}
       # Start your own worker by calling: AdminApp.Worker.start_link(arg1, arg2, arg3)
       # worker(AdminApp.Worker, [arg1, arg2, arg3]),
     ]

apps/admin_app/lib/admin_app/etsy_importer.ex

@@ -108,8 +108,8 @@ defmodule Avia.Etsy.Importer do
 
   defp timestamps() do
     %{
-      inserted_at: Ecto.DateTime.utc(),
-      updated_at: Ecto.DateTime.utc()
+      inserted_at: NaiveDateTime.utc_now(),
+      updated_at: NaiveDateTime.utc_now()
     }
   end
 

apps/admin_app/lib/admin_app_web/templates/layout/main.html.eex

@@ -5,6 +5,6 @@
     </div>
   <% end %>
   <div class="main" >
-    <%= Map.get(assigns, :inner_layout) || render @view_module, @view_template, assigns %>
+    <%= Map.get(assigns, :inner_layout) || @inner_content %>
   </div>
 </main>

apps/admin_app/lib/admin_app_web/views/input_helpers.ex

@@ -325,9 +325,7 @@ defmodule AdminAppWeb.InputHelpers do
 
     wrapper_opts = [
       class:
-        "form-group form-group-default input-group cb-group #{validate_required} #{
-          state_class(form, field)
-        }"
+        "form-group form-group-default input-group cb-group #{validate_required} #{state_class(form, field)}"
     ]
 
     type = Form.input_type(form, field)

apps/admin_app/lib/admin_app_web/views/product_view.ex

@@ -123,9 +123,7 @@ defmodule AdminAppWeb.ProductView do
 
   def make_search_query_string(conn, column, expression, type, term) do
     query =
-      "&rummage[search][#{column}][search_expr]=#{expression}&rummage[search][#{column}][search_type]=#{
-        type
-      }&rummage[search][#{column}][search_term]=#{term}"
+      "&rummage[search][#{column}][search_expr]=#{expression}&rummage[search][#{column}][search_type]=#{type}&rummage[search][#{column}][search_term]=#{term}"
 
     conn_query =
       load_query_string(conn, ["rummage", "sort"], ["rummage", "search"])

apps/admin_app/mix.exs

@@ -9,7 +9,7 @@ defmodule AdminApp.Mixfile do
       config_path: "../../config/config.exs",
       deps_path: "../../deps",
       lockfile: "../../mix.lock",
-      elixir: "~> 1.7.2",
+      elixir: "~> 1.13.4",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: [:phoenix, :gettext] ++ Mix.compilers(),
       start_permanent: Mix.env() == :prod,
@@ -36,18 +36,18 @@ defmodule AdminApp.Mixfile do
   # Type `mix help deps` for examples and options.
   defp deps do
     [
-      {:phoenix, "~> 1.3.0"},
-      {:phoenix_pubsub, "~> 1.0"},
+      {:phoenix, "~> 1.5.0"},
+      {:phoenix_pubsub, "~> 2.0"},
       {:phoenix_html, "~> 2.10"},
       {:phoenix_live_reload, "~> 1.0", only: :dev},
-      {:phoenix_ecto, "~> 3.0"},
+      {:phoenix_ecto, "~> 4.4"},
       {:gettext, "~> 0.11"},
       {:csv, "~> 2.0.0"},
       {:elixlsx, "~> 0.1.1"},
-      {:cowboy, "~> 1.0"},
+      {:plug_cowboy, "~> 2.5"},
       {:snitch_core, "~> 0.0.1", in_umbrella: true},
       {:guardian, "~> 1.0"},
-      {:params, "~> 2.0"},
+      {:params, "~> 2.2"},
       {:yaml_elixir, "~> 2.1.0"},
       # email
       {:swoosh, "~> 0.15"},
@@ -59,7 +59,7 @@ defmodule AdminApp.Mixfile do
 
       # import from store
       {:oauther, "~> 1.1"},
-      {:honeydew, "~> 1.2.6"}
+      {:honeydew, "~> 1.5"}
     ]
   end
 end

apps/help/mix.exs

@@ -9,7 +9,7 @@ defmodule Help.Mixfile do
       config_path: "../../config/config.exs",
       deps_path: "../../deps",
       lockfile: "../../mix.lock",
-      elixir: "~> 1.5",
+      elixir: "~> 1.13.4",
       start_permanent: Mix.env() == :prod,
       deps: deps()
     ]

apps/snitch_api/config/config.exs

@@ -10,7 +10,7 @@ config :snitch_api, SnitchApiWeb.Endpoint,
   url: [host: "localhost"],
   secret_key_base: "VAvkjDkSJ/5nLB4aI+77rZ/PyR3foxuD6u1p1X01M3hpc0MJrRDwRNZ0/ERHfcUb",
   render_errors: [view: SnitchApiWeb.ErrorView, accepts: ~w(json)],
-  pubsub: [name: SnitchApi.PubSub, adapter: Phoenix.PubSub.PG2]
+  pubsub_server: SnitchApi.PubSub
 
 # Configures Elixir's Logger
 config :logger, :console,

apps/snitch_api/lib/snitch_api/application.ex

@@ -9,7 +9,8 @@ defmodule SnitchApi.Application do
     # Define workers and child supervisors to be supervised
     children = [
       # Start the endpoint when the application starts
-      supervisor(SnitchApiWeb.Endpoint, [])
+      supervisor(SnitchApiWeb.Endpoint, []),
+      {Phoenix.PubSub, [name: SnitchApi.PubSub, adapter: Phoenix.PubSub.PG2]}
       # Start your own worker by calling: SnitchApi.Worker.start_link(arg1, arg2, arg3)
       # worker(SnitchApi.Worker, [arg1, arg2, arg3]),
     ]

apps/snitch_api/lib/snitch_api_web/controllers/hosted_payment_controller.ex

@@ -215,9 +215,7 @@ defmodule SnitchApiWeb.HostedPaymentController do
 
   defp generate_payubiz_hash(params) do
     hash_string =
-      "#{params[:key]}|#{params[:txnid]}|#{params[:amount]}|#{params[:productinfo]}|#{
-        params[:firstname]
-      }|#{params[:email]}#{String.duplicate("|", 11)}#{params[:salt]}"
+      "#{params[:key]}|#{params[:txnid]}|#{params[:amount]}|#{params[:productinfo]}|#{params[:firstname]}|#{params[:email]}#{String.duplicate("|", 11)}#{params[:salt]}"
 
     Base.encode16(:crypto.hash(:sha512, hash_string), case: :lower)
   end

apps/snitch_api/mix.exs

@@ -9,7 +9,7 @@ defmodule SnitchApi.Mixfile do
       config_path: "../../config/config.exs",
       deps_path: "../../deps",
       lockfile: "../../mix.lock",
-      elixir: "~> 1.7.2",
+      elixir: "~> 1.13.4",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: [:phoenix, :gettext] ++ Mix.compilers(),
       start_permanent: Mix.env() == :prod,
@@ -36,10 +36,10 @@ defmodule SnitchApi.Mixfile do
   # Type `mix help deps` for examples and options.
   defp deps do
     [
-      {:phoenix, "~> 1.3.0"},
-      {:phoenix_pubsub, "~> 1.0"},
+      {:phoenix, "~> 1.5.0"},
+      {:phoenix_pubsub, "~> 2.0"},
       {:gettext, "~> 0.11"},
-      {:cowboy, "~> 1.0"},
+      {:plug_cowboy, "~> 2.5"},
       {:snitch_core, "~> 0.0.1", in_umbrella: true},
       {:plug, "~> 1.0"},
       {:corsica, "~> 1.0"},

apps/snitch_core/config/config.exs

@@ -47,4 +47,6 @@ config :snitch_core, Snitch.Tools.ElasticsearchCluster,
     }
   }
 
+config :ex_cldr, default_backend: Snitch.Tools.Cldr
+
 import_config "#{Mix.env()}.exs"

apps/snitch_core/config/dev.exs

@@ -7,7 +7,8 @@ config :snitch_core, Snitch.Repo,
   password: "postgres",
   database: "snitch_dev",
   hostname: System.get_env("DB_HOST"),
-  pool_size: 10
+  pool_size: 10,
+  show_sensitive_data_on_connection_error: true
 
 config :snitch_core, :defaults_module, Snitch.Tools.Defaults
 config :arc, storage: Arc.Storage.Local

apps/snitch_core/lib/core/data/model/product.ex

@@ -109,7 +109,7 @@ defmodule Snitch.Data.Model.Product do
       |> Repo.all()
 
     Product
-    |> join(:left, [p], v in Variation, v.child_product_id == p.id)
+    |> join(:left, [p], v in Variation, on: v.child_product_id == p.id)
     |> where(
       [p, v],
       p.state == "active" and p.deleted_at == ^0 and p.id not in ^parent_product_ids

apps/snitch_core/lib/core/data/model/role.ex

@@ -132,8 +132,8 @@ defmodule Snitch.Data.Model.Role do
       [
         permission_id: permission,
         role_id: role.id,
-        inserted_at: DateTime.utc_now(),
-        updated_at: DateTime.utc_now()
+        inserted_at: NaiveDateTime.local_now(),
+        updated_at: NaiveDateTime.local_now()
       ]
     end)
   end

apps/snitch_core/lib/core/data/schema/payment/payment.ex

@@ -14,7 +14,7 @@ defmodule Snitch.Data.Schema.Payment do
 
   schema "snitch_payments" do
     field(:slug, :string)
-    field(:payment_type, :string, size: 3)
+    field(:payment_type, :string)
     field(:amount, Money.Ecto.Composite.Type, default: Money.new(0, :USD))
     field(:state, :string, default: "pending")
 

apps/snitch_core/lib/core/data/schema/payment/payment_method.ex

@@ -6,6 +6,8 @@ defmodule Snitch.Data.Schema.PaymentMethod do
   use Snitch.Data.Schema
 
   alias Snitch.Data.Schema.Payment
+  alias SnitchPayments.Gateway.{PayuBiz, Stripe, RazorPay}
+  alias SnitchPayments.Payment.CashOnDelivery
 
   @typedoc """
   A struct which represents PaymentMethod.
@@ -32,11 +34,11 @@ defmodule Snitch.Data.Schema.PaymentMethod do
 
   schema "snitch_payment_methods" do
     field(:name, :string)
-    field(:code, :string, size: 3)
+    field(:code, :string)
     field(:active?, :boolean, default: true)
 
     field(:live_mode?, :boolean, default: false)
-    field(:provider, Ecto.Atom)
+    field(:provider, Ecto.Enum, values: [PayuBiz, Stripe, RazorPay, CashOnDelivery])
     field(:preferences, :map)
     field(:description, :string)
 

apps/snitch_core/lib/core/data/schema/product.ex

@@ -31,7 +31,7 @@ defmodule Snitch.Data.Schema.Product do
   @type t :: %__MODULE__{}
 
   schema "snitch_products" do
-    field(:name, :string, null: false, default: "")
+    field(:name, :string, default: "")
     field(:description, :string)
     field(:available_on, :utc_datetime)
     field(:deleted_at, UnixTimestamp, default: 0)

apps/snitch_core/lib/core/data/schema/product_brand.ex

@@ -9,7 +9,7 @@ defmodule Snitch.Data.Schema.ProductBrand do
   @type t :: %__MODULE__{}
 
   schema "snitch_product_brands" do
-    field(:name, :string, null: false)
+    field(:name, :string)
     field(:tenant, :string, virtual: true)
     timestamps()
 

apps/snitch_core/lib/core/data/schema/product_property.ex

@@ -21,7 +21,7 @@ defmodule Snitch.Data.Schema.ProductProperty do
   schema "snitch_product_properties" do
     belongs_to(:product, Product)
     belongs_to(:property, Property)
-    field(:value, :string, null: false)
+    field(:value, :string)
     timestamps()
   end
 

apps/snitch_core/lib/core/data/schema/promotion/promotion.ex

@@ -37,7 +37,7 @@ defmodule Snitch.Data.Schema.Promotion do
     field(:code, :string)
     field(:name, :string)
     field(:description, :string)
-    field(:starts_at, :utc_datetime, default: DateTime.utc_now())
+    field(:starts_at, :utc_datetime, default: DateTime.truncate(DateTime.utc_now(), :second))
     field(:expires_at, :utc_datetime)
     field(:usage_limit, :integer, default: 0)
     field(:current_usage_count, :integer, default: 0)

apps/snitch_core/lib/core/data/schema/rating/rating_option.ex

@@ -18,9 +18,9 @@ defmodule Snitch.Data.Schema.RatingOption do
   @type t :: %__MODULE__{}
 
   schema "snitch_rating_options" do
-    field(:code, :string, null: false)
-    field(:value, :integer, null: false)
-    field(:position, :integer, null: false)
+    field(:code, :string)
+    field(:value, :integer)
+    field(:position, :integer)
 
     belongs_to(:rating, Rating)
 

apps/snitch_core/lib/core/data/schema/shipping_method.ex

@@ -53,11 +53,7 @@ defmodule Snitch.Data.Schema.ShippingMethod do
   The `zones` must be `Snitch.Data.Schema.Zone.t` structs.
   The `categories` must be `Snitch.Data.Schema.ShippingCategory.t` structs.
 
-  The following fields must be present in `params`: `[#{
-    @create_fields
-    |> Enum.map(fn x -> ":#{x}" end)
-    |> Enum.intersperse(", ")
-  }]`
+  The following fields must be present in `params`: `[#{@create_fields |> Enum.map(fn x -> ":#{x}" end) |> Enum.intersperse(", ")}]`
   """
   @spec create_changeset(t, map, [Zone.t()], [ShippingCategory.t()]) :: Ecto.Changeset.t()
   def create_changeset(%__MODULE__{} = shipping_method, params, zones, categories) do

apps/snitch_core/lib/core/data/schema/shipping_rules/shipping_rule_identifier.ex

@@ -9,7 +9,7 @@ defmodule Snitch.Data.Schema.ShippingRuleIdentifier do
   @type t :: %__MODULE__{}
 
   schema "snitch_shipping_rule_identifiers" do
-    field(:code, Ecto.Atom)
+    field(:code, Ecto.Enum, values: [:fso, :fsoa, :fsrp, :ofr])
     field(:description, :string)
 
     timestamps()

apps/snitch_core/lib/core/data/schema/taxanomy/taxon.ex

@@ -32,8 +32,8 @@ defmodule Snitch.Data.Schema.Taxon do
     timestamps()
   end
 
-  @cast_fields ~w(name parent_id taxonomy_id lft rgt)
-  @update_fields ~w(name)
+  @cast_fields ~w(name parent_id taxonomy_id lft rgt)a
+  @update_fields ~w(name)a
 
   def changeset(taxon, params) do
     taxon

apps/snitch_core/lib/core/data/schema/user.ex

@@ -91,7 +91,7 @@ defmodule Snitch.Data.Schema.User do
   def delete_changeset(user, _params \\ %{}) do
     params = %{
       state: :deleted,
-      deleted_at: NaiveDateTime.utc_now()
+      deleted_at: NaiveDateTime.local_now()
     }
 
     user

apps/snitch_core/lib/core/data/schema/variant.ex

@@ -5,7 +5,6 @@ defmodule Snitch.Data.Schema.Variant do
 
   use Snitch.Data.Schema
 
-  alias Money.Ecto.Composite.Type, as: MoneyType
   alias Snitch.Data.Schema.{Image, Product, ShippingCategory, StockItem}
 
   @type t :: %__MODULE__{}
@@ -16,8 +15,8 @@ defmodule Snitch.Data.Schema.Variant do
     field(:height, :decimal, default: Decimal.new(0))
     field(:width, :decimal, default: Decimal.new(0))
     field(:depth, :decimal, default: Decimal.new(0))
-    field(:selling_price, MoneyType)
-    field(:cost_price, MoneyType)
+    field(:selling_price, Money.Ecto.Composite.Type)
+    field(:cost_price, Money.Ecto.Composite.Type)
     field(:position, :integer)
     field(:track_inventory, :boolean, default: true)
     field(:discontinue_on, :utc_datetime)

apps/snitch_core/lib/core/domain/order/default_machine.ex

@@ -45,6 +45,7 @@ defmodule Snitch.Domain.Order.DefaultMachine do
   modules/functions that perform some logic based on the state need to be
   generated or configured at compile-time as well.
   """
+
   # TODO: How to attach the additional info like ability, etc with the states?
   # TODO: make the order state machine a behaviour to simplify things.
 

apps/snitch_core/lib/core/repo.ex

@@ -1,3 +1,3 @@
 defmodule Snitch.Repo do
-  use Ecto.Repo, otp_app: :snitch_core
+  use Ecto.Repo, otp_app: :snitch_core, adapter: Ecto.Adapters.Postgres
 end

apps/snitch_core/lib/core/tools/cldr.ex

@@ -0,0 +1,6 @@
+defmodule Snitch.Tools.Cldr do
+  use Cldr,
+    locales: ["en"],
+    default_locale: "en",
+    providers: [Cldr.Number, Money]
+end