photowall/graphql-api-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added designers

Browse Source
This commit is contained in:
Niklas Fondberg
2021-04-08 23:11:24 +02:00
parent 2b57afbc4a
commit 3c648cee29
18 changed files with 366 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/datasources/BaseSQLDataSource.ts
+4
View File
@@ -9,6 +9,10 @@ export class BaseSQLDataSource extends SQLDataSource {
this.cache = config.cache || new InMemoryLRUCache();
}
getSQLDate(date: Date): string {
return date.toISOString().split('T')[0];
}
async cacheQuery(ttl = 5, query) {
const cacheKey = crypto
.createHash('sha1')
src/datasources/designer-api.ts
+42
View File
@@ -0,0 +1,42 @@
import { BaseSQLDataSource } from './BaseSQLDataSource';
import { Designer } from './designer-types';
import { Maybe } from './types';
const MINUTE = 60;
export class DesignerAPI extends BaseSQLDataSource {
constructor(config) {
super(config);
}
async getDesignerById(id: number): Promise<Designer> {
return await this.knex
.select('*')
.from('designers')
.where('designerid', id)
.first()
.cache(MINUTE)
.then((row) => {
return {
...row,
id: row.designerid,
};
});
}
async getDesigners(limit: Maybe<number>): Promise<Array<Designer>> {
limit = limit ?? 100;
return await this.knex
.select('*')
.from('designers')
.limit(limit)
.cache(MINUTE)
.then((rows) => {
return rows.map((row) => {
return {
...row,
id: row.designerid,
};
});
});
}
}
src/datasources/designer-types.ts
+5
View File
@@ -0,0 +1,5 @@
export interface Designer {
id: number;
name: string;
path: string;
}
src/datasources/order-api.ts
+102 -80
View File
@@ -1,3 +1,5 @@
import { SQLDataSource } from 'datasource-sql';
import { BaseSQLDataSource } from './BaseSQLDataSource';
import { camelcase } from 'stringcase';
import {
@@ -7,11 +9,10 @@ import {
Order,
OrderRow,
} from './order-types';
import { Maybe } from './types';
import { GeneralInput, Maybe } from './types';
const MINUTE = 60;
export class OrderAPI extends BaseSQLDataSource {
cache: any;
constructor(config) {
super(config);
}
@@ -65,28 +66,40 @@ export class OrderAPI extends BaseSQLDataSource {
getDeliveryInformation(row): ContactInformation {
return {
email: 'niklas.fondberg@photowall.se',
email: 'niklas.fondberg@photowall.se', // TODO: fix hardcoded
phone: '+46761386397',
addressId: row.deliveryAddressId,
};
}
async getOrders(): Promise<Array<Order>> {
return await this.knex
.select('*')
.from('orders')
.where('inserted', '>=', '2021-03-01T00:00:00Z')
.cache(MINUTE)
.then((rows) =>
rows.map((row) => {
row.billingInformation = this.getBillingInformation(row);
row.deliveryInformation = this.getDeliveryInformation(row);
return row;
}),
);
async getOrders(input: Maybe<GeneralInput>): Promise<Array<Order>> {
let query = this.knex.select('*').from('orders');
// .where('inserted', '>=', '2021-03-01T00:00:00Z')
if (input?.dates?.from) {
query = query.where('inserted', '>=', input.dates.from);
}
if (input?.dates?.to) {
query = query.where('inserted', '<=', input.dates.to);
}
query = query.orderBy('inserted', 'ASC');
if (input?.limit) {
query = query.limit(input?.limit);
}
// console.log(query.toString());
return await query.cache(MINUTE).then((rows) =>
rows.map((row) => {
row.billingInformation = this.getBillingInformation(row);
row.deliveryInformation = this.getDeliveryInformation(row);
return row;
}),
);
}
async getOrder(id: number): Promise<Order> {
async getOrderById(id: number): Promise<Order> {
return await this.knex
.select('*')
.from('orders')
@@ -100,90 +113,99 @@ export class OrderAPI extends BaseSQLDataSource {
});
}
async getOrderRows(orderId: number): Promise<Array<OrderRow>> {
async getOrderRowFieldMapping(): Promise<any> {
// const fields = await this.knex.select('*').from('order-row_fields');
const fieldsRes = await this.cacheQuery(
120,
60,
this.knex
.raw('SELECT * from "order-row_fields"')
.then((data) => data.rows),
);
const fields = fieldsRes.reduce((obj, item) => {
return fieldsRes.reduce((obj, item) => {
obj[item.fieldid] = item.name;
return obj;
}, {});
}
const rows = await this.knex
.raw('SELECT * FROM "order-rows" WHERE orderid = ?', orderId)
/**
* Gets the row details
*/
async getOrderRowDetailsForRowId(rowId: number): Promise<any> {
const details = await this.knex
.raw('SELECT * FROM "order-rows_details" WHERE rowid = ?', rowId)
.then((data) => data.rows);
// Skip empty order rows
if (!details.length) {
return null;
}
const fields = await this.getOrderRowFieldMapping();
const orderRow = details.reduce((obj, item) => {
obj[camelcase(fields[item.fieldid])] = item.value;
return obj;
}, {});
if ('group' in orderRow) {
orderRow['productGroup'] = orderRow['group'];
}
return orderRow;
}
/**
* Takes input from order-rows query and gets the row details
*/
async getOrderRows(rows: any): Promise<Array<OrderRow>> {
let orderRows = [];
for (let i = 0; i < rows.length; i++) {
const rowId = rows[i].rowid;
const details = await this.knex
.raw('SELECT * FROM "order-rows_details" WHERE rowid = ?', rowId)
.then((data) => data.rows);
// Skip empty order rows
if (!details.length) {
const orderRow = await this.getOrderRowDetailsForRowId(rowId);
if (!orderRow) {
continue;
}
const orderRow = details.reduce((obj, item) => {
obj[camelcase(fields[item.fieldid])] = item.value;
return obj;
}, {});
if ('group' in orderRow) {
orderRow['productGroup'] = orderRow['group'];
}
// take some data from order-rows results
orderRow['id'] = rowId;
orderRow['orderId'] = orderId;
orderRow['orderId'] = rows[i].orderid;
orderRow['inserted'] = rows[i].inserted;
orderRows.push(orderRow);
}
return orderRows;
}
async getOrderRowsByOrderId(orderId: number): Promise<Array<OrderRow>> {
const rows = await this.knex
.raw('SELECT * FROM "order-rows" WHERE orderid = ?', orderId)
.then((data) => data.rows);
return await this.getOrderRows(rows);
}
async getOrderRowsByDesignerId(
designerId: number,
input: Maybe<GeneralInput>,
): Promise<Array<OrderRow>> {
const query = /* sql */ `
SELECT orderdetails.*, "order-rows".orderid
FROM "order-rows_details" orderdetails
JOIN "order-rows" ON "order-rows".rowid = orderdetails.rowid
WHERE orderdetails.fieldid = 105
AND orderdetails.value = ?
AND orderdetails.inserted >= ?
AND orderdetails.inserted <= ?
ORDER BY orderdetails.inserted ASC
${input?.limit ? `LIMIT ${input.limit}` : ''}
`;
const from = input?.dates?.from ? input.dates.from : new Date('2000-01-01');
const to = input?.dates?.to ? input.dates.to : new Date();
const rows = await this.knex
.raw(query, [designerId, this.getSQLDate(from), this.getSQLDate(to)])
.then((data) => data.rows);
return await this.getOrderRows(rows);
}
}
/**
* row
{
printId: '73963',
inserted: 2021-02-04T10:11:41.093Z,
productId: '54192',
group: 'photo-wallpaper',
type: 'scaling',
artNo: 'e50075',
path: 'flora-hysterica-4',
name: 'Flora Hysterica 4',
price: '587.092480',
width: '640',
height: '260',
x: '0.000000',
y: '0.135133',
weight: '1',
designer: 'martin-bergstrom',
designerId: '201',
commission: '0',
commissionResale: '0',
status: 'print',
process: 'true',
vat: '1.210000',
commissionAmount: '0.000000',
framed: '0',
mirrored: '0',
edge: '0',
imageprocessed: 'true',
imageprocessingrejected: 'false',
resolution: '150',
imagedonotprint: 'false',
material: 'premium-wallpaper',
discountType: '%',
discountValue: '25',
measureUnit: 'cm',
displayWidth: '640',
displayHeight: '260',
designerPath: 'martin-bergstrom'
},
*/
src/datasources/order-types.ts
+2
View File
@@ -1,3 +1,5 @@
import { DateInput } from './types';
export interface Market {
id: number;
name: string;
src/datasources/product-api.ts
+6 -2
View File
@@ -45,11 +45,12 @@ export class ProductAPI extends SQLDataSource {
}
getPrintProducts(row: any): Array<PrintProduct> {
if (!row.printProducts) {
if (!row.printproducts) {
return [];
}
return row.printProducts.map((pp: any) => {
return row.printproducts.map((pp: any) => {
pp.group = ProductGroup[pp.groupId];
pp.id = pp.printId;
return pp;
});
}
@@ -66,6 +67,7 @@ export class ProductAPI extends SQLDataSource {
data.rows.map((row) => {
row.blacklisting = this.getBlacklisting(row);
row.printProducts = this.getPrintProducts(row);
row.designerId = row.designerid;
return row;
}),
);
@@ -76,8 +78,10 @@ export class ProductAPI extends SQLDataSource {
const res = await this.knex.raw(query).then((data) =>
data.rows.map((row) => {
console.log(row);
row.blacklisting = this.getBlacklisting(row);
row.printProducts = this.getPrintProducts(row);
row.designerId = row.designerid;
return row;
}),
);
src/datasources/sql/products-sql.ts
+1 -1
View File
@@ -26,7 +26,7 @@ SELECT products.productid as id,
"product-printproducts".updated
)
) FROM "product-printproducts" WHERE "product-printproducts".productid = products.productid
) AS printProducts,
) AS printproducts,
( SELECT json_agg(
json_build_object(
'id',
src/datasources/types.ts
+14
View File
@@ -1 +1,15 @@
export type Maybe<T> = T | undefined;
export interface DateInput {
from: Date;
to: Date;
}
export interface GeneralInput {
dates: DateInput;
limit: number;
}
export interface FilterInput {
filter: GeneralInput;
}