Make user API compatible with postgres

Author: darshanasbg

backend/dbscripts/thunderdb/postgress.sql

@@ -1,5 +1,5 @@
 -- Table to store Users
-CREATE TABLE USER (
+CREATE TABLE "USER" (
     ID         INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
     USER_ID    VARCHAR(36) UNIQUE NOT NULL,
     ORG_ID     VARCHAR(36) NOT NULL,
@@ -114,7 +114,7 @@ VALUES
 ('550e8400-e29b-41d4-a716-446655440000', '550e8400-e29b-41d4-a716-446655440001', '550e8400-e29b-41d4-a716-446655440004'),
 ('550e8400-e29b-41d4-a716-446655440000', '550e8400-e29b-41d4-a716-446655440002', '550e8400-e29b-41d4-a716-446655440005');
 
-INSERT INTO USER (USER_ID, ORG_ID, TYPE, ATTRIBUTES, CREATED_AT, UPDATED_AT)
+INSERT INTO "USER" (USER_ID, ORG_ID, TYPE, ATTRIBUTES)
 VALUES
 ('550e8400-e29b-41d4-a716-446655440000', '456e8400-e29b-41d4-a716-446655440001', 'person',
 '{"age": 30, "roles": ["admin", "user"], "address": {"city": "Colombo", "zip": "00100"}}');

backend/internal/user/store/constants.go

@@ -23,22 +23,22 @@ import dbmodel "github.com/asgardeo/thunder/internal/system/database/model"
 var (
 	QueryCreateUser = dbmodel.DBQuery{
 		Id:    "ASQ-USER_MGT-01",
-		Query: "INSERT INTO USER (USER_ID, ORG_ID, TYPE, ATTRIBUTES) VALUES ($1, $2, $3, $4)",
+		Query: "INSERT INTO \"USER\" (USER_ID, ORG_ID, TYPE, ATTRIBUTES) VALUES ($1, $2, $3, $4)",
 	}
 	QueryGetUserByUserId = dbmodel.DBQuery{
 		Id:    "ASQ-USER_MGT-02",
-		Query: "SELECT USER_ID, ORG_ID, TYPE, ATTRIBUTES FROM USER WHERE USER_ID = $1",
+		Query: "SELECT USER_ID, ORG_ID, TYPE, ATTRIBUTES FROM \"USER\" WHERE USER_ID = $1",
 	}
 	QueryGetUserList = dbmodel.DBQuery{
 		Id:    "ASQ-USER_MGT-03",
-		Query: "SELECT USER_ID, ORG_ID, TYPE, ATTRIBUTES FROM USER",
+		Query: "SELECT USER_ID, ORG_ID, TYPE, ATTRIBUTES FROM \"USER\"",
 	}
 	QueryUpdateUserByUserId = dbmodel.DBQuery{
 		Id:    "ASQ-USER_MGT-04",
-		Query: "UPDATE USER SET ORG_ID = $2, TYPE = $3, ATTRIBUTES = $4 WHERE USER_ID = $1;",
+		Query: "UPDATE \"USER\" SET ORG_ID = $2, TYPE = $3, ATTRIBUTES = $4 WHERE USER_ID = $1;",
 	}
 	QueryDeleteUserByUserId = dbmodel.DBQuery{
 		Id:    "ASQ-USER_MGT-05",
-		Query: "DELETE FROM USER WHERE USER_ID = $1",
+		Query: "DELETE FROM \"USER\" WHERE USER_ID = $1",
 	}
 )

backend/internal/user/store/store.go

@@ -210,9 +210,14 @@ func buildUserFromResultRow(row map[string]interface{}) (model.User, error) {
 		return model.User{}, fmt.Errorf("failed to parse type as string")
 	}
 
-	attributes, ok := row["attributes"].(string)
-	if !ok {
-		logger.Error("failed to parse attributes as string")
+	var attributes string
+	switch v := row["attributes"].(type) {
+	case string:
+		attributes = v
+	case []byte:
+		attributes = string(v) // Convert byte slice to string
+	default:
+		logger.Error("failed to parse attributes", log.Any("raw_value", row["attributes"]), log.String("type", fmt.Sprintf("%T", row["attributes"])))
 		return model.User{}, fmt.Errorf("failed to parse attributes as string")
 	}