|
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/main/java/org/dataone/bookkeeper/api/Quota.java (diff) |
Commit
24749f01f9925e3e205e8c622150405858ae0262
by csjChange 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
|
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/main/java/org/dataone/bookkeeper/jdbi/MembershipStore.java (diff) |
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/main/java/org/dataone/bookkeeper/api/OrderItem.java (diff) |
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/main/java/org/dataone/bookkeeper/jdbi/QuotaStore.java (diff) |
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/main/resources/db/migrations/V1.1__Create_Quotas_Table.sql (diff) |
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/test/java/org/dataone/bookkeeper/helpers/MembershipHelper.java (diff) |
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/test/java/org/dataone/bookkeeper/jdbi/UsageStoreTest.java (diff) |
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/main/java/org/dataone/bookkeeper/api/Quota.java (diff) |
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/test/java/org/dataone/bookkeeper/helpers/QuotaHelper.java (diff) |
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/main/java/org/dataone/bookkeeper/resources/MembershipsResource.java (diff) |
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/test/java/org/dataone/bookkeeper/jdbi/QuotaStoreTest.java (diff) |
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/test/java/org/dataone/bookkeeper/helpers/ProductHelper.java (diff) |
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/main/resources/db/migrations/V1.2__Insert_Standard_Quotas.sql (diff) |
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/main/java/org/dataone/bookkeeper/resources/UsagesResource.java (diff) |
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/test/java/org/dataone/bookkeeper/jdbi/MembershipStoreTest.java (diff) |
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/main/java/org/dataone/bookkeeper/resources/QuotasResource.java (diff) |
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/main/java/org/dataone/bookkeeper/resources/OrdersResource.java (diff) |
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/main/java/org/dataone/bookkeeper/jdbi/UsageStore.java (diff) |
Commit
ae015f578b4493ba7d0760f4977593ae2e7cefb6
by csjRefactor 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
|
![The file was removed The file was removed](/jenkins/static/b611b658/images/16x16/document_delete.png) | src/main/resources/db/migrations/V1.3__Create_Memberships_Table.sql |
![The file was removed The file was removed](/jenkins/static/b611b658/images/16x16/document_delete.png) | src/main/resources/db/migrations/V1.7__Create_Products_Table.sql |
![The file was removed The file was removed](/jenkins/static/b611b658/images/16x16/document_delete.png) | src/main/resources/db/migrations/V1.13__Create_Function_Update_Quota_Table_Usage.sql |
![The file was removed The file was removed](/jenkins/static/b611b658/images/16x16/document_delete.png) | src/main/resources/db/migrations/V1.9__Alter_Memberships_Add_Product_FK.sql |
![The file was added The file was added](/jenkins/static/b611b658/images/16x16/document_add.png) | src/main/resources/db/migrations/V1.6__Insert_Standard_Products.sql |
![The file was removed The file was removed](/jenkins/static/b611b658/images/16x16/document_delete.png) | src/main/resources/db/migrations/V1.6__Alter_Memberships_Add_Customer_FK.sql |
![The file was removed The file was removed](/jenkins/static/b611b658/images/16x16/document_delete.png) | src/main/resources/db/migrations/V1.8__Insert_Standard_Products.sql |
![The file was added The file was added](/jenkins/static/b611b658/images/16x16/document_add.png) | src/main/resources/db/migrations/V1.4__Create_Customers_Table.sql |
![The file was added The file was added](/jenkins/static/b611b658/images/16x16/document_add.png) | src/main/resources/db/migrations/V1.3__Alter_Quotas_Add_Order_FK.sql |
![The file was removed The file was removed](/jenkins/static/b611b658/images/16x16/document_delete.png) | src/main/resources/db/migrations/V1.5__Create_Customers_Table.sql |
![The file was removed The file was removed](/jenkins/static/b611b658/images/16x16/document_delete.png) | src/main/resources/db/migrations/V1.14__Alter_Usages_Add_Unique_Constraint.sql |
![The file was removed The file was removed](/jenkins/static/b611b658/images/16x16/document_delete.png) | src/main/resources/db/migrations/V1.15__Alter_Quotas_Add_Unique_Constraint_MembershipId_QuotaType.sql |
![The file was added The file was added](/jenkins/static/b611b658/images/16x16/document_add.png) | src/main/resources/db/migrations/V1.5__Create_Products_Table.sql |
![The file was added The file was added](/jenkins/static/b611b658/images/16x16/document_add.png) | src/main/resources/db/migrations/V1.8__Alter_Orders_Add_Customer_FK.sql |
![The file was removed The file was removed](/jenkins/static/b611b658/images/16x16/document_delete.png) | src/main/resources/db/migrations/V1.11__Alter_Orders_Add_Customer_FK.sql |
![The file was added The file was added](/jenkins/static/b611b658/images/16x16/document_add.png) | src/main/resources/db/migrations/V1.12__Alter_Quotas_Add_Unique_Constraint_OrderId_QuotaType.sql |
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/main/resources/db/migrations/V1.1__Create_Quotas_Table.sql (diff) |
![The file was removed The file was removed](/jenkins/static/b611b658/images/16x16/document_delete.png) | src/main/resources/db/migrations/V1.10__Create_Orders_Table.sql |
![The file was removed The file was removed](/jenkins/static/b611b658/images/16x16/document_delete.png) | src/main/resources/db/migrations/V1.12__Create_Usages_Table.sql |
![The file was added The file was added](/jenkins/static/b611b658/images/16x16/document_add.png) | src/main/resources/db/migrations/V1.10__Create_Function_Update_Quota_Table_Usage.sql |
![The file was added The file was added](/jenkins/static/b611b658/images/16x16/document_add.png) | src/main/resources/db/migrations/V1.11__Alter_Usages_Add_Unique_Constraint.sql |
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/main/resources/db/migrations/V1.2__Insert_Standard_Quotas.sql (diff) |
![The file was added The file was added](/jenkins/static/b611b658/images/16x16/document_add.png) | src/main/resources/db/migrations/V1.9__Create_Usages_Table.sql |
![The file was removed The file was removed](/jenkins/static/b611b658/images/16x16/document_delete.png) | src/main/resources/db/migrations/V1.4__Alter_Quotas_Add_Membership_FK.sql |
![The file was added The file was added](/jenkins/static/b611b658/images/16x16/document_add.png) | src/main/resources/db/migrations/V1.7__Create_Orders_Table.sql |
|
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | README.rst (diff) |
|
![The file was removed The file was removed](/jenkins/static/b611b658/images/16x16/document_delete.png) | src/main/resources/db/migrations/V1.7__Create_Orders_Table.sql |
![The file was removed The file was removed](/jenkins/static/b611b658/images/16x16/document_delete.png) | src/main/resources/db/migrations/V1.5__Create_Products_Table.sql |
![The file was removed The file was removed](/jenkins/static/b611b658/images/16x16/document_delete.png) | src/main/resources/db/migrations/V1.6__Insert_Standard_Products.sql |
![The file was added The file was added](/jenkins/static/b611b658/images/16x16/document_add.png) | src/main/resources/db/migrations/V1.6__Create_Orders_Table.sql |
![The file was removed The file was removed](/jenkins/static/b611b658/images/16x16/document_delete.png) | src/main/resources/db/migrations/V1.3__Alter_Quotas_Add_Order_FK.sql |
![The file was added The file was added](/jenkins/static/b611b658/images/16x16/document_add.png) | src/main/resources/db/migrations/V1.7__Alter_Quotas_Add_Order_FK.sql |
![The file was added The file was added](/jenkins/static/b611b658/images/16x16/document_add.png) | src/main/resources/db/migrations/V1.3__Create_Customers_Table.sql |
![The file was added The file was added](/jenkins/static/b611b658/images/16x16/document_add.png) | src/main/resources/db/migrations/V1.4__Create_Products_Table.sql |
![The file was added The file was added](/jenkins/static/b611b658/images/16x16/document_add.png) | src/main/resources/db/migrations/V1.5__Insert_Standard_Products.sql |
![The file was removed The file was removed](/jenkins/static/b611b658/images/16x16/document_delete.png) | src/main/resources/db/migrations/V1.4__Create_Customers_Table.sql |
|
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/main/resources/db/migrations/V1.6__Create_Orders_Table.sql (diff) |
Commit
b50d41e4975ae08833c2fbb54cc554bb9c55dffc
by csjMerge 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
|
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/main/java/org/dataone/bookkeeper/api/Order.java (diff) |
Commit
4bd29a63b747decf044bb0abf55d2721a3372018
by csjMigrate 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
|
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/main/java/org/dataone/bookkeeper/api/Quota.java (diff) |
Commit
521b2dca2a76f2b6d92c57b51109d3c64cda935d
by csjMigrate 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
|
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/main/java/org/dataone/bookkeeper/jdbi/mappers/OrderMapper.java (diff) |
![The file was removed The file was removed](/jenkins/static/b611b658/images/16x16/document_delete.png) | src/main/java/org/dataone/bookkeeper/jdbi/mappers/MembershipMapper.java |
|
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/main/java/org/dataone/bookkeeper/api/Quota.java (diff) |
|
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/test/java/org/dataone/bookkeeper/EmbeddedPostgresqlTest.java (diff) |
|
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/test/resources/fixtures/order.json (diff) |
|
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | README.rst (diff) |
|
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/main/java/org/dataone/bookkeeper/jdbi/QuotaStore.java (diff) |
Commit
5b9c97b28c0832bc7653a1ea4d465f2f802b4806
by csjMigrate 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
|
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/main/java/org/dataone/bookkeeper/jdbi/OrderStore.java (diff) |
Commit
032b38c26fbd46329838626c9e24ef961b9334cd
by csjMigrate 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
|
![The file was removed The file was removed](/jenkins/static/b611b658/images/16x16/document_delete.png) | src/main/java/org/dataone/bookkeeper/jdbi/MembershipQuotasReducer.java |
![The file was added The file was added](/jenkins/static/b611b658/images/16x16/document_add.png) | src/main/java/org/dataone/bookkeeper/jdbi/OrderQuotasReducer.java |
Commit
a1c95fc02a62edbc19371a4c7ea5f89ea0d6a6e7
by csjUpdate 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
|
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/main/java/org/dataone/bookkeeper/jdbi/mappers/OrderMapper.java (diff) |
|
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/main/java/org/dataone/bookkeeper/resources/CustomersResource.java (diff) |
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/test/java/org/dataone/bookkeeper/helpers/CustomerHelper.java (diff) |
Commit
256e4f83d2579ab1e6b49cf31c52a149d3e443fa
by csjMigrate 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
|
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/test/java/org/dataone/bookkeeper/helpers/QuotaHelper.java (diff) |
Commit
b3fef6fa92b83db0de898b57452a225118804811
by csjUpdate 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
|
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/test/java/org/dataone/bookkeeper/helpers/OrderHelper.java (diff) |
Commit
fc4d0a2fea5f7ceea7b4bcbf675b716e618a4ff9
by csjChange 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
|
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/main/java/org/dataone/bookkeeper/resources/OrdersResource.java (diff) |
|
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/main/java/org/dataone/bookkeeper/resources/QuotasResource.java (diff) |
|
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/main/java/org/dataone/bookkeeper/Bookkeeper.java (diff) |
Commit
0edcc727cf150288c3803c40f0f1bb9b19dcebe4
by csjRemove 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
|
![The file was removed The file was removed](/jenkins/static/b611b658/images/16x16/document_delete.png) | src/test/java/org/dataone/bookkeeper/helpers/MembershipHelper.java |
![The file was removed The file was removed](/jenkins/static/b611b658/images/16x16/document_delete.png) | src/main/java/org/dataone/bookkeeper/api/Membership.java |
![The file was removed The file was removed](/jenkins/static/b611b658/images/16x16/document_delete.png) | src/main/java/org/dataone/bookkeeper/resources/MembershipsResource.java |
![The file was removed The file was removed](/jenkins/static/b611b658/images/16x16/document_delete.png) | src/main/java/org/dataone/bookkeeper/api/MembershipList.java |
![The file was removed The file was removed](/jenkins/static/b611b658/images/16x16/document_delete.png) | src/main/java/org/dataone/bookkeeper/jdbi/MembershipStore.java |
![The file was removed The file was removed](/jenkins/static/b611b658/images/16x16/document_delete.png) | src/test/java/org/dataone/bookkeeper/jdbi/MembershipStoreTest.java |
|
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/test/java/org/dataone/bookkeeper/jdbi/OrderStoreTest.java (diff) |
Commit
0bddfa7696c36232861906ebb1b7bb2a3b485356
by csjMigrate the QuotaStoreTest to produce orders not memberships: Change all tests to build orders, insert orders, etc. refs https://github.com/DataONEorg/bookkeeper/issues/65
|
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/test/java/org/dataone/bookkeeper/jdbi/QuotaStoreTest.java (diff) |
Commit
9d99e99e08d8e4a76665587342f18b28efe1b4c9
by csjMigrate the UsageStoreTest to produce orders not memberships: Change all tests to build orders, insert orders, etc. refs https://github.com/DataONEorg/bookkeeper/issues/65
|
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/test/java/org/dataone/bookkeeper/jdbi/UsageStoreTest.java (diff) |
|
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/main/java/org/dataone/bookkeeper/api/Quota.java (diff) |
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/main/resources/db/migrations/V1.1__Create_Quotas_Table.sql (diff) |
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/test/java/org/dataone/bookkeeper/helpers/UsageHelper.java (diff) |
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/test/java/org/dataone/bookkeeper/helpers/OrderHelper.java (diff) |
![The file was modified The file was modified](/jenkins/static/b611b658/images/16x16/document_edit.png) | src/test/java/org/dataone/bookkeeper/helpers/QuotaHelper.java (diff) |