Revision bea584e1 snf-astakos-app/astakos/api/quotas.py

b/snf-astakos-app/astakos/api/quotas.py
47 47
import astakos.quotaholder_app.callpoint as qh
48 48

  
49 49
from .util import (json_response, is_integer, are_integer,
50
                   user_from_token, service_from_token)
50
                   user_from_token, component_from_token)
51 51

  
52 52
@api.api_method(http_method='GET', token_required=True, user_required=False)
53 53
@user_from_token
......
57 57

  
58 58

  
59 59
@api.api_method(http_method='GET', token_required=True, user_required=False)
60
@service_from_token
60
@component_from_token
61 61
def service_quotas(request):
62 62
    user = request.GET.get('user')
63 63
    users = [user] if user is not None else None
64
    result = service_get_quotas(request.service_instance, users=users)
64
    result = service_get_quotas(request.component_instance, users=users)
65 65

  
66 66
    if user is not None and result == {}:
67 67
        raise ItemNotFound("No such user '%s'" % user)
......
87 87

  
88 88

  
89 89
@api.api_method(http_method='GET', token_required=True, user_required=False)
90
@service_from_token
90
@component_from_token
91 91
def get_pending_commissions(request):
92 92
    data = request.GET
93
    client_key = str(request.service_instance)
93
    client_key = str(request.component_instance)
94 94

  
95 95
    result = qh.get_pending_commissions(clientkey=client_key)
96 96
    return json_response(result)
......
115 115

  
116 116
@csrf_exempt
117 117
@api.api_method(http_method='POST', token_required=True, user_required=False)
118
@service_from_token
118
@component_from_token
119 119
def issue_commission(request):
120 120
    data = request.raw_post_data
121 121
    try:
......
123 123
    except json.JSONDecodeError:
124 124
        raise BadRequest("POST data should be in json format.")
125 125

  
126
    client_key = str(request.service_instance)
126
    client_key = str(request.component_instance)
127 127
    provisions = input_data.get('provisions')
128 128
    if provisions is None:
129 129
        raise BadRequest("Provisions are missing.")
......
205 205

  
206 206
@csrf_exempt
207 207
@api.api_method(http_method='POST', token_required=True, user_required=False)
208
@service_from_token
208
@component_from_token
209 209
@commit_on_success_strict()
210 210
def resolve_pending_commissions(request):
211 211
    data = request.raw_post_data
......
214 214
    except json.JSONDecodeError:
215 215
        raise BadRequest("POST data should be in json format.")
216 216

  
217
    client_key = str(request.service_instance)
217
    client_key = str(request.component_instance)
218 218
    accept = input_data.get('accept', [])
219 219
    reject = input_data.get('reject', [])
220 220

  
......
241 241

  
242 242

  
243 243
@api.api_method(http_method='GET', token_required=True, user_required=False)
244
@service_from_token
244
@component_from_token
245 245
def get_commission(request, serial):
246 246
    data = request.GET
247
    client_key = str(request.service_instance)
247
    client_key = str(request.component_instance)
248 248
    try:
249 249
        serial = int(serial)
250 250
    except ValueError:
......
261 261

  
262 262
@csrf_exempt
263 263
@api.api_method(http_method='POST', token_required=True, user_required=False)
264
@service_from_token
264
@component_from_token
265 265
@commit_on_success_strict()
266 266
def serial_action(request, serial):
267 267
    data = request.raw_post_data
......
275 275
    except ValueError:
276 276
        raise BadRequest("Serial should be an integer.")
277 277

  
278
    client_key = str(request.service_instance)
278
    client_key = str(request.component_instance)
279 279

  
280 280
    accept = 'accept' in input_data
281 281
    reject = 'reject' in input_data

Also available in: Unified diff