jamm 1.0.8 → 1.0.10

data/lib/jamm/api.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-# #api/v1/common.proto
+# #Jamm API
 #
 # No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 #
-# The version of the OpenAPI document: version not set
+# The version of the OpenAPI document: 1.0
 #
 # Generated by: https://openapi-generator.tech
 # Generator version: 7.9.0
@@ -18,13 +18,17 @@ require 'jamm/api/configuration'
 
 # Models
 require 'jamm/api/models/customer_service_update_customer_body'
+require 'jamm/api/models/googlerpc_status'
 require 'jamm/api/models/protobuf_any'
-require 'jamm/api/models/rpc_status'
 require 'jamm/api/models/v1_add_charge_request'
 require 'jamm/api/models/v1_add_charge_response'
 require 'jamm/api/models/v1_buyer'
 require 'jamm/api/models/v1_charge'
+require 'jamm/api/models/v1_charge_message'
+require 'jamm/api/models/v1_charge_message_status'
+require 'jamm/api/models/v1_charge_result'
 require 'jamm/api/models/v1_contract'
+require 'jamm/api/models/v1_contract_message'
 require 'jamm/api/models/v1_contract_status'
 require 'jamm/api/models/v1_create_contract_with_charge_request'
 require 'jamm/api/models/v1_create_contract_with_charge_response'
@@ -34,20 +38,30 @@ require 'jamm/api/models/v1_create_customer_request'
 require 'jamm/api/models/v1_create_customer_response'
 require 'jamm/api/models/v1_customer'
 require 'jamm/api/models/v1_delete_customer_response'
+require 'jamm/api/models/v1_error'
+require 'jamm/api/models/v1_event_type'
+require 'jamm/api/models/v1_get_charge_response'
+require 'jamm/api/models/v1_get_charges_response'
 require 'jamm/api/models/v1_get_contract_response'
 require 'jamm/api/models/v1_get_customer_response'
 require 'jamm/api/models/v1_initial_charge'
 require 'jamm/api/models/v1_merchant'
 require 'jamm/api/models/v1_merchant_customer'
+require 'jamm/api/models/v1_merchant_webhook_message'
+require 'jamm/api/models/v1_message_response'
+require 'jamm/api/models/v1_pagination'
 require 'jamm/api/models/v1_payment_link'
 require 'jamm/api/models/v1_ping_response'
 require 'jamm/api/models/v1_url'
 require 'jamm/api/models/v1_update_customer_response'
+require 'jamm/api/models/v1_withdraw_request'
+require 'jamm/api/models/v1_withdraw_response'
 
 # APIs
 require 'jamm/api/api/customer_api'
 require 'jamm/api/api/healthcheck_api'
 require 'jamm/api/api/payment_api'
+require 'jamm/api/api/webhook_service_api'
 
 module Api
   class << self

data/lib/jamm/api_patches.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Api
+  class Customer
+    # Allow to drill down to list charges.
+    # e.g. cus.charges --> []
+    def charges(pagination: nil)
+      Jamm::Charge.list(
+        customer: self.id,
+        pagination: pagination
+      )
+    end
+  end
+end

data/lib/jamm/charge.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'rest-client'
+require 'json'
+require 'base64'
+require 'jamm/errors'
+
+module Jamm
+  module Charge
+    def self.create_with_redirect(customer:, charge:, redirect:)
+      request = Jamm::OpenAPI::AddChargeRequest.new(
+        customer: customer,
+        charge: charge,
+        redirect: redirect
+      )
+
+      Jamm::OpenAPI::PaymentApi.new(Jamm::Client.handler).add_charge(request)
+    end
+
+    def self.create_without_redirect(customer:, charge:)
+      request = Jamm::OpenAPI::WithdrawRequest.new(
+        customer: customer,
+        charge: charge
+      )
+
+      Jamm::OpenAPI::PaymentApi.new(Jamm::Client.handler).withdraw(request)
+    end
+
+    def self.get(charge_id)
+      Jamm::OpenAPI::PaymentApi.new(Jamm::Client.handler).get_charge(charge_id)
+    rescue Jamm::OpenAPI::ApiError => e
+      [404].include?(e.code) ? nil : raise
+    end
+
+    def self.list(customer:, pagination: nil)
+      got = Jamm::OpenAPI::PaymentApi.new(Jamm::Client.handler).get_charges(customer, pagination.nil? ? {} : pagination)
+
+      got.charges
+    rescue Jamm::OpenAPI::ApiError => e
+      [404].include?(e.code) ? nil : []
+    end
+  end
+end

data/lib/jamm/client.rb

@@ -1,7 +1,7 @@
 module Jamm
   module Client
     def self.handler
-      base = Jamm::ApiClient.new
+      base = Jamm::OpenAPI::ApiClient.new
 
       # Configure
       base.config.host = Jamm.openapi.config.host

data/lib/jamm/contract.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'rest-client'
+require 'json'
+require 'base64'
+require 'jamm/errors'
+
+module Jamm
+  module Contract
+    def self.create_with_charge(buyer:, charge:, redirect:)
+      request = Jamm::OpenAPI::CreateContractWithChargeRequest.new(
+        buyer: buyer,
+        charge: charge,
+        redirect: redirect
+      )
+
+      Jamm::OpenAPI::PaymentApi.new(Jamm::Client.handler).create_contract_with_charge(request)
+    end
+
+    def self.create_without_charge(buyer:, redirect:)
+      request = Jamm::OpenAPI::CreateContractWithoutChargeRequest.new(
+        buyer: buyer,
+        redirect: redirect
+      )
+
+      Jamm::OpenAPI::PaymentApi.new(Jamm::Client.handler).create_contract_without_charge(request)
+    end
+
+    def self.get(customer_id)
+      Jamm::OpenAPI::CustomerApi.new(Jamm::Client.handler).get_contract(customer_id)
+    rescue Jamm::OpenAPI::ApiError => e
+      [404].include?(e.code) ? nil : raise
+    end
+  end
+end

data/lib/jamm/customer.rb

@@ -4,23 +4,38 @@ require 'rest-client'
 require 'json'
 require 'base64'
 require 'jamm/errors'
+require 'jamm/api/models/v1_create_customer_request'
 
 module Jamm
   module Customer
-    def self.get(customer:)
-      Jamm::CustomerApi.new(Jamm::Client.handler).get customer
-    rescue Jamm::ApiError => e
-      return nil if e.code == 404
+    def self.create(buyer:)
+      r = Jamm::OpenAPI::CustomerApi.new(Jamm::Client.handler).create(
+        buyer: buyer
+      )
 
-      raise
+      r.customer
     end
 
-    def self.update(**params)
-      Jamm::CustomerApi.new(Jamm::Client.handler).update(params[:id], params)
+    def self.get(id_or_email)
+      Jamm::OpenAPI::CustomerApi.new(Jamm::Client.handler).get(id_or_email)
+    rescue Jamm::OpenAPI::ApiError => e
+      [404].include?(e.code) ? nil : raise
     end
 
-    def self.delete(customer:)
-      Jamm::CustomerApi.new(Jamm::Client.handler).delete customer
+    def self.get_contract(id)
+      Jamm::OpenAPI::CustomerApi.new(Jamm::Client.handler).get_contract(id)
+    rescue Jamm::OpenAPI::ApiError => e
+      [404].include?(e.code) ? nil : raise
+    end
+
+    def self.update(id, params)
+      r = Jamm::OpenAPI::CustomerApi.new(Jamm::Client.handler).update(id, params)
+
+      r.customer
+    end
+
+    def self.delete(id)
+      Jamm::OpenAPI::CustomerApi.new(Jamm::Client.handler).delete(id)
     end
   end
 end

data/lib/jamm/healthcheck.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'rest-client'
+require 'json'
+require 'base64'
+require 'jamm/errors'
+
+module Jamm
+  module Healthcheck
+    def self.ping
+      Jamm::OpenAPI::HealthcheckApi.new(Jamm::Client.handler).ping
+    end
+  end
+end

data/lib/jamm/openapi.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'jamm/api'
+
+module Jamm
+  # Customer wrapper for OpenAPI definitions.
+  module OpenAPI
+    include Api
+  end
+end

data/lib/jamm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Jamm
-  VERSION = '1.0.8'
+  VERSION = '1.0.10'
 end

data/lib/jamm/webhook.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'rest-client'
+require 'json'
+require 'base64'
+require 'jamm/errors'
+
+module Jamm
+  module Webhook
+    # Parse command is for parsing the received webhook message.
+    # It does not call anything remotely, instead returns the suitable object.
+    def self.parse(json)
+      out = {
+        id: json[:id],
+        signature: json[:signature],
+        event_type: json[:event_type],
+        content: nil,
+        created_at: json[:created_at]
+      }
+
+      case json[:event_type]
+      when Jamm::OpenAPI::EventType::CHARGE_CREATED
+        out[:content] = Jamm::OpenAPI::ChargeMessage.new(json[:content])
+        return out
+
+      when Jamm::OpenAPI::EventType::CHARGE_UPDATED
+        out[:content] = Jamm::OpenAPI::ChargeMessage.new(json[:content])
+        return out
+
+      when Jamm::OpenAPI::EventType::CHARGE_SUCCESS
+        out[:content] = Jamm::OpenAPI::ChargeMessage.new(json[:content])
+        return out
+
+      when Jamm::OpenAPI::EventType::CHARGE_FAIL
+        out[:content] = Jamm::OpenAPI::ChargeMessage.new(json[:content])
+        return out
+
+      when Jamm::OpenAPI::EventType::CONTRACT_ACTIVATED
+        out[:content] = Jamm::OpenAPI::ContractMessage.new(json[:content])
+        return out
+      end
+
+      raise 'Unknown event type'
+    end
+  end
+end

data/lib/jamm.rb

@@ -4,15 +4,21 @@ require 'rest-client'
 require 'openssl'
 require 'json'
 
-require 'jamm/api'
 require 'jamm/client'
 require 'jamm/errors'
 require 'jamm/oauth'
+require 'jamm/openapi'
 require 'jamm/version'
 
 # OpenAPI wrappers
+require 'jamm/charge'
 require 'jamm/customer'
-require 'jamm/payment'
+require 'jamm/contract'
+require 'jamm/healthcheck'
+require 'jamm/webhook'
+
+# Patches
+require 'jamm/api_patches'
 
 # Jamm Ruby SDK
 module Jamm
@@ -23,10 +29,6 @@ module Jamm
   @read_timeout = 90
   @max_retry = 0
 
-  # Include OpenAPI generated module into root Jamm namespace.
-  # The OpenAPI sub-modules and methods can be accessed via Jamm::{foo}
-  include Api
-
   class << self
     attr_accessor :api, :client_id, :client_secret, :api_base, :env, :oauth_base, :api_version, :connect_base,
                   :openapi, :open_timeout, :read_timeout, :max_retry, :retry_initial_delay, :retry_max_delay
@@ -40,20 +42,20 @@ module Jamm
     when 'prod'
       self.oauth_base = 'https://merchant-identity.jamm-pay.jp'
 
-      self.openapi = Jamm::ApiClient.new
+      self.openapi = Jamm::OpenAPI::ApiClient.new
       openapi.config.host = 'api.jamm-pay.jp'
 
-    # Debugger mode, uncomment when needed
-    # when 'local'
-    #   self.oauth_base = "https://merchant-identity.#{env}.jamm-pay.jp"
-
-    #   self.openapi = Jamm::ApiClient.new
-    #   openapi.config.host = 'api.jamm.test'
+    when 'local'
+      self.oauth_base = 'https://merchant-identity.develop.jamm-pay.jp'
 
+      self.openapi = Jamm::OpenAPI::ApiClient.new
+      openapi.config.host = 'api.jamm.test'
+      openapi.config.verify_ssl = false
+      openapi.config.verify_ssl_host = false
     else
       self.oauth_base = "https://merchant-identity.#{env}.jamm-pay.jp"
 
-      self.openapi = Jamm::ApiClient.new
+      self.openapi = Jamm::OpenAPI::ApiClient.new
       openapi.config.host = "api.#{env}.jamm-pay.jp"
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jamm
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.10
 platform: ruby
 authors:
 - Jamm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-05 00:00:00.000000000 Z
+date: 2024-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -63,17 +63,22 @@ files:
 - lib/jamm/api/api/customer_api.rb
 - lib/jamm/api/api/healthcheck_api.rb
 - lib/jamm/api/api/payment_api.rb
+- lib/jamm/api/api/webhook_service_api.rb
 - lib/jamm/api/api_client.rb
 - lib/jamm/api/api_error.rb
 - lib/jamm/api/configuration.rb
 - lib/jamm/api/models/customer_service_update_customer_body.rb
+- lib/jamm/api/models/googlerpc_status.rb
 - lib/jamm/api/models/protobuf_any.rb
-- lib/jamm/api/models/rpc_status.rb
 - lib/jamm/api/models/v1_add_charge_request.rb
 - lib/jamm/api/models/v1_add_charge_response.rb
 - lib/jamm/api/models/v1_buyer.rb
 - lib/jamm/api/models/v1_charge.rb
+- lib/jamm/api/models/v1_charge_message.rb
+- lib/jamm/api/models/v1_charge_message_status.rb
+- lib/jamm/api/models/v1_charge_result.rb
 - lib/jamm/api/models/v1_contract.rb
+- lib/jamm/api/models/v1_contract_message.rb
 - lib/jamm/api/models/v1_contract_status.rb
 - lib/jamm/api/models/v1_create_contract_with_charge_request.rb
 - lib/jamm/api/models/v1_create_contract_with_charge_response.rb
@@ -83,22 +88,36 @@ files:
 - lib/jamm/api/models/v1_create_customer_response.rb
 - lib/jamm/api/models/v1_customer.rb
 - lib/jamm/api/models/v1_delete_customer_response.rb
+- lib/jamm/api/models/v1_error.rb
+- lib/jamm/api/models/v1_event_type.rb
+- lib/jamm/api/models/v1_get_charge_response.rb
+- lib/jamm/api/models/v1_get_charges_response.rb
 - lib/jamm/api/models/v1_get_contract_response.rb
 - lib/jamm/api/models/v1_get_customer_response.rb
 - lib/jamm/api/models/v1_initial_charge.rb
 - lib/jamm/api/models/v1_merchant.rb
 - lib/jamm/api/models/v1_merchant_customer.rb
+- lib/jamm/api/models/v1_merchant_webhook_message.rb
+- lib/jamm/api/models/v1_message_response.rb
+- lib/jamm/api/models/v1_pagination.rb
 - lib/jamm/api/models/v1_payment_link.rb
 - lib/jamm/api/models/v1_ping_response.rb
 - lib/jamm/api/models/v1_update_customer_response.rb
 - lib/jamm/api/models/v1_url.rb
+- lib/jamm/api/models/v1_withdraw_request.rb
+- lib/jamm/api/models/v1_withdraw_response.rb
 - lib/jamm/api/version.rb
+- lib/jamm/api_patches.rb
+- lib/jamm/charge.rb
 - lib/jamm/client.rb
+- lib/jamm/contract.rb
 - lib/jamm/customer.rb
 - lib/jamm/errors.rb
+- lib/jamm/healthcheck.rb
 - lib/jamm/oauth.rb
-- lib/jamm/payment.rb
+- lib/jamm/openapi.rb
 - lib/jamm/version.rb
+- lib/jamm/webhook.rb
 homepage: https://jamm-pay.jp
 licenses:
 - MIT

data/lib/jamm/payment.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-require 'rest-client'
-require 'json'
-require 'base64'
-require 'jamm/errors'
-
-module Jamm
-  module Payment
-    def self.contract_with_charge(**params)
-      request = Jamm::CreateContractWithChargeRequest.new(params)
-
-      Jamm::PaymentApi.new(Jamm::Client.handler).create_contract_with_charge(request)
-    end
-
-    def self.get_contract(contract:)
-      Jamm::PaymentApi.new(Jamm::Client.handler).get_contract(contract)
-    end
-
-    def self.add_charge(**params)
-      request = Jamm::AddChargeRequest.new(params)
-
-      p = Jamm::PaymentApi.new(Jamm::Client.handler)
-      p.add_charge(request)
-    end
-  end
-end