diff --git a/api/namex/VERSION.py b/api/namex/VERSION.py index d8ecf328b..b1a372daf 100644 --- a/api/namex/VERSION.py +++ b/api/namex/VERSION.py @@ -1 +1 @@ -__version__ = '1.1.36' +__version__ = '1.1.37' diff --git a/api/namex/models/request.py b/api/namex/models/request.py index 41dad41b9..26700bd08 100644 --- a/api/namex/models/request.py +++ b/api/namex/models/request.py @@ -331,11 +331,15 @@ def find_existing_name_by_user(cls, user_name_search_string, email): """ Gets requests submited by user with given name choice in state draft """ + current_time = datetime.utcnow() existing_nr = db.session.query(Request). \ join(Applicant, and_(Applicant.nrId == Request.id)). \ filter( Applicant.emailAddress == email, - (Request.stateCd == 'DRAFT') | (Request.stateCd == 'PENDING_PAYMENT') , + #Check if status of request is in pending payment state (payment failed/stuck) within 5 mins + #check if status of request is in draft (payment successful/request in for name examination) + (Request.stateCd == 'DRAFT') | (Request.stateCd == 'PENDING_PAYMENT'), + (Request.submittedDate >= current_time - timedelta(minutes=5)), (Request.nameSearch == ('('+user_name_search_string+')')) | ( Request.nameSearch == user_name_search_string )). \ one_or_none()