Skip to content

Commit

Permalink
misc(docker): Remove GCL env vars (#144)
Browse files Browse the repository at this point in the history
  • Loading branch information
jdenquin authored Dec 2, 2022
1 parent 8f3aa57 commit cd67b4e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
2 changes: 1 addition & 1 deletion api
Submodule api updated 80 files
+4 −5 app/controllers/api/v1/credit_notes_controller.rb
+4 −3 app/graphql/mutations/credit_notes/create.rb
+1 −2 app/graphql/types/credit_note_items/input.rb
+2 −5 app/graphql/types/credit_note_items/object.rb
+4 −0 app/graphql/types/credit_notes/object.rb
+10 −0 app/graphql/types/events/object.rb
+6 −0 app/graphql/types/fees/object.rb
+2 −2 app/graphql/types/subscriptions/object.rb
+2 −2 app/jobs/bill_add_on_job.rb
+14 −0 app/jobs/credit_notes/refunds/gocardless_create_job.rb
+1 −1 app/models/concerns/customer_timezone.rb
+2 −13 app/models/credit_note_item.rb
+3 −0 app/models/event.rb
+1 −1 app/models/plan.rb
+10 −2 app/models/subscription.rb
+2 −4 app/serializers/v1/credit_note_item_serializer.rb
+1 −0 app/serializers/v1/credit_note_serializer.rb
+1 −1 app/services/applied_add_ons/create_service.rb
+1 −0 app/services/billable_metrics/aggregations/recurring_count_service.rb
+59 −37 app/services/billing_service.rb
+32 −16 app/services/credit_notes/create_service.rb
+157 −0 app/services/credit_notes/refunds/gocardless_service.rb
+3 −1 app/services/credit_notes/refunds/stripe_service.rb
+4 −1 app/services/credit_notes/update_service.rb
+15 −72 app/services/credit_notes/validate_item_service.rb
+83 −0 app/services/credit_notes/validate_service.rb
+2 −2 app/services/fees/subscription_service.rb
+10 −8 app/services/invoices/add_on_service.rb
+213 −0 app/services/invoices/calculate_fees_service.rb
+12 −184 app/services/invoices/create_service.rb
+5 −5 app/services/invoices/customer_usage_service.rb
+10 −6 app/services/invoices/paid_credit_service.rb
+30 −0 app/services/invoices/payments/create_service.rb
+14 −0 app/services/payment_providers/gocardless_service.rb
+2 −1 app/services/subscriptions/activate_service.rb
+1 −1 app/services/subscriptions/dates/yearly_service.rb
+39 −27 app/services/subscriptions/dates_service.rb
+6 −6 app/views/templates/credit_note.slim
+10 −9 app/views/templates/invoice.slim
+4 −1 clock.rb
+1 −1 config/environments/production.rb
+3 −2 config/initializers/sidekiq.rb
+23 −0 db/migrate/20221110151027_changes_credit_note_items_columns.rb
+7 −0 db/migrate/20221118084547_add_refunded_at_to_credit_notes.rb
+17 −0 db/migrate/20221125111605_add_issuing_date_to_credit_notes.rb
+5 −5 db/schema.rb
+3 −2 db/seeds/invoices.rb
+11 −6 schema.graphql
+129 −61 schema.json
+14 −18 spec/controllers/api/v1/credit_notes_controller_spec.rb
+2 −4 spec/factories/credit_note_items.rb
+2 −0 spec/factories/credit_notes.rb
+22 −0 spec/fixtures/gocardless/events_refund.json
+23 −26 spec/graphql/mutations/credit_notes/create_spec.rb
+4 −2 spec/graphql/resolvers/credit_note_resolver_spec.rb
+2 −4 spec/graphql/resolvers/customer_resolver_spec.rb
+2 −0 spec/graphql/resolvers/events_resolver_spec.rb
+4 −0 spec/graphql/resolvers/invoice_resolver_spec.rb
+4 −4 spec/jobs/bill_add_on_job_spec.rb
+24 −0 spec/jobs/credit_notes/refunds/gocardless_create_job_spec.rb
+0 −15 spec/models/credit_note_item_spec.rb
+9 −1 spec/models/plan_spec.rb
+2 −1 spec/services/billing_service_spec.rb
+64 −37 spec/services/credit_notes/create_service_spec.rb
+261 −0 spec/services/credit_notes/refunds/gocardless_service_spec.rb
+1 −0 spec/services/credit_notes/refunds/stripe_service_spec.rb
+1 −0 spec/services/credit_notes/update_service_spec.rb
+17 −108 spec/services/credit_notes/validate_item_service_spec.rb
+165 −0 spec/services/credit_notes/validate_service_spec.rb
+24 −9 spec/services/invoices/add_on_service_spec.rb
+824 −0 spec/services/invoices/calculate_fees_service_spec.rb
+47 −932 spec/services/invoices/create_service_spec.rb
+21 −6 spec/services/invoices/paid_credit_service_spec.rb
+29 −0 spec/services/invoices/payments/create_service_spec.rb
+22 −0 spec/services/payment_providers/gocardless_service_spec.rb
+24 −3 spec/services/subscriptions/activate_service_spec.rb
+158 −75 spec/services/subscriptions/dates/monthly_service_spec.rb
+139 −56 spec/services/subscriptions/dates/weekly_service_spec.rb
+162 −79 spec/services/subscriptions/dates/yearly_service_spec.rb
+8 −8 spec/services/subscriptions/dates_service_spec.rb
6 changes: 1 addition & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,7 @@ services:
- LAGO_REDIS_CACHE_URL=redis://${LAGO_REDIS_CACHE_HOST:-redis}:${LAGO_REDIS_CACHE_PORT:-6379}
- LAGO_REDIS_CACHE_PASSWORD=${LAGO_REDIS_CACHE_PASSWORD}
- LAGO_DISABLE_SEGMENT=${LAGO_DISABLE_SEGMENT}
- GOCARDLESS_CLIENT_ID=${GOCARDLESS_CLIENT_ID}
- GOCARDLESS_CLIENT_SECRET=${GOCARDLESS_CLIENT_SECRET}
- LAGO_OAUTH_PROXY_URL=${LAGO_OAUTH_PROXY_URL}
- LAGO_OAUTH_PROXY_URL=https://proxy.getlago.com
volumes:
- lago_storage_data:/app/storage
# If using GCS, you need to put the credentials keyfile here
Expand Down Expand Up @@ -147,8 +145,6 @@ services:
- LAGO_REDIS_CACHE_URL=redis://${LAGO_REDIS_CACHE_HOST:-redis}:${LAGO_REDIS_CACHE_PORT:-6379}
- LAGO_REDIS_CACHE_PASSWORD=${LAGO_REDIS_CACHE_PASSWORD}
- LAGO_DISABLE_SEGMENT=${LAGO_DISABLE_SEGMENT}
- GOCARDLESS_CLIENT_ID=${GOCARDLESS_CLIENT_ID}
- GOCARDLESS_CLIENT_SECRET=${GOCARDLESS_CLIENT_SECRET}
volumes:
- lago_storage_data:/app/storage

Expand Down

0 comments on commit cd67b4e

Please sign in to comment.