Merge pull request #157 from purplship/purplship-2021.11

[release-candidate] purplship 2021.11

.codegen/typescript/api/purplship.ts

@@ -1,9 +1,12 @@
-import { PurplshipClient } from './index';
+import { ConfigurationParameters, PurplshipClient } from './index';
 
-export const Client = PurplshipClient;
+export default function Purplship(apiKey: string, host: string = 'https://cloud.purplship.com', apiKeyPrefix: string = 'Token') {
+  const clientConfig: ConfigurationParameters = {
+    basePath: host,
+    apiKey: `${apiKeyPrefix} ${apiKey}`,
+  };
 
-export class Purplship extends PurplshipClient {
-  constructor({ apiKey, host }: { apiKey: string, host: string }) {
-    super({ basePath: host, apiKey });
-  }
-}
+  return new PurplshipClient(clientConfig);
+}
+
+Purplship.Client = PurplshipClient;

.codegen/typescript/gulpfile.js

@@ -16,7 +16,7 @@ gulp.task('build', async function () {
   await bundle.write({
     file: output,
     format: 'umd',
-    name: 'purplship',
+    name: 'Purplship',
     sourcemap: true
   });
 });

.gitignore

@@ -108,6 +108,8 @@ venv.bak/
 .DS_Store
 
 # purplship stuff:
+sdk/**/poetry.lock
+schemas/**/poetry.lock
 .bash_history
 *.DS_Store
 .idea/

README.md

@@ -67,7 +67,7 @@ docker run -d \
   -e ADMIN_EMAIL=admin@example.com \
   -e ADMIN_PASSWORD=demo \
   --link=db:db -p 5002:5002 \
-  danh91.docker.scarf.sh/purplship/server:2021.10
+  danh91.docker.scarf.sh/purplship/server:2021.11
 ```
 
 </details>
@@ -92,7 +92,7 @@ services:
       - db_network
 
   pship:
-    image: danh91.docker.scarf.sh/purplship/server:2021.10
+    image: danh91.docker.scarf.sh/purplship/server:2021.11
     restart: unless-stopped
     environment:
       - DEBUG_MODE=True
@@ -163,6 +163,7 @@ pip install purplship.canadapost
 - `purplship.canadapost`
 - `purplship.canpar`
 - `purplship.dhl-express`
+- `purplship.dhl-poland`
 - `purplship.dhl-universal`
 - `purplship.dicom`
 - `purplship.fedex`
@@ -189,7 +190,7 @@ pip install purplship.canadapost
 ```python
 import purplship
 from purplship.core.models import Address, Parcel, RateRequest
-from purplship.mappers.canadapost.settings import Settings
+from purplship.mappers.canadapost import Settings
 
 
 # Initialize a carrier gateway

docker-compose.insiders.yml

@@ -44,15 +44,9 @@ services:
       file: docker-compose.yml
       service: redis
 
-  nginx:
-    extends:
-      file: docker-compose.yml
-      service: nginx
-
-
 volumes:
-  redisdata:
-  pshipdata:
+  redisdata: null
+  pshipdata: null
   pshipstatics:
     driver: local
 
@@ -61,4 +55,3 @@ networks:
     driver: bridge
   web_network:
     driver: bridge
-

docker/Dockerfile

@@ -1,11 +1,16 @@
 # The base image compilation
 FROM python:3.8-slim AS compile-image
+
+ARG REQUIREMENTS="requirements.txt"
+ARG REGISTRY_TOKEN
+ARG REGISTRY_TOKEN_NAME
+
 RUN python -m venv /pship/venv
 ENV PATH="/pship/venv/bin:$PATH"
-COPY requirements.txt /temp/
+COPY "${REQUIREMENTS}" /temp/
 RUN pip install --upgrade pip && \
     pip install dumb-init && \
-    pip install -r /temp/requirements.txt
+    pip install -r "/temp/${REQUIREMENTS}"
 
 
 # The runtime image

docker/entrypoint.sh

@@ -2,7 +2,7 @@
 
 # Setup DB and static files
 purplship migrate || exit
-purplship collectstatic --clear --noinput || exit
+purplship collectstatic --clear --noinput 2>&1 || exit
 
 # Setup Default super admin
 (echo "

insiders/server/orgs/purplship/server/orgs/migrations/0004_auto_20211113_1338.py

@@ -0,0 +1,28 @@
+# Generated by Django 3.2.9 on 2021-11-13 13:38
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('events', '0002_event'),
+        ('orgs', '0003_organization_system_carriers'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='EventLink',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('item', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='link', to='events.event')),
+                ('org', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='event_links', to='orgs.organization')),
+            ],
+        ),
+        migrations.AddField(
+            model_name='organization',
+            name='events',
+            field=models.ManyToManyField(related_name='org', through='orgs.EventLink', to='events.Event'),
+        ),
+    ]

insiders/server/orgs/purplship/server/orgs/models.py

@@ -4,7 +4,7 @@
     AbstractOrganization,
     AbstractOrganizationUser,
     AbstractOrganizationOwner,
-    AbstractOrganizationInvitation
+    AbstractOrganizationInvitation,
 )
 
 import purplship.server.providers.models as providers
@@ -17,38 +17,66 @@
 
 
 class Organization(AbstractOrganization):
-    id = models.CharField(max_length=50, primary_key=True, default=partial(core.uuid, prefix='org_'), editable=False)
-
-    carriers = models.ManyToManyField(providers.Carrier, related_name="org", through='CarrierLink')
-    system_carriers = models.ManyToManyField(providers.Carrier, related_name="active_orgs")
-
-    parcels = models.ManyToManyField(manager.Parcel, related_name="org", through='ParcelLink')
-    pickups = models.ManyToManyField(manager.Pickup, related_name="org", through='PickupLink')
-    customs = models.ManyToManyField(manager.Customs, related_name="org", through='CustomsLink')
-    trackers = models.ManyToManyField(manager.Tracking, related_name="org", through='TrackerLink')
-    addresses = models.ManyToManyField(manager.Address, related_name="org", through='AddressLink')
-    shipments = models.ManyToManyField(manager.Shipment, related_name="org", through='ShipmentLink')
-    commodities = models.ManyToManyField(manager.Commodity, related_name="org", through='CommodityLink')
-
-    templates = models.ManyToManyField(graph.Template, related_name="org", through='TemplateLink')
-
-    webhooks = models.ManyToManyField(events.Webhook, related_name="org", through='WebhookLink')
-
-    logs = models.ManyToManyField(core.APILog, related_name="org", through='LogLink')
-
-    tokens = models.ManyToManyField(auth.Token, related_name="org", through='TokenLink')
+    id = models.CharField(
+        max_length=50,
+        primary_key=True,
+        default=partial(core.uuid, prefix="org_"),
+        editable=False,
+    )
+
+    carriers = models.ManyToManyField(
+        providers.Carrier, related_name="org", through="CarrierLink"
+    )
+    system_carriers = models.ManyToManyField(
+        providers.Carrier, related_name="active_orgs"
+    )
+
+    parcels = models.ManyToManyField(
+        manager.Parcel, related_name="org", through="ParcelLink"
+    )
+    pickups = models.ManyToManyField(
+        manager.Pickup, related_name="org", through="PickupLink"
+    )
+    customs = models.ManyToManyField(
+        manager.Customs, related_name="org", through="CustomsLink"
+    )
+    trackers = models.ManyToManyField(
+        manager.Tracking, related_name="org", through="TrackerLink"
+    )
+    addresses = models.ManyToManyField(
+        manager.Address, related_name="org", through="AddressLink"
+    )
+    shipments = models.ManyToManyField(
+        manager.Shipment, related_name="org", through="ShipmentLink"
+    )
+    commodities = models.ManyToManyField(
+        manager.Commodity, related_name="org", through="CommodityLink"
+    )
+
+    templates = models.ManyToManyField(
+        graph.Template, related_name="org", through="TemplateLink"
+    )
+
+    webhooks = models.ManyToManyField(
+        events.Webhook, related_name="org", through="WebhookLink"
+    )
+    events = models.ManyToManyField(
+        events.Event, related_name="org", through="EventLink"
+    )
+
+    logs = models.ManyToManyField(core.APILog, related_name="org", through="LogLink")
+
+    tokens = models.ManyToManyField(auth.Token, related_name="org", through="TokenLink")
 
     surcharges = models.ManyToManyField(pricing.Surcharge, related_name="org")
 
 
 class OrganizationUser(AbstractOrganizationUser):
-
     def __str__(self):
         return f"{self.user.email} ({self.organization.name})"
 
 
 class OrganizationOwner(AbstractOrganizationOwner):
-
     def __str__(self):
         return "{0}: {1}".format(self.organization, self.organization_user.user.email)
 
@@ -61,60 +89,117 @@ class OrganizationInvitation(AbstractOrganizationInvitation):
 
 
 class CarrierLink(models.Model):
-    org = models.ForeignKey(Organization, on_delete=models.CASCADE, related_name="carrier_links")
-    item = models.OneToOneField(providers.Carrier, on_delete=models.CASCADE, related_name="link")
+    org = models.ForeignKey(
+        Organization, on_delete=models.CASCADE, related_name="carrier_links"
+    )
+    item = models.OneToOneField(
+        providers.Carrier, on_delete=models.CASCADE, related_name="link"
+    )
 
 
 class ParcelLink(models.Model):
-    org = models.ForeignKey(Organization, on_delete=models.CASCADE, related_name="parcel_links")
-    item = models.OneToOneField(manager.Parcel, on_delete=models.CASCADE, related_name="link")
+    org = models.ForeignKey(
+        Organization, on_delete=models.CASCADE, related_name="parcel_links"
+    )
+    item = models.OneToOneField(
+        manager.Parcel, on_delete=models.CASCADE, related_name="link"
+    )
 
 
 class PickupLink(models.Model):
-    org = models.ForeignKey(Organization, on_delete=models.CASCADE, related_name="pickup_links")
-    item = models.OneToOneField(manager.Pickup, on_delete=models.CASCADE, related_name="link")
+    org = models.ForeignKey(
+        Organization, on_delete=models.CASCADE, related_name="pickup_links"
+    )
+    item = models.OneToOneField(
+        manager.Pickup, on_delete=models.CASCADE, related_name="link"
+    )
 
 
 class CustomsLink(models.Model):
-    org = models.ForeignKey(Organization, on_delete=models.CASCADE, related_name="custom_links")
-    item = models.OneToOneField(manager.Customs, on_delete=models.CASCADE, related_name="link")
+    org = models.ForeignKey(
+        Organization, on_delete=models.CASCADE, related_name="custom_links"
+    )
+    item = models.OneToOneField(
+        manager.Customs, on_delete=models.CASCADE, related_name="link"
+    )
 
 
 class TrackerLink(models.Model):
-    org = models.ForeignKey(Organization, on_delete=models.CASCADE, related_name="tracker_links")
-    item = models.OneToOneField(manager.Tracking, on_delete=models.CASCADE, related_name="link")
+    org = models.ForeignKey(
+        Organization, on_delete=models.CASCADE, related_name="tracker_links"
+    )
+    item = models.OneToOneField(
+        manager.Tracking, on_delete=models.CASCADE, related_name="link"
+    )
 
 
 class AddressLink(models.Model):
-    org = models.ForeignKey(Organization, on_delete=models.CASCADE, related_name="address_links")
-    item = models.OneToOneField(manager.Address, on_delete=models.CASCADE, related_name="link")
+    org = models.ForeignKey(
+        Organization, on_delete=models.CASCADE, related_name="address_links"
+    )
+    item = models.OneToOneField(
+        manager.Address, on_delete=models.CASCADE, related_name="link"
+    )
 
 
 class ShipmentLink(models.Model):
-    org = models.ForeignKey(Organization, on_delete=models.CASCADE, related_name="shipment_links")
-    item = models.OneToOneField(manager.Shipment, on_delete=models.CASCADE, related_name="link")
+    org = models.ForeignKey(
+        Organization, on_delete=models.CASCADE, related_name="shipment_links"
+    )
+    item = models.OneToOneField(
+        manager.Shipment, on_delete=models.CASCADE, related_name="link"
+    )
 
 
 class CommodityLink(models.Model):
-    org = models.ForeignKey(Organization, on_delete=models.CASCADE, related_name="commodity_links")
-    item = models.OneToOneField(manager.Commodity, on_delete=models.CASCADE, related_name="link")
+    org = models.ForeignKey(
+        Organization, on_delete=models.CASCADE, related_name="commodity_links"
+    )
+    item = models.OneToOneField(
+        manager.Commodity, on_delete=models.CASCADE, related_name="link"
+    )
 
 
 class TemplateLink(models.Model):
-    org = models.ForeignKey(Organization, on_delete=models.CASCADE, related_name="template_links")
-    item = models.OneToOneField(graph.Template, on_delete=models.CASCADE, related_name="link")
+    org = models.ForeignKey(
+        Organization, on_delete=models.CASCADE, related_name="template_links"
+    )
+    item = models.OneToOneField(
+        graph.Template, on_delete=models.CASCADE, related_name="link"
+    )
 
 
 class WebhookLink(models.Model):
-    org = models.ForeignKey(Organization, on_delete=models.CASCADE, related_name="webhook_links")
-    item = models.OneToOneField(events.Webhook, on_delete=models.CASCADE, related_name="link")
+    org = models.ForeignKey(
+        Organization, on_delete=models.CASCADE, related_name="webhook_links"
+    )
+    item = models.OneToOneField(
+        events.Webhook, on_delete=models.CASCADE, related_name="link"
+    )
+
+
+class EventLink(models.Model):
+    org = models.ForeignKey(
+        Organization, on_delete=models.CASCADE, related_name="event_links"
+    )
+    item = models.OneToOneField(
+        events.Event, on_delete=models.CASCADE, related_name="link"
+    )
 
 
 class LogLink(models.Model):
-    org = models.ForeignKey(Organization, on_delete=models.CASCADE, related_name="log_links")
-    item = models.OneToOneField(core.APILog, on_delete=models.CASCADE, related_name="link")
+    org = models.ForeignKey(
+        Organization, on_delete=models.CASCADE, related_name="log_links"
+    )
+    item = models.OneToOneField(
+        core.APILog, on_delete=models.CASCADE, related_name="link"
+    )
 
 
 class TokenLink(models.Model):
-    org = models.ForeignKey(Organization, on_delete=models.CASCADE, related_name="token_links")
-    item = models.OneToOneField(auth.Token, on_delete=models.CASCADE, related_name="link")
+    org = models.ForeignKey(
+        Organization, on_delete=models.CASCADE, related_name="token_links"
+    )
+    item = models.OneToOneField(
+        auth.Token, on_delete=models.CASCADE, related_name="link"
+    )