Started by an SCM changerepository_urlfile:///var/www/maven32471a7e468df9df87874e22d303a7dd5eaeb36620471a7e468df9df87874e22d303a7dd5eaeb36620origin/master471a7e468df9df87874e22d303a7dd5eaeb36620471a7e468df9df87874e22d303a7dd5eaeb36620origin/master8d7d0cf5116bc3e5a7f9bd418e64e5a5707b31648d7d0cf5116bc3e5a7f9bd418e64e5a5707b31648origin/feature-client-jard7d0cf5116bc3e5a7f9bd418e64e5a5707b31648d7d0cf5116bc3e5a7f9bd418e64e5a5707b31648origin/feature-client-jar34f65b708fd7b7c0c032bfbcde94c577d4a260a234f65b708fd7b7c0c032bfbcde94c577d4a260a23refs/remotes/origin/master4f65b708fd7b7c0c032bfbcde94c577d4a260a234f65b708fd7b7c0c032bfbcde94c577d4a260a23refs/remotes/origin/master471a7e468df9df87874e22d303a7dd5eaeb36620471a7e468df9df87874e22d303a7dd5eaeb36620origin/masterhttps://github.com/dataoneorg/bookkeeper0064testReport32http://jenkins-ucsb-1.dataone.org/jenkins/user/tommythelen/my-views/view/all/job/bookkeeper-unstable/org.dataone$bookkeeper/32/18.223999false06400org.dataone.bookkeeper.EmbeddedPostgresqlTest0.0020testEmbeddedConnectivityfalsePASSED0org.dataone.bookkeeper.EmbeddedPostgresqlTest0.0010testSelectPresetQuotaCountfalsePASSED0org.dataone.bookkeeper.EmbeddedPostgresqlTest0.0010testSelect1GBQuotafalsePASSED0org.dataone.bookkeeper.EmbeddedPostgresqlTest0.0080testInsertCustomerfalsePASSED2.226org.dataone.bookkeeper.EmbeddedPostgresqlTest0org.dataone.bookkeeper.api.AddressTest0.0020deserializesFromJSONfalsePASSED0org.dataone.bookkeeper.api.AddressTest0.0020serializesToJSONfalsePASSED0.005org.dataone.bookkeeper.api.AddressTest0org.dataone.bookkeeper.api.CustomerTest0.0220deserializesFromJSONfalsePASSED0org.dataone.bookkeeper.api.CustomerTest0.0050serializesToJSONfalsePASSED0.029org.dataone.bookkeeper.api.CustomerTest0org.dataone.bookkeeper.api.FeatureTest0.0040deserializesFromJSONfalsePASSED0org.dataone.bookkeeper.api.FeatureTest0.0040serializesToJSONfalsePASSED0.008org.dataone.bookkeeper.api.FeatureTest0org.dataone.bookkeeper.api.OrderItemTest0.0030deserializesFromJSONfalsePASSED0org.dataone.bookkeeper.api.OrderItemTest0.0010serializesToJSONfalsePASSED0.005org.dataone.bookkeeper.api.OrderItemTest0org.dataone.bookkeeper.api.OrderTest0.2020deserializesFromJSONfalsePASSED0org.dataone.bookkeeper.api.OrderTest0.0430serializesToJSONfalsePASSED0.549org.dataone.bookkeeper.api.OrderTest0org.dataone.bookkeeper.api.ProductTest0.0140deserializesFromJSONfalsePASSED0org.dataone.bookkeeper.api.ProductTest0.0130serializesToJSONfalsePASSED0.028org.dataone.bookkeeper.api.ProductTest0org.dataone.bookkeeper.api.QuotaTest0.0030deserializesFromJSONfalsePASSED0org.dataone.bookkeeper.api.QuotaTest0.0020serializesToJSONfalsePASSED0.006org.dataone.bookkeeper.api.QuotaTest0org.dataone.bookkeeper.api.UsageStatusTest0.0020deserializesFromJSONfalsePASSED0org.dataone.bookkeeper.api.UsageStatusTest0.0010serializesToJSONfalsePASSED0.005org.dataone.bookkeeper.api.UsageStatusTest0org.dataone.bookkeeper.api.UsageTest0.0040deserializesFromJSONfalsePASSED0org.dataone.bookkeeper.api.UsageTest0.0030serializesToJSONfalsePASSED0.007org.dataone.bookkeeper.api.UsageTest0org.dataone.bookkeeper.jdbi.CustomerStoreTest0.0210testGetCustomerByIdfalsePASSED0org.dataone.bookkeeper.jdbi.CustomerStoreTest0.0180testFindCustomerBySubjectfalsePASSED0org.dataone.bookkeeper.jdbi.CustomerStoreTest0.0060testListCustomersfalsePASSED0org.dataone.bookkeeper.jdbi.CustomerStoreTest0.0220testFindCustomerByEmailfalsePASSED0org.dataone.bookkeeper.jdbi.CustomerStoreTest0.0160testDeletefalsePASSED0org.dataone.bookkeeper.jdbi.CustomerStoreTest0.0390testInsertfalsePASSED0org.dataone.bookkeeper.jdbi.CustomerStoreTest0.840testUpdatefalsePASSED2.379org.dataone.bookkeeper.jdbi.CustomerStoreTest0org.dataone.bookkeeper.jdbi.OrderStoreTest0.0370testGetOrderfalsePASSED0org.dataone.bookkeeper.jdbi.OrderStoreTest0.0340testFindOrdersBySubjectfalsePASSED0org.dataone.bookkeeper.jdbi.OrderStoreTest0.0210testListOrdersfalsePASSED0org.dataone.bookkeeper.jdbi.OrderStoreTest0.0210testFindOrdersByCustomerIdfalsePASSED0org.dataone.bookkeeper.jdbi.OrderStoreTest0.0170testDeletefalsePASSED0org.dataone.bookkeeper.jdbi.OrderStoreTest0.0180testInsertfalsePASSED0org.dataone.bookkeeper.jdbi.OrderStoreTest0.0480testUpdatefalsePASSED2.32org.dataone.bookkeeper.jdbi.OrderStoreTest0org.dataone.bookkeeper.jdbi.ProductStoreTest0.280testFindProductsByNamefalsePASSED0org.dataone.bookkeeper.jdbi.ProductStoreTest0.0310testFindProductsByDescriptionfalsePASSED0org.dataone.bookkeeper.jdbi.ProductStoreTest0.0250testGetProductfalsePASSED0org.dataone.bookkeeper.jdbi.ProductStoreTest0.0360testFindProductsByActiveStatusfalsePASSED0org.dataone.bookkeeper.jdbi.ProductStoreTest0.0540testListProductsfalsePASSED0org.dataone.bookkeeper.jdbi.ProductStoreTest0.0120testDeletefalsePASSED0org.dataone.bookkeeper.jdbi.ProductStoreTest0.0120testInsertfalsePASSED0org.dataone.bookkeeper.jdbi.ProductStoreTest0.0240testUpdatefalsePASSED6.121org.dataone.bookkeeper.jdbi.ProductStoreTest0org.dataone.bookkeeper.jdbi.QuotaStoreTest0.1520testListQuotasByNameAndSubjectsfalsePASSED0org.dataone.bookkeeper.jdbi.QuotaStoreTest0.0040testGetQuotafalsePASSED0org.dataone.bookkeeper.jdbi.QuotaStoreTest0.0410testGetQuotasByMemberIdfalsePASSED0org.dataone.bookkeeper.jdbi.QuotaStoreTest0.620testGetQuotasBySubjectfalsePASSED0org.dataone.bookkeeper.jdbi.QuotaStoreTest0.0070testInsertWithQuotafalsePASSED0org.dataone.bookkeeper.jdbi.QuotaStoreTest0.0040testListQuotasfalsePASSED0org.dataone.bookkeeper.jdbi.QuotaStoreTest0.090testDeletefalsePASSED0org.dataone.bookkeeper.jdbi.QuotaStoreTest0.0570testUpdatefalsePASSED0org.dataone.bookkeeper.jdbi.QuotaStoreTest0.060testListQuotasBySubjectsfalsePASSED2.546org.dataone.bookkeeper.jdbi.QuotaStoreTest0org.dataone.bookkeeper.jdbi.UsageStoreTest0.1120testFindUsagesByQuotaSubjectsfalsePASSED0org.dataone.bookkeeper.jdbi.UsageStoreTest0.0230testGetQuotafalsePASSED0org.dataone.bookkeeper.jdbi.UsageStoreTest0.0350testInsertWithUsagefalsePASSED0org.dataone.bookkeeper.jdbi.UsageStoreTest0.0450testInsertDuplicateUsagesfalsePASSED0org.dataone.bookkeeper.jdbi.UsageStoreTest0.0330testFindUsagesByQuotaTypefalsePASSED0org.dataone.bookkeeper.jdbi.UsageStoreTest0.0180testFindUsagesByInstanceIdAndSubjectsfalsePASSED0org.dataone.bookkeeper.jdbi.UsageStoreTest0.0010testListUsagesfalsePASSED0org.dataone.bookkeeper.jdbi.UsageStoreTest0.0180testFindUsagesByInstanceIdfalsePASSED0org.dataone.bookkeeper.jdbi.UsageStoreTest0.0460testDeletefalsePASSED0org.dataone.bookkeeper.jdbi.UsageStoreTest0.0320testFindUsagesByQuotaTypeAndSubjectsfalsePASSED0org.dataone.bookkeeper.jdbi.UsageStoreTest0.0450testUpdatefalsePASSED1.99org.dataone.bookkeeper.jdbi.UsageStoreTestbookkeeperbookkeeper-0.1.0-SNAPSHOT.jarbookkeeper-0.1.0-SNAPSHOT.jarorg.dataone9e78699423dca211c541a7ab80c3b3b4jar0.1.0-SNAPSHOT32http://jenkins-ucsb-1.dataone.org/jenkins/user/tommythelen/my-views/view/all/job/bookkeeper-unstable/org.dataone$bookkeeper/32/bookkeeperbookkeeper-0.1.0-SNAPSHOT.pomdependency-reduced-pom.xmlorg.dataone7f6d0d7a24e410f2dd21a785174ca406pom0.1.0-SNAPSHOThttp://jenkins-ucsb-1.dataone.org/jenkins/user/tommythelen/my-views/view/all/job/bookkeeper-unstable/org.dataone$bookkeeper/32/mavenArtifacts/http://jenkins-ucsb-1.dataone.org/jenkins/user/tommythelen/my-views/view/all/job/bookkeeper-unstable/32/artifacthttp://jenkins-ucsb-1.dataone.org/jenkins/user/tommythelen/my-views/view/all/job/bookkeeper-unstable/changeshttp://jenkins-ucsb-1.dataone.org/jenkins/user/tommythelen/my-views/view/all/job/bookkeeper-unstable/32/http://jenkins-ucsb-1.dataone.org/jenkins/user/tommythelen/my-views/view/all/job/bookkeeper-unstable/32/testReportfalse#324903042940bookkeeper-unstable #3232false322101SUCCESS1602097730929http://jenkins-ucsb-1.dataone.org/jenkins/user/tommythelen/my-views/view/all/job/bookkeeper-unstable/32/- src/main/java/org/dataone/bookkeeper/api/Quota.javad4090b8cf1fd256f270dadf5aa1bfd932648b7931601924969000http://jenkins-ucsb-1.dataone.org/jenkins/user/csjcsjcsj@christopherjones.coChange the Quota model: add a name property:
Associates a quota with an order for easier recognition.
refs https://github.com/DataONEorg/bookkeeper/issues/65
2020-10-05 13:09:29 -0600d4090b8cf1fd256f270dadf5aa1bfd932648b793Change the Quota model: add a name property:editsrc/main/java/org/dataone/bookkeeper/api/Quota.java
- src/main/java/org/dataone/bookkeeper/jdbi/MembershipStore.javasrc/main/resources/db/migrations/V1.1__Create_Quotas_Table.sqlsrc/main/java/org/dataone/bookkeeper/jdbi/UsageStore.javasrc/main/java/org/dataone/bookkeeper/resources/MembershipsResource.javasrc/test/java/org/dataone/bookkeeper/helpers/QuotaHelper.javasrc/test/java/org/dataone/bookkeeper/jdbi/QuotaStoreTest.javasrc/test/java/org/dataone/bookkeeper/helpers/ProductHelper.javasrc/main/java/org/dataone/bookkeeper/resources/UsagesResource.javasrc/main/java/org/dataone/bookkeeper/jdbi/QuotaStore.javasrc/test/java/org/dataone/bookkeeper/jdbi/UsageStoreTest.javasrc/main/java/org/dataone/bookkeeper/api/Quota.javasrc/main/java/org/dataone/bookkeeper/resources/QuotasResource.javasrc/main/resources/db/migrations/V1.2__Insert_Standard_Quotas.sqlsrc/main/java/org/dataone/bookkeeper/api/OrderItem.javasrc/main/java/org/dataone/bookkeeper/resources/OrdersResource.javasrc/test/java/org/dataone/bookkeeper/helpers/MembershipHelper.javasrc/test/java/org/dataone/bookkeeper/jdbi/MembershipStoreTest.java24749f01f9925e3e205e8c622150405858ae02621601926173000http://jenkins-ucsb-1.dataone.org/jenkins/user/csjcsjcsj@christopherjones.coChange the Quota.owner to Quota.subject:
Rename it back given it is the most appropriate name. It get's copied
from Order.subject now, which can be a user or group.
refs https://github.com/DataONEorg/bookkeeper/issues/65
2020-10-05 13:29:33 -060024749f01f9925e3e205e8c622150405858ae0262Change the Quota.owner to Quota.subject:editsrc/test/java/org/dataone/bookkeeper/jdbi/QuotaStoreTest.javaeditsrc/test/java/org/dataone/bookkeeper/helpers/MembershipHelper.javaeditsrc/main/java/org/dataone/bookkeeper/resources/UsagesResource.javaeditsrc/main/java/org/dataone/bookkeeper/jdbi/QuotaStore.javaeditsrc/test/java/org/dataone/bookkeeper/helpers/ProductHelper.javaeditsrc/main/java/org/dataone/bookkeeper/jdbi/MembershipStore.javaeditsrc/main/resources/db/migrations/V1.1__Create_Quotas_Table.sqleditsrc/main/java/org/dataone/bookkeeper/jdbi/UsageStore.javaeditsrc/main/java/org/dataone/bookkeeper/api/OrderItem.javaeditsrc/main/java/org/dataone/bookkeeper/resources/MembershipsResource.javaeditsrc/test/java/org/dataone/bookkeeper/jdbi/UsageStoreTest.javaeditsrc/main/java/org/dataone/bookkeeper/resources/OrdersResource.javaeditsrc/main/java/org/dataone/bookkeeper/resources/QuotasResource.javaeditsrc/main/java/org/dataone/bookkeeper/api/Quota.javaeditsrc/test/java/org/dataone/bookkeeper/jdbi/MembershipStoreTest.javaeditsrc/test/java/org/dataone/bookkeeper/helpers/QuotaHelper.javaeditsrc/main/resources/db/migrations/V1.2__Insert_Standard_Quotas.sql
- src/main/resources/db/migrations/V1.9__Alter_Memberships_Add_Product_FK.sqlsrc/main/resources/db/migrations/V1.6__Insert_Standard_Products.sqlsrc/main/resources/db/migrations/V1.4__Create_Customers_Table.sqlsrc/main/resources/db/migrations/V1.9__Create_Usages_Table.sqlsrc/main/resources/db/migrations/V1.3__Create_Memberships_Table.sqlsrc/main/resources/db/migrations/V1.15__Alter_Quotas_Add_Unique_Constraint_MembershipId_QuotaType.sqlsrc/main/resources/db/migrations/V1.4__Alter_Quotas_Add_Membership_FK.sqlsrc/main/resources/db/migrations/V1.13__Create_Function_Update_Quota_Table_Usage.sqlsrc/main/resources/db/migrations/V1.11__Alter_Usages_Add_Unique_Constraint.sqlsrc/main/resources/db/migrations/V1.3__Alter_Quotas_Add_Order_FK.sqlsrc/main/resources/db/migrations/V1.5__Create_Products_Table.sqlsrc/main/resources/db/migrations/V1.12__Create_Usages_Table.sqlsrc/main/resources/db/migrations/V1.1__Create_Quotas_Table.sqlsrc/main/resources/db/migrations/V1.12__Alter_Quotas_Add_Unique_Constraint_OrderId_QuotaType.sqlsrc/main/resources/db/migrations/V1.14__Alter_Usages_Add_Unique_Constraint.sqlsrc/main/resources/db/migrations/V1.6__Alter_Memberships_Add_Customer_FK.sqlsrc/main/resources/db/migrations/V1.2__Insert_Standard_Quotas.sqlsrc/main/resources/db/migrations/V1.8__Alter_Orders_Add_Customer_FK.sqlsrc/main/resources/db/migrations/V1.11__Alter_Orders_Add_Customer_FK.sqlsrc/main/resources/db/migrations/V1.8__Insert_Standard_Products.sqlsrc/main/resources/db/migrations/V1.5__Create_Customers_Table.sqlsrc/main/resources/db/migrations/V1.10__Create_Orders_Table.sqlsrc/main/resources/db/migrations/V1.10__Create_Function_Update_Quota_Table_Usage.sqlsrc/main/resources/db/migrations/V1.7__Create_Products_Table.sqlsrc/main/resources/db/migrations/V1.7__Create_Orders_Table.sqlae015f578b4493ba7d0760f4977593ae2e7cefb61601945016000http://jenkins-ucsb-1.dataone.org/jenkins/user/csjcsjcsj@christopherjones.coRefactor SQL scripts to update orders schema:
As we use orders to represent subscriptions/memberships, delete the
memberships SQL scripts, and add appropriate attributes to the quotas
and orders tables. Renumber the scripts for flyway migrations.
refs https://github.com/DataONEorg/bookkeeper/issues/65
2020-10-05 18:43:36 -0600ae015f578b4493ba7d0760f4977593ae2e7cefb6Refactor SQL scripts to update orders schema:deletesrc/main/resources/db/migrations/V1.15__Alter_Quotas_Add_Unique_Constraint_MembershipId_QuotaType.sqleditsrc/main/resources/db/migrations/V1.1__Create_Quotas_Table.sqldeletesrc/main/resources/db/migrations/V1.14__Alter_Usages_Add_Unique_Constraint.sqldeletesrc/main/resources/db/migrations/V1.7__Create_Products_Table.sqladdsrc/main/resources/db/migrations/V1.6__Insert_Standard_Products.sqleditsrc/main/resources/db/migrations/V1.2__Insert_Standard_Quotas.sqldeletesrc/main/resources/db/migrations/V1.6__Alter_Memberships_Add_Customer_FK.sqladdsrc/main/resources/db/migrations/V1.12__Alter_Quotas_Add_Unique_Constraint_OrderId_QuotaType.sqldeletesrc/main/resources/db/migrations/V1.5__Create_Customers_Table.sqladdsrc/main/resources/db/migrations/V1.7__Create_Orders_Table.sqldeletesrc/main/resources/db/migrations/V1.8__Insert_Standard_Products.sqladdsrc/main/resources/db/migrations/V1.3__Alter_Quotas_Add_Order_FK.sqldeletesrc/main/resources/db/migrations/V1.13__Create_Function_Update_Quota_Table_Usage.sqldeletesrc/main/resources/db/migrations/V1.3__Create_Memberships_Table.sqldeletesrc/main/resources/db/migrations/V1.9__Alter_Memberships_Add_Product_FK.sqldeletesrc/main/resources/db/migrations/V1.12__Create_Usages_Table.sqladdsrc/main/resources/db/migrations/V1.11__Alter_Usages_Add_Unique_Constraint.sqldeletesrc/main/resources/db/migrations/V1.10__Create_Orders_Table.sqladdsrc/main/resources/db/migrations/V1.10__Create_Function_Update_Quota_Table_Usage.sqladdsrc/main/resources/db/migrations/V1.4__Create_Customers_Table.sqladdsrc/main/resources/db/migrations/V1.8__Alter_Orders_Add_Customer_FK.sqladdsrc/main/resources/db/migrations/V1.9__Create_Usages_Table.sqladdsrc/main/resources/db/migrations/V1.5__Create_Products_Table.sqldeletesrc/main/resources/db/migrations/V1.11__Alter_Orders_Add_Customer_FK.sqldeletesrc/main/resources/db/migrations/V1.4__Alter_Quotas_Add_Membership_FK.sql
- README.rst1ac1d13344ac9279ee3cab7244acd6825d1909c21601945411000http://jenkins-ucsb-1.dataone.org/jenkins/user/csjcsjcsj@christopherjones.coChange membershipId to orderId in the Readme example.
refs https://github.com/DataONEorg/bookkeeper/issues/65
2020-10-05 18:50:11 -06001ac1d13344ac9279ee3cab7244acd6825d1909c2Change membershipId to orderId in the Readme example.editREADME.rst
- src/main/resources/db/migrations/V1.6__Insert_Standard_Products.sqlsrc/main/resources/db/migrations/V1.4__Create_Customers_Table.sqlsrc/main/resources/db/migrations/V1.3__Alter_Quotas_Add_Order_FK.sqlsrc/main/resources/db/migrations/V1.5__Insert_Standard_Products.sqlsrc/main/resources/db/migrations/V1.6__Create_Orders_Table.sqlsrc/main/resources/db/migrations/V1.5__Create_Products_Table.sqlsrc/main/resources/db/migrations/V1.4__Create_Products_Table.sqlsrc/main/resources/db/migrations/V1.7__Create_Orders_Table.sqlsrc/main/resources/db/migrations/V1.3__Create_Customers_Table.sqlsrc/main/resources/db/migrations/V1.7__Alter_Quotas_Add_Order_FK.sqlcfc9e49ca31e3f3be59febb199fd19bef4e111901602000081000http://jenkins-ucsb-1.dataone.org/jenkins/user/csjcsjcsj@christopherjones.coReorder SQL schema migrations to handle orders change.
refs https://github.com/DataONEorg/bookkeeper/issues/65
2020-10-06 10:01:21 -0600cfc9e49ca31e3f3be59febb199fd19bef4e11190Reorder SQL schema migrations to handle orders change.addsrc/main/resources/db/migrations/V1.7__Alter_Quotas_Add_Order_FK.sqldeletesrc/main/resources/db/migrations/V1.4__Create_Customers_Table.sqldeletesrc/main/resources/db/migrations/V1.5__Create_Products_Table.sqladdsrc/main/resources/db/migrations/V1.4__Create_Products_Table.sqldeletesrc/main/resources/db/migrations/V1.6__Insert_Standard_Products.sqldeletesrc/main/resources/db/migrations/V1.3__Alter_Quotas_Add_Order_FK.sqladdsrc/main/resources/db/migrations/V1.5__Insert_Standard_Products.sqladdsrc/main/resources/db/migrations/V1.3__Create_Customers_Table.sqldeletesrc/main/resources/db/migrations/V1.7__Create_Orders_Table.sqladdsrc/main/resources/db/migrations/V1.6__Create_Orders_Table.sql
- src/main/resources/db/migrations/V1.6__Create_Orders_Table.sql25d247ec4f1e2606f23c541b1742e2eb3c31c72a1602000216000http://jenkins-ucsb-1.dataone.org/jenkins/user/csjcsjcsj@christopherjones.coFix minor index bug.
refs https://github.com/DataONEorg/bookkeeper/issues/65
2020-10-06 10:03:36 -060025d247ec4f1e2606f23c541b1742e2eb3c31c72aFix minor index bug.editsrc/main/resources/db/migrations/V1.6__Create_Orders_Table.sql
- src/main/java/org/dataone/bookkeeper/api/Order.javab50d41e4975ae08833c2fbb54cc554bb9c55dffc1602008131000http://jenkins-ucsb-1.dataone.org/jenkins/user/csjcsjcsj@christopherjones.coMerge in Subscription fields:
Add the subject, name, seriesId, startDate, and endDate fields to the
Order model in lieu of a subscription. Update the status enum to merge
in Subscription status values. Add getters and setters for new fields,
and update the equals() and hashcode() methods. Add JsonProperty
annotations on methods as needed.
refs https://github.com/DataONEorg/bookkeeper/issues/65
2020-10-06 12:15:31 -0600b50d41e4975ae08833c2fbb54cc554bb9c55dffcMerge in Subscription fields:editsrc/main/java/org/dataone/bookkeeper/api/Order.java
- src/main/java/org/dataone/bookkeeper/api/Quota.java4bd29a63b747decf044bb0abf55d2721a33720181602008267000http://jenkins-ucsb-1.dataone.org/jenkins/user/csjcsjcsj@christopherjones.coMigrate quota subscriptions to orders:
Change the subscriptionId property to orderId, and update the getter and
setter methods accordingly.
refs https://github.com/DataONEorg/bookkeeper/issues/65
2020-10-06 12:17:47 -06004bd29a63b747decf044bb0abf55d2721a3372018Migrate quota subscriptions to orders:editsrc/main/java/org/dataone/bookkeeper/api/Quota.java
- src/main/java/org/dataone/bookkeeper/jdbi/mappers/MembershipMapper.javasrc/main/java/org/dataone/bookkeeper/jdbi/mappers/OrderMapper.java521b2dca2a76f2b6d92c57b51109d3c64cda935d1602008460000http://jenkins-ucsb-1.dataone.org/jenkins/user/csjcsjcsj@christopherjones.coMigrate the MembershipMapper to an orderMapper:
Map Order objects correctly, adding support for the subject, name,
seriesId, startDate, endDate, and quotas fields.
refs https://github.com/DataONEorg/bookkeeper/issues/65
2020-10-06 12:21:00 -0600521b2dca2a76f2b6d92c57b51109d3c64cda935dMigrate the MembershipMapper to an orderMapper:editsrc/main/java/org/dataone/bookkeeper/jdbi/mappers/OrderMapper.javadeletesrc/main/java/org/dataone/bookkeeper/jdbi/mappers/MembershipMapper.java
- src/main/java/org/dataone/bookkeeper/api/Quota.java72bddaae625d248ce493769a086d0884e62f541f1602092278000http://jenkins-ucsb-1.dataone.org/jenkins/user/csjcsjcsj@christopherjones.coDon't initialize totalUsage to 0.0.
refs https://github.com/DataONEorg/bookkeeper/issues/65
2020-10-07 11:37:58 -060072bddaae625d248ce493769a086d0884e62f541fDon't initialize totalUsage to 0.0.editsrc/main/java/org/dataone/bookkeeper/api/Quota.java
- src/test/java/org/dataone/bookkeeper/EmbeddedPostgresqlTest.java1a618dce08b0607413d1ebc8d269f2499285467c1602092345000http://jenkins-ucsb-1.dataone.org/jenkins/user/csjcsjcsj@christopherjones.coFix a typo with Quota.membershipId, now orderId.
refs https://github.com/DataONEorg/bookkeeper/issues/65
2020-10-07 11:39:05 -06001a618dce08b0607413d1ebc8d269f2499285467cFix a typo with Quota.membershipId, now orderId.editsrc/test/java/org/dataone/bookkeeper/EmbeddedPostgresqlTest.java
- src/test/resources/fixtures/order.json3f20099665047114f31ae6d777e34c613516f34e1602092376000http://jenkins-ucsb-1.dataone.org/jenkins/user/csjcsjcsj@christopherjones.coUpdate the order fixture to include new properties.
refs https://github.com/DataONEorg/bookkeeper/issues/65
2020-10-07 11:39:36 -06003f20099665047114f31ae6d777e34c613516f34eUpdate the order fixture to include new properties.editsrc/test/resources/fixtures/order.json
- README.rstb4246716b0357e3e75bc2c2c431898af87cede6b1602092411000http://jenkins-ucsb-1.dataone.org/jenkins/user/csjcsjcsj@christopherjones.coRemove memberships from the README.
refs https://github.com/DataONEorg/bookkeeper/issues/65
2020-10-07 11:40:11 -0600b4246716b0357e3e75bc2c2c431898af87cede6bRemove memberships from the README.editREADME.rst
- src/main/java/org/dataone/bookkeeper/jdbi/QuotaStore.javae7522971035edd9ee6cc1c863acef29790a7c7ee1602092546000http://jenkins-ucsb-1.dataone.org/jenkins/user/csjcsjcsj@christopherjones.coMigrate the QuotaStore from using membershipId to orderId.
refs https://github.com/DataONEorg/bookkeeper/issues/65
2020-10-07 11:42:26 -0600e7522971035edd9ee6cc1c863acef29790a7c7eeMigrate the QuotaStore from using membershipId to orderId.editsrc/main/java/org/dataone/bookkeeper/jdbi/QuotaStore.java
- src/main/java/org/dataone/bookkeeper/jdbi/OrderStore.java5b9c97b28c0832bc7653a1ea4d465f2f802b48061602092840000http://jenkins-ucsb-1.dataone.org/jenkins/user/csjcsjcsj@christopherjones.coMigrate the OrderStore to accommodate quotas:
Now that orders also represent a paid subscription, update the SQL
SELECT statement to return quotas associated with a given order (if any,
i.e. LEFT JOIN). In the interface SELECT methods, use the OrderMapper
and the OrderQuotasReducer to populate the returned JSON object with an
embedded quota list. For the INSERT and UPDATE operations, add the new
properties that are now part of an order.
refs https://github.com/DataONEorg/bookkeeper/issues/65
2020-10-07 11:47:20 -06005b9c97b28c0832bc7653a1ea4d465f2f802b4806Migrate the OrderStore to accommodate quotas:editsrc/main/java/org/dataone/bookkeeper/jdbi/OrderStore.java
- src/main/java/org/dataone/bookkeeper/jdbi/MembershipQuotasReducer.javasrc/main/java/org/dataone/bookkeeper/jdbi/OrderQuotasReducer.java032b38c26fbd46329838626c9e24ef961b9334cd1602093447000http://jenkins-ucsb-1.dataone.org/jenkins/user/csjcsjcsj@christopherjones.coMigrate the MembershipQuotasReducer to an OrderQuotasReducer:
Change the reducer to produce an Order with a list of quotas if quotas
are present in the result set. Otherwise, return a plain Order object.
refs https://github.com/DataONEorg/bookkeeper/issues/65
2020-10-07 11:57:27 -0600032b38c26fbd46329838626c9e24ef961b9334cdMigrate the MembershipQuotasReducer to an OrderQuotasReducer:addsrc/main/java/org/dataone/bookkeeper/jdbi/OrderQuotasReducer.javadeletesrc/main/java/org/dataone/bookkeeper/jdbi/MembershipQuotasReducer.java
- src/main/java/org/dataone/bookkeeper/jdbi/mappers/OrderMapper.javaa1c95fc02a62edbc19371a4c7ea5f89ea0d6a6e71602093643000http://jenkins-ucsb-1.dataone.org/jenkins/user/csjcsjcsj@christopherjones.coUpdate the OrderMapper to accommodate new properties:
Since the result set may include joined quotas, use table prefixes to
identify columns, and add in the new Order properties to the mapper.
refs https://github.com/DataONEorg/bookkeeper/issues/65
2020-10-07 12:00:43 -0600a1c95fc02a62edbc19371a4c7ea5f89ea0d6a6e7Update the OrderMapper to accommodate new properties:editsrc/main/java/org/dataone/bookkeeper/jdbi/mappers/OrderMapper.java
- src/main/java/org/dataone/bookkeeper/resources/CustomersResource.javasrc/test/java/org/dataone/bookkeeper/helpers/CustomerHelper.java47041ff90851118cca999a7d361d74a6996e747a1602093884000http://jenkins-ucsb-1.dataone.org/jenkins/user/csjcsjcsj@christopherjones.coMinor formatting changes.
refs https://github.com/DataONEorg/bookkeeper/issues/65
2020-10-07 12:04:44 -060047041ff90851118cca999a7d361d74a6996e747aMinor formatting changes.editsrc/main/java/org/dataone/bookkeeper/resources/CustomersResource.javaeditsrc/test/java/org/dataone/bookkeeper/helpers/CustomerHelper.java
- src/test/java/org/dataone/bookkeeper/helpers/QuotaHelper.java256e4f83d2579ab1e6b49cf31c52a149d3e443fa1602094690000http://jenkins-ucsb-1.dataone.org/jenkins/user/csjcsjcsj@christopherjones.coMigrate the QuotaHelper to use create Orders:
Insert test quotas with order identifiers rather than membership
identifiers, and rename methods to use Orders. Add javadoc. Improve
formatting.
refs https://github.com/DataONEorg/bookkeeper/issues/65
2020-10-07 12:18:10 -0600256e4f83d2579ab1e6b49cf31c52a149d3e443faMigrate the QuotaHelper to use create Orders:editsrc/test/java/org/dataone/bookkeeper/helpers/QuotaHelper.java
- src/test/java/org/dataone/bookkeeper/helpers/OrderHelper.javab3fef6fa92b83db0de898b57452a2251188048111602095120000http://jenkins-ucsb-1.dataone.org/jenkins/user/csjcsjcsj@christopherjones.coUpdate the OrderHelper to handle new order details:
Migrate the test methods to select, insert, update, and delete orders
with new properties. Update SELECTs to optionally join quotas into the
orders. Add Javadoc. Improve formatting.
refs https://github.com/DataONEorg/bookkeeper/issues/65
2020-10-07 12:25:20 -0600b3fef6fa92b83db0de898b57452a225118804811Update the OrderHelper to handle new order details:editsrc/test/java/org/dataone/bookkeeper/helpers/OrderHelper.java
- src/main/java/org/dataone/bookkeeper/resources/OrdersResource.javafc4d0a2fea5f7ceea7b4bcbf675b716e618a4ff91602096095000http://jenkins-ucsb-1.dataone.org/jenkins/user/csjcsjcsj@christopherjones.coChange the orders resource to insert quotas with new properties:
Remove membership insertions. Also set the trialing status and
transitions.
refs https://github.com/DataONEorg/bookkeeper/issues/65
2020-10-07 12:41:35 -0600fc4d0a2fea5f7ceea7b4bcbf675b716e618a4ff9Change the orders resource to insert quotas with new properties:editsrc/main/java/org/dataone/bookkeeper/resources/OrdersResource.java
- src/main/java/org/dataone/bookkeeper/resources/QuotasResource.java91bda569d53b715a7dc495ae72db3109ee9d4c6e1602096219000http://jenkins-ucsb-1.dataone.org/jenkins/user/csjcsjcsj@christopherjones.coMinor Javadoc update.
refs https://github.com/DataONEorg/bookkeeper/issues/65
2020-10-07 12:43:39 -060091bda569d53b715a7dc495ae72db3109ee9d4c6eMinor Javadoc update.editsrc/main/java/org/dataone/bookkeeper/resources/QuotasResource.java
- src/main/java/org/dataone/bookkeeper/Bookkeeper.javadad47f6e4a5b5ae93911bb0712be955748850c3c1602096276000http://jenkins-ucsb-1.dataone.org/jenkins/user/csjcsjcsj@christopherjones.coRemove the call to register the MembershipResource.
refs https://github.com/DataONEorg/bookkeeper/issues/65
2020-10-07 12:44:36 -0600dad47f6e4a5b5ae93911bb0712be955748850c3cRemove the call to register the MembershipResource.editsrc/main/java/org/dataone/bookkeeper/Bookkeeper.java
- src/main/java/org/dataone/bookkeeper/jdbi/MembershipStore.javasrc/test/java/org/dataone/bookkeeper/helpers/MembershipHelper.javasrc/main/java/org/dataone/bookkeeper/api/MembershipList.javasrc/main/java/org/dataone/bookkeeper/api/Membership.javasrc/main/java/org/dataone/bookkeeper/resources/MembershipsResource.javasrc/test/java/org/dataone/bookkeeper/jdbi/MembershipStoreTest.java0edcc727cf150288c3803c40f0f1bb9b19dcebe41602096354000http://jenkins-ucsb-1.dataone.org/jenkins/user/csjcsjcsj@christopherjones.coRemove the membership model, list, resource, store, and unit test:
these are no longer needed with the simplified model where orders
represent subscriptions.
refs https://github.com/DataONEorg/bookkeeper/issues/65
2020-10-07 12:45:54 -06000edcc727cf150288c3803c40f0f1bb9b19dcebe4Remove the membership model, list, resource, store, and unit test:deletesrc/test/java/org/dataone/bookkeeper/jdbi/MembershipStoreTest.javadeletesrc/test/java/org/dataone/bookkeeper/helpers/MembershipHelper.javadeletesrc/main/java/org/dataone/bookkeeper/resources/MembershipsResource.javadeletesrc/main/java/org/dataone/bookkeeper/api/MembershipList.javadeletesrc/main/java/org/dataone/bookkeeper/jdbi/MembershipStore.javadeletesrc/main/java/org/dataone/bookkeeper/api/Membership.java
- src/test/java/org/dataone/bookkeeper/jdbi/OrderStoreTest.java801a22b49d81bd0268add972092bcbfdefbecb661602096514000http://jenkins-ucsb-1.dataone.org/jenkins/user/csjcsjcsj@christopherjones.coFix reversed test assertion.
refs https://github.com/DataONEorg/bookkeeper/issues/65
2020-10-07 12:48:34 -0600801a22b49d81bd0268add972092bcbfdefbecb66Fix reversed test assertion.editsrc/test/java/org/dataone/bookkeeper/jdbi/OrderStoreTest.java
- src/test/java/org/dataone/bookkeeper/jdbi/QuotaStoreTest.java0bddfa7696c36232861906ebb1b7bb2a3b4853561602096634000http://jenkins-ucsb-1.dataone.org/jenkins/user/csjcsjcsj@christopherjones.coMigrate the QuotaStoreTest to produce orders not memberships:
Change all tests to build orders, insert orders, etc.
refs https://github.com/DataONEorg/bookkeeper/issues/65
2020-10-07 12:50:34 -06000bddfa7696c36232861906ebb1b7bb2a3b485356Migrate the QuotaStoreTest to produce orders not memberships:editsrc/test/java/org/dataone/bookkeeper/jdbi/QuotaStoreTest.java
- src/test/java/org/dataone/bookkeeper/jdbi/UsageStoreTest.java9d99e99e08d8e4a76665587342f18b28efe1b4c91602096675000http://jenkins-ucsb-1.dataone.org/jenkins/user/csjcsjcsj@christopherjones.coMigrate the UsageStoreTest to produce orders not memberships:
Change all tests to build orders, insert orders, etc.
refs https://github.com/DataONEorg/bookkeeper/issues/65
2020-10-07 12:51:15 -06009d99e99e08d8e4a76665587342f18b28efe1b4c9Migrate the UsageStoreTest to produce orders not memberships:editsrc/test/java/org/dataone/bookkeeper/jdbi/UsageStoreTest.java
- src/main/java/org/dataone/bookkeeper/api/Quota.javasrc/main/resources/db/migrations/V1.1__Create_Quotas_Table.sqlsrc/test/java/org/dataone/bookkeeper/helpers/OrderHelper.javasrc/test/java/org/dataone/bookkeeper/helpers/UsageHelper.javasrc/test/java/org/dataone/bookkeeper/helpers/QuotaHelper.java471a7e468df9df87874e22d303a7dd5eaeb366201602097382000http://jenkins-ucsb-1.dataone.org/jenkins/user/csjcsjcsj@christopherjones.coRemove references to memberships.
refs https://github.com/DataONEorg/bookkeeper/issues/65
2020-10-07 13:03:02 -0600471a7e468df9df87874e22d303a7dd5eaeb36620Remove references to memberships.editsrc/test/java/org/dataone/bookkeeper/helpers/OrderHelper.javaeditsrc/test/java/org/dataone/bookkeeper/helpers/UsageHelper.javaeditsrc/main/resources/db/migrations/V1.1__Create_Quotas_Table.sqleditsrc/test/java/org/dataone/bookkeeper/helpers/QuotaHelper.javaeditsrc/main/java/org/dataone/bookkeeper/api/Quota.java
githttp://jenkins-ucsb-1.dataone.org/jenkins/user/csjcsjcsjbookkeeperbookkeeper-0.1.0-SNAPSHOT.jarbookkeeper-0.1.0-SNAPSHOT.jarorg.dataone9e78699423dca211c541a7ab80c3b3b4jar0.1.0-SNAPSHOT32http://jenkins-ucsb-1.dataone.org/jenkins/user/tommythelen/my-views/view/all/job/bookkeeper-unstable/org.dataone$bookkeeper/32/bookkeeperbookkeeper-0.1.0-SNAPSHOT.pomdependency-reduced-pom.xmlorg.dataone7f6d0d7a24e410f2dd21a785174ca406pom0.1.0-SNAPSHOThttp://jenkins-ucsb-1.dataone.org/jenkins/user/tommythelen/my-views/view/all/job/bookkeeper-unstable/org.dataone$bookkeeper/32/mavenArtifacts/3.6.0