Merge pull request #680 from code-corps/remove-unused-arc-code

Remove unused arc code

Author: joshsmith

config/config.exs

@@ -47,9 +47,7 @@ config :ex_aws, :code_corps,
   access_key_id: [System.get_env("AWS_ACCESS_KEY_ID"), :instance_role],
   secret_access_key: [System.get_env("AWS_SECRET_ACCESS_KEY"), :instance_role]
 
-# Configures Arc for image uploads
-config :arc,
-  bucket: System.get_env("S3_BUCKET"),
+config :code_corps,
   asset_host: System.get_env("CLOUDFRONT_DOMAIN")
 
 config :segment,

lib/code_corps/helpers/cloudinary_url.ex

@@ -1,7 +1,7 @@
 defmodule CodeCorps.Helpers.CloudinaryUrl do
 
   def for(nil, _options, version, default_color, type) do
-    "#{Application.get_env(:arc, :asset_host)}/icons/#{type}_default_#{version}_#{default_color}.png"
+    "#{Application.get_env(:code_corps, :asset_host)}/icons/#{type}_default_#{version}_#{default_color}.png"
   end
   def for(public_id, options, _version, _default_color, _type) do
     Cloudex.Url.for(public_id, options)

mix.exs

@@ -31,7 +31,6 @@ defmodule CodeCorps.Mixfile do
         :gettext,
         :phoenix_ecto,
         :postgrex,
-        :arc_ecto,
         :cloudex,
         :comeonin,
         :corsica,
@@ -68,8 +67,6 @@ defmodule CodeCorps.Mixfile do
       {:phoenix_live_reload, "~> 1.0", only: :dev},
       {:gettext, "~> 0.12"},
       {:cowboy, "~> 1.0"},
-      {:arc, "~> 0.6"}, # Photo uploads
-      {:arc_ecto, "~> 0.5"},
       {:benchfella, "~> 0.3.0", only: :dev},
       {:canary, "~> 1.1"}, # Authorization
       {:cloudex, "~> 0.1.10"},

priv/repo/image_migration.exs

@@ -0,0 +1,17 @@
+defmodule CodeCorps.Repo.Migrations.RemovePhotoIconColumns do
+  use Ecto.Migration
+
+  def change do
+    alter table(:organizations) do
+      remove :icon
+    end
+
+    alter table(:projects) do
+      remove :icon
+    end
+
+    alter table(:users) do
+      remove :photo
+    end
+  end
+end

priv/repo/migrations/20170201183258_remove_photo_icon_columns.exs

@@ -195,7 +195,6 @@ CREATE TABLE organizations (
     slug character varying(255) NOT NULL,
     inserted_at timestamp without time zone NOT NULL,
     updated_at timestamp without time zone NOT NULL,
-    icon character varying(255),
     approved boolean DEFAULT false,
     cloudinary_public_id character varying(255),
     default_color character varying(255)
@@ -332,7 +331,6 @@ CREATE TABLE projects (
     organization_id integer NOT NULL,
     inserted_at timestamp without time zone NOT NULL,
     updated_at timestamp without time zone NOT NULL,
-    icon character varying(255),
     total_monthly_donated integer DEFAULT 0,
     approved boolean DEFAULT false,
     cloudinary_public_id character varying(255),
@@ -1066,6 +1064,38 @@ CREATE SEQUENCE task_lists_id_seq
 ALTER SEQUENCE task_lists_id_seq OWNED BY task_lists.id;
 
 
+--
+-- Name: task_skills; Type: TABLE; Schema: public; Owner: -
+--
+
+CREATE TABLE task_skills (
+    id integer NOT NULL,
+    skill_id integer NOT NULL,
+    task_id integer NOT NULL,
+    inserted_at timestamp without time zone NOT NULL,
+    updated_at timestamp without time zone NOT NULL
+);
+
+
+--
+-- Name: task_skills_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE task_skills_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: task_skills_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE task_skills_id_seq OWNED BY task_skills.id;
+
+
 --
 -- Name: tasks; Type: TABLE; Schema: public; Owner: -
 --
@@ -1251,7 +1281,6 @@ CREATE TABLE users (
     website character varying(255),
     twitter character varying(255),
     biography text,
-    photo character varying(255),
     admin boolean DEFAULT false NOT NULL,
     state character varying(255) DEFAULT 'signed_up'::character varying,
     cloudinary_public_id character varying(255),
@@ -1460,6 +1489,13 @@ ALTER TABLE ONLY stripe_platform_customers ALTER COLUMN id SET DEFAULT nextval('
 ALTER TABLE ONLY task_lists ALTER COLUMN id SET DEFAULT nextval('task_lists_id_seq'::regclass);
 
 
+--
+-- Name: id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY task_skills ALTER COLUMN id SET DEFAULT nextval('task_skills_id_seq'::regclass);
+
+
 --
 -- Name: id; Type: DEFAULT; Schema: public; Owner: -
 --
@@ -1678,6 +1714,14 @@ ALTER TABLE ONLY task_lists
     ADD CONSTRAINT task_lists_pkey PRIMARY KEY (id);
 
 
+--
+-- Name: task_skills_pkey; Type: CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY task_skills
+    ADD CONSTRAINT task_skills_pkey PRIMARY KEY (id);
+
+
 --
 -- Name: user_categories_pkey; Type: CONSTRAINT; Schema: public; Owner: -
 --
@@ -2019,6 +2063,13 @@ CREATE UNIQUE INDEX stripe_platform_customers_user_id_index ON stripe_platform_c
 CREATE INDEX task_lists_project_id_index ON task_lists USING btree (project_id);
 
 
+--
+-- Name: task_skills_task_id_skill_id_index; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE UNIQUE INDEX task_skills_task_id_skill_id_index ON task_skills USING btree (task_id, skill_id);
+
+
 --
 -- Name: tasks_number_project_id_index; Type: INDEX; Schema: public; Owner: -
 --
@@ -2361,6 +2412,22 @@ ALTER TABLE ONLY task_lists
     ADD CONSTRAINT task_lists_project_id_fkey FOREIGN KEY (project_id) REFERENCES projects(id);
 
 
+--
+-- Name: task_skills_skill_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY task_skills
+    ADD CONSTRAINT task_skills_skill_id_fkey FOREIGN KEY (skill_id) REFERENCES skills(id);
+
+
+--
+-- Name: task_skills_task_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY task_skills
+    ADD CONSTRAINT task_skills_task_id_fkey FOREIGN KEY (task_id) REFERENCES tasks(id);
+
+
 --
 -- Name: tasks_project_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
@@ -2453,5 +2520,5 @@ ALTER TABLE ONLY user_tasks
 -- PostgreSQL database dump complete
 --
 
-INSERT INTO "schema_migrations" (version) VALUES (20160723215749), (20160804000000), (20160804001111), (20160805132301), (20160805203929), (20160808143454), (20160809214736), (20160810124357), (20160815125009), (20160815143002), (20160816020347), (20160816034021), (20160817220118), (20160818000944), (20160818132546), (20160820113856), (20160820164905), (20160822002438), (20160822004056), (20160822011624), (20160822020401), (20160822044612), (20160830081224), (20160830224802), (20160911233738), (20160912002705), (20160912145957), (20160918003206), (20160928232404), (20161003185918), (20161019090945), (20161019110737), (20161020144622), (20161021131026), (20161031001615), (20161121005339), (20161121014050), (20161121043941), (20161121045709), (20161122015942), (20161123081114), (20161123150943), (20161124085742), (20161125200620), (20161126045705), (20161127054559), (20161205024856), (20161207112519), (20161209192504), (20161212005641), (20161214005935), (20161215052051), (20161216051447), (20161218005913), (20161219160401), (20161219163909), (20161220141753), (20161221085759), (20161226213600), (20161231063614), (20170102130055), (20170102181053), (20170104113708), (20170104212623), (20170104235423), (20170106013143), (20170115035159), (20170115230549), (20170121014100), (20170201014901), (20170201025454), (20170201035458);
+INSERT INTO "schema_migrations" (version) VALUES (20160723215749), (20160804000000), (20160804001111), (20160805132301), (20160805203929), (20160808143454), (20160809214736), (20160810124357), (20160815125009), (20160815143002), (20160816020347), (20160816034021), (20160817220118), (20160818000944), (20160818132546), (20160820113856), (20160820164905), (20160822002438), (20160822004056), (20160822011624), (20160822020401), (20160822044612), (20160830081224), (20160830224802), (20160911233738), (20160912002705), (20160912145957), (20160918003206), (20160928232404), (20161003185918), (20161019090945), (20161019110737), (20161020144622), (20161021131026), (20161031001615), (20161121005339), (20161121014050), (20161121043941), (20161121045709), (20161122015942), (20161123081114), (20161123150943), (20161124085742), (20161125200620), (20161126045705), (20161127054559), (20161205024856), (20161207112519), (20161209192504), (20161212005641), (20161214005935), (20161215052051), (20161216051447), (20161218005913), (20161219160401), (20161219163909), (20161220141753), (20161221085759), (20161226213600), (20161231063614), (20170102130055), (20170102181053), (20170104113708), (20170104212623), (20170104235423), (20170106013143), (20170115035159), (20170115230549), (20170121014100), (20170131234029), (20170201014901), (20170201025454), (20170201035458), (20170201183258);
 

priv/repo/structure.sql

@@ -9,7 +9,7 @@ defmodule CodeCorps.OrganizationViewTest do
     slugged_route = insert(:slugged_route, organization: organization)
     stripe_connect_account = insert(:stripe_connect_account, organization: organization)
 
-    host = Application.get_env(:arc, :asset_host)
+    host = Application.get_env(:code_corps, :asset_host)
 
     rendered_json =  render(CodeCorps.OrganizationView, "show.json-api", data: organization)
 

test/views/organization_view_test.exs

@@ -12,7 +12,7 @@ defmodule CodeCorps.ProjectViewTest do
     task_list = insert(:task_list, project: project)
     task = insert(:task, project: project, task_list: task_list)
 
-    host = Application.get_env(:arc, :asset_host)
+    host = Application.get_env(:code_corps, :asset_host)
 
     rendered_json = render(CodeCorps.ProjectView, "show.json-api", data: project)
 

test/views/project_view_test.exs

@@ -15,7 +15,7 @@ defmodule CodeCorps.UserViewTest do
     user_role = insert(:user_role, user: user)
     user_skill = insert(:user_skill, user: user)
 
-    host = Application.get_env(:arc, :asset_host)
+    host = Application.get_env(:code_corps, :asset_host)
 
     rendered_json = render(CodeCorps.UserView, "show.json-api", data: user)
 

test/views/user_view_test.exs

@@ -3,7 +3,6 @@ defmodule CodeCorps.Organization do
   Represents an organization on Code Corps, e.g. "Code Corps" itself.
   """
 
-  use Arc.Ecto.Schema
   use CodeCorps.Web, :model
   import CodeCorps.Helpers.RandomIconColor
   import CodeCorps.Helpers.Slug
@@ -14,7 +13,6 @@ defmodule CodeCorps.Organization do
     field :cloudinary_public_id
     field :default_color
     field :description, :string
-    field :icon, CodeCorps.OrganizationIcon.Type
     field :name, :string
     field :slug, :string
     field :approved, :boolean