@rivascva/dt-idl 1.1.79 → 1.1.81

package/dist/index.d.ts

@@ -692,8 +692,7 @@ interface paths$2 {
             path?: never;
             cookie?: never;
         };
-        /** @description Gets all portfolios */
-        get: operations$2["getPortfolios"];
+        get?: never;
         put?: never;
         /** @description Adds a new portfolio */
         post: operations$2["addPortfolio"];
@@ -720,6 +719,23 @@ 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;
@@ -759,6 +775,8 @@ interface components$2 {
     schemas: {
         /** @description Payload to add a new portfolio */
         AddPortfolioPayload: {
+            /** @example 123456 */
+            userId: string;
             /** @example PERSONAL */
             type: components$2["schemas"]["PortfolioType"];
             /**
@@ -773,8 +791,6 @@ 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"][];
             /**
@@ -920,28 +936,6 @@ interface components$2 {
     pathItems: never;
 }
 interface operations$2 {
-    getPortfolios: {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        requestBody?: never;
-        responses: {
-            /** @description Success */
-            200: {
-                headers: {
-                    [name: string]: unknown;
-                };
-                content: {
-                    "application/json": components$2["schemas"]["Portfolio"][];
-                };
-            };
-            404: components$2["responses"]["NotFound"];
-            500: components$2["responses"]["InternalServerError"];
-        };
-    };
     addPortfolio: {
         parameters: {
             query?: never;
@@ -1001,6 +995,31 @@ interface operations$2 {
             500: components$2["responses"]["InternalServerError"];
         };
     };
+    getPortfoliosByUser: {
+        parameters: {
+            query?: never;
+            header?: never;
+            path: {
+                /** @description The user id */
+                userId: string;
+            };
+            cookie?: never;
+        };
+        requestBody?: never;
+        responses: {
+            /** @description Success */
+            200: {
+                headers: {
+                    [name: string]: unknown;
+                };
+                content: {
+                    "application/json": components$2["schemas"]["Portfolio"][];
+                };
+            };
+            404: components$2["responses"]["NotFound"];
+            500: components$2["responses"]["InternalServerError"];
+        };
+    };
     addOrder: {
         parameters: {
             query?: never;
@@ -1112,7 +1131,8 @@ interface paths$1 {
             path?: never;
             cookie?: never;
         };
-        get?: never;
+        /** @description Gets all users */
+        get: operations$1["getUsers"];
         put?: never;
         /** @description Adds a new user */
         post: operations$1["addUser"];
@@ -1122,17 +1142,17 @@ interface paths$1 {
         patch?: never;
         trace?: never;
     };
-    "/users/me": {
+    "/users/{userId}": {
         parameters: {
             query?: never;
             header?: never;
             path?: never;
             cookie?: never;
         };
-        /** @description Gets the current user */
-        get: operations$1["getCurrentUser"];
-        /** @description Updates the current user */
-        put: operations$1["updateCurrentUser"];
+        /** @description Gets a user */
+        get: operations$1["getUser"];
+        /** @description Updates an existing user */
+        put: operations$1["updateUser"];
         post?: never;
         delete?: never;
         options?: never;
@@ -1309,6 +1329,28 @@ interface operations$1 {
             500: components$1["responses"]["InternalServerError"];
         };
     };
+    getUsers: {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        requestBody?: never;
+        responses: {
+            /** @description Success */
+            200: {
+                headers: {
+                    [name: string]: unknown;
+                };
+                content: {
+                    "application/json": components$1["schemas"]["User"][];
+                };
+            };
+            404: components$1["responses"]["NotFound"];
+            500: components$1["responses"]["InternalServerError"];
+        };
+    };
     addUser: {
         parameters: {
             query?: never;
@@ -1336,11 +1378,14 @@ interface operations$1 {
             500: components$1["responses"]["InternalServerError"];
         };
     };
-    getCurrentUser: {
+    getUser: {
         parameters: {
             query?: never;
             header?: never;
-            path?: never;
+            path: {
+                /** @description The user id */
+                userId: string;
+            };
             cookie?: never;
         };
         requestBody?: never;
@@ -1358,14 +1403,17 @@ interface operations$1 {
             500: components$1["responses"]["InternalServerError"];
         };
     };
-    updateCurrentUser: {
+    updateUser: {
         parameters: {
             query?: never;
             header?: never;
-            path?: never;
+            path: {
+                /** @description The user id */
+                userId: string;
+            };
             cookie?: never;
         };
-        /** @description The request body to update the current user */
+        /** @description The request body to update a user */
         requestBody: {
             content: {
                 "application/json": components$1["schemas"]["UpdateUserPayload"];

package/go/log/log.go

@@ -62,11 +62,9 @@ func (l *Log) With(kvs ...any) Logger {
 	// add the new key-value pairs into the new map
 	for i := 0; i < len(kvs); i += 2 {
 		k := fmt.Sprintf("%v", kvs[i])
-		v := ""
-		if i+1 < len(kvs) {
-			v = fmt.Sprintf("%v", kvs[i+1])
+		if k != "" && i+1 < len(kvs) {
+			newkvs[k] = kvs[i+1]
 		}
-		newkvs[k] = v
 	}
 
 	return &Log{

package/go/log/utils.go

@@ -36,7 +36,7 @@ func toJson(m any, kvs map[string]any, level string) string {
 // kvsWithContext returns a new kvs map with added context metadata.
 func kvsWithContext(ctx context.Context, kvs map[string]any) map[string]any {
 	// copy the existing key-value pairs into a new map
-	newkvs := make(map[string]any, len(kvs)+2)
+	newkvs := make(map[string]any, len(kvs)+3)
 	maps.Copy(newkvs, kvs)
 
 	// add the user id to the key-value pairs
@@ -45,8 +45,13 @@ func kvsWithContext(ctx context.Context, kvs map[string]any) map[string]any {
 	}
 
 	// add the request path to the key-value pairs
-	if path, err := utils.GetPathFromContext(ctx); err == nil {
-		newkvs["path"] = path
+	if requestPath, err := utils.GetRequestPathFromContext(ctx); err == nil {
+		newkvs["requestPath"] = requestPath
+	}
+
+	// add the request id to the key-value pairs
+	if requestId, err := utils.GetRequestIdFromContext(ctx); err == nil {
+		newkvs["requestId"] = requestId
 	}
 
 	return newkvs

package/go/middlewares/middlewares.go

@@ -10,6 +10,7 @@ import (
 	"github.com/RivasCVA/dt-idl/go/log"
 	"github.com/RivasCVA/dt-idl/go/models"
 	"github.com/RivasCVA/dt-idl/go/write"
+	"github.com/google/uuid"
 )
 
 // GetAuthMiddleware returns a middleware function that authenticates all requests, except for the login endpoints.
@@ -19,7 +20,7 @@ func GetAuthMiddleware(secret string) func(http.Handler) http.Handler {
 
 	return func(next http.Handler) http.Handler {
 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			// check if the request is a login endpoint
+			// check if the request path is a login endpoint
 			if slices.Contains([]string{"/v1/login", "/v1/login/provider"}, r.URL.Path) {
 				next.ServeHTTP(w, r)
 				return
@@ -49,13 +50,23 @@ func GetAuthMiddleware(secret string) func(http.Handler) http.Handler {
 	}
 }
 
-// ContextMiddleware adds helpful information to the request context.
-func ContextMiddleware(next http.Handler) http.Handler {
+// CommonContext adds shared values to the request context.
+func CommonContext(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		// set the path in the request context
-		ctx := context.WithValue(r.Context(), models.PathKey, r.URL.Path)
-		r = r.WithContext(ctx)
+		// get the request context
+		ctx := r.Context()
+
+		// set the request id in the request context
+		requestId := r.Header.Get("X-Request-Id")
+		if requestId == "" {
+			requestId = uuid.New().String()
+		}
+		ctx = context.WithValue(ctx, models.RequestIdKey, requestId)
 
+		// set the request path in the request context
+		ctx = context.WithValue(ctx, models.RequestPathKey, r.URL.Path)
+
+		r = r.WithContext(ctx)
 		next.ServeHTTP(w, r)
 	})
 }

package/go/models/constants.go

@@ -6,6 +6,8 @@ type ContextKey string
 const (
 	// TokenKey is the key used to set/get the JWT token in the request context.
 	TokenKey = ContextKey("token")
-	// PathKey is the key used to set/get the request path in the request context.
-	PathKey = ContextKey("path")
+	// RequestPathKey is the key used to set/get the request path in the request context.
+	RequestPathKey = ContextKey("requestPath")
+	// RequestIdKey is the key used to set/get the request id in the request context.
+	RequestIdKey = ContextKey("requestId")
 )

package/go/utils/context.go

@@ -38,11 +38,20 @@ func GetUserIdFromContext(ctx context.Context) (string, error) {
 	return userId, nil
 }
 
-// GetPathFromContext retrieves the request path from the given context.
-func GetPathFromContext(ctx context.Context) (string, error) {
-	path, ok := ctx.Value(models.PathKey).(string)
+// GetRequestPathFromContext retrieves the request path from the given context.
+func GetRequestPathFromContext(ctx context.Context) (string, error) {
+	requestPath, ok := ctx.Value(models.RequestPathKey).(string)
 	if !ok {
-		return "", errors.New("path not found in the context")
+		return "", errors.New("request path not found in the context")
 	}
-	return path, nil
+	return requestPath, nil
+}
+
+// GetRequestIdFromContext retrieves the request id from the given context.
+func GetRequestIdFromContext(ctx context.Context) (string, error) {
+	requestId, ok := ctx.Value(models.RequestIdKey).(string)
+	if !ok {
+		return "", errors.New("request id not found in the context")
+	}
+	return requestId, nil
 }

package/go.mod

@@ -2,4 +2,7 @@ module github.com/RivasCVA/dt-idl
 
 go 1.23
 
-require github.com/golang-jwt/jwt/v5 v5.2.2
+require (
+	github.com/golang-jwt/jwt/v5 v5.2.2
+	github.com/google/uuid v1.6.0
+)

package/go.sum

@@ -1,2 +1,4 @@
 github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8=
 github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=

package/package.json

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

package/services/dt-trade-service.yaml

@@ -10,24 +10,6 @@ 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
@@ -89,6 +71,34 @@ 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
@@ -145,6 +155,9 @@ components:
     AddPortfolioPayload:
       description: Payload to add a new portfolio
       properties:
+        userId:
+          type: string
+          example: 123456
         type:
           $ref: '#/components/schemas/PortfolioType'
           example: PERSONAL
@@ -153,6 +166,7 @@ components:
           format: double
           example: 10500.25
       required:
+        - userId
         - type
         - cash
 
@@ -170,9 +184,6 @@ components:
             id:
               type: string
               example: 123456
-            userId:
-              type: string
-              example: 123456
             holdings:
               type: array
               items:
@@ -191,7 +202,6 @@ components:
               example: 1713398544000
           required:
             - id
-            - userId
             - holdings
             - orders
             - dateCreated

package/services/dt-user-service.yaml

@@ -67,6 +67,24 @@ paths:
           $ref: '#/components/responses/InternalServerError'
 
   /users:
+    get:
+      description: Gets all users
+      operationId: getUsers
+      tags:
+        - Users
+      responses:
+        200:
+          description: Success
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/User'
+        404:
+          $ref: '#/components/responses/NotFound'
+        500:
+          $ref: '#/components/responses/InternalServerError'
     post:
       description: Adds a new user
       operationId: addUser
@@ -91,12 +109,20 @@ paths:
         500:
           $ref: '#/components/responses/InternalServerError'
 
-  /users/me:
+  /users/{userId}:
     get:
-      description: Gets the current user
-      operationId: getCurrentUser
+      description: Gets a user
+      operationId: getUser
       tags:
         - Users
+      parameters:
+        - in: path
+          name: userId
+          description: The user id
+          required: true
+          schema:
+            type: string
+            example: 123456
       responses:
         200:
           description: Success
@@ -110,12 +136,20 @@ paths:
         500:
           $ref: '#/components/responses/InternalServerError'
     put:
-      description: Updates the current user
-      operationId: updateCurrentUser
+      description: Updates an existing user
+      operationId: updateUser
       tags:
         - Users
+      parameters:
+        - in: path
+          name: userId
+          description: The user id
+          required: true
+          schema:
+            type: string
+            example: 123456
       requestBody:
-        description: The request body to update the current user
+        description: The request body to update a user
         required: true
         content:
           application/json:

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

@@ -11,8 +11,7 @@ export interface paths {
             path?: never;
             cookie?: never;
         };
-        /** @description Gets all portfolios */
-        get: operations["getPortfolios"];
+        get?: never;
         put?: never;
         /** @description Adds a new portfolio */
         post: operations["addPortfolio"];
@@ -39,6 +38,23 @@ 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;
@@ -79,6 +95,8 @@ export interface components {
     schemas: {
         /** @description Payload to add a new portfolio */
         AddPortfolioPayload: {
+            /** @example 123456 */
+            userId: string;
             /** @example PERSONAL */
             type: components["schemas"]["PortfolioType"];
             /**
@@ -93,8 +111,6 @@ export interface components {
         Portfolio: components["schemas"]["AddPortfolioPayload"] & {
             /** @example 123456 */
             id: string;
-            /** @example 123456 */
-            userId: string;
             holdings: components["schemas"]["Holding"][];
             orders: components["schemas"]["Order"][];
             /**
@@ -241,28 +257,6 @@ export interface components {
 }
 export type $defs = Record<string, never>;
 export interface operations {
-    getPortfolios: {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        requestBody?: never;
-        responses: {
-            /** @description Success */
-            200: {
-                headers: {
-                    [name: string]: unknown;
-                };
-                content: {
-                    "application/json": components["schemas"]["Portfolio"][];
-                };
-            };
-            404: components["responses"]["NotFound"];
-            500: components["responses"]["InternalServerError"];
-        };
-    };
     addPortfolio: {
         parameters: {
             query?: never;
@@ -322,6 +316,31 @@ export interface operations {
             500: components["responses"]["InternalServerError"];
         };
     };
+    getPortfoliosByUser: {
+        parameters: {
+            query?: never;
+            header?: never;
+            path: {
+                /** @description The user id */
+                userId: string;
+            };
+            cookie?: never;
+        };
+        requestBody?: never;
+        responses: {
+            /** @description Success */
+            200: {
+                headers: {
+                    [name: string]: unknown;
+                };
+                content: {
+                    "application/json": components["schemas"]["Portfolio"][];
+                };
+            };
+            404: components["responses"]["NotFound"];
+            500: components["responses"]["InternalServerError"];
+        };
+    };
     addOrder: {
         parameters: {
             query?: never;

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

@@ -62,7 +62,8 @@ export interface paths {
             path?: never;
             cookie?: never;
         };
-        get?: never;
+        /** @description Gets all users */
+        get: operations["getUsers"];
         put?: never;
         /** @description Adds a new user */
         post: operations["addUser"];
@@ -72,17 +73,17 @@ export interface paths {
         patch?: never;
         trace?: never;
     };
-    "/users/me": {
+    "/users/{userId}": {
         parameters: {
             query?: never;
             header?: never;
             path?: never;
             cookie?: never;
         };
-        /** @description Gets the current user */
-        get: operations["getCurrentUser"];
-        /** @description Updates the current user */
-        put: operations["updateCurrentUser"];
+        /** @description Gets a user */
+        get: operations["getUser"];
+        /** @description Updates an existing user */
+        put: operations["updateUser"];
         post?: never;
         delete?: never;
         options?: never;
@@ -261,6 +262,28 @@ export interface operations {
             500: components["responses"]["InternalServerError"];
         };
     };
+    getUsers: {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        requestBody?: never;
+        responses: {
+            /** @description Success */
+            200: {
+                headers: {
+                    [name: string]: unknown;
+                };
+                content: {
+                    "application/json": components["schemas"]["User"][];
+                };
+            };
+            404: components["responses"]["NotFound"];
+            500: components["responses"]["InternalServerError"];
+        };
+    };
     addUser: {
         parameters: {
             query?: never;
@@ -288,11 +311,14 @@ export interface operations {
             500: components["responses"]["InternalServerError"];
         };
     };
-    getCurrentUser: {
+    getUser: {
         parameters: {
             query?: never;
             header?: never;
-            path?: never;
+            path: {
+                /** @description The user id */
+                userId: string;
+            };
             cookie?: never;
         };
         requestBody?: never;
@@ -310,14 +336,17 @@ export interface operations {
             500: components["responses"]["InternalServerError"];
         };
     };
-    updateCurrentUser: {
+    updateUser: {
         parameters: {
             query?: never;
             header?: never;
-            path?: never;
+            path: {
+                /** @description The user id */
+                userId: string;
+            };
             cookie?: never;
         };
-        /** @description The request body to update the current user */
+        /** @description The request body to update a user */
         requestBody: {
             content: {
                 "application/json": components["schemas"]["UpdateUserPayload"];