Add info about product return to product history

Author: ArktinenKarpalo

openapi.yaml

@@ -122,6 +122,10 @@ components:
           type: integer
           example: 19
           description: Price (in cents) of the product bought.
+        returned:
+          type: boolean
+          example: false
+          description: Has the user returned this product or not?
     PurchaseEventProduct:
       type: object
       required:

src/db/historyStore.ts

@@ -10,6 +10,7 @@ const rowToPurchase = (row) => {
 		price: row.sellprice,
 		balanceAfter: row.saldo,
 		stockAfter: row.count,
+		returned: row.returned,
 	};
 };
 
@@ -31,6 +32,7 @@ export const createPurchaseHistoryQuery = () =>
 		.leftJoin('RVPERSON', 'ITEMHISTORY.userid', 'RVPERSON.userid')
 		.leftJoin('ROLE', 'RVPERSON.roleid', 'ROLE.roleid')
 		.leftJoin('SALDOHISTORY', 'ITEMHISTORY.saldhistid', 'SALDOHISTORY.saldhistid')
+		.leftJoin('ITEMHISTORY as ih2', 'ih2.itemhistid2', 'ITEMHISTORY.itemhistid')
 		.select(
 			'ITEMHISTORY.itemhistid',
 			'ITEMHISTORY.time',
@@ -49,7 +51,8 @@ export const createPurchaseHistoryQuery = () =>
 			'RVPERSON.saldo as currentsaldo',
 			'ROLE.role',
 			'SALDOHISTORY.saldo',
-			'RVPERSON.privacy_level'
+			'RVPERSON.privacy_level',
+			knex.raw('(ih2.itemhistid2 is not null) as returned')
 		)
 		.where('ITEMHISTORY.actionid', actions.BOUGHT_BY) /* actionid 5 = buy action */
 		.orderBy([

src/routes/userPurchaseHistory.ts

@@ -25,6 +25,7 @@ router.get('/', async (req: Authenticated_request, res) => {
 					sellPrice: purchase.product.sellPrice,
 					stock: purchase.product.stock,
 				},
+				returned: purchase.returned,
 				price: purchase.price,
 				balanceAfter: purchase.balanceAfter,
 			};
@@ -75,6 +76,7 @@ router.get('/:purchaseId(\\d+)', async (req: Authenticated_request, res) => {
 					sellPrice: purchase.product.sellPrice,
 					stock: purchase.product.stock,
 				},
+				returned: purchase.returned,
 				price: purchase.price,
 				balanceAfter: purchase.balanceAfter,
 			},