wip: create account

api/api.yml

@@ -295,7 +295,7 @@ paths:
       tags:
         - Account
       requestBody:
-        $ref: "#/components/requestBodies/CreateAccount"
+        $ref: "./requests/createAccount.yml#/components/requestBodies/CreateAccount"
       responses:
         201:
           description: Created
@@ -928,19 +928,6 @@ components:
                 type: string
               description:
                 type: string
-    # Body for creating an account
-    CreateAccount:
-      content:
-        application/json:
-          schema:
-            type: object
-            required:
-              - name
-            properties:
-              name:
-                type: string
-              description:
-                type: string
 
     # Body for updating an account
     UpdateAccount:

api/out.yml

@@ -902,7 +902,7 @@ components:
                 type: string
               description:
                 type: string
-    CreateAccount:
+    UpdateAccount:
       content:
         application/json:
           schema:
@@ -914,7 +914,9 @@ components:
                 type: string
               description:
                 type: string
-    UpdateAccount:
+              claims:
+                $ref: '#/components/schemas/JWTAccountClaims'
+    CreateOperatorAccountUser:
       content:
         application/json:
           schema:
@@ -924,11 +926,9 @@ components:
             properties:
               name:
                 type: string
-              description:
+              email:
                 type: string
-              claims:
-                $ref: '#/components/schemas/JWTAccountClaims'
-    CreateOperatorAccountUser:
+    CreateOperator:
       content:
         application/json:
           schema:
@@ -938,22 +938,26 @@ components:
             properties:
               name:
                 type: string
-              email:
+              description:
                 type: string
-    CreateOperator:
+              contactEmail:
+                type: string
+    CreateAccount:
       content:
         application/json:
           schema:
             type: object
             required:
+              - systemId
               - name
             properties:
+              systemId:
+                type: string
+                format: uuid
               name:
                 type: string
               description:
                 type: string
-              contactEmail:
-                type: string
   securitySchemes:
     bearerAuth:
       type: http

api/requests/createAccount.yml

@@ -0,0 +1,18 @@
+components:
+  requestBodies:
+    CreateAccount:
+      content:
+        application/json:
+          schema:
+            type: object
+            required:
+              - systemId
+              - name
+            properties:
+              systemId:
+                type: string
+                format: uuid
+              name:
+                type: string
+              description:
+                type: string

internal/api/controllers/accounts.go

@@ -8,19 +8,31 @@ import (
 	"github.com/zeiss/typhoon/internal/api/ports"
 )
 
+// CreateAccountRequest ...
+type CreateAccountRequest struct {
+	Name        string    `json:"name"`
+	Description string    `json:"description"`
+	SystemID    uuid.UUID `json:"system_id"`
+}
+
+// CreateAccountResponse ...
+type CreateAccountResponse struct {
+	Account models.Account `json:"account"`
+}
+
 // ListAccountsRequest ...
 type ListAccountsRequest struct {
-	SystemID uuid.UUID
-	Limit    int
-	Offset   int
+	SystemID uuid.UUID `json:"system_id"`
+	Limit    int       `json:"limit"`
+	Offset   int       `json:"offset"`
 }
 
 // ListAccountsResponse ...
 type ListAccountsResponse struct {
-	Accounts []models.Account
-	Total    int
-	Offset   int
-	Limit    int
+	Accounts []models.Account `json:"accounts"`
+	Total    int              `json:"total"`
+	Offset   int              `json:"offset"`
+	Limit    int              `json:"limit"`
 }
 
 // AccountsController is the interface that wraps the methods to access accounts.

internal/api/controllers/systems.go

@@ -112,7 +112,7 @@ func (s *SystemsControllerImpl) UpdateSystemOperator(ctx context.Context, system
 		return system, err
 	}
 
-	system.OperatorID = &operatorID
+	system.OperatorID = operatorID
 
 	if err := s.db.UpdateSystem(ctx, &system); err != nil {
 		return system, err

internal/api/models/account.go

@@ -16,12 +16,18 @@ type Account struct {
 	ID uuid.UUID `json:"id" gorm:"type:uuid;primary_key;default:gen_random_uuid()"`
 	// Name is the name of the account.
 	Name string `json:"name"`
+	// Description is the description of the account.
+	Description *string `json:"description"`
 	// Key is the issuer key identifier.
 	Key   NKey   `json:"key"`
 	KeyID string `json:"key_id" gorm:"foreignKey:ID"`
 	// Token is the JWT token used to authenticate the account.
 	Token   Token  `json:"token" gorm:"foreignKey:TokenID"`
 	TokenID string `json:"token_id"`
+	// System is the system the account belongs to.
+	System *System `json:"system" gorm:"foreignKey:SystemID"`
+	// SystemID is the system the account belongs to.
+	SystemID uuid.UUID `json:"system_id"`
 	// SigningKeyGroups is the list of signing key groups the account has.
 	SigningKeyGroups []SigningKeyGroup `json:"signing_key_groups" gorm:"many2many:account_signing_key_groups;foreignKey:ID;joinForeignKey:AccountID;joinReferences:SigningKeyGroupID"`
 	// SignedBy is the entity that signs this one.

internal/api/models/system.go

@@ -30,13 +30,13 @@ type System struct {
 	Clusters []Cluster `json:"clusters" gorm:"foreignKey:SystemID"`
 
 	// Operator is the operator this is associated with this system to operate.
-	Operator   Operator   `json:"operator" gorm:"foreignKey:OperatorID"`
-	OperatorID *uuid.UUID `json:"operator_id"`
+	Operator   *Operator `json:"operator" gorm:"foreignKey:OperatorID"`
+	OperatorID uuid.UUID `json:"operator_id"`
 
 	// SystemAccount is the account that is used to control the system.
 	// The system account needs to be signed by the operator.
-	SystemAccount   Account    `json:"system_account" gorm:"foreignKey:SystemAccountID"`
-	SystemAccountID *uuid.UUID `json:"system_account_id"`
+	SystemAccount   Account   `json:"system_account" gorm:"foreignKey:SystemAccountID"`
+	SystemAccountID uuid.UUID `json:"system_account_id"`
 
 	// Tags is the tags that are associated with the system.
 	Tags []*Tag `json:"tags" gorm:"polymorphic:Taggable;polymorphicValue:system;"`

pkg/apis/dto/accounts.go

@@ -2,10 +2,33 @@ package dto
 
 import (
 	"github.com/zeiss/typhoon/internal/api/controllers"
+	"github.com/zeiss/typhoon/internal/api/models"
 	"github.com/zeiss/typhoon/internal/utils"
 	openapi "github.com/zeiss/typhoon/pkg/apis"
 )
 
+// FromCreateAccountRequest ...
+func FromCreateAccountRequest(req openapi.CreateAccountRequestObject) controllers.CreateAccountRequest {
+	return controllers.CreateAccountRequest{
+		SystemID:    req.Body.SystemId,
+		Name:        req.Body.Name,
+		Description: utils.PtrStr(req.Body.Description),
+	}
+}
+
+// ToCreateAccountResponse ...
+func ToCreateAccountResponse(account models.Account) openapi.CreateAccount201JSONResponse {
+	res := openapi.CreateAccount201JSONResponse{}
+
+	res.Id = utils.PtrUUID(account.ID)
+	res.Name = account.Name
+	res.CreatedAt = utils.PtrTime(account.CreatedAt)
+	res.UpdatedAt = utils.PtrTime(account.UpdatedAt)
+	res.DeletedAt = utils.PtrTime(account.DeletedAt.Time)
+
+	return res
+}
+
 // ToListAccountResponse ...
 func ToListAccountResponse(output controllers.ListAccountsResponse) openapi.ListAccounts200JSONResponse {
 	res := openapi.ListAccounts200JSONResponse{}