[tailsdotcom/tails] Revert "Revert "Feature/international delivery services [WIP]"" (#1307)

(▰˘◡˘▰)
12:44 (10 hours ago)
Reverts tailsdotcom/tails#1306 there are bugs in this, and will break production can you also include us in PR's that touch shipment/warehouse code - we are hap
4

Matt M
20:31 (2 hours ago)
@zelane pushed 1 commit. - a3d5b85 rename france store to fr for consistency View it on GitHub or mute the thread.

(▰˘◡˘▰) <notifications@github.com>
21:25 (1 hour ago)
to Subscribed, tailsdotcom/tails

has anyone run this code yet?



Matt M <notifications@github.com>
21:28 (1 hour ago)
to tailsdotcom/tails, Subscribed

it's be run against, web, fy and by. We don't currently have any test setup for packing etc or any docs on it. If I can get some kind of logs for the issue that was seen I can implement a fix and we can test it together tomorrow. Whilst digging in to this it looks like the migration in this PR wasn't run against the prod db, so maybe that was the issue?



(▰˘◡˘▰) <notifications@github.com>
21:53 (1 hour ago)
to tailsdotcom/tails, Subscribed

but why are you editing code you do not know how to run?
not running it..
and then pushing it to live?

you can always chuck anything you need doing on our end into our sprint (which lives on trello, and everyone should have access to?), you've just got to turn up and bargain for priority against the rest of them haha, and if you ever want any of us to run through or help you setup stuff, we are always here to help! (this goes for anyone else too!)

I can help you run the code tomorrow, I will come find you and we can do it on your laptop : )



(▰˘◡˘▰) <notifications@github.com>
21:57 (1 hour ago)
to tailsdotcom/tails, Subscribed

@NULL-OPERATOR commented on this pull request.

In lib/shipment/shipment_helper.py:

> -                    '10': 1, #before 10 30
-                    '12': 1, #before 12
-                   '48': 2,
-                   '72': 3,
-                   'packet': 3,
-                   'ISLE': 5}
+# TODO: This could move to the CourierDeliveryService?
+fulfilment_days = {
+    '24': 1,
+    '10': 1,  # before 10 30
+    '12': 1,  # before 12
+    '48': 2,
+    '72': 3,
+    'packet': 3,
+    'ISLE': 5,
+    'international': 5
also.. where was this decided?



Matt M <notifications@github.com>
22:13 (1 hour ago)
to tailsdotcom/tails, Subscribed

It's shared code so it's run in several applications, it's been tested in the ones I have a running environment for in development, which did not have any issues.

Given that the only changes that should impact other services are the changes to two function signatures, and I searched the code base for and updated the call sites, I did not consider it high enough risk to trade off against a full regression costing both of us time, given that the plan was to merge all of our international changes into master and then run a full end to end test together, which should have shaken any issues out before going to prod.

These changes were not intended for prod and no one on our side deploy them, however they were merged into master to facilitate the end to end test that everyone was hoping to do today.

I really would have appreciated some logs from the issue you saw when it got accidentally pushed to production as it would have let me get ahead of the curve on resolving this issue, which might be as simple as just making sure the migration has been run against prod. As you know the deadline for getting intentional live is pretty punchy and whilst discussions about shared code etiquette are something we should definitely make time for, they will not solve the immediate issue at hand.



Matt M <notifications@github.com>
22:16 (1 hour ago)
to tailsdotcom/tails, Subscribed

@zelane commented on this pull request.

In lib/shipment/shipment_helper.py:

> -                    '10': 1, #before 10 30
-                    '12': 1, #before 12
-                   '48': 2,
-                   '72': 3,
-                   'packet': 3,
-                   'ISLE': 5}
+# TODO: This could move to the CourierDeliveryService?
+fulfilment_days = {
+    '24': 1,
+    '10': 1,  # before 10 30
+    '12': 1,  # before 12
+    '48': 2,
+    '72': 3,
+    'packet': 3,
+    'ISLE': 5,
+    'international': 5
the delivery range is arbitrary for now, to be finalised before any international shipments make it into the queue. It simply needs to be there before we can do an end to end test



Steve Webster <notifications@github.com>
22:20 (58 minutes ago)
to tailsdotcom/tails, Subscribed

I've cleaned up this PR and left only comments relevant to the change and less on ways of working, which we'll tackle elsewhere. Please keep focussed on solving the issue here.



(▰˘◡˘▰) <notifications@github.com>
22:47 (31 minutes ago)
to tailsdotcom/tails, Subscribed

and that is ok?



(▰˘◡˘▰) <notifications@github.com>
23:02 (16 minutes ago)
to tailsdotcom/tails, Subscribed

I have cleaned up further! looking good!