From 2d79caefac860f813815695a16c1682068ff20dd Mon Sep 17 00:00:00 2001
From: zhouqunjie <450705171@qq.com>
Date: Tue, 8 Nov 2022 01:20:31 -0800
Subject: [PATCH] list/get for user/account/association

---
 adaptor/pcm_slurm/service/slurmdb_account.go  | 22 +++++++++----------
 .../pcm_slurm/service/slurmdb_association.go  |  2 +-
 adaptor/pcm_slurm/service/slurmdb_user.go     | 10 +++++----
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/adaptor/pcm_slurm/service/slurmdb_account.go b/adaptor/pcm_slurm/service/slurmdb_account.go
index 3f87e06..c2bce49 100644
--- a/adaptor/pcm_slurm/service/slurmdb_account.go
+++ b/adaptor/pcm_slurm/service/slurmdb_account.go
@@ -84,14 +84,15 @@ func GetAcctInfo() AcctInfoMsg {
 
 func (slurmStruct SlurmStruct) ListAccounts(ctx context.Context, req *pbslurm.ListAccountsReq) (*pbslurm.ListAccountsResp, error) {
 
-	AcctList := GetAcctInfo()
+	acctList := GetAcctInfo()
 
 	resp := pbslurm.ListAccountsResp{}
-	for _, Acct := range AcctList.AcctInfoList {
-		AcctInfoResult := pbslurm.AccountInfo{}
-		AcctInfoResult.Name = Acct.Name
+	for _, acct := range acctList.AcctInfoList {
+		//AcctInfoResult := pbslurm.AccountInfo{}
+		//AcctInfoResult.Name = Acct.Name
+		acctInfoResult := acct
 
-		resp.AccountInfos = append(resp.AccountInfos, &AcctInfoResult)
+		resp.AccountInfos = append(resp.AccountInfos, &acctInfoResult)
 	}
 
 	return &resp, nil
@@ -99,14 +100,13 @@ func (slurmStruct SlurmStruct) ListAccounts(ctx context.Context, req *pbslurm.Li
 
 func (slurmStruct SlurmStruct) GetAccount(ctx context.Context, req *pbslurm.GetAccountReq) (*pbslurm.GetAccountResp, error) {
 
-	AcctList := GetAcctInfo()
+	acctList := GetAcctInfo()
 
 	resp := pbslurm.GetAccountResp{}
-	for _, Acct := range AcctList.AcctInfoList {
-		AcctInfoResult := pbslurm.AccountInfo{}
-		AcctInfoResult.Name = Acct.Name
-
-		resp.AccountInfos = append(resp.AccountInfos, &AcctInfoResult)
+	for _, acct := range acctList.AcctInfoList {
+		acctInfoResult := acct
+		//todo add filter logic
+		resp.AccountInfos = append(resp.AccountInfos, &acctInfoResult)
 	}
 
 	return &resp, nil
diff --git a/adaptor/pcm_slurm/service/slurmdb_association.go b/adaptor/pcm_slurm/service/slurmdb_association.go
index a86f75c..ae6cc1a 100644
--- a/adaptor/pcm_slurm/service/slurmdb_association.go
+++ b/adaptor/pcm_slurm/service/slurmdb_association.go
@@ -193,7 +193,7 @@ func (slurmStruct SlurmStruct) GetAssociation(ctx context.Context, req *pbslurm.
 	resp := pbslurm.GetAssociationResp{}
 	for _, assoc := range assocList.AssocInfoList {
 		assocResult := assoc
-		//todo logic rewrite
+		//todo add filter logic
 		if assocResult.Cluster == req.Cluster && assocResult.User == req.User && assocResult.Acct == assocResult.Acct && assocResult.Partition == req.Partition {
 			resp.AssocInfos = append(resp.AssocInfos, &assocResult)
 		}
diff --git a/adaptor/pcm_slurm/service/slurmdb_user.go b/adaptor/pcm_slurm/service/slurmdb_user.go
index cd68173..596ea62 100644
--- a/adaptor/pcm_slurm/service/slurmdb_user.go
+++ b/adaptor/pcm_slurm/service/slurmdb_user.go
@@ -92,8 +92,8 @@ func (slurmStruct SlurmStruct) ListUsers(ctx context.Context, req *pbslurm.ListU
 
 	resp := pbslurm.ListUsersResp{}
 	for _, user := range userList.UserInfoList {
-		userInfoResult := pbslurm.UserInfo{}
-		userInfoResult.Name = user.Name
+		userInfoResult := user
+		//userInfoResult.Name = user.Name
 
 		resp.UserInfos = append(resp.UserInfos, &userInfoResult)
 	}
@@ -107,8 +107,10 @@ func (slurmStruct SlurmStruct) GetUser(ctx context.Context, req *pbslurm.GetUser
 
 	resp := pbslurm.GetUserResp{}
 	for _, user := range userList.UserInfoList {
-		userInfoResult := pbslurm.UserInfo{}
-		userInfoResult.Name = user.Name
+		//userInfoResult := pbslurm.UserInfo{}
+		//todo add filter logic
+		userInfoResult := user
+		//userInfoResult.Name = user.Name
 
 		resp.UserInfo = append(resp.UserInfo, &userInfoResult)
 	}