ishapi 0.1.8.246 → 0.1.8.248

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ddbe9fcd8124677c56eefec990b277af917d78858eb4407c79afc1640b39898
-  data.tar.gz: 9dec346d2bde34a2dae7256ba8b389e2432834c8424a42b996f4f0eb216d56f8
+  metadata.gz: c22c9af79d588c3398c93d419294e103fb1cf0a2832dc194767e5355875a3540
+  data.tar.gz: e478c4d3932697c2c8fa9f5626b87c4942ab5df270b74db7a1971031008af2b6
 SHA512:
-  metadata.gz: bf1287a34c2f5f289d5770b8123c6a7fe65b3ebbc3eb71761926e3679a0dbbacd3dd1996226569e8c2f60d830703c2c951fbf1054214d69bda96d28f2dd27a29
-  data.tar.gz: dc5d08229ed5792dd1ff6e5c1e3f6322605d2222ffe53a988db24a133ad5090065c803b0fe2bd1d3c2b45f9cfa5c95b8385c5c82241274c5b73f2abf7dd7ebd6
+  metadata.gz: 83d25afaa7f23d1ac7f1902d1112ed3b65f70848bca00e93ea98072fecabe889837472f1b2b97c37f2fa026e1c873409a0ef24ff90d4757f7adb2f8e2971e4b4
+  data.tar.gz: cb3f87379270bfd0ded5f35bdc7e12bdbc146b04361748221631bdb5269e4fd66f350d085d80b4827a188f51408dd0999dfd49aa09e9243b45e1f056360b1bec

data/app/controllers/ishapi/payments_controller.rb

@@ -1,132 +1,96 @@
 require_dependency "ishapi/application_controller"
-module Ishapi
-  class PaymentsController < ApplicationController
-
-    before_action :check_profile, only: %i| create2 unlock |
-
-    # alphabetized : )
-
-    ##
-    ## this was for invoices on wasya.co
-    ## 20200712
-    ##
-    def create
-      authorize! :open_permission, ::Ishapi
-      begin
-        invoice = Ish::Invoice.where( :email => params[:email], :number => params[:number] ).first
-        payment = Ish::Payment.new :invoice => invoice, :email => params[:email], :amount => params[:amount]
-        amount_cents  = ( params[:amount].to_f * 100 ).to_i
-
-        ::Stripe.api_key = STRIPE_SK
-        acct = Stripe::Account.create(
-          :country => 'US',
-          :type => 'custom'
-        )
-        charge = ::Stripe::Charge.create(
-          :amount => amount_cents,
-          :currency => 'usd',
-          :source => params[:token][:id],
-          :destination => {
-            :account => acct,
-          }
-        )
-
-        payment.charge = JSON.parse( charge.to_json )
-        if payment.save
-          render :json => { :status => :ok }
-        else
-          render :status => 404, :json => {}
-        end
-      rescue Mongoid::Errors::DocumentNotFound => e
-        puts! e, 'e'
-        render :status => 404, :json => {}
-      end
+class Ishapi::PaymentsController < ApplicationController
+
+  before_action :check_profile, only: %i| create2 unlock |
+
+  # alphabetized : )
+
+  ## _vp_ 2020-07-21 This is for guyd
+  ## _vp_ 2022-03-01 It's been a while!
+  ## _vp_ 2022-09-04 continue
+  ##
+  ## @TODO: cannot proceed if already is_purchasing?
+  ##
+  def create
+    authorize! :create, ::Ish::Payment
+    @current_profile.update_attributes({ is_purchasing: true })
+
+    begin
+      amount_cents  = params[:amount_cents].to_i # @TODO: change
+
+      ::Stripe.api_key = ::STRIPE_SK
+      intent = Stripe::PaymentIntent.create({
+        amount: amount_cents,
+        currency: 'usd',
+        metadata: { integration_check: "accept_a_payment" },
+      })
+
+      payment = Ish::Payment.create!(
+        client_secret: intent.client_secret,
+        email: @current_profile.email,
+        payment_intent_id: intent.id,
+        profile_id: @current_profile.id,
+      )
+      render json: {
+        client_secret: intent.client_secret,
+        clientSecret: intent.client_secret,
+      }
+
+    rescue Mongoid::Errors::DocumentNotFound => e
+      puts! e, '#create2 Mongoid::Errors::DocumentNotFound'
+      render :status => 404, :json => e
     end
+  end
 
-    ## _vp_ 2020-07-21 This is for guyd
-    ## _vp_ 2022-03-01 It's been a while!
-    ## _vp_ 2022-09-04 continue
-    ##
-    ## @TODO: cannot proceed if already is_purchasing?
-    ##
-    def create2
-      authorize! :create, ::Ish::Payment
-      @current_profile.update_attributes({ is_purchasing: true })
-
-      begin
-        amount_cents  = params[:amount_cents].to_i # @TODO: change
-
-        ::Stripe.api_key = ::STRIPE_SK
-        intent = Stripe::PaymentIntent.create({
-          amount: amount_cents,
-          currency: 'usd',
-          metadata: { integration_check: "accept_a_payment" },
-        })
-
-        payment = Ish::Payment.create!(
-          client_secret: intent.client_secret,
-          email: @current_profile.email,
-          payment_intent_id: intent.id,
-          profile_id: @current_profile.id,
-        )
-
-        render json: { client_secret: intent.client_secret }
-      rescue Mongoid::Errors::DocumentNotFound => e
-        puts! e, '#create2 Mongoid::Errors::DocumentNotFound'
-        render :status => 404, :json => e
-      end
+  ##
+  ## webhook
+  ##
+  def stripe_confirm
+    authorize! :open_permission, ::Ishapi
+    payload = request.body.read
+    event = nil
+    begin
+      event = Stripe::Event.construct_from(JSON.parse(payload, symbolize_names: true))
+    rescue StandardError => err
+      puts! err, 'could not #stripe_confirm'
+      render status: 400, json: { status: :not_ok }
+      return
     end
 
-    ##
-    ## webhook
-    ##
-    def stripe_confirm
-      authorize! :open_permission, ::Ishapi
-      payload = request.body.read
-      event = nil
-      begin
-        event = Stripe::Event.construct_from(JSON.parse(payload, symbolize_names: true))
-      rescue StandardError => e
-        puts! e, 'could not #stripe_confirm'
-        render status: 400, json: { status: :not_ok }
-        return
-      end
-
-      payment_intent = event.data.object
-
-      payment = Ish::Payment.where( payment_intent_id: payment_intent.id ).first
-      if payment && payment_intent['status'] == 'succeeded'
-
-        payment.update_attributes( status: :confirmed )
-        n_unlocks = payment.profile.n_unlocks + 1 # @TODO: it's not always 5? adjust
-
-        payment.profile.update_attributes!( n_unlocks: n_unlocks, is_purchasing: false )
-      end
-
-      render status: 200, json: { status: :ok }
-    end
+    payment_intent = event.data.object
 
-    ##
-    ## Spend an unlock without spending money. _vp_ 2022-03-01
-    ##
-    def unlock
-      authorize! :unlock, ::Ish::Payment
-      item = Object::const_get(params['kind']).find params['id']
+    payment = Ish::Payment.where( payment_intent_id: payment_intent.id ).first
+    if payment && payment_intent['status'] == 'succeeded'
 
-      existing = Purchase.where( user_profile: @current_profile, item: item ).first
-      if existing
-        render status: 200, json: { status: :ok, message: 'already purchased' }
-        return
-      end
+      payment.update_attributes( status: :confirmed )
+      n_unlocks = payment.profile.n_unlocks + 1 # @TODO: it's not always 5, adjust! herehere
 
-      @current_profile.inc( n_unlocks: -item.premium_tier )
+      payment.profile.update_attributes!( n_unlocks: n_unlocks, is_purchasing: false )
+    end
 
-      purchase = ::Gameui::PremiumPurchase.create!( item: item, user_profile: @current_profile, )
+    render status: 200, json: { status: :ok }
+  end
 
-      @profile = @current_profile
-      render 'ishapi/user_profiles/account'
+  ##
+  ## Spend an unlock without spending money. _vp_ 2022-03-01
+  ##
+  def unlock
+    authorize! :unlock, ::Ish::Payment
+    item = Object::const_get(params['kind']).find params['id']
+
+    existing = Purchase.where( user_profile: @current_profile, item: item ).first
+    if existing
+      render status: 200, json: { status: :ok, message: 'already purchased' }
+      return
     end
 
+    @current_profile.inc( n_unlocks: -item.premium_tier )
+
+    purchase = ::Gameui::PremiumPurchase.create!( item: item, user_profile: @current_profile, )
+
+    @profile = @current_profile
+    render 'ishapi/user_profiles/account'
   end
+
 end
 

data/app/jobs/ishapi/email_message_intake_job.rb

@@ -1,17 +1,6 @@
 
-=begin
-
-m_id_2 = "2021-07-12T19_17_26Fpedidos_jmc2_gmail_com"
-stub = Stub.new( object_key: m_id_2 )
-stub = Stub.find_by( object_key: m_id_2 )
-stub.update_attribute(:state, 'state_pending')
-Ishapi::EmailMessageIntakeJob.perform_now( stub.id.to_s )
-
-=end
-
-
 ##
-## 2023-02-26 _vp_ let's go
+## 2023-02-26 _vp_ Let's go
 ## 2023-03-02 _vp_ Continue
 ## 2023-03-07 _vp_ Continue
 ##
@@ -131,7 +120,7 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
     @message.email_conversation_id = conv.id
     conv.update_attributes({
       state: Conv::STATE_UNREAD,
-      latest_at: the_mail.date,
+      latest_at: the_mail.date || Time.now.to_datetime,
       wp_term_ids: ( [ email_inbox_tag_id ] + conv.wp_term_ids + stub.wp_term_ids ).uniq,
     })
 

data/config/routes.rb

@@ -47,10 +47,8 @@ Ishapi::Engine.routes.draw do
 
   post 'do_purchase', to: 'gameui#do_purchase' # @TODO: rename to just purchase, or destroy endpoint
   post 'payments', :to => 'payments#create'
-  post 'payments2', :to => 'payments#create2' # @TODO: change
-  get  'payments2', to: 'payments#create2'
   post 'payments/unlock', to: 'payments#unlock' # do_purchase
-  post  'stripe_confirm', to: 'payments#stripe_confirm' # @TODO: test-drive
+  post 'payments/stripe_confirm', to: 'payments#stripe_confirm' # @TODO: test-drive herehere
 
   get 'photos/view/:id', to: 'photos#show'
   get 'profiles/view/:username', :to => 'user_profiles#show'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.246
+  version: 0.1.8.248
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-27 00:00:00.000000000 Z
+date: 2023-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails