From c8805db0b53e6b1a9f8222a852415b57e66d1d25 Mon Sep 17 00:00:00 2001
From: Allan Bowe <allnbwe@gmail.com>
Date: Fri, 17 Jun 2022 07:46:51 +0000
Subject: [PATCH] feat: filter for groups by user id in ms_getgroups

---
 all.sas                 | 16 ++++++++++++----
 server/ms_getgroups.sas | 16 ++++++++++++----
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/all.sas b/all.sas
index fded7fb..caf6cbe 100644
--- a/all.sas
+++ b/all.sas
@@ -20278,12 +20278,17 @@ filename &headref clear;
 
       %ms_getgroups(outds=userlist)
 
-  With filter:
+  With filter on username:
 
       %ms_getgroups(outds=userlist, user=James)
 
+  With filter on userid:
+
+      %ms_getgroups(outds=userlist, uid=1)
+
   @param [in] mdebug= (0) Set to 1 to enable DEBUG messages
   @param [in] user= (0) Provide the username on which to filter
+  @param [in] uid= (0) Provide the userid on which to filter
   @param [out] outds= (work.ms_getgroups) This output dataset will contain the
     list of groups. Format:
 |NAME:$32.|DESCRIPTION:$64.|GROUPID:best.|
@@ -20306,6 +20311,7 @@ filename &headref clear;
 
 %macro ms_getgroups(
   user=0,
+  uid=0,
   outds=work.ms_getgroups,
   mdebug=0
 );
@@ -20355,8 +20361,10 @@ run;
   run;
 %end;
 
-%if "&user"="0" %then %let url=/SASjsApi/group;
-%else %let url=/SASjsApi/user/by/username/&user;
+%if "&user" ne "0" %then %let url=/SASjsApi/user/by/username/&user;
+%else %if "&uid" ne "0" %then %let url=/SASjsApi/user/&uid;
+%else %let url=/SASjsApi/group;
+
 
 proc http method='GET' headerin=&fref0 out=&fref1
   url="&_sasjs_apiserverurl.&url";
@@ -20373,7 +20381,7 @@ run;
 
 libname &libref JSON fileref=&fref1;
 
-%if "&user"="0" %then %do;
+%if "&user"="0" and "&uid"="0" %then %do;
   data &outds;
     length NAME $32 DESCRIPTION $64. GROUPID 8;
     if _n_=1 then call missing(of _all_);
diff --git a/server/ms_getgroups.sas b/server/ms_getgroups.sas
index 597f9fb..43d9717 100644
--- a/server/ms_getgroups.sas
+++ b/server/ms_getgroups.sas
@@ -9,12 +9,17 @@
 
       %ms_getgroups(outds=userlist)
 
-  With filter:
+  With filter on username:
 
       %ms_getgroups(outds=userlist, user=James)
 
+  With filter on userid:
+
+      %ms_getgroups(outds=userlist, uid=1)
+
   @param [in] mdebug= (0) Set to 1 to enable DEBUG messages
   @param [in] user= (0) Provide the username on which to filter
+  @param [in] uid= (0) Provide the userid on which to filter
   @param [out] outds= (work.ms_getgroups) This output dataset will contain the
     list of groups. Format:
 |NAME:$32.|DESCRIPTION:$64.|GROUPID:best.|
@@ -37,6 +42,7 @@
 
 %macro ms_getgroups(
   user=0,
+  uid=0,
   outds=work.ms_getgroups,
   mdebug=0
 );
@@ -86,8 +92,10 @@ run;
   run;
 %end;
 
-%if "&user"="0" %then %let url=/SASjsApi/group;
-%else %let url=/SASjsApi/user/by/username/&user;
+%if "&user" ne "0" %then %let url=/SASjsApi/user/by/username/&user;
+%else %if "&uid" ne "0" %then %let url=/SASjsApi/user/&uid;
+%else %let url=/SASjsApi/group;
+
 
 proc http method='GET' headerin=&fref0 out=&fref1
   url="&_sasjs_apiserverurl.&url";
@@ -104,7 +112,7 @@ run;
 
 libname &libref JSON fileref=&fref1;
 
-%if "&user"="0" %then %do;
+%if "&user"="0" and "&uid"="0" %then %do;
   data &outds;
     length NAME $32 DESCRIPTION $64. GROUPID 8;
     if _n_=1 then call missing(of _all_);