GrantRepo#for_collection_class inst,group soft delete support

lauth/app/repositories/grant_repo.rb

@@ -16,8 +16,10 @@ def for_collection_class(username:, client_ip:, collection_class:)
           .where(grants[:dlpsDeleted].is("f"))
           .join(collections.name.dataset, uniqueIdentifier: :coll, dlpsDeleted: "f")
           .left_join(users.name.dataset, userid: grants[:userid], dlpsDeleted: "f")
-          .left_join(institution_memberships.name.dataset, inst: grants[:inst])
-          .left_join(group_memberships.name.dataset, user_grp: grants[:user_grp])
+          .left_join(institutions.name.dataset, uniqueIdentifier: grants[:inst], dlpsDeleted: "f")
+          .left_join(institution_memberships.name.dataset, inst: grants[:inst], dlpsDeleted: "f")
+          .left_join(groups.name.dataset, uniqueIdentifier: grants[:user_grp], dlpsDeleted: "f")
+          .left_join(group_memberships.name.dataset, user_grp: grants[:user_grp], dlpsDeleted: "f")
           .left_join(Sequel.as(smallest_network, :smallest), inst: grants[:inst])
           .where(collections[:dlpsClass] => collection_class)
           .where(
@@ -27,10 +29,12 @@ def for_collection_class(username:, client_ip:, collection_class:)
                 {users[:userid] => username}
               ),
               Sequel.&(
+                Sequel.~(institutions[:uniqueIdentifier] => nil),
                 Sequel.~(institution_memberships[:userid] => nil),
                 {institution_memberships[:userid] => username}
               ),
               Sequel.&(
+                Sequel.~(groups[:uniqueIdentifier] => nil),
                 Sequel.~(group_memberships[:userid] => nil),
                 {group_memberships[:userid] => username}
               ),
@@ -93,7 +97,7 @@ def for(username:, uri:, client_ip: nil)
 
       def smallest_network_for_ip(client_ip)
         ip = client_ip ? IPAddr.new(client_ip).to_i : nil
-        smallest_network = networks
+        networks
           .dataset
           .where(dlpsDeleted: "f")
           .where { dlpsAddressStart <= ip }

lauth/spec/repositories/soft_delete/grants_for_group_member_spec.rb

@@ -2,7 +2,7 @@
   subject(:grants) { repo.for(username: "lauth-group-member", uri: "/restricted-by-username/") }
 
   let(:repo) { Lauth::Repositories::GrantRepo.new }
-  let(:collection) { Factory[:collection, :restricted_by_username] }
+  let(:collection) { Factory[:collection, :restricted_by_username, dlpsClass: "someclass"] }
   let(:group) { Factory[:group] }
   let(:member) { Factory[:user, userid: "lauth-group-member"] }
   let(:membership) { Factory[:group_membership, user: member, group: group] }
@@ -21,6 +21,14 @@
     expect(grants.map(&:uniqueIdentifier)).to contain_exactly grant.uniqueIdentifier
   end
 
+  it "#for_collection_class finds the grant" do
+    expect(repo.for_collection_class(
+      username: "lauth-group-member",
+      client_ip: "10.99.3.4",
+      collection_class: "someclass"
+    ).map(&:uniqueIdentifier)).to contain_exactly grant.uniqueIdentifier
+  end
+
   context "when collection is soft deleted" do
     let(:collection) { Factory[:collection, :restricted_by_username, :soft_deleted] }
 
@@ -43,6 +51,14 @@
     it "finds no grants" do
       expect(grants).to be_empty
     end
+
+    it "#for_collection_class finds no grants" do
+      expect(repo.for_collection_class(
+        username: "lauth-group-member",
+        client_ip: "10.99.3.4",
+        collection_class: "someclass"
+      )).to be_empty
+    end
   end
 
   context "when member is soft deleted" do
@@ -59,6 +75,14 @@
     it "finds no grants" do
       expect(grants).to be_empty
     end
+
+    it "#for_collection_class finds no grants" do
+      expect(repo.for_collection_class(
+        username: "lauth-group-member",
+        client_ip: "10.99.3.4",
+        collection_class: "someclass"
+      )).to be_empty
+    end
   end
 
   context "when grant is soft deleted" do

lauth/spec/repositories/soft_delete/grants_for_institution_member_spec.rb

@@ -2,7 +2,7 @@
   subject(:grants) { repo.for(username: "lauth-inst-member", uri: "/restricted-by-username/") }
 
   let(:repo) { Lauth::Repositories::GrantRepo.new }
-  let(:collection) { Factory[:collection, :restricted_by_username] }
+  let(:collection) { Factory[:collection, :restricted_by_username, dlpsClass: "someclass"] }
   let(:institution) { Factory[:institution] }
   let(:member) { Factory[:user, userid: "lauth-inst-member"] }
   let(:membership) { Factory[:institution_membership, user: member, institution: institution] }
@@ -21,6 +21,14 @@
     expect(grants.map(&:uniqueIdentifier)).to contain_exactly(grant.uniqueIdentifier)
   end
 
+  it "#for_collection_class finds the grant" do
+    expect(repo.for_collection_class(
+      username: "lauth-inst-member",
+      client_ip: "10.99.3.4",
+      collection_class: "someclass"
+    ).map(&:uniqueIdentifier)).to contain_exactly grant.uniqueIdentifier
+  end
+
   context "when collection is soft deleted" do
     let(:collection) { Factory[:collection, :restricted_by_username, :soft_deleted] }
 
@@ -43,6 +51,14 @@
     it "finds no grants" do
       expect(grants).to be_empty
     end
+
+    it "#for_collection_class finds no grants" do
+      expect(repo.for_collection_class(
+        username: "lauth-inst-member",
+        client_ip: "10.99.3.4",
+        collection_class: "someclass"
+      )).to be_empty
+    end
   end
 
   context "when member is soft deleted" do
@@ -59,6 +75,14 @@
     it "finds no grants" do
       expect(grants).to be_empty
     end
+
+    it "#for_collection_class finds no grants" do
+      expect(repo.for_collection_class(
+        username: "lauth-inst-member",
+        client_ip: "10.2.3.4",
+        collection_class: "someclass"
+      )).to be_empty
+    end
   end
 
   context "when grant is soft deleted" do