@rivascva/dt-idl 1.1.128 → 1.1.130

package/dist/index.d.ts

@@ -719,6 +719,23 @@ interface paths$2 {
         patch?: never;
         trace?: never;
     };
+    "/portfolios/{portfolioId}/history": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        /** @description Gets the portfolio history values */
+        get: operations$2["getPortfolioHistory"];
+        put?: never;
+        post?: never;
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
     "/portfolios/by-user/{userId}": {
         parameters: {
             query?: never;
@@ -770,6 +787,23 @@ interface paths$2 {
         patch?: never;
         trace?: never;
     };
+    "/orders/by-portfolio/{portfolioId}": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        /** @description Gets the orders for the given portfolio */
+        get: operations$2["getOrdersByPortfolio"];
+        put?: never;
+        post?: never;
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
 }
 interface components$2 {
     schemas: {
@@ -810,6 +844,33 @@ interface components$2 {
              */
             dateUpdated: number;
         };
+        /** @description A portfolio history value */
+        PortfolioHistoryValue: {
+            /** @example 123456 */
+            id: string;
+            /** @example 123456 */
+            portfolioId: string;
+            /**
+             * Format: double
+             * @example 10500.25
+             */
+            cash: number;
+            /**
+             * Format: double
+             * @example 10500.25
+             */
+            totalValue: number;
+            /**
+             * Format: int64
+             * @example 1713398544000
+             */
+            dateCreated: number;
+            /**
+             * Format: int64
+             * @example 1713398544000
+             */
+            dateUpdated: number;
+        };
         /** @description A stock holding */
         Holding: {
             /** @example 123456 */
@@ -899,6 +960,10 @@ interface components$2 {
         PortfolioType: "PERSONAL" | "COMPETITIVE";
         /** @enum {string} */
         OrderType: "BUY_MARKET" | "BUY_LIMIT" | "BUY_STOP" | "SELL_MARKET" | "SELL_LIMIT" | "SELL_STOP";
+        /** @enum {string} */
+        PortfolioHistoryTimeframe: "MIN5" | "MIN15" | "MIN30" | "HOUR1" | "HOUR4" | "DAY1";
+        /** @enum {string} */
+        OrderStatus: "PENDING" | "COMPLETED";
     };
     responses: {
         /** @description No content */
@@ -1001,6 +1066,38 @@ interface operations$2 {
             500: components$2["responses"]["InternalServerError"];
         };
     };
+    getPortfolioHistory: {
+        parameters: {
+            query: {
+                /** @description The portfolio history timeframe */
+                timeframe: components$2["schemas"]["PortfolioHistoryTimeframe"];
+                /** @description The portfolio history from date */
+                from: string;
+                /** @description The portfolio history to date */
+                to: string;
+            };
+            header?: never;
+            path: {
+                /** @description The portfolio id */
+                portfolioId: string;
+            };
+            cookie?: never;
+        };
+        requestBody?: never;
+        responses: {
+            /** @description Success */
+            200: {
+                headers: {
+                    [name: string]: unknown;
+                };
+                content: {
+                    "application/json": components$2["schemas"]["PortfolioHistoryValue"][];
+                };
+            };
+            404: components$2["responses"]["NotFound"];
+            500: components$2["responses"]["InternalServerError"];
+        };
+    };
     getPortfoliosByUser: {
         parameters: {
             query?: never;
@@ -1072,6 +1169,36 @@ interface operations$2 {
             500: components$2["responses"]["InternalServerError"];
         };
     };
+    getOrdersByPortfolio: {
+        parameters: {
+            query?: {
+                /** @description The order status */
+                status?: components$2["schemas"]["OrderStatus"];
+                /** @description The maximum number of order results */
+                limit?: number;
+            };
+            header?: never;
+            path: {
+                /** @description The portfolio id */
+                portfolioId: string;
+            };
+            cookie?: never;
+        };
+        requestBody?: never;
+        responses: {
+            /** @description Success */
+            200: {
+                headers: {
+                    [name: string]: unknown;
+                };
+                content: {
+                    "application/json": components$2["schemas"]["Order"][];
+                };
+            };
+            404: components$2["responses"]["NotFound"];
+            500: components$2["responses"]["InternalServerError"];
+        };
+    };
 }
 
 /**

package/go/auth/jwt.go

@@ -41,22 +41,22 @@ func NewServiceAccessToken(accessTokenSecret string, issuer string, service stri
 
 // NewUserRefreshToken creates a new JWT refresh token for the given user id.
 func NewUserRefreshToken(refreshTokenSecret string, issuer string, userId string, duration time.Duration) (*jwt.Token, error) {
-	return newRefreshToken(refreshTokenSecret, issuer, userId, duration)
+	return newRefreshToken(refreshTokenSecret, "user", issuer, userId, duration)
 }
 
 // NewServiceRefreshToken creates a new JWT refresh token for the given service.
 func NewServiceRefreshToken(refreshTokenSecret string, issuer string, service string, duration time.Duration) (*jwt.Token, error) {
-	return newRefreshToken(refreshTokenSecret, issuer, service, duration)
+	return newRefreshToken(refreshTokenSecret, "service", issuer, service, duration)
 }
 
 // newAccessToken creates a new JWT access token.
-func newAccessToken(accessTokenSecret string, ttype string, issuer string, subject string, duration time.Duration) (*jwt.Token, error) {
+func newAccessToken(accessTokenSecret string, tokenType string, issuer string, subject string, duration time.Duration) (*jwt.Token, error) {
 	t := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{
-		"type": ttype,
-		"iss":  issuer,
-		"sub":  subject,
-		"iat":  jwt.NewNumericDate(time.Now()),
-		"exp":  jwt.NewNumericDate(time.Now().Add(duration)),
+		"typ": fmt.Sprintf("access:%s", tokenType),
+		"iss": issuer,
+		"sub": subject,
+		"iat": jwt.NewNumericDate(time.Now()),
+		"exp": jwt.NewNumericDate(time.Now().Add(duration)),
 	})
 
 	s, err := t.SignedString([]byte(accessTokenSecret))
@@ -78,13 +78,13 @@ func newAccessToken(accessTokenSecret string, ttype string, issuer string, subje
 }
 
 // newRefreshToken creates a new JWT refresh token.
-func newRefreshToken(refreshTokenSecret string, issuer string, subject string, duration time.Duration) (*jwt.Token, error) {
+func newRefreshToken(refreshTokenSecret string, tokenType string, issuer string, subject string, duration time.Duration) (*jwt.Token, error) {
 	t := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{
-		"type": "refresh",
-		"iss":  issuer,
-		"sub":  subject,
-		"iat":  jwt.NewNumericDate(time.Now()),
-		"exp":  jwt.NewNumericDate(time.Now().Add(duration)),
+		"typ": fmt.Sprintf("refresh:%s", tokenType),
+		"iss": issuer,
+		"sub": subject,
+		"iat": jwt.NewNumericDate(time.Now()),
+		"exp": jwt.NewNumericDate(time.Now().Add(duration)),
 	})
 
 	s, err := t.SignedString([]byte(refreshTokenSecret))

package/go/auth/utils.go

@@ -24,9 +24,9 @@ func CanActorAccessResourcesForUser(ctx context.Context, userId string) (bool, e
 
 	// check if the actor is allowed to access the user id
 	switch tokenType {
-	case "user":
+	case "access:user":
 		return actorId == userId, nil
-	case "service":
+	case "access:service":
 		return slices.Contains(approvedServices, actorId), nil
 	default:
 		return false, fmt.Errorf("invalid token type %s", tokenType)
@@ -49,9 +49,9 @@ func CanActorAccessAllResources(ctx context.Context) (bool, error) {
 
 	// check if the actor is a service
 	switch tokenType {
-	case "user":
+	case "access:user":
 		return false, nil
-	case "service":
+	case "access:service":
 		return slices.Contains(approvedServices, actorId), nil
 	default:
 		return false, fmt.Errorf("invalid token type %s", tokenType)

package/go/utils/context.go

@@ -49,7 +49,7 @@ func GetTokenTypeFromContext(ctx context.Context) (string, error) {
 	}
 
 	// get the token type from the access token
-	tokenType, ok := accessToken.Claims.(jwt.MapClaims)["type"].(string)
+	tokenType, ok := accessToken.Claims.(jwt.MapClaims)["typ"].(string)
 	if !ok {
 		return "", errors.New("token type not found in the access token")
 	}

package/package.json

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

package/services/dt-trade-service.yaml

@@ -71,6 +71,55 @@ paths:
         500:
           $ref: '#/components/responses/InternalServerError'
 
+  /portfolios/{portfolioId}/history:
+    get:
+      description: Gets the portfolio history values
+      operationId: getPortfolioHistory
+      tags:
+        - Portfolios
+      parameters:
+        - in: path
+          name: portfolioId
+          description: The portfolio id
+          required: true
+          schema:
+            type: string
+            example: 123456
+        - in: query
+          name: timeframe
+          description: The portfolio history timeframe
+          required: true
+          schema:
+            $ref: '#/components/schemas/PortfolioHistoryTimeframe'
+            example: MIN5
+        - in: query
+          name: from
+          description: The portfolio history from date
+          required: true
+          schema:
+            type: string
+            example: 2024-12-24
+        - in: query
+          name: to
+          description: The portfolio history to date
+          required: true
+          schema:
+            type: string
+            example: 2024-12-31
+      responses:
+        200:
+          description: Success
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/PortfolioHistoryValue'
+        404:
+          $ref: '#/components/responses/NotFound'
+        500:
+          $ref: '#/components/responses/InternalServerError'
+
   /portfolios/by-user/{userId}:
     get:
       description: Gets the portfolios for the given user
@@ -150,6 +199,50 @@ paths:
         500:
           $ref: '#/components/responses/InternalServerError'
 
+  /orders/by-portfolio/{portfolioId}:
+    get:
+      description: Gets the orders for the given portfolio
+      operationId: getOrdersByPortfolio
+      tags:
+        - Orders
+      parameters:
+        - in: path
+          name: portfolioId
+          description: The portfolio id
+          required: true
+          schema:
+            type: string
+            example: 12345
+        - in: query
+          name: status
+          description: The order status
+          required: false
+          schema:
+            $ref: '#/components/schemas/OrderStatus'
+            example: COMPLETED
+        - in: query
+          name: limit
+          description: The maximum number of order results
+          required: false
+          schema:
+            type: integer
+            format: int64
+            example: 10
+            default: 10
+      responses:
+        200:
+          description: Success
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/Order'
+        404:
+          $ref: '#/components/responses/NotFound'
+        500:
+          $ref: '#/components/responses/InternalServerError'
+
 components:
   schemas:
     AddPortfolioPayload:
@@ -213,6 +306,39 @@ components:
             - dateCreated
             - dateUpdated
 
+    PortfolioHistoryValue:
+      description: A portfolio history value
+      properties:
+        id:
+          type: string
+          example: 123456
+        portfolioId:
+          type: string
+          example: 123456
+        cash:
+          type: number
+          format: double
+          example: 10500.25
+        totalValue:
+          type: number
+          format: double
+          example: 10500.25
+        dateCreated:
+          type: integer
+          format: int64
+          example: 1713398544000
+        dateUpdated:
+          type: integer
+          format: int64
+          example: 1713398544000
+      required:
+        - id
+        - portfolioId
+        - cash
+        - totalValue
+        - dateCreated
+        - dateUpdated
+
     Holding:
       description: A stock holding
       properties:
@@ -349,6 +475,22 @@ components:
         - SELL_LIMIT
         - SELL_STOP
 
+    PortfolioHistoryTimeframe:
+      type: string
+      enum:
+        - MIN5
+        - MIN15
+        - MIN30
+        - HOUR1
+        - HOUR4
+        - DAY1
+
+    OrderStatus:
+      type: string
+      enum:
+        - PENDING
+        - COMPLETED
+
   responses:
     NoContent:
       description: No content

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

@@ -38,6 +38,23 @@ export interface paths {
         patch?: never;
         trace?: never;
     };
+    "/portfolios/{portfolioId}/history": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        /** @description Gets the portfolio history values */
+        get: operations["getPortfolioHistory"];
+        put?: never;
+        post?: never;
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
     "/portfolios/by-user/{userId}": {
         parameters: {
             query?: never;
@@ -89,6 +106,23 @@ export interface paths {
         patch?: never;
         trace?: never;
     };
+    "/orders/by-portfolio/{portfolioId}": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        /** @description Gets the orders for the given portfolio */
+        get: operations["getOrdersByPortfolio"];
+        put?: never;
+        post?: never;
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
 }
 export type webhooks = Record<string, never>;
 export interface components {
@@ -130,6 +164,33 @@ export interface components {
              */
             dateUpdated: number;
         };
+        /** @description A portfolio history value */
+        PortfolioHistoryValue: {
+            /** @example 123456 */
+            id: string;
+            /** @example 123456 */
+            portfolioId: string;
+            /**
+             * Format: double
+             * @example 10500.25
+             */
+            cash: number;
+            /**
+             * Format: double
+             * @example 10500.25
+             */
+            totalValue: number;
+            /**
+             * Format: int64
+             * @example 1713398544000
+             */
+            dateCreated: number;
+            /**
+             * Format: int64
+             * @example 1713398544000
+             */
+            dateUpdated: number;
+        };
         /** @description A stock holding */
         Holding: {
             /** @example 123456 */
@@ -219,6 +280,10 @@ export interface components {
         PortfolioType: "PERSONAL" | "COMPETITIVE";
         /** @enum {string} */
         OrderType: "BUY_MARKET" | "BUY_LIMIT" | "BUY_STOP" | "SELL_MARKET" | "SELL_LIMIT" | "SELL_STOP";
+        /** @enum {string} */
+        PortfolioHistoryTimeframe: "MIN5" | "MIN15" | "MIN30" | "HOUR1" | "HOUR4" | "DAY1";
+        /** @enum {string} */
+        OrderStatus: "PENDING" | "COMPLETED";
     };
     responses: {
         /** @description No content */
@@ -322,6 +387,38 @@ export interface operations {
             500: components["responses"]["InternalServerError"];
         };
     };
+    getPortfolioHistory: {
+        parameters: {
+            query: {
+                /** @description The portfolio history timeframe */
+                timeframe: components["schemas"]["PortfolioHistoryTimeframe"];
+                /** @description The portfolio history from date */
+                from: string;
+                /** @description The portfolio history to date */
+                to: string;
+            };
+            header?: never;
+            path: {
+                /** @description The portfolio id */
+                portfolioId: string;
+            };
+            cookie?: never;
+        };
+        requestBody?: never;
+        responses: {
+            /** @description Success */
+            200: {
+                headers: {
+                    [name: string]: unknown;
+                };
+                content: {
+                    "application/json": components["schemas"]["PortfolioHistoryValue"][];
+                };
+            };
+            404: components["responses"]["NotFound"];
+            500: components["responses"]["InternalServerError"];
+        };
+    };
     getPortfoliosByUser: {
         parameters: {
             query?: never;
@@ -393,4 +490,34 @@ export interface operations {
             500: components["responses"]["InternalServerError"];
         };
     };
+    getOrdersByPortfolio: {
+        parameters: {
+            query?: {
+                /** @description The order status */
+                status?: components["schemas"]["OrderStatus"];
+                /** @description The maximum number of order results */
+                limit?: number;
+            };
+            header?: never;
+            path: {
+                /** @description The portfolio id */
+                portfolioId: string;
+            };
+            cookie?: never;
+        };
+        requestBody?: never;
+        responses: {
+            /** @description Success */
+            200: {
+                headers: {
+                    [name: string]: unknown;
+                };
+                content: {
+                    "application/json": components["schemas"]["Order"][];
+                };
+            };
+            404: components["responses"]["NotFound"];
+            500: components["responses"]["InternalServerError"];
+        };
+    };
 }