Merge pull request #67 from ianibo/master

Improve searching and title lookup
folio-org · Dec 11, 2018 · 9b00f86 · 9b00f86
2 parents e9954fc + 6457b54
commit 9b00f86
Show file tree

Hide file tree

Showing 10 changed files with 222 additions and 208 deletions.
diff --git a/scripts/dev_submit_pkg.sh b/scripts/dev_submit_pkg.sh
@@ -61,7 +61,7 @@ TRIAL_AGREEMENT_ID=`curl --header "X-Okapi-Tenant: diku" -H "Content-Type: appli
   localReference: "TRIAL_ALR_001",
   vendorReference: "TRIAL_AVR_001",
   startDate: "2018-01-01",
-  endDate: "2018-12-31",
+  endDate: "2019-12-31",
   renewalDate: "2019-01-01",
   nextReviewDate: "2018-10-01",
   vendor: {

diff --git a/scripts/register_and_enable.sh b/scripts/register_and_enable.sh
@@ -11,11 +11,11 @@ if [ ! -d "$DESCRIPTORDIR" ]; then
     ./gradlew generateDescriptors
 fi
 
-curl -XDELETE http://localhost:9130/_/proxy/tenants/diku/modules/olf-erm-1.0.0
-curl -XDELETE http://localhost:9130/_/discovery/modules/olf-erm-1.0.0/localhost-olf-erm-1.0.0
-curl -XDELETE http://localhost:9130/_/proxy/modules/olf-erm-1.0.0
+curl -XDELETE http://localhost:9130/_/proxy/tenants/diku/modules/olf-erm-1.0.3
+curl -XDELETE http://localhost:9130/_/discovery/modules/olf-erm-1.0.0/localhost-olf-erm-1.0.3
+curl -XDELETE http://localhost:9130/_/proxy/modules/olf-erm-1.0.3
 # ./gradlew clean generateDescriptors
 curl -XPOST http://localhost:9130/_/proxy/modules -d @"${DESCRIPTORDIR}/ModuleDescriptor.json"
 curl -XPOST http://localhost:9130/_/discovery/modules -d @"${DESCRIPTORDIR}/DeploymentDescriptor.json"
-curl -XPOST http://localhost:9130/_/proxy/tenants/diku/modules -d '{"id": "olf-erm-1.0.0"}'
+curl -XPOST http://localhost:9130/_/proxy/tenants/diku/modules -d '{"id": "olf-erm-1.0.3"}'
 popd
diff --git a/service/gradle.properties b/service/gradle.properties
@@ -3,8 +3,7 @@ gormVersion=6.1.10.RELEASE
 gradleWrapperVersion=3.5
 
 appName=olf-erm
-appVersion=1.0.2
-
+appVersion=1.0.3
 
 dockerRepo=folioci
 dockerTagSuffix=
diff --git a/service/grails-app/domain/org/olf/kb/Identifier.groovy b/service/grails-app/domain/org/olf/kb/Identifier.groovy
@@ -23,8 +23,8 @@ public class Identifier implements MultiTenant<Identifier> {
   static mapping = {
                    id column:'id_id', generator: 'uuid', length:36
               version column:'id_version'
-                value column:'id_value'
-                   ns column:'id_ns_fk'
+                value column:'id_value', index:'identifier_value_idx'
+                   ns column:'id_ns_fk', index:'identifier_value_idx'
   }
 
   static constraints = {

diff --git a/service/grails-app/domain/org/olf/kb/TitleInstance.groovy b/service/grails-app/domain/org/olf/kb/TitleInstance.groovy
@@ -16,13 +16,8 @@ public class TitleInstance extends ErmResource implements MultiTenant<TitleInsta
   static namedQueries = {
     entitled {
       createAlias ('platformInstances', 'pi')
-//        createAlias ('pi.entitlements', 'pi_entitlements', JoinType.LEFT_OUTER_JOIN)
-        createAlias ('pi.packageOccurences', 'pi_po', JoinType.LEFT_OUTER_JOIN)
-//          createAlias ('pi_po.entitlements', 'pi_po_entitlements', JoinType.LEFT_OUTER_JOIN)
-          createAlias ('pi_po.pkg', 'pi_po_pkg', JoinType.LEFT_OUTER_JOIN)
-//            createAlias ('pi_po_pkg.entitlements', 'pi_po_pkg_entitlements', JoinType.LEFT_OUTER_JOIN)
-
-
+      createAlias ('pi.packageOccurences', 'pi_po', JoinType.LEFT_OUTER_JOIN)
+      createAlias ('pi_po.pkg', 'pi_po_pkg', JoinType.LEFT_OUTER_JOIN)
       or {
         isNotEmpty 'pi.entitlements'
         isNotEmpty 'pi_po.entitlements'
@@ -62,4 +57,11 @@ public class TitleInstance extends ErmResource implements MultiTenant<TitleInsta
             name (nullable:false, blank:false)
             work (nullable:true, blank:false)
   }
+
+  public String getCodexSummary() {
+    dev num_entitlements = 0;
+    dev num_current_entitlements = 0;
+    dev num_package_appearences = 0;
+    return "${name} (${type?.value}/${subType?.value})";
+  }
 }