From 78134671feff75e0bb18eeb16483e0e61aae3a9a Mon Sep 17 00:00:00 2001
From: Arnaud Levy <contact@arnaudlevy.com>
Date: Wed, 13 Apr 2022 09:15:02 +0200
Subject: [PATCH] imports
---
app/models/university/organization.rb | 3 ++-
app/models/university/organization/import.rb | 3 ++-
.../admin/university/organization/imports/new.html.erb | 8 ++++++--
app/views/admin/university/organizations/index.html.erb | 2 +-
db/migrate/20220413071151_fix_siret.rb | 6 ++++++
db/schema.rb | 5 +++--
test/fixtures/university/organizations.yml | 3 ++-
test/models/university/organization_test.rb | 3 ++-
8 files changed, 24 insertions(+), 9 deletions(-)
create mode 100644 db/migrate/20220413071151_fix_siret.rb
diff --git a/app/models/university/organization.rb b/app/models/university/organization.rb
index b53bb6e69..f4de3cad8 100644
--- a/app/models/university/organization.rb
+++ b/app/models/university/organization.rb
@@ -12,8 +12,9 @@
# kind :integer default("company")
# long_name :string
# name :string
+# nic :string
# phone :string
-# sirene :string
+# siren :string
# slug :string
# text :text
# url :string
diff --git a/app/models/university/organization/import.rb b/app/models/university/organization/import.rb
index b7115fc64..46f51178f 100644
--- a/app/models/university/organization/import.rb
+++ b/app/models/university/organization/import.rb
@@ -45,7 +45,8 @@ class University::Organization::Import < ApplicationRecord
[
:long_name,
:kind,
- :sirene,
+ :siren,
+ :nic,
:description,
:address,
:zipcode,
diff --git a/app/views/admin/university/organization/imports/new.html.erb b/app/views/admin/university/organization/imports/new.html.erb
index 714bdfc7a..9199ac8ab 100644
--- a/app/views/admin/university/organization/imports/new.html.erb
+++ b/app/views/admin/university/organization/imports/new.html.erb
@@ -34,8 +34,12 @@
<td>company</td>
</tr>
<tr>
- <th>sirene</th>
- <td>00000000</td>
+ <th>siren</th>
+ <td>433891850</td>
+ </tr>
+ <tr>
+ <th>nic</th>
+ <td>00052</td>
</tr>
<tr>
<th>description</th>
diff --git a/app/views/admin/university/organizations/index.html.erb b/app/views/admin/university/organizations/index.html.erb
index 1fd6f4dbf..b538dd5cd 100644
--- a/app/views/admin/university/organizations/index.html.erb
+++ b/app/views/admin/university/organizations/index.html.erb
@@ -5,7 +5,7 @@
<% content_for :action_bar_left do %>
<%= link_to t('import'),
- admin_university_organization_imports_path,
+ new_admin_university_organization_import_path,
class: button_classes if can? :manage, University::Organization::Import %>
<% end %>
diff --git a/db/migrate/20220413071151_fix_siret.rb b/db/migrate/20220413071151_fix_siret.rb
new file mode 100644
index 000000000..779548842
--- /dev/null
+++ b/db/migrate/20220413071151_fix_siret.rb
@@ -0,0 +1,6 @@
+class FixSiret < ActiveRecord::Migration[6.1]
+ def change
+ rename_column :university_organizations, :sirene, :siren
+ add_column :university_organizations, :nic, :string
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index e55c58753..319a9edd7 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 2022_04_08_091854) do
+ActiveRecord::Schema.define(version: 2022_04_13_071151) do
# These are extensions that must be enabled in order to support this database
enable_extension "pgcrypto"
@@ -642,12 +642,13 @@ ActiveRecord::Schema.define(version: 2022_04_08_091854) do
t.string "phone"
t.string "email"
t.boolean "active", default: true
- t.string "sirene"
+ t.string "siren"
t.integer "kind", default: 10
t.datetime "created_at", precision: 6, null: false
t.datetime "updated_at", precision: 6, null: false
t.string "slug"
t.text "text"
+ t.string "nic"
t.index ["university_id"], name: "index_university_organizations_on_university_id"
end
diff --git a/test/fixtures/university/organizations.yml b/test/fixtures/university/organizations.yml
index a6627badc..e20b37fe7 100644
--- a/test/fixtures/university/organizations.yml
+++ b/test/fixtures/university/organizations.yml
@@ -12,8 +12,9 @@
# kind :integer default("company")
# long_name :string
# name :string
+# nic :string
# phone :string
-# sirene :string
+# siren :string
# slug :string
# text :text
# url :string
diff --git a/test/models/university/organization_test.rb b/test/models/university/organization_test.rb
index 12c790022..a57d401f9 100644
--- a/test/models/university/organization_test.rb
+++ b/test/models/university/organization_test.rb
@@ -12,8 +12,9 @@
# kind :integer default("company")
# long_name :string
# name :string
+# nic :string
# phone :string
-# sirene :string
+# siren :string
# slug :string
# text :text
# url :string
--
GitLab