Skip to content

Conversation

@phl0
Copy link
Contributor

@phl0 phl0 commented Apr 24, 2023

After working several days with @AndreasK79 it came clear that station_country is a multi-redundant column in station_profile table. This has several implications (besides redundant data) and for example breaks marking deleted DXCC as such. From my extensive tests it seems that I pinched all functions relying on station_country and replaced them with proper SQL joins to get DXCC name from dxcc_entities. But still I would like @AndreasK79 and @magicbug to confirm before merging this to dev.

Squashed commit of the following:

commit 29e5f51
Merge: 566b390 e0a04cb
Author: phl0 github@florian-wolters.de
Date: Mon Apr 24 23:28:31 2023 +0200

Merge remote-tracking branch 'upstream/dev' into removeRedundantDxccNames

commit 566b390
Author: phl0 github@florian-wolters.de
Date: Mon Apr 24 23:18:28 2023 +0200

Refactor reassign function to use DXCC name from dxcc_entities

commit 2e50b34
Author: phl0 github@florian-wolters.de
Date: Mon Apr 24 22:05:12 2023 +0200

Use DXCC name from DXCC entities upon import

commit d2b1d89
Author: phl0 github@florian-wolters.de
Date: Mon Apr 24 21:18:53 2023 +0200

Add DB migration script

commit 0ecf4b8
Author: phl0 github@florian-wolters.de
Date: Mon Apr 24 18:16:55 2023 +0200

Fix export function for requests QSLs

commit 51d2c5c
Author: phl0 github@florian-wolters.de
Date: Mon Apr 24 17:53:50 2023 +0200

Fix webadif/qrz upload

commit 45039a6
Author: phl0 github@florian-wolters.de
Date: Mon Apr 24 17:32:40 2023 +0200

Fix lotw_export function

commit 1306225
Author: phl0 github@florian-wolters.de
Date: Mon Apr 24 17:21:37 2023 +0200

Fix SIG export function

commit 082798a
Author: phl0 github@florian-wolters.de
Date: Mon Apr 24 17:01:42 2023 +0200

Fix SAT export functions

commit 2f035af
Merge: 87555f2 d613943
Author: phl0 github@florian-wolters.de
Date: Mon Apr 24 16:52:43 2023 +0200

Merge remote-tracking branch 'upstream/dev' into removeRedundantDxccNames

commit 87555f2
Author: phl0 github@florian-wolters.de
Date: Thu Apr 20 23:54:14 2023 +0200

Use DXCC entity name from dxcc_entities in ADIF export

commit e2fd1c5
Author: phl0 github@florian-wolters.de
Date: Thu Apr 20 23:36:16 2023 +0200

Make logbooks use DXCC name from entities table

commit 4630575
Author: phl0 github@florian-wolters.de
Date: Thu Apr 20 23:01:58 2023 +0200

Use DXCC name from separate table in QSO view

commit 62b8f7a
Author: phl0 github@florian-wolters.de
Date: Thu Apr 20 18:21:57 2023 +0200

Add table join to station profile lookup

commit 0afe155
Author: phl0 github@florian-wolters.de
Date: Thu Apr 20 18:13:35 2023 +0200

Remove country name from edit functions

commit ecb3689
Author: phl0 github@florian-wolters.de
Date: Thu Apr 20 18:07:58 2023 +0200

Remove station_country parameter

commit 22c350a
Author: phl0 github@florian-wolters.de
Date: Thu Apr 20 17:59:24 2023 +0200

Use DXCC name from dxcc_entitites table

phl0 added 2 commits April 25, 2023 00:13
Squashed commit of the following:

commit 29e5f51
Merge: 566b390 e0a04cb
Author: phl0 <github@florian-wolters.de>
Date:   Mon Apr 24 23:28:31 2023 +0200

    Merge remote-tracking branch 'upstream/dev' into removeRedundantDxccNames

commit 566b390
Author: phl0 <github@florian-wolters.de>
Date:   Mon Apr 24 23:18:28 2023 +0200

    Refactor reassign function to use DXCC name from dxcc_entities

commit 2e50b34
Author: phl0 <github@florian-wolters.de>
Date:   Mon Apr 24 22:05:12 2023 +0200

    Use DXCC name from DXCC entities upon import

commit d2b1d89
Author: phl0 <github@florian-wolters.de>
Date:   Mon Apr 24 21:18:53 2023 +0200

    Add DB migration script

commit 0ecf4b8
Author: phl0 <github@florian-wolters.de>
Date:   Mon Apr 24 18:16:55 2023 +0200

    Fix export function for requests QSLs

commit 51d2c5c
Author: phl0 <github@florian-wolters.de>
Date:   Mon Apr 24 17:53:50 2023 +0200

    Fix webadif/qrz upload

commit 45039a6
Author: phl0 <github@florian-wolters.de>
Date:   Mon Apr 24 17:32:40 2023 +0200

    Fix lotw_export function

commit 1306225
Author: phl0 <github@florian-wolters.de>
Date:   Mon Apr 24 17:21:37 2023 +0200

    Fix SIG export function

commit 082798a
Author: phl0 <github@florian-wolters.de>
Date:   Mon Apr 24 17:01:42 2023 +0200

    Fix SAT export functions

commit 2f035af
Merge: 87555f2 d613943
Author: phl0 <github@florian-wolters.de>
Date:   Mon Apr 24 16:52:43 2023 +0200

    Merge remote-tracking branch 'upstream/dev' into removeRedundantDxccNames

commit 87555f2
Author: phl0 <github@florian-wolters.de>
Date:   Thu Apr 20 23:54:14 2023 +0200

    Use DXCC entity name from dxcc_entities in ADIF export

commit e2fd1c5
Author: phl0 <github@florian-wolters.de>
Date:   Thu Apr 20 23:36:16 2023 +0200

    Make logbooks use DXCC name from entities table

commit 4630575
Author: phl0 <github@florian-wolters.de>
Date:   Thu Apr 20 23:01:58 2023 +0200

    Use DXCC name from separate table in QSO view

commit 62b8f7a
Author: phl0 <github@florian-wolters.de>
Date:   Thu Apr 20 18:21:57 2023 +0200

    Add table join to station profile lookup

commit 0afe155
Author: phl0 <github@florian-wolters.de>
Date:   Thu Apr 20 18:13:35 2023 +0200

    Remove country name from edit functions

commit ecb3689
Author: phl0 <github@florian-wolters.de>
Date:   Thu Apr 20 18:07:58 2023 +0200

    Remove station_country parameter

commit 22c350a
Author: phl0 <github@florian-wolters.de>
Date:   Thu Apr 20 17:59:24 2023 +0200

    Use DXCC name from dxcc_entitites table
@phl0 phl0 marked this pull request as ready for review April 26, 2023 07:43
@magicbug
Copy link
Owner

Should be OK flo, my only thing would be to check lotw bits to make sure its not used in there.

@phl0
Copy link
Contributor Author

phl0 commented Apr 26, 2023

Should be OK flo, my only thing would be to check lotw bits to make sure its not used in there.

Tnx feedback. I have tested this with LoTW uploads (actually not uploading but inspecting files to be uploaded). I am just trying to find other places where it might break. Once that is finished I will try a real upload to LoTW for you to make sure.

@phl0
Copy link
Contributor Author

phl0 commented Apr 26, 2023

So here is my feedback:

I did dig a few places where the code would break with excellent support by @AndreasK79. We think that those are fixed now. I then switched to this branch on my dev machine and made a QSO with DL5DTL on QO-100. Here are the results:

Upload to LoTW worked:
Screenshot from 2023-04-26 14-53-45

Upload to QO-100 Dx Club aka webadif worked:
Screenshot from 2023-04-26 14-54-05

Upload to qrz.com logbook worked:
Screenshot from 2023-04-26 14-54-25

Upload to clublog worked:
Screenshot from 2023-04-26 14-54-56

Upload to eqsl worked:
Screenshot from 2023-04-26 14-58-49

After all I tested various export options:

  • ADIF export works
  • All SAT QSO export works
  • All SAT QSO with LoTW cnfm works
  • DX Atlas Export works
  • SOTA csv export works
  • CBR export works
  • kml export works

Cannot think of anything else to test at the moment. Pretty sure there might be some place that needs fixing but I guess the main stuff is done. Happy to hear your feedback.

@AndreasK79
Copy link
Contributor

Go for merge. I think that we have covered all changes necessary.

@AndreasK79 AndreasK79 merged commit 3ab60c4 into magicbug:dev Apr 26, 2023
@magicbug
Copy link
Owner

Good job boys!

@AndreasK79
Copy link
Contributor

Thanks. I think we should release soon. @phl0 has a few things left on the drawing board. Let's wait for them, then release.

@AndreasK79
Copy link
Contributor

And @phl0 was the heavy lifter. I mostly pointed out where the issues were :)

@phl0
Copy link
Contributor Author

phl0 commented Apr 26, 2023

Come on guys :) Thank you for the feedback. I am just good at breaking stuff :-P

@phl0 phl0 deleted the removeRedundantDxccData branch October 16, 2023 15:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants