Fix ID's

Author: AchoArnold

api/docs/docs.go

@@ -3342,6 +3342,7 @@ const docTemplate = `{
                 "notification_message_status_enabled",
                 "notification_newsletter_enabled",
                 "notification_webhook_enabled",
+                "subscription_id",
                 "subscription_name",
                 "timezone",
                 "updated_at"
@@ -3387,6 +3388,10 @@ const docTemplate = `{
                     "type": "string",
                     "example": "2022-06-05T14:26:02.302718+03:00"
                 },
+                "subscription_id": {
+                    "type": "string",
+                    "example": "8f9c71b8-b84e-4417-8408-a62274f65a08"
+                },
                 "subscription_name": {
                     "type": "string",
                     "example": "free"

api/docs/swagger.json

@@ -3073,6 +3073,7 @@
         "notification_message_status_enabled",
         "notification_newsletter_enabled",
         "notification_webhook_enabled",
+        "subscription_id",
         "subscription_name",
         "timezone",
         "updated_at"
@@ -3118,6 +3119,10 @@
           "type": "string",
           "example": "2022-06-05T14:26:02.302718+03:00"
         },
+        "subscription_id": {
+          "type": "string",
+          "example": "8f9c71b8-b84e-4417-8408-a62274f65a08"
+        },
         "subscription_name": {
           "type": "string",
           "example": "free"

api/docs/swagger.yaml

@@ -388,6 +388,9 @@ definitions:
       subscription_ends_at:
         example: "2022-06-05T14:26:02.302718+03:00"
         type: string
+      subscription_id:
+        example: 8f9c71b8-b84e-4417-8408-a62274f65a08
+        type: string
       subscription_name:
         example: free
         type: string
@@ -412,6 +415,7 @@ definitions:
       - notification_message_status_enabled
       - notification_newsletter_enabled
       - notification_webhook_enabled
+      - subscription_id
       - subscription_name
       - timezone
       - updated_at

api/pkg/entities/user.go

@@ -78,7 +78,7 @@ type User struct {
 	Timezone                         string           `json:"timezone" example:"Europe/Helsinki" gorm:"default:Africa/Accra"`
 	ActivePhoneID                    *uuid.UUID       `json:"active_phone_id" gorm:"type:uuid;" example:"32343a19-da5e-4b1b-a767-3298a73703cb" validate:"optional"`
 	SubscriptionName                 SubscriptionName `json:"subscription_name" example:"free"`
-	SubscriptionID                   *string          `json:"subscription_id" example:"8f9c71b8-b84e-4417-8408-a62274f65a08" swaggerignore:"true"`
+	SubscriptionID                   *string          `json:"subscription_id" example:"8f9c71b8-b84e-4417-8408-a62274f65a08"`
 	SubscriptionStatus               *string          `json:"subscription_status" example:"on_trial" validate:"optional"`
 	SubscriptionRenewsAt             *time.Time       `json:"subscription_renews_at" example:"2022-06-05T14:26:02.302718+03:00" validate:"optional"`
 	SubscriptionEndsAt               *time.Time       `json:"subscription_ends_at" example:"2022-06-05T14:26:02.302718+03:00" validate:"optional"`

web/models/api.ts

@@ -224,6 +224,8 @@ export interface EntitiesUser {
   notification_webhook_enabled: boolean
   /** @example "2022-06-05T14:26:02.302718+03:00" */
   subscription_ends_at?: string
+  /** @example "8f9c71b8-b84e-4417-8408-a62274f65a08" */
+  subscription_id: string
   /** @example "free" */
   subscription_name: string
   /** @example "2022-06-05T14:26:02.302718+03:00" */