77import org .apache .log4j .Logger ;
88
99import com .stacksync .commons .models .User ;
10+ import com .stacksync .commons .models .Workspace ;
1011import com .stacksync .quotaserver .db .ConnectionPool ;
1112import com .stacksync .quotaserver .db .DAOFactory ;
1213import com .stacksync .quotaserver .db .UserDAO ;
14+ import com .stacksync .quotaserver .db .WorkspaceDAO ;
1315import com .stacksync .quotaserver .exceptions .dao .DAOException ;
1416import com .stacksync .quotaserver .util .Config ;
1517
@@ -18,6 +20,7 @@ public class XmlRpcQuotaHandler {
1820 private static final Logger logger = Logger .getLogger (XmlRpcQuotaHandler .class .getName ());
1921
2022 private UserDAO userDAO ;
23+ private WorkspaceDAO workspaceDAO ;
2124
2225 public XmlRpcQuotaHandler (ConnectionPool pool ) {
2326 try {
@@ -29,18 +32,19 @@ public XmlRpcQuotaHandler(ConnectionPool pool) {
2932 }
3033 }
3134
32- public String getAvailableQuota (String strUser ) {
35+ public String getAvailableQuota (String strSwiftContainer ) {
3336
34- logger .debug (String .format ("XMLRPC Request. getAvailableQuota [userId : %s]" , strUser ));
37+ logger .debug (String .format ("XMLRPC Request. getAvailableQuota [containerdId : %s]" , strSwiftContainer ));
3538 JsonObject jResponse = new JsonObject ();
36- jResponse . addProperty ( "user" , strUser );
39+
3740
3841 try {
39- User user = userDAO . findBySwiftName ( strUser );
42+ User user = workspaceDAO . getOwnerBySwiftContainer ( strSwiftContainer );
4043 jResponse .addProperty ("quota_used" , user .getQuotaUsedReal ());
4144 jResponse .addProperty ("quota_limit" , user .getQuotaLimit ());
45+ jResponse .addProperty ("user" , user .getSwiftUser ());
4246 } catch (DAOException ex ) {
43- logger .error ("Can't get user from ID : " + strUser );
47+ logger .error ("Can't get user from swiftContainer : " + strSwiftContainer );
4448 jResponse .addProperty ("quota_used" , -1 );
4549 jResponse .addProperty ("quota_limit" , -1 );
4650 }
0 commit comments