Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

No stickers migration #528

Merged
merged 3 commits into from
Jan 24, 2025
Merged

No stickers migration #528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
11a85e4
Update: commented out sticker creation in migration script
awf-dbca Jan 24, 2025
8f38333
Update: AUP moorings displayed if migrated even without sticker
awf-dbca Jan 24, 2025
3d42939
Update: fixed sticker amendment issue with moa
awf-dbca Jan 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions mooringlicensing/components/approvals/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ class Meta:
def get_current_moas_by_approval(approval):
no_end_date = Q(end_date__isnull=True)
ml_is_current = Q(mooring__mooring_licence__status__in=MooringLicence.STATUSES_AS_CURRENT)
sticker_is_current = Q(sticker__status__in=Sticker.STATUSES_AS_CURRENT)
sticker_is_current = Q(Q(sticker__status__in=Sticker.STATUSES_AS_CURRENT) | Q(approval__migrated=True)) #or approval is migrated
is_active = Q(active=True)
moas = approval.mooringonapproval_set.filter((no_end_date & ml_is_current) & sticker_is_current & is_active)
return moas
Expand Down Expand Up @@ -1670,7 +1670,7 @@ def manage_stickers(self, proposal=None):
# All the sticker gets 'expired' status once payment made
moas_current = MooringOnApproval.get_current_moas_by_approval(self)
for moa in moas_current:
if moa.sticker not in _stickers_to_be_replaced:
if moa.sticker and moa.sticker not in _stickers_to_be_replaced:
_stickers_to_be_replaced.append(moa.sticker)
_stickers_to_be_replaced_for_renewal.append(moa.sticker)

Expand Down Expand Up @@ -1706,6 +1706,7 @@ def manage_stickers(self, proposal=None):
return list(set(moas_to_be_reallocated)), list(set(stickers_to_be_returned))

def update_lists_due_to_stickers_to_be_replaced(self, _stickers_to_be_replaced, moas_to_be_reallocated, moas_to_be_removed, stickers_to_be_returned):
print(_stickers_to_be_replaced)
for sticker in _stickers_to_be_replaced:
stickers_to_be_returned.append(sticker)
for moa in sticker.mooringonapproval_set.all():
Expand Down Expand Up @@ -1762,22 +1763,25 @@ def update_lists_due_to_vessel_changes(self, moas_to_be_reallocated, stickers_to
# Due to the vessel length change, the colour of the existing sticker needs to be changed
moas_current = MooringOnApproval.get_current_moas_by_approval(self)
for moa in moas_current:
stickers_to_be_replaced.append(moa.sticker)
if moa.sticker:
stickers_to_be_replaced.append(moa.sticker)

# Handle vessel changes
if self.approval.current_proposal.vessel_removed:
# self.current_proposal.vessel_ownership.vessel_removed --> All the stickers to be returned
# A vessel --> No vessels
moas_current = MooringOnApproval.get_current_moas_by_approval(self)
for moa in moas_current:
stickers_to_be_replaced.append(moa.sticker)
if moa.sticker:
stickers_to_be_replaced.append(moa.sticker)

if self.approval.current_proposal.vessel_swapped:
# All the stickers to be removed and all the mooring on them to be reallocated
# A vessel --> Another vessel
moas_current = MooringOnApproval.get_current_moas_by_approval(self)
for moa in moas_current:
stickers_to_be_replaced.append(moa.sticker)
if moa.sticker:
stickers_to_be_replaced.append(moa.sticker)

if self.approval.current_proposal.vessel_null_to_new:
# --> Create new sticker
Expand Down
222 changes: 111 additions & 111 deletions mooringlicensing/utils/mooring_licence_migrate_pd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1378,53 +1378,53 @@ def create_mooring_licences(self):
start_date = start_date, #TODO get actual
)

try:
mailing_date = datetime.datetime.strptime(sticker_sent, '%d/%m/%Y').date() if sticker_sent else None
except:
mailing_date = None

if sticker_number:
sticker = Sticker.objects.create(
number=sticker_number,
status=Sticker.STICKER_STATUS_CURRENT,
approval=approval,
proposal_initiated=proposal,
vessel_ownership=vessel_ownership,
printing_date=None,
mailing_date=mailing_date,
sticker_printing_batch=None,
sticker_printing_response=None,

postal_address_line1=proposal_applicant.postal_address_line1,
postal_address_locality=proposal_applicant.postal_address_locality,
postal_address_state=proposal_applicant.postal_address_state,
postal_address_country=proposal_applicant.postal_address_country,
postal_address_postcode=proposal_applicant.postal_address_postcode,
)

approval_history.stickers.add(sticker.id)

for i in range(len(additional_ves_rows_details)):
if i['sticker_number']:
vessel_ownership = VesselOwnership.objects.filter(owner=owner, vessel__rego_no=i['rego_no']).order_by("-created").first()
if vessel_ownership:
sticker = Sticker.objects.create(
number=i['sticker_number'],
status=Sticker.STICKER_STATUS_CURRENT,
approval=approval,
proposal_initiated=proposal,
vessel_ownership=vessel_ownership,
printing_date=None,
mailing_date=mailing_date,
sticker_printing_batch=None,
sticker_printing_response=None,

postal_address_line1=proposal_applicant.postal_address_line1,
postal_address_locality=proposal_applicant.postal_address_locality,
postal_address_state=proposal_applicant.postal_address_state,
postal_address_country=proposal_applicant.postal_address_country,
postal_address_postcode=proposal_applicant.postal_address_postcode,
)
#try:
# mailing_date = datetime.datetime.strptime(sticker_sent, '%d/%m/%Y').date() if sticker_sent else None
#except:
# mailing_date = None

#if sticker_number:
# sticker = Sticker.objects.create(
# number=sticker_number,
# status=Sticker.STICKER_STATUS_CURRENT,
# approval=approval,
# proposal_initiated=proposal,
# vessel_ownership=vessel_ownership,
# printing_date=None,
# mailing_date=mailing_date,
# sticker_printing_batch=None,
# sticker_printing_response=None,
#
# postal_address_line1=proposal_applicant.postal_address_line1,
# postal_address_locality=proposal_applicant.postal_address_locality,
# postal_address_state=proposal_applicant.postal_address_state,
# postal_address_country=proposal_applicant.postal_address_country,
# postal_address_postcode=proposal_applicant.postal_address_postcode,
# )

# approval_history.stickers.add(sticker.id)

#for i in range(len(additional_ves_rows_details)):
# if i['sticker_number']:
# vessel_ownership = VesselOwnership.objects.filter(owner=owner, vessel__rego_no=i['rego_no']).order_by("-created").first()
# if vessel_ownership:
# sticker = Sticker.objects.create(
# number=i['sticker_number'],
# status=Sticker.STICKER_STATUS_CURRENT,
# approval=approval,
# proposal_initiated=proposal,
# vessel_ownership=vessel_ownership,
# printing_date=None,
# mailing_date=mailing_date,
# sticker_printing_batch=None,
# sticker_printing_response=None,
#
# postal_address_line1=proposal_applicant.postal_address_line1,
# postal_address_locality=proposal_applicant.postal_address_locality,
# postal_address_state=proposal_applicant.postal_address_state,
# postal_address_country=proposal_applicant.postal_address_country,
# postal_address_postcode=proposal_applicant.postal_address_postcode,
# )

except Exception as e:
logger.error(f'ERROR: {row.name}. {str(e)}')
Expand Down Expand Up @@ -1654,25 +1654,25 @@ def create_authuser_permits(self):
start_date = start_date,
)

sticker = None
if sticker_number:
sticker = Sticker.objects.create(
number=sticker_number,
status=Sticker.STICKER_STATUS_CURRENT, # 'current'
approval=approval,
proposal_initiated=proposal,
vessel_ownership=vessel_ownership,
printing_date=None, #TODAY,
mailing_date=datetime.datetime.strptime(sticker_sent, '%d/%m/%Y').date() if sticker_sent else None,
sticker_printing_batch=None,
sticker_printing_response=None,

postal_address_line1=proposal_applicant.postal_address_line1,
postal_address_locality=proposal_applicant.postal_address_locality,
postal_address_state=proposal_applicant.postal_address_state,
postal_address_country=proposal_applicant.postal_address_country,
postal_address_postcode=proposal_applicant.postal_address_postcode,
)
#sticker = None
#if sticker_number:
# sticker = Sticker.objects.create(
# number=sticker_number,
# status=Sticker.STICKER_STATUS_CURRENT, # 'current'
# approval=approval,
# proposal_initiated=proposal,
# vessel_ownership=vessel_ownership,
# printing_date=None, #TODAY,
# mailing_date=datetime.datetime.strptime(sticker_sent, '%d/%m/%Y').date() if sticker_sent else None,
# sticker_printing_batch=None,
# sticker_printing_response=None,
#
# postal_address_line1=proposal_applicant.postal_address_line1,
# postal_address_locality=proposal_applicant.postal_address_locality,
# postal_address_state=proposal_applicant.postal_address_state,
# postal_address_country=proposal_applicant.postal_address_country,
# postal_address_postcode=proposal_applicant.postal_address_postcode,
# )

auth_user_moorings = self.df_authuser[(self.df_authuser['vessel_rego']==rego_no)].drop_duplicates(subset=['mooring_no','vessel_rego'])
for idx, auth_user in auth_user_moorings.iterrows():
Expand All @@ -1681,7 +1681,7 @@ def create_authuser_permits(self):
moa = MooringOnApproval.objects.create(
approval=approval,
mooring=mooring[0],
sticker=sticker,
#sticker=sticker,
site_licensee=site_licensee,
)

Expand Down Expand Up @@ -1969,19 +1969,19 @@ def create_dcv(self):
status=DcvPermit.DCV_PERMIT_STATUS_CURRENT,
)

if sticker_no:
sticker = Sticker.objects.create(
number=sticker_no,
status=Sticker.STICKER_STATUS_CURRENT, # 'current'
dcv_permit=dcv_permit,
mailing_date=TODAY,

postal_address_line1=dcv_permit.postal_address_line1,
postal_address_locality=dcv_permit.postal_address_suburb,
postal_address_state=dcv_permit.postal_address_state,
postal_address_country=dcv_permit.postal_address_country,
postal_address_postcode=dcv_permit.postal_address_postcode,
)
#if sticker_no:
# sticker = Sticker.objects.create(
# number=sticker_no,
# status=Sticker.STICKER_STATUS_CURRENT, # 'current'
# dcv_permit=dcv_permit,
# mailing_date=TODAY,
#
# postal_address_line1=dcv_permit.postal_address_line1,
# postal_address_locality=dcv_permit.postal_address_suburb,
# postal_address_state=dcv_permit.postal_address_state,
# postal_address_country=dcv_permit.postal_address_country,
# postal_address_postcode=dcv_permit.postal_address_postcode,
# )
dcv_created.append(dcv_permit.id)

except Exception as e:
Expand Down Expand Up @@ -2151,8 +2151,8 @@ def create_annual_admissions(self):
lodgement_date = datetime.datetime.strptime(date_applied, '%Y-%m-%d').astimezone(datetime.timezone.utc)

status = 'approved'
if not sticker_no:
status = 'printing_sticker'
#if not sticker_no:
# status = 'printing_sticker'

proposal=AnnualAdmissionApplication.objects.create(
proposal_type_id=ProposalType.objects.get(code='new').id, # new application
Expand Down Expand Up @@ -2218,35 +2218,35 @@ def create_annual_admissions(self):
start_date = start_date,
)

if sticker_no:
sticker = Sticker.objects.create(
number=sticker_no,
status=Sticker.STICKER_STATUS_CURRENT,
approval=approval,
proposal_initiated=proposal,
vessel_ownership=vessel_ownership,
printing_date=datetime.datetime.strptime(date_created.split(' ')[0], '%d/%m/%Y').date() if date_created else None,
mailing_date=datetime.datetime.strptime(date_created.split(' ')[0], '%d/%m/%Y').date() if date_created else None,
sticker_printing_batch=None,
sticker_printing_response=None,
postal_address_line1=proposal_applicant.postal_address_line1,
postal_address_locality=proposal_applicant.postal_address_locality,
postal_address_state=proposal_applicant.postal_address_state,
postal_address_country=proposal_applicant.postal_address_country,
postal_address_postcode=proposal_applicant.postal_address_postcode,
)
else:
#create non-exported sticker record
sticker = Sticker.objects.create(
approval=approval,
proposal_initiated=proposal,
vessel_ownership=vessel_ownership,
postal_address_line1=proposal_applicant.postal_address_line1,
postal_address_locality=proposal_applicant.postal_address_locality,
postal_address_state=proposal_applicant.postal_address_state,
postal_address_country=proposal_applicant.postal_address_country,
postal_address_postcode=proposal_applicant.postal_address_postcode,
)
#if sticker_no:
# sticker = Sticker.objects.create(
# number=sticker_no,
# status=Sticker.STICKER_STATUS_CURRENT,
# approval=approval,
# proposal_initiated=proposal,
# vessel_ownership=vessel_ownership,
# printing_date=datetime.datetime.strptime(date_created.split(' ')[0], '%d/%m/%Y').date() if date_created else None,
# mailing_date=datetime.datetime.strptime(date_created.split(' ')[0], '%d/%m/%Y').date() if date_created else None,
# sticker_printing_batch=None,
# sticker_printing_response=None,
# postal_address_line1=proposal_applicant.postal_address_line1,
# postal_address_locality=proposal_applicant.postal_address_locality,
# postal_address_state=proposal_applicant.postal_address_state,
# postal_address_country=proposal_applicant.postal_address_country,
# postal_address_postcode=proposal_applicant.postal_address_postcode,
# )
#else:
# #create non-exported sticker record
# sticker = Sticker.objects.create(
# approval=approval,
# proposal_initiated=proposal,
# vessel_ownership=vessel_ownership,
# postal_address_line1=proposal_applicant.postal_address_line1,
# postal_address_locality=proposal_applicant.postal_address_locality,
# postal_address_state=proposal_applicant.postal_address_state,
# postal_address_country=proposal_applicant.postal_address_country,
# postal_address_postcode=proposal_applicant.postal_address_postcode,
# )

except Exception as e:
if user:
Expand Down
Loading