From 73d68903d6c107154becbf43d0b0a2c190808ec5 Mon Sep 17 00:00:00 2001
From: wang yan <wangyan@vmware.com>
Date: Thu, 14 Mar 2019 13:28:32 +0800
Subject: [PATCH] update robot account return attribute

Signed-off-by: wang yan <wangyan@vmware.com>
---
 docs/swagger.yaml                                               | 2 +-
 src/common/models/robot.go                                      | 2 +-
 .../src/app/project/robot-account/robot-account.component.html  | 2 +-
 src/portal/src/app/project/robot-account/robot.ts               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 4e0591aaf..4ec3670af 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -4777,7 +4777,7 @@ definitions:
       description:
         type: string
         description: The description of robot account
-      expiresat:
+      expires_at:
         type: integer
         description: The expiration of robot account (in seconds)
       project_id:
diff --git a/src/common/models/robot.go b/src/common/models/robot.go
index 5cd63ae52..6ca89d093 100644
--- a/src/common/models/robot.go
+++ b/src/common/models/robot.go
@@ -29,7 +29,7 @@ type Robot struct {
 	Name         string    `orm:"column(name)" json:"name"`
 	Description  string    `orm:"column(description)" json:"description"`
 	ProjectID    int64     `orm:"column(project_id)" json:"project_id"`
-	ExpiresAt    int64     `orm:"column(expiresat)" json:"expiresat"`
+	ExpiresAt    int64     `orm:"column(expiresat)" json:"expires_at"`
 	Disabled     bool      `orm:"column(disabled)" json:"disabled"`
 	CreationTime time.Time `orm:"column(creation_time);auto_now_add" json:"creation_time"`
 	UpdateTime   time.Time `orm:"column(update_time);auto_now" json:"update_time"`
diff --git a/src/portal/src/app/project/robot-account/robot-account.component.html b/src/portal/src/app/project/robot-account/robot-account.component.html
index 53fa836a7..5ed649545 100644
--- a/src/portal/src/app/project/robot-account/robot-account.component.html
+++ b/src/portal/src/app/project/robot-account/robot-account.component.html
@@ -51,7 +51,7 @@
           <clr-icon shape="check-circle" *ngSwitchCase="false" size="20" class="color-green"></clr-icon>
           <clr-icon shape="times-circle" *ngSwitchCase="true" size="16" class="color-red red-position"></clr-icon>
         </clr-dg-cell>
-        <clr-dg-cell>{{r.expiresat * 1000 | date: 'short'}}</clr-dg-cell>
+        <clr-dg-cell>{{r.expires_at * 1000 | date: 'short'}}</clr-dg-cell>
         <clr-dg-cell>{{r.description}}</clr-dg-cell>
       </clr-dg-row>
       <clr-dg-footer>
diff --git a/src/portal/src/app/project/robot-account/robot.ts b/src/portal/src/app/project/robot-account/robot.ts
index 2dcf432b9..a96d63fe9 100644
--- a/src/portal/src/app/project/robot-account/robot.ts
+++ b/src/portal/src/app/project/robot-account/robot.ts
@@ -3,7 +3,7 @@ export class Robot {
   id: number;
   name: string;
   description: string;
-  expiresat: number;
+  expires_at: number;
   disabled: boolean;
   access: {
     isPull: boolean;