add ROLE_DEV. #731

datacite · Apr 23, 2021 · 96449c6 · 96449c6
1 parent 1a7d88d
commit 96449c6
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 19 deletions.
diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
@@ -130,7 +130,7 @@ def show
     def set_provider
       @provider =
         Provider.unscoped.where(
-          "allocator.role_name IN ('ROLE_FOR_PROFIT_PROVIDER', 'ROLE_CONTRACTUAL_PROVIDER', 'ROLE_CONSORTIUM' , 'ROLE_CONSORTIUM_ORGANIZATION', 'ROLE_ALLOCATOR', 'ROLE_MEMBER', 'ROLE_REGISTRATION_AGENCY')",
+          "allocator.role_name IN ('ROLE_FOR_PROFIT_PROVIDER', 'ROLE_CONTRACTUAL_PROVIDER', 'ROLE_CONSORTIUM' , 'ROLE_CONSORTIUM_ORGANIZATION', 'ROLE_ALLOCATOR', 'ROLE_MEMBER', 'ROLE_DEV')",
         ).
           where(deleted_at: nil).
           where(symbol: params[:id]).

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
@@ -216,7 +216,7 @@ def show
     def set_provider
       @provider =
         Provider.unscoped.where(
-          "allocator.role_name IN ('ROLE_FOR_PROFIT_PROVIDER', 'ROLE_CONTRACTUAL_PROVIDER', 'ROLE_CONSORTIUM' , 'ROLE_CONSORTIUM_ORGANIZATION', 'ROLE_ALLOCATOR', 'ROLE_ADMIN', 'ROLE_MEMBER', 'ROLE_REGISTRATION_AGENCY')",
+          "allocator.role_name IN ('ROLE_FOR_PROFIT_PROVIDER', 'ROLE_CONTRACTUAL_PROVIDER', 'ROLE_CONSORTIUM' , 'ROLE_CONSORTIUM_ORGANIZATION', 'ROLE_ALLOCATOR', 'ROLE_ADMIN', 'ROLE_MEMBER', 'ROLE_DEV')",
         ).
           where(deleted_at: nil).
           where(symbol: params[:id]).

diff --git a/app/controllers/providers_controller.rb b/app/controllers/providers_controller.rb
@@ -385,7 +385,7 @@ def set_include
     def set_provider
       @provider =
         Provider.unscoped.where(
-          "allocator.role_name IN ('ROLE_FOR_PROFIT_PROVIDER', 'ROLE_CONTRACTUAL_PROVIDER', 'ROLE_CONSORTIUM' , 'ROLE_CONSORTIUM_ORGANIZATION', 'ROLE_ALLOCATOR', 'ROLE_ADMIN', 'ROLE_MEMBER', 'ROLE_REGISTRATION_AGENCY')",
+          "allocator.role_name IN ('ROLE_FOR_PROFIT_PROVIDER', 'ROLE_CONTRACTUAL_PROVIDER', 'ROLE_CONSORTIUM' , 'ROLE_CONSORTIUM_ORGANIZATION', 'ROLE_ALLOCATOR', 'ROLE_ADMIN', 'ROLE_MEMBER', 'ROLE_DEV')",
         ).
           where(deleted_at: nil).
           where(symbol: params[:id]).

diff --git a/app/controllers/v3/providers_controller.rb b/app/controllers/v3/providers_controller.rb
@@ -379,7 +379,7 @@ def set_include
     def set_provider
       @provider =
         Provider.unscoped.where(
-          "allocator.role_name IN ('ROLE_FOR_PROFIT_PROVIDER', 'ROLE_CONTRACTUAL_PROVIDER', 'ROLE_CONSORTIUM' , 'ROLE_CONSORTIUM_ORGANIZATION', 'ROLE_ALLOCATOR', 'ROLE_ADMIN', 'ROLE_MEMBER', 'ROLE_REGISTRATION_AGENCY')",
+          "allocator.role_name IN ('ROLE_FOR_PROFIT_PROVIDER', 'ROLE_CONTRACTUAL_PROVIDER', 'ROLE_CONSORTIUM' , 'ROLE_CONSORTIUM_ORGANIZATION', 'ROLE_ALLOCATOR', 'ROLE_ADMIN', 'ROLE_MEMBER', 'ROLE_DEV')",
         ).
           where(deleted_at: nil).
           where(symbol: params[:id]).

diff --git a/app/graphql/types/query_type.rb b/app/graphql/types/query_type.rb
@@ -20,7 +20,7 @@ def members(**args)
   end
 
   def member(id:)
-    Provider.unscoped.where("allocator.role_name IN ('ROLE_FOR_PROFIT_PROVIDER', 'ROLE_CONTRACTUAL_PROVIDER', 'ROLE_CONSORTIUM' , 'ROLE_CONSORTIUM_ORGANIZATION', 'ROLE_ALLOCATOR', 'ROLE_ADMIN', 'ROLE_MEMBER', 'ROLE_REGISTRATION_AGENCY')").where(deleted_at: nil).where(symbol: id).first
+    Provider.unscoped.where("allocator.role_name IN ('ROLE_FOR_PROFIT_PROVIDER', 'ROLE_CONTRACTUAL_PROVIDER', 'ROLE_CONSORTIUM' , 'ROLE_CONSORTIUM_ORGANIZATION', 'ROLE_ALLOCATOR', 'ROLE_ADMIN', 'ROLE_MEMBER', 'ROLE_DEV')").where(deleted_at: nil).where(symbol: id).first
   end
 
   field :me, MeType, null: true

diff --git a/app/models/concerns/authenticable.rb b/app/models/concerns/authenticable.rb
@@ -175,13 +175,13 @@ def decode_auth_param(username: nil, password: nil)
     def get_payload(uid: nil, user: nil, password: nil)
       roles = {
         "ROLE_ADMIN" => "staff_admin",
+        "ROLE_DEV" => "staff_admin",
         "ROLE_DATACENTRE" => "client_admin",
         "ROLE_ALLOCATOR" => "provider_admin",
         "ROLE_CONSORTIUM" => "consortium_admin",
         "ROLE_CONSORTIUM_ORGANIZATION" => "provider_admin",
         "ROLE_CONTRACTUAL_PROVIDER" => "provider_admin",
         "ROLE_FOR_PROFIT_PROVIDER" => "provider_admin",
-        "ROLE_REGISTRATION_AGENCY" => "provider_admin",
       }
       payload = {
         "uid" => uid,

diff --git a/app/models/provider.rb b/app/models/provider.rb
@@ -93,7 +93,6 @@ class Provider < ApplicationRecord
                            ROLE_CONSORTIUM_ORGANIZATION
                            ROLE_ALLOCATOR
                            ROLE_MEMBER
-                           ROLE_REGISTRATION_AGENCY
                            ROLE_ADMIN
                            ROLE_DEV
                          ],
@@ -710,9 +709,8 @@ def member_type_labels
       "ROLE_CONSORTIUM_ORGANIZATION" => "Consortium Organization",
       "ROLE_CONTRACTUAL_PROVIDER" => "Contractual Member",
       "ROLE_ADMIN" => "DataCite Admin",
-      "ROLE_DEV" => "DataCite Developer",
+      "ROLE_DEV" => "Developer",
       "ROLE_FOR_PROFIT_PROVIDER" => "Direct Member",
-      "ROLE_REGISTRATION_AGENCY" => "DOI Registration Agency",
     }
   end
 
@@ -733,7 +731,7 @@ def member_types
       "ROLE_CONSORTIUM_ORGANIZATION" => "consortium_organization",
       "ROLE_CONTRACTUAL_PROVIDER" => "contractual_member",
       "ROLE_FOR_PROFIT_PROVIDER" => "for-profit_provider",
-      "ROLE_REGISTRATION_AGENCY" => "registration_agency",
+      "ROLE_DEV" => "developer",
     }
   end
 

diff --git a/spec/models/provider_spec.rb b/spec/models/provider_spec.rb
@@ -45,20 +45,20 @@
     end
   end
 
-  describe "provider with ROLE_REGISTRATION_AGENCY" do
+  describe "provider with ROLE_DEV" do
     subject do
       create(
         :provider,
-        role_name: "ROLE_REGISTRATION_AGENCY",
-        name: "Crossref",
-        symbol: "CROSSREF",
+        role_name: "ROLE_DEV",
+        name: "Super Developer",
+        symbol: "SUPERDEV",
       )
     end
 
     it "works" do
-      expect(subject.role_name).to eq("ROLE_REGISTRATION_AGENCY")
-      expect(subject.member_type).to eq("registration_agency")
-      expect(subject.member_type_label).to eq("DOI Registration Agency")
+      expect(subject.role_name).to eq("ROLE_DEV")
+      expect(subject.member_type).to eq("developer")
+      expect(subject.member_type_label).to eq("Developer")
     end
   end
 

diff --git a/spec/requests/providers_spec.rb b/spec/requests/providers_spec.rb
@@ -203,7 +203,7 @@
 
   describe "GET /providers/totals" do
     let(:provider) { create(:provider) }
-    let(:ra) { create(:provider, role_name: "ROLE_REGISTRATION_AGENCY") }
+    let(:dev) { create(:provider, role_name: "ROLE_DEV") }
     let(:client) { create(:client, provider: provider) }
     let!(:prefixes) { create_list(:prefix, 10) }
     let!(:dois) { create_list(:doi, 3, client: client, aasm_state: "findable") }

diff --git a/spec/requests/v3/providers_spec.rb b/spec/requests/v3/providers_spec.rb
@@ -203,7 +203,7 @@
 
   describe "GET /v3/providers/totals" do
     let(:provider) { create(:provider) }
-    let(:ra) { create(:provider, role_name: "ROLE_REGISTRATION_AGENCY") }
+    let(:dev) { create(:provider, role_name: "ROLE_DEV") }
     let(:client) { create(:client, provider: provider) }
     let!(:prefixes) { create_list(:prefix, 10) }
     let!(:dois) { create_list(:doi, 3, client: client, aasm_state: "findable") }