Commit 311ea6f9 authored by Simon Esposito's avatar Simon Esposito
Browse files

Fix subscription upsert query

parent 9114f9bb

apigrpc/apigrpc.swagger.json

+9 −5
Original line number Diff line number Diff line
@@ -4688,10 +4688,6 @@ 
        "operator": {

          "$ref": "#/definitions/apiOperator",

          "description": "Operator."

        },

        "authoritative": {

          "type": "boolean",

          "description": "Whether the leaderboard was created authoritatively or not."

        }

      },

      "description": "A tournament on the server."
@@ -5010,7 +5006,7 @@ 
        },

        "providerResponse": {

          "type": "string",

          "description": "Raw provider validation response."

          "description": "Raw provider validation response body."

        },

        "environment": {

          "$ref": "#/definitions/apiStoreEnvironment",
@@ -5065,6 +5061,14 @@ 
        "active": {

          "type": "boolean",

          "description": "Whether the subscription is currently active or not."

        },

        "providerResponse": {

          "type": "string",

          "description": "Raw provider validation response body."

        },

        "providerNotification": {

          "type": "string",

          "description": "Raw provider notification body."

        }

      }

    },

console/console.swagger.json

+9 −1
Original line number Diff line number Diff line
@@ -3011,7 +3011,7 @@ 
        },

        "provider_response": {

          "type": "string",

          "description": "Raw provider validation response."

          "description": "Raw provider validation response body."

        },

        "environment": {

          "$ref": "#/definitions/apiStoreEnvironment",
@@ -3066,6 +3066,14 @@ 
        "active": {

          "type": "boolean",

          "description": "Whether the subscription is currently active or not."

        },

        "provider_response": {

          "type": "string",

          "description": "Raw provider validation response body."

        },

        "provider_notification": {

          "type": "string",

          "description": "Raw provider notification body."

        }

      }

    },

console/ui/src/app/console.service.ts

+5 −1
Original line number Diff line number Diff line
@@ -740,7 +740,7 @@ export interface ApiValidatedPurchase { 
	environment?:ApiStoreEnvironment

  // Purchase Product ID.

	product_id?:string

  // Raw provider validation response.

  // Raw provider validation response body.

	provider_response?:string

  // UNIX Timestamp when the purchase was done.

	purchase_time?:string
@@ -767,6 +767,10 @@ export interface ApiValidatedSubscription { 
	original_transaction_id?:string

  // Purchase Product ID.

	product_id?:string

  // Raw provider notification body.

	provider_notification?:string

  // Raw provider validation response body.

	provider_response?:string

  // UNIX Timestamp when the purchase was done.

	purchase_time?:string

  // Store identifier

go.sum

+0 −4
Original line number Diff line number Diff line
@@ -285,10 +285,6 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO 
github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=

github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=

github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=

github.com/heroiclabs/nakama-common v1.25.0 h1:EtYBlUQtQCsCGEpCQQc6zAtRZMYv2yjs8fUYfpN1ROw=

github.com/heroiclabs/nakama-common v1.25.0/go.mod h1:zdYggBBPmykSfz4zYFJmBDX5wyURSPAGANtJPEDdbx8=

github.com/heroiclabs/nakama-common v1.25.1-0.20221124142234-d30d90a403a0 h1:e+TBC3Gkmn2g/a7WPPB9OSDDBcw7aC1Pyf+Lb/Ntrwg=

github.com/heroiclabs/nakama-common v1.25.1-0.20221124142234-d30d90a403a0/go.mod h1:zdYggBBPmykSfz4zYFJmBDX5wyURSPAGANtJPEDdbx8=

github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=

github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=

github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=

server/core_subscription.go

+4 −4
Original line number Diff line number Diff line
@@ -492,15 +492,15 @@ INTO 
         		raw_notification

        )

VALUES

    ($1, $2, $3, $4, $5, $6, $7, NULLIF($8, ''), NULLIF($9, ''))

    ($1, $2, $3, $4, $5, $6, $7, COALESCE(NULLIF($8, ''), '{}'::JSONB), COALESCE(NULLIF($9, ''), '{}'::JSONB))

ON CONFLICT

    (original_transaction_id)

DO

	UPDATE SET

		expire_time = $7,

		update_time = now(),

		raw_response = $8,

		raw_notification = $9

		raw_response = COALESCE(NULLIF($8, ''), subscription.raw_response),

		raw_notification = COALESCE(NULLIF($9, ''), subscription.raw_notification)

RETURNING

    create_time, update_time, expire_time, raw_response, raw_notification

`
@@ -511,7 +511,7 @@ RETURNING 
		rawResponse     string

		rawNotification string

	)

	if err := db.QueryRowContext(ctx, query, sub.userID, sub.store, sub.originalTransactionId, sub.productId, sub.purchaseTime, sub.environment, sub.expireTime, sub.rawResponse).Scan(&createTime, &updateTime, &expireTime, &rawResponse, &rawNotification); err != nil {

	if err := db.QueryRowContext(ctx, query, sub.userID, sub.store, sub.originalTransactionId, sub.productId, sub.purchaseTime, sub.environment, sub.expireTime, sub.rawResponse, sub.rawNotification).Scan(&createTime, &updateTime, &expireTime, &rawResponse, &rawNotification); err != nil {

		return err

	}