From 567fb836b3fb29eb492a1474e80882deddf469a7 Mon Sep 17 00:00:00 2001
From: tanshu <git@tanshu.com>
Date: Tue, 22 Jun 2021 05:34:02 +0530
Subject: [PATCH] Fix: Kots should be sorted by date as a relationship of the
 voucher. This was causing them to appear in random order in sales.

---
 barker/barker/models/voucher.py |  2 ++
 deploy.sh                       | 12 +----------
 docker/app/Dockerfile           |  2 +-
 version_bump.sh                 | 35 +++++++++++++++++----------------
 4 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/barker/barker/models/voucher.py b/barker/barker/models/voucher.py
index 8f3c315..e46b2b8 100644
--- a/barker/barker/models/voucher.py
+++ b/barker/barker/models/voucher.py
@@ -13,6 +13,7 @@ from sqlalchemy import (
 from sqlalchemy.dialects.postgresql import UUID
 from sqlalchemy.orm import relationship
 
+from .kot import Kot
 from .meta import Base
 from .voucher_type import VoucherType
 
@@ -51,6 +52,7 @@ class Voucher(Base):
         backref="voucher",
         cascade="delete, delete-orphan",
         cascade_backrefs=False,
+        order_by=Kot.date,
     )
     settlements = relationship(
         "Settlement",
diff --git a/deploy.sh b/deploy.sh
index 13d0d44..b8c6e54 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -5,17 +5,7 @@ cd "$parent_path" || exit
 
 ./lint.sh
 
-if [ 1 -eq "$#" ]
-then
-  ./version_bump.sh "$1"
-else
-echo "No version bump"
-  git push
-  git tag --delete latest
-  git tag latest
-  git push --delete origin latest
-  git push --tags
-fi
+./version_bump.sh "$1"
 
 cd "$parent_path/docker/app" || exit
 docker build --tag barker:latest .
diff --git a/docker/app/Dockerfile b/docker/app/Dockerfile
index 3172459..c6ccdbc 100644
--- a/docker/app/Dockerfile
+++ b/docker/app/Dockerfile
@@ -2,7 +2,7 @@ FROM node:latest AS builder
 ADD https://git.tanshu.com/api/v1/repos/tanshu/barker/tags /tags.json
 RUN git clone --single-branch --depth 1 --branch latest https://git.tanshu.com/tanshu/barker.git /app
 WORKDIR /app/bookie
-RUN npm install --unsafe-perm && /app/bookie/node_modules/.bin/ng build --prod
+RUN npm install --unsafe-perm && /app/bookie/node_modules/.bin/ng build
 
 
 FROM python:latest
diff --git a/version_bump.sh b/version_bump.sh
index 9f65873..4dae7d8 100755
--- a/version_bump.sh
+++ b/version_bump.sh
@@ -2,27 +2,28 @@
 parent_path=$( cd "$(dirname "${BASH_SOURCE[0]}")" || exit ; pwd -P )
 cd "$parent_path" || exit
 
-if [ 1 -ne "$#" ]
+if [ 1 -eq "$#" ]
 then
-  echo "Usage: `basename $0` Version: eg. 9.0.0"
-  exit 0
+  echo "Version bump to $1"
+  sed --in-place --regexp-extended 's/"([0-9].[0-9].[0-9])"/"'"$1"'"/g' barker/barker/__version__.py
+  git add barker/barker/__version__.py
+  sed --in-place --regexp-extended 's/version = "([0-9].[0-9].[0-9])"/version = "'"$1"'"/g' barker/pyproject.toml
+  git add barker/pyproject.toml
+  sed --in-place --regexp-extended 's/version = "([0-9].[0-9].[0-9])"/version = "'"$1"'"/g' frank/pyproject.toml
+  git add frank/pyproject.toml
+  sed --in-place --regexp-extended 's/version: '\''([0-9].[0-9].[0-9])'\''/version: '\'"$1"\''/g' bookie/src/environments/environment.prod.ts
+  git add bookie/src/environments/environment.prod.ts
+  sed --in-place --regexp-extended 's/version: '\''([0-9].[0-9].[0-9])'\''/version: '\'"$1"\''/g' bookie/src/environments/environment.ts
+  git add bookie/src/environments/environment.ts
+  sed --in-place --regexp-extended 's/"version": "([0-9].[0-9].[0-9])"/"version": "'"$1"'"/g' bookie/package.json
+  git add bookie/package.json
+  git commit -m "Version Bump v$1"
+  git tag "v$1"
+else
+  echo "No version bump"
 fi
-sed --in-place --regexp-extended 's/"([0-9].[0-9].[0-9])"/"'"$1"'"/g' barker/barker/__version__.py
-git add barker/barker/__version__.py
-sed --in-place --regexp-extended 's/version = "([0-9].[0-9].[0-9])"/version = "'"$1"'"/g' barker/pyproject.toml
-git add barker/pyproject.toml
-sed --in-place --regexp-extended 's/version = "([0-9].[0-9].[0-9])"/version = "'"$1"'"/g' frank/pyproject.toml
-git add frank/pyproject.toml
-sed --in-place --regexp-extended 's/version: '\''([0-9].[0-9].[0-9])'\''/version: '\'"$1"\''/g' bookie/src/environments/environment.prod.ts
-git add bookie/src/environments/environment.prod.ts
-sed --in-place --regexp-extended 's/version: '\''([0-9].[0-9].[0-9])'\''/version: '\'"$1"\''/g' bookie/src/environments/environment.ts
-git add bookie/src/environments/environment.ts
-sed --in-place --regexp-extended 's/"version": "([0-9].[0-9].[0-9])"/"version": "'"$1"'"/g' bookie/package.json
-git add bookie/package.json
-git commit -m "Version Bump v$1"
 git push
 git tag --delete latest
 git tag latest
-git tag "v$1"
 git push --delete origin latest
 git push --tags