0064testReport0064testReporthttp://jenkins-ucsb-1.dataone.org/jenkins/job/bookkeeper-unstable/org.dataone$bookkeeper/33/mavenArtifacts/bookkeeper-0.1.0-SNAPSHOT.jarbookkeeper-0.1.0-SNAPSHOT.jarorg.dataone/bookkeeper/0.1.0-SNAPSHOT/bookkeeper-0.1.0-SNAPSHOT.jarbookkeeper-0.1.0-SNAPSHOT.pombookkeeper-0.1.0-SNAPSHOT.pomorg.dataone/bookkeeper/0.1.0-SNAPSHOT/bookkeeper-0.1.0-SNAPSHOT.pomfalse#333485330986bookkeeper-unstable ยป bookkeeper #3333false33-1SUCCESS1603491829465http://jenkins-ucsb-1.dataone.org/jenkins/job/bookkeeper-unstable/org.dataone$bookkeeper/33/- src/main/java/org/dataone/bookkeeper/api/Quota.java39a2c620e4dc3b0a5709b7c145961e7e1c1e50171603490061000http://jenkins-ucsb-1.dataone.org/jenkins/user/csjcsjcsj@christopherjones.coSet the Quota.name in the constructor
refs #68
2020-10-23 15:54:21 -060039a2c620e4dc3b0a5709b7c145961e7e1c1e5017Set the Quota.name in the constructoreditsrc/main/java/org/dataone/bookkeeper/api/Quota.java
- src/main/java/org/dataone/bookkeeper/jdbi/QuotaStore.java2183dff80aac2ba135e37564497f345b41b5321d1603490153000http://jenkins-ucsb-1.dataone.org/jenkins/user/csjcsjcsj@christopherjones.coSupport Quota.name in the QuotaStore interface:
Return the name property when getting or listing quotas. Set the name
property when updating quotas.
refs #68
2020-10-23 15:55:53 -06002183dff80aac2ba135e37564497f345b41b5321dSupport Quota.name in the QuotaStore interface:editsrc/main/java/org/dataone/bookkeeper/jdbi/QuotaStore.java
- src/test/java/org/dataone/bookkeeper/api/QuotaTest.java7d34d18e1fd6ee3e4c2bf22542079d3a4088d4991603490196000http://jenkins-ucsb-1.dataone.org/jenkins/user/csjcsjcsj@christopherjones.coFix the Quota model unit test:
Make sure we include the name property.
refs #68
2020-10-23 15:56:36 -06007d34d18e1fd6ee3e4c2bf22542079d3a4088d499Fix the Quota model unit test:editsrc/test/java/org/dataone/bookkeeper/api/QuotaTest.java
- src/test/java/org/dataone/bookkeeper/helpers/ProductHelper.java211d30d5953984424bb946d12b1b2e95393c36881603490411000http://jenkins-ucsb-1.dataone.org/jenkins/user/csjcsjcsj@christopherjones.coCreate quotas correctly in the ProductHelper.
refs #68
2020-10-23 16:00:11 -0600211d30d5953984424bb946d12b1b2e95393c3688Create quotas correctly in the ProductHelper.editsrc/test/java/org/dataone/bookkeeper/helpers/ProductHelper.java
- src/test/java/org/dataone/bookkeeper/api/FeatureTest.java949b26860adb29573ff3538eded801136f0660ae1603490442000http://jenkins-ucsb-1.dataone.org/jenkins/user/csjcsjcsj@christopherjones.coCreate quotas correctly in the FeatureTest.
refs #68
2020-10-23 16:00:42 -0600949b26860adb29573ff3538eded801136f0660aeCreate quotas correctly in the FeatureTest.editsrc/test/java/org/dataone/bookkeeper/api/FeatureTest.java
- src/main/java/org/dataone/bookkeeper/api/Order.javafd931416e5bebed05509866b5a3931353d9549931603490720000http://jenkins-ucsb-1.dataone.org/jenkins/user/csjcsjcsj@christopherjones.coReduce the required Order fields:
Make amount, status and seriesId optional to make creating orders
easier. This are set serverside during create().
refs #70
2020-10-23 16:05:20 -0600fd931416e5bebed05509866b5a3931353d954993Reduce the required Order fields:editsrc/main/java/org/dataone/bookkeeper/api/Order.java
- src/main/java/org/dataone/bookkeeper/jdbi/OrderStore.java946914ffaa8e7212d67f6f45acfc36afae2fab811603490871000http://jenkins-ucsb-1.dataone.org/jenkins/user/csjcsjcsj@christopherjones.coFind orders by a subject list, not a single subject:
This allows us to return orders for groups associated with the caller as
well as the caller's subject. We did this previously in the
SubscriptionStore, so we're migrating the functionality over here.
refs #70
2020-10-23 16:07:51 -0600946914ffaa8e7212d67f6f45acfc36afae2fab81Find orders by a subject list, not a single subject:editsrc/main/java/org/dataone/bookkeeper/jdbi/OrderStore.java
- src/test/java/org/dataone/bookkeeper/jdbi/OrderStoreTest.java00a656e63c555fcc613b68c686137fbfbbbeed291603490913000http://jenkins-ucsb-1.dataone.org/jenkins/user/csjcsjcsj@christopherjones.coUpdate the OrderStoreTest to pass a subject list.
refs #70
2020-10-23 16:08:33 -060000a656e63c555fcc613b68c686137fbfbbbeed29Update the OrderStoreTest to pass a subject list.editsrc/test/java/org/dataone/bookkeeper/jdbi/OrderStoreTest.java
- src/main/java/org/dataone/bookkeeper/resources/OrdersResource.javac3e9dbab3038bb17a9e21a34b74a90bce9001fca1603491262000http://jenkins-ucsb-1.dataone.org/jenkins/user/csjcsjcsj@christopherjones.coImprove calls to listOrders():
Handle admin calls separately from non-admin calls, and always list
orders for admins. When no orders exist, return 404 NotFound. For
non-admins, return orders if the caller subject equals the customer
subject - i.e. they own the order. When passing in a list of subjects,
redact orders unless the customer subject matches the caller subject. We
want to expose financial portions of the order to owners, but send back
other order details pertinent to order group members. Note that we need
to not redact when the caller subject is a group owner. This is a future
TODO.
refs #70
2020-10-23 16:14:22 -0600c3e9dbab3038bb17a9e21a34b74a90bce9001fcaImprove calls to listOrders():editsrc/main/java/org/dataone/bookkeeper/resources/OrdersResource.java
- bookkeeper.yml8f62c3e131868fe91b7f6711a410edb4376f11571603491494000http://jenkins-ucsb-1.dataone.org/jenkins/user/csjcsjcsj@christopherjones.coImprove the console logging output:
Include io.dropwizard DEGUG entries, and remove the appender json
layout. We need to discuss what format is best for Kubernetes logging.
refs #70
2020-10-23 16:18:14 -06008f62c3e131868fe91b7f6711a410edb4376f1157Improve the console logging output:editbookkeeper.yml
http://jenkins-ucsb-1.dataone.org/jenkins/user/csjcsjhttp://jenkins-ucsb-1.dataone.org/jenkins/job/bookkeeper-unstable/org.dataone$bookkeeper/33/mavenArtifacts/13.225false06400org.dataone.bookkeeper.EmbeddedPostgresqlTest0.0010testEmbeddedConnectivityfalsePASSED0org.dataone.bookkeeper.EmbeddedPostgresqlTest0.0020testSelectPresetQuotaCountfalsePASSED0org.dataone.bookkeeper.EmbeddedPostgresqlTest0.0010testSelect1GBQuotafalsePASSED0org.dataone.bookkeeper.EmbeddedPostgresqlTest0.0060testInsertCustomerfalsePASSED1.153org.dataone.bookkeeper.EmbeddedPostgresqlTest0org.dataone.bookkeeper.api.AddressTest0.0020deserializesFromJSONfalsePASSED0org.dataone.bookkeeper.api.AddressTest0.0020serializesToJSONfalsePASSED0.005org.dataone.bookkeeper.api.AddressTest0org.dataone.bookkeeper.api.CustomerTest0.0210deserializesFromJSONfalsePASSED0org.dataone.bookkeeper.api.CustomerTest0.0040serializesToJSONfalsePASSED0.029org.dataone.bookkeeper.api.CustomerTest0org.dataone.bookkeeper.api.FeatureTest0.0050deserializesFromJSONfalsePASSED0org.dataone.bookkeeper.api.FeatureTest0.0040serializesToJSONfalsePASSED0.01org.dataone.bookkeeper.api.FeatureTest0org.dataone.bookkeeper.api.OrderItemTest0.0020deserializesFromJSONfalsePASSED0org.dataone.bookkeeper.api.OrderItemTest0.0020serializesToJSONfalsePASSED0.005org.dataone.bookkeeper.api.OrderItemTest0org.dataone.bookkeeper.api.OrderTest0.1780deserializesFromJSONfalsePASSED0org.dataone.bookkeeper.api.OrderTest0.0350serializesToJSONfalsePASSED0.491org.dataone.bookkeeper.api.OrderTest0org.dataone.bookkeeper.api.ProductTest0.00deserializesFromJSONfalsePASSED0org.dataone.bookkeeper.api.ProductTest0.0090serializesToJSONfalsePASSED0.01org.dataone.bookkeeper.api.ProductTest0org.dataone.bookkeeper.api.QuotaTest0.0030deserializesFromJSONfalsePASSED0org.dataone.bookkeeper.api.QuotaTest0.0030serializesToJSONfalsePASSED0.007org.dataone.bookkeeper.api.QuotaTest0org.dataone.bookkeeper.api.UsageStatusTest0.0030deserializesFromJSONfalsePASSED0org.dataone.bookkeeper.api.UsageStatusTest0.0020serializesToJSONfalsePASSED0.006org.dataone.bookkeeper.api.UsageStatusTest0org.dataone.bookkeeper.api.UsageTest0.0010deserializesFromJSONfalsePASSED0org.dataone.bookkeeper.api.UsageTest0.0030serializesToJSONfalsePASSED0.007org.dataone.bookkeeper.api.UsageTest0org.dataone.bookkeeper.jdbi.CustomerStoreTest0.0170testGetCustomerByIdfalsePASSED0org.dataone.bookkeeper.jdbi.CustomerStoreTest0.0160testFindCustomerBySubjectfalsePASSED0org.dataone.bookkeeper.jdbi.CustomerStoreTest0.0060testListCustomersfalsePASSED0org.dataone.bookkeeper.jdbi.CustomerStoreTest0.0160testFindCustomerByEmailfalsePASSED0org.dataone.bookkeeper.jdbi.CustomerStoreTest0.020testDeletefalsePASSED0org.dataone.bookkeeper.jdbi.CustomerStoreTest0.0230testInsertfalsePASSED0org.dataone.bookkeeper.jdbi.CustomerStoreTest0.0450testUpdatefalsePASSED1.386org.dataone.bookkeeper.jdbi.CustomerStoreTest0org.dataone.bookkeeper.jdbi.OrderStoreTest0.0390testGetOrderfalsePASSED0org.dataone.bookkeeper.jdbi.OrderStoreTest0.0210testListOrdersfalsePASSED0org.dataone.bookkeeper.jdbi.OrderStoreTest0.020testFindOrdersByCustomerIdfalsePASSED0org.dataone.bookkeeper.jdbi.OrderStoreTest0.0320testFindOrdersBySubjectsfalsePASSED0org.dataone.bookkeeper.jdbi.OrderStoreTest0.0170testDeletefalsePASSED0org.dataone.bookkeeper.jdbi.OrderStoreTest0.0180testInsertfalsePASSED0org.dataone.bookkeeper.jdbi.OrderStoreTest0.030testUpdatefalsePASSED1.391org.dataone.bookkeeper.jdbi.OrderStoreTest0org.dataone.bookkeeper.jdbi.ProductStoreTest0.2830testFindProductsByNamefalsePASSED0org.dataone.bookkeeper.jdbi.ProductStoreTest0.0310testFindProductsByDescriptionfalsePASSED0org.dataone.bookkeeper.jdbi.ProductStoreTest0.0250testGetProductfalsePASSED0org.dataone.bookkeeper.jdbi.ProductStoreTest0.0340testFindProductsByActiveStatusfalsePASSED0org.dataone.bookkeeper.jdbi.ProductStoreTest0.0430testListProductsfalsePASSED0org.dataone.bookkeeper.jdbi.ProductStoreTest0.010testDeletefalsePASSED0org.dataone.bookkeeper.jdbi.ProductStoreTest0.010testInsertfalsePASSED0org.dataone.bookkeeper.jdbi.ProductStoreTest0.0220testUpdatefalsePASSED5.261org.dataone.bookkeeper.jdbi.ProductStoreTest0org.dataone.bookkeeper.jdbi.QuotaStoreTest0.1310testListQuotasByNameAndSubjectsfalsePASSED0org.dataone.bookkeeper.jdbi.QuotaStoreTest0.0030testGetQuotafalsePASSED0org.dataone.bookkeeper.jdbi.QuotaStoreTest0.0450testGetQuotasByMemberIdfalsePASSED0org.dataone.bookkeeper.jdbi.QuotaStoreTest0.1210testGetQuotasBySubjectfalsePASSED0org.dataone.bookkeeper.jdbi.QuotaStoreTest0.0050testInsertWithQuotafalsePASSED0org.dataone.bookkeeper.jdbi.QuotaStoreTest0.0030testListQuotasfalsePASSED0org.dataone.bookkeeper.jdbi.QuotaStoreTest0.1190testDeletefalsePASSED0org.dataone.bookkeeper.jdbi.QuotaStoreTest0.0530testUpdatefalsePASSED0org.dataone.bookkeeper.jdbi.QuotaStoreTest0.0560testListQuotasBySubjectsfalsePASSED1.753org.dataone.bookkeeper.jdbi.QuotaStoreTest0org.dataone.bookkeeper.jdbi.UsageStoreTest0.1310testFindUsagesByQuotaSubjectsfalsePASSED0org.dataone.bookkeeper.jdbi.UsageStoreTest0.0220testGetQuotafalsePASSED0org.dataone.bookkeeper.jdbi.UsageStoreTest0.0320testInsertWithUsagefalsePASSED0org.dataone.bookkeeper.jdbi.UsageStoreTest0.0390testInsertDuplicateUsagesfalsePASSED0org.dataone.bookkeeper.jdbi.UsageStoreTest0.0320testFindUsagesByQuotaTypefalsePASSED0org.dataone.bookkeeper.jdbi.UsageStoreTest0.0190testFindUsagesByInstanceIdAndSubjectsfalsePASSED0org.dataone.bookkeeper.jdbi.UsageStoreTest0.0020testListUsagesfalsePASSED0org.dataone.bookkeeper.jdbi.UsageStoreTest0.0170testFindUsagesByInstanceIdfalsePASSED0org.dataone.bookkeeper.jdbi.UsageStoreTest0.0440testDeletefalsePASSED0org.dataone.bookkeeper.jdbi.UsageStoreTest0.0290testFindUsagesByQuotaTypeAndSubjectsfalsePASSED0org.dataone.bookkeeper.jdbi.UsageStoreTest0.0410testUpdatefalsePASSED1.711org.dataone.bookkeeper.jdbi.UsageStoreTest