@rivascva/dt-idl 1.1.70 → 1.1.72

package/dist/index.d.ts

@@ -692,7 +692,8 @@ interface paths$2 {
             path?: never;
             cookie?: never;
         };
-        get?: never;
+        /** @description Gets all portfolios */
+        get: operations$2["getPortfolios"];
         put?: never;
         /** @description Adds a new portfolio */
         post: operations$2["addPortfolio"];
@@ -719,23 +720,6 @@ interface paths$2 {
         patch?: never;
         trace?: never;
     };
-    "/portfolios/by-user/{userId}": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        /** @description Gets the portfolios for the given user */
-        get: operations$2["getPortfoliosByUser"];
-        put?: never;
-        post?: never;
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
     "/orders": {
         parameters: {
             query?: never;
@@ -775,8 +759,6 @@ interface components$2 {
     schemas: {
         /** @description Payload to add a new portfolio */
         AddPortfolioPayload: {
-            /** @example 123456 */
-            userId: string;
             /** @example PERSONAL */
             type: components$2["schemas"]["PortfolioType"];
             /**
@@ -791,6 +773,8 @@ interface components$2 {
         Portfolio: components$2["schemas"]["AddPortfolioPayload"] & {
             /** @example 123456 */
             id: string;
+            /** @example 123456 */
+            userId: string;
             holdings: components$2["schemas"]["Holding"][];
             orders: components$2["schemas"]["Order"][];
             /**
@@ -936,53 +920,44 @@ interface components$2 {
     pathItems: never;
 }
 interface operations$2 {
-    addPortfolio: {
+    getPortfolios: {
         parameters: {
             query?: never;
             header?: never;
             path?: never;
             cookie?: never;
         };
-        /** @description The request body to add a portfolio */
-        requestBody: {
-            content: {
-                "application/json": components$2["schemas"]["AddPortfolioPayload"];
-            };
-        };
+        requestBody?: never;
         responses: {
-            /** @description Added */
-            201: {
+            /** @description Success */
+            200: {
                 headers: {
                     [name: string]: unknown;
                 };
                 content: {
-                    "application/json": components$2["schemas"]["Portfolio"];
+                    "application/json": components$2["schemas"]["Portfolio"][];
                 };
             };
-            400: components$2["responses"]["BadRequest"];
             404: components$2["responses"]["NotFound"];
             500: components$2["responses"]["InternalServerError"];
         };
     };
-    updatePortfolio: {
+    addPortfolio: {
         parameters: {
             query?: never;
             header?: never;
-            path: {
-                /** @description The portfolio id */
-                portfolioId: string;
-            };
+            path?: never;
             cookie?: never;
         };
-        /** @description The request body to update a portfolio */
+        /** @description The request body to add a portfolio */
         requestBody: {
             content: {
-                "application/json": components$2["schemas"]["UpdatePortfolioPayload"];
+                "application/json": components$2["schemas"]["AddPortfolioPayload"];
             };
         };
         responses: {
-            /** @description Success */
-            200: {
+            /** @description Added */
+            201: {
                 headers: {
                     [name: string]: unknown;
                 };
@@ -995,17 +970,22 @@ interface operations$2 {
             500: components$2["responses"]["InternalServerError"];
         };
     };
-    getPortfoliosByUser: {
+    updatePortfolio: {
         parameters: {
             query?: never;
             header?: never;
             path: {
-                /** @description The user id */
-                userId: string;
+                /** @description The portfolio id */
+                portfolioId: string;
             };
             cookie?: never;
         };
-        requestBody?: never;
+        /** @description The request body to update a portfolio */
+        requestBody: {
+            content: {
+                "application/json": components$2["schemas"]["UpdatePortfolioPayload"];
+            };
+        };
         responses: {
             /** @description Success */
             200: {
@@ -1013,9 +993,10 @@ interface operations$2 {
                     [name: string]: unknown;
                 };
                 content: {
-                    "application/json": components$2["schemas"]["Portfolio"][];
+                    "application/json": components$2["schemas"]["Portfolio"];
                 };
             };
+            400: components$2["responses"]["BadRequest"];
             404: components$2["responses"]["NotFound"];
             500: components$2["responses"]["InternalServerError"];
         };

package/go/utils/context.go

@@ -2,6 +2,8 @@ package utils
 
 import (
 	"context"
+	"errors"
+	"fmt"
 
 	"github.com/RivasCVA/dt-idl/go/models"
 	"github.com/golang-jwt/jwt/v5"
@@ -15,3 +17,23 @@ func GetTokenFromContext(ctx context.Context) *jwt.Token {
 	}
 	return token
 }
+
+// GetUserIdFromContext retrieves the user id from the JTW token in the given context.
+func GetUserIdFromContext(ctx context.Context) (string, error) {
+	// get the token from the context
+	token := GetTokenFromContext(ctx)
+	if token == nil {
+		return "", errors.New("token not found in the context")
+	}
+
+	// get the subject (userId) from the token
+	userId, err := token.Claims.GetSubject()
+	if err != nil {
+		return "", fmt.Errorf("failed to get the subject from the token: %w", err)
+	}
+	if userId == "" {
+		return "", errors.New("user id not found in the token subject")
+	}
+
+	return userId, nil
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rivascva/dt-idl",
-  "version": "1.1.70",
+  "version": "1.1.72",
   "description": "Dream Trade - Interface Definition Language",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",

package/services/dt-trade-service.yaml

@@ -10,6 +10,24 @@ servers:
 
 paths:
   /portfolios:
+    get:
+      description: Gets all portfolios
+      operationId: getPortfolios
+      tags:
+        - Portfolios
+      responses:
+        200:
+          description: Success
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/Portfolio'
+        404:
+          $ref: '#/components/responses/NotFound'
+        500:
+          $ref: '#/components/responses/InternalServerError'
     post:
       description: Adds a new portfolio
       operationId: addPortfolio
@@ -71,34 +89,6 @@ paths:
         500:
           $ref: '#/components/responses/InternalServerError'
 
-  /portfolios/by-user/{userId}:
-    get:
-      description: Gets the portfolios for the given user
-      operationId: getPortfoliosByUser
-      tags:
-        - Portfolios
-      parameters:
-        - in: path
-          name: userId
-          description: The user id
-          required: true
-          schema:
-            type: string
-            example: 123456
-      responses:
-        200:
-          description: Success
-          content:
-            application/json:
-              schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/Portfolio'
-        404:
-          $ref: '#/components/responses/NotFound'
-        500:
-          $ref: '#/components/responses/InternalServerError'
-
   /orders:
     post:
       description: Adds a new order
@@ -155,9 +145,6 @@ components:
     AddPortfolioPayload:
       description: Payload to add a new portfolio
       properties:
-        userId:
-          type: string
-          example: 123456
         type:
           $ref: '#/components/schemas/PortfolioType'
           example: PERSONAL
@@ -166,7 +153,6 @@ components:
           format: double
           example: 10500.25
       required:
-        - userId
         - type
         - cash
 
@@ -184,6 +170,9 @@ components:
             id:
               type: string
               example: 123456
+            userId:
+              type: string
+              example: 123456
             holdings:
               type: array
               items:
@@ -202,6 +191,7 @@ components:
               example: 1713398544000
           required:
             - id
+            - userId
             - holdings
             - orders
             - dateCreated

package/ts/services/dt-trade-service.ts

@@ -11,7 +11,8 @@ export interface paths {
             path?: never;
             cookie?: never;
         };
-        get?: never;
+        /** @description Gets all portfolios */
+        get: operations["getPortfolios"];
         put?: never;
         /** @description Adds a new portfolio */
         post: operations["addPortfolio"];
@@ -38,23 +39,6 @@ export interface paths {
         patch?: never;
         trace?: never;
     };
-    "/portfolios/by-user/{userId}": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        /** @description Gets the portfolios for the given user */
-        get: operations["getPortfoliosByUser"];
-        put?: never;
-        post?: never;
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
     "/orders": {
         parameters: {
             query?: never;
@@ -95,8 +79,6 @@ export interface components {
     schemas: {
         /** @description Payload to add a new portfolio */
         AddPortfolioPayload: {
-            /** @example 123456 */
-            userId: string;
             /** @example PERSONAL */
             type: components["schemas"]["PortfolioType"];
             /**
@@ -111,6 +93,8 @@ export interface components {
         Portfolio: components["schemas"]["AddPortfolioPayload"] & {
             /** @example 123456 */
             id: string;
+            /** @example 123456 */
+            userId: string;
             holdings: components["schemas"]["Holding"][];
             orders: components["schemas"]["Order"][];
             /**
@@ -257,53 +241,44 @@ export interface components {
 }
 export type $defs = Record<string, never>;
 export interface operations {
-    addPortfolio: {
+    getPortfolios: {
         parameters: {
             query?: never;
             header?: never;
             path?: never;
             cookie?: never;
         };
-        /** @description The request body to add a portfolio */
-        requestBody: {
-            content: {
-                "application/json": components["schemas"]["AddPortfolioPayload"];
-            };
-        };
+        requestBody?: never;
         responses: {
-            /** @description Added */
-            201: {
+            /** @description Success */
+            200: {
                 headers: {
                     [name: string]: unknown;
                 };
                 content: {
-                    "application/json": components["schemas"]["Portfolio"];
+                    "application/json": components["schemas"]["Portfolio"][];
                 };
             };
-            400: components["responses"]["BadRequest"];
             404: components["responses"]["NotFound"];
             500: components["responses"]["InternalServerError"];
         };
     };
-    updatePortfolio: {
+    addPortfolio: {
         parameters: {
             query?: never;
             header?: never;
-            path: {
-                /** @description The portfolio id */
-                portfolioId: string;
-            };
+            path?: never;
             cookie?: never;
         };
-        /** @description The request body to update a portfolio */
+        /** @description The request body to add a portfolio */
         requestBody: {
             content: {
-                "application/json": components["schemas"]["UpdatePortfolioPayload"];
+                "application/json": components["schemas"]["AddPortfolioPayload"];
             };
         };
         responses: {
-            /** @description Success */
-            200: {
+            /** @description Added */
+            201: {
                 headers: {
                     [name: string]: unknown;
                 };
@@ -316,17 +291,22 @@ export interface operations {
             500: components["responses"]["InternalServerError"];
         };
     };
-    getPortfoliosByUser: {
+    updatePortfolio: {
         parameters: {
             query?: never;
             header?: never;
             path: {
-                /** @description The user id */
-                userId: string;
+                /** @description The portfolio id */
+                portfolioId: string;
             };
             cookie?: never;
         };
-        requestBody?: never;
+        /** @description The request body to update a portfolio */
+        requestBody: {
+            content: {
+                "application/json": components["schemas"]["UpdatePortfolioPayload"];
+            };
+        };
         responses: {
             /** @description Success */
             200: {
@@ -334,9 +314,10 @@ export interface operations {
                     [name: string]: unknown;
                 };
                 content: {
-                    "application/json": components["schemas"]["Portfolio"][];
+                    "application/json": components["schemas"]["Portfolio"];
                 };
             };
+            400: components["responses"]["BadRequest"];
             404: components["responses"]["NotFound"];
             500: components["responses"]["InternalServerError"];
         };