Revision 164e64d5 snf-astakos-app/astakos/quotaholder_app/callpoint.py

b/snf-astakos-app/astakos/quotaholder_app/callpoint.py
31 31
# interpreted as representing official policies, either expressed
32 32
# or implied, of GRNET S.A.
33 33

  
34
from datetime import datetime
34 35
from django.db.models import F
35 36
from astakos.quotaholder_app.exception import (
36 37
    QuotaholderError,
......
43 44
    Import, Release, Operations, finalize, undo)
44 45

  
45 46
from astakos.quotaholder_app.models import (
46
    Holding, Commission, Provision, ProvisionLog, now)
47
    Holding, Commission, Provision, ProvisionLog)
47 48

  
48 49

  
49 50
def get_quota(holders=None, sources=None, resources=None):
......
165 166

  
166 167
    commission = Commission.objects.create(clientkey=clientkey,
167 168
                                           name=name,
168
                                           issue_time=now())
169
                                           issue_datetime=datetime.now())
169 170
    for (holder, source, resource), quantity in provisions_to_create:
170 171
        Provision.objects.create(serial=commission,
171 172
                                 holder=holder,
......
176 177
    return commission.serial
177 178

  
178 179

  
179
def _log_provision(commission, provision, holding, log_time, reason):
180
def _log_provision(commission, provision, holding, log_datetime, reason):
180 181

  
181 182
    kwargs = {
182 183
        'serial':              commission.serial,
......
188 189
        'usage_min':           holding.usage_min,
189 190
        'usage_max':           holding.usage_max,
190 191
        'delta_quantity':      provision.quantity,
191
        'issue_time':          commission.issue_time,
192
        'log_time':            log_time,
192
        'issue_datetime':      commission.issue_datetime,
193
        'log_datetime':        log_datetime,
193 194
        'reason':              reason,
194 195
    }
195 196

  
......
240 241
    holdings = _get_holdings_for_update(holding_keys)
241 242
    provisions = _partition_by(lambda p: p.serial_id, ps)
242 243

  
243
    log_time = now()
244
    log_datetime = datetime.now()
244 245

  
245 246
    accepted, rejected, notFound = [], [], []
246 247
    for serial, accept in actions.iteritems():
......
267 268

  
268 269
            prefix = 'ACCEPT:' if accept else 'REJECT:'
269 270
            comm_reason = prefix + reason[-121:]
270
            _log_provision(commission, pv, h, log_time, comm_reason)
271
            _log_provision(commission, pv, h, log_datetime, comm_reason)
271 272
            pv.delete()
272 273
        commission.delete()
273 274
    return accepted, rejected, notFound, conflicting
......
306 307

  
307 308
    response = {'serial':     serial,
308 309
                'provisions': ps,
309
                'issue_time': commission.issue_time,
310
                'issue_time': commission.issue_datetime,
310 311
                'name':       commission.name,
311 312
                }
312 313
    return response

Also available in: Unified diff