PPOB/ppob-backend
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' into 'devops-staging'

Browse Source 
add: get product by categories

See merge request empatnusabangsa/ppob/ppob-backend!6
This commit is contained in:
ilham dwi pratama
2021-12-09 17:14:56 +00:00
parent 1d1e58d4c1 09c84f2cf5
commit db951657a2
4 changed files with 302 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/product/product.controller.ts
View File

@@ -78,6 +78,21 @@ export class ProductController {
};
}
@Get('by-categories')
async findByCategories(
@Query('page') page: number,
@Query('categories') categories: string,
) {
const [data, count] = await this.productService.findAll(page);
return {
data,
count,
statusCode: HttpStatus.OK,
message: 'success',
};
}
@Get('categories')
async findAllCategories(@Query('page') page: number) {
const [data, count] = await this.productCategoriesService.findAll(page);

13
src/product/product.service.ts
View File

@@ -53,6 +53,19 @@ export class ProductService {
});
}
findAllByCategories(page, categories) {
return this.productRepository.findAndCount({
where: {
subCategories: categories,
},
skip: page * 10,
take: 10,
order: {
version: 'DESC',
},
});
}
async findOne(code: string) {
try {
return await this.productRepository.findOneOrFail({ code: code });

36
src/transaction/transaction.controller.ts
View File

@@ -7,7 +7,7 @@ import {
Param,
Delete,
Request,
HttpStatus
HttpStatus,
} from '@nestjs/common';
import { TransactionService } from './transaction.service';
import { DistributeTransactionDto } from './dto/distribute-transaction.dto';
@@ -25,42 +25,52 @@ export class TransactionController {
@Post('distribute')
create(
@Body() createTransactionDto: DistributeTransactionDto,
@Request() req
@Request() req,
) {
return this.transactionService.distributeDeposit(createTransactionDto,req.user);
return this.transactionService.distributeDeposit(
createTransactionDto,
req.user,
);
}
@Post('distribute-admin')
distributeAdmin(
@Body() createTransactionDto: DistributeTransactionDto,
@Request() req
@Request() req,
) {
return {
data: this.transactionService.distributeFromAdmin(createTransactionDto,req.user),
data: this.transactionService.distributeFromAdmin(
createTransactionDto,
req.user,
),
statusCode: HttpStatus.CREATED,
message: 'success',
};
};
}
@Post('add-saldo-supplier')
async addSaldoSupplier(
@Body() addSaldoSupplier: AddSaldoSupplier,
@Request() req
@Request() req,
) {
return {
data: await this.transactionService.addIRSWallet(addSaldoSupplier,req.user),
data: await this.transactionService.addIRSWallet(
addSaldoSupplier,
req.user,
),
statusCode: HttpStatus.CREATED,
message: 'success',
};
};
}
@Post('order')
orderTransaction(
@Body() orderTransactionDto: OrderTransactionDto,
@Request() req
@Request() req,
) {
return this.transactionService.orderTransaction(orderTransactionDto,req.user);
return this.transactionService.orderTransaction(
orderTransactionDto,
req.user,
);
}
}

403
src/transaction/transaction.service.ts
View File

@@ -8,9 +8,9 @@ import { COA } from './entities/coa.entity';
import { TransactionType } from './entities/transaction-type.entity';
import { TransactionJournal } from './entities/transaction-journal.entity';
import { CoaService } from './coa.service';
import * as uuid from "uuid";
import { uniq } from "lodash";
import {Decimal} from 'decimal.js';
import * as uuid from 'uuid';
import { uniq } from 'lodash';
import { Decimal } from 'decimal.js';
import {
balanceType,
coaType,
@@ -46,50 +46,58 @@ export class TransactionService {
private connection: Connection,
) {}
async addIRSWallet(addSaldoSupplier: AddSaldoSupplier,currentUser:any) {
async addIRSWallet(addSaldoSupplier: AddSaldoSupplier, currentUser: any) {
// GET COA
const coaBank = await this.coaService.findByName(
coaType[coaType.BANK]+'-SYSTEM',
`${coaType[coaType.BANK]}-SYSTEM`,
);
const coaInventory = await this.coaService.findByName(
coaType[coaType.INVENTORY]+'-'+addSaldoSupplier.supplier,
`${coaType[coaType.INVENTORY]}-${addSaldoSupplier.supplier}`,
);
//GET USER
const userData = await this.userService.findByUsername(currentUser.username);
const userData = await this.userService.findByUsername(
currentUser.username,
);
await this.connection.transaction(async (manager) => {
//INSERT TRANSACTION
let transactionData = new Transactions();
const transactionData = new Transactions();
transactionData.id = uuid.v4();
transactionData.amount = addSaldoSupplier.amount,
transactionData.user = userData.id,
transactionData.status = statusTransaction.SUCCESS,
transactionData.type = typeTransaction.DEPOSIT_IRS,
transactionData.amount = addSaldoSupplier.amount;
transactionData.user = userData.id;
transactionData.status = statusTransaction.SUCCESS;
transactionData.type = typeTransaction.DEPOSIT_IRS;
await manager.insert(Transactions, transactionData);
await this.accountingTransaction({
createTransaction: false,
transactionalEntityManager:manager,
transaction: transactionData,
amount: transactionData.amount,
journals: [{
coa_id: coaBank.id,
debit: transactionData.amount
}, {
coa_id: coaInventory.id,
credit: transactionData.amount
}]
createTransaction: false,
transactionalEntityManager: manager,
transaction: transactionData,
amount: transactionData.amount,
journals: [
{
coa_id: coaBank.id,
debit: transactionData.amount,
},
{
coa_id: coaInventory.id,
credit: transactionData.amount,
},
],
});
});
return true;
}
async distributeFromAdmin(distributeTransactionDto: DistributeTransactionDto,currentUser:any) {
async distributeFromAdmin(
distributeTransactionDto: DistributeTransactionDto,
currentUser: any,
) {
// GET COA
const coaAR = await this.coaService.findByUser(
distributeTransactionDto.destination,
@@ -101,42 +109,52 @@ export class TransactionService {
);
//GET USER
const userData = await this.userService.findByUsername(currentUser.username);
const userData = await this.userService.findByUsername(
currentUser.username,
);
await this.connection.transaction(async (manager) => {
//INSERT TRANSACTION
let transactionData = new Transactions();
transactionData.id = uuid.v4();
transactionData.amount = distributeTransactionDto.amount,
transactionData.user = userData.id,
transactionData.status = statusTransaction.SUCCESS,
transactionData.type = typeTransaction.DISTRIBUTION,
await manager.insert(Transactions, transactionData);
await this.accountingTransaction({
createTransaction: false,
transactionalEntityManager:manager,
transaction: transactionData,
amount: transactionData.amount,
journals: [{
coa_id: coaAR.id,
debit: transactionData.amount
}, {
coa_id: coaWallet.id,
credit: transactionData.amount
}]
});
const transactionData = new Transactions();
transactionData.id = uuid.v4();
transactionData.amount = distributeTransactionDto.amount;
transactionData.user = userData.id;
transactionData.status = statusTransaction.SUCCESS;
transactionData.type = typeTransaction.DISTRIBUTION;
await manager.insert(Transactions, transactionData);
await this.accountingTransaction({
createTransaction: false,
transactionalEntityManager: manager,
transaction: transactionData,
amount: transactionData.amount,
journals: [
{
coa_id: coaAR.id,
debit: transactionData.amount,
},
{
coa_id: coaWallet.id,
credit: transactionData.amount,
},
],
});
});
return true;
}
async distributeDeposit(distributeTransactionDto: DistributeTransactionDto,currentUser:any) {
async distributeDeposit(
distributeTransactionDto: DistributeTransactionDto,
currentUser: any,
) {
//GET USER
const userData = await this.userService.findByUsername(currentUser.username);
const userData = await this.userService.findByUsername(
currentUser.username,
);
// GET COA
const coaSenderWallet = await this.coaService.findByUser(
userData.id,
@@ -161,54 +179,74 @@ export class TransactionService {
);
await this.connection.transaction(async (manager) => {
let transactionData = new Transactions();
const transactionData = new Transactions();
transactionData.id = uuid.v4();
transactionData.amount = distributeTransactionDto.amount,
transactionData.user = userData.id,
transactionData.status = statusTransaction.SUCCESS,
transactionData.type = typeTransaction.DISTRIBUTION,
transactionData.amount = distributeTransactionDto.amount;
transactionData.user = userData.id;
transactionData.status = statusTransaction.SUCCESS;
transactionData.type = typeTransaction.DISTRIBUTION;
await manager.insert(Transactions, transactionData);
await this.accountingTransaction({
createTransaction: false,
transactionalEntityManager:manager,
transaction: transactionData,
amount: transactionData.amount,
journals: [{
coa_id: coaSenderWallet.id,
debit: transactionData.amount
}, {
coa_id: coaReceiverWallet.id,
credit: transactionData.amount
}, {
createTransaction: false,
transactionalEntityManager: manager,
transaction: transactionData,
amount: transactionData.amount,
journals: [
{
coa_id: coaSenderWallet.id,
debit: transactionData.amount,
},
{
coa_id: coaReceiverWallet.id,
credit: transactionData.amount,
},
{
coa_id: coaAR.id,
debit: transactionData.amount
}, {
coa_id: coaAP.id,
credit: transactionData.amount
}]
debit: transactionData.amount,
},
{
coa_id: coaAP.id,
credit: transactionData.amount,
},
],
});
});
return true;
}
async orderTransaction(orderTransactionDto: OrderTransactionDto,currentUser:any) {
async orderTransaction(
orderTransactionDto: OrderTransactionDto,
currentUser: any,
) {
//GET PRODUCT
const product = await this.productService.findOne(
orderTransactionDto.productCode,
);
//GET USER
const userData = await this.userService.findByUsername(currentUser.username);
const userData = await this.userService.findByUsername(
currentUser.username,
);
let supervisorData = [];
if(userData.superior != null){
supervisorData.push(await this.userService.findByUsername(currentUser.username));
if(supervisorData[0].superior != null){
supervisorData.push(await this.userService.findByUsername(currentUser.username));
if(supervisorData[0].superior != null){
supervisorData.push(await this.userService.findByUsername(currentUser.username));
if (userData.superior != null) {
supervisorData.push(
await this.userService.findByUsername(currentUser.username),
);
if (supervisorData[0].superior != null) {
supervisorData.push(
await this.userService.findByUsername(currentUser.username),
);
if (supervisorData[0].superior != null) {
supervisorData.push(
await this.userService.findByUsername(currentUser.username),
);
}
}
}
@@ -220,22 +258,22 @@ export class TransactionService {
);
const coaInventory = await this.coaService.findByName(
coaType[coaType.INVENTORY]+'-IRS',
`${coaType[coaType.INVENTORY]}-IRS`,
);
const coaCostOfSales = await this.coaService.findByName(
coaType[coaType.COST_OF_SALES]+'-SYSTEM',
`${coaType[coaType.COST_OF_SALES]}-SYSTEM`,
);
const coaSales = await this.coaService.findByName(
coaType[coaType.SALES]+'-SYSTEM',
`${coaType[coaType.SALES]}-SYSTEM`,
);
const coaExpense = await this.coaService.findByName(
coaType[coaType.EXPENSE]+'-SYSTEM',
`${coaType[coaType.EXPENSE]}-SYSTEM`,
);
supervisorData = supervisorData.map(async it =>{
supervisorData = supervisorData.map(async (it) => {
const coaAccount = await this.coaService.findByUser(
it.id,
coaType.WALLET,
@@ -243,9 +281,9 @@ export class TransactionService {
return {
coa_id: coaAccount.id,
credit: 0
}
})
credit: 0,
};
});
if (coaAccount.amount <= product.price) {
throw new HttpException(
@@ -259,103 +297,164 @@ export class TransactionService {
try {
await this.connection.transaction(async (manager) => {
let transactionData = new Transactions();
const transactionData = new Transactions();
transactionData.id = uuid.v4();
transactionData.amount = product.price,
transactionData.user = userData.id,
transactionData.status = statusTransaction.SUCCESS,
transactionData.type = typeTransaction.DISTRIBUTION,
transactionData.amount = product.price;
transactionData.user = userData.id;
transactionData.status = statusTransaction.SUCCESS;
transactionData.type = typeTransaction.DISTRIBUTION;
await manager.insert(Transactions, transactionData);
await this.accountingTransaction({
createTransaction: false,
transactionalEntityManager:manager,
transaction: transactionData,
amount: transactionData.amount,
journals: [{
coa_id: coaInventory.id,
credit: product.basePrice
}, {
coa_id: coaCostOfSales.id,
debit: product.basePrice
}, {
coa_id: coaAccount.id,
debit: product.price
}, {
coa_id: coaSales.id,
credit: product.price
},{
coa_id: coaExpense.id,
credit: 0
}].concat(supervisorData)
createTransaction: false,
transactionalEntityManager: manager,
transaction: transactionData,
amount: transactionData.amount,
journals: [
{
coa_id: coaInventory.id,
credit: product.basePrice,
},
{
coa_id: coaCostOfSales.id,
debit: product.basePrice,
},
{
coa_id: coaAccount.id,
debit: product.price,
},
{
coa_id: coaSales.id,
credit: product.price,
},
{
coa_id: coaExpense.id,
credit: 0,
},
].concat(supervisorData),
});
});
} catch (e) {
throw e;
}
return true;
}
async accountingTransaction(createJournalDto: CreateJournalDto ) {
let creditSum = createJournalDto.journals.map(it => it.credit).filter(it => it).reduce((a, b) => a.plus(b), new Decimal(0));
let debitSum = createJournalDto.journals.map(it => it.debit).filter(it => it).reduce((a, b) => a.plus(b), new Decimal(0));
let coaIds = uniq(createJournalDto.journals.map(it => it.coa_id));
async accountingTransaction(createJournalDto: CreateJournalDto) {
const creditSum = createJournalDto.journals
.map((it) => {
return it.credit;
})
.filter((it) => {
return it;
})
.reduce((a, b) => {
return a.plus(b);
}, new Decimal(0));
const debitSum = createJournalDto.journals
.map((it) => {
return it.debit;
})
.filter((it) => {
return it;
})
.reduce((a, b) => {
return a.plus(b);
}, new Decimal(0));
const coaIds = uniq(
createJournalDto.journals.map((it) => {
return it.coa_id;
}),
);
if (!creditSum.equals(debitSum)) {
throw new Error(`credit and debit doesn't match`);
throw new Error(`credit and debit doesn't match`);
}
const coas = await this.coaRepository.findByIds(coaIds);
console.log("berhasil")
const transaction = createJournalDto.transaction;
const transaction = createJournalDto.transaction
await Promise.all(createJournalDto.journals.map(journal => {
const coa = coas.find(it => it.id === journal.coa_id);
await Promise.all(
createJournalDto.journals.map((journal) => {
const coa = coas.find((it) => {
return it.id === journal.coa_id;
});
if (!coa) {
throw new Error(`coa ${journal.coa_id} not found`);
throw new Error(`coa ${journal.coa_id} not found`);
}
const journalEntry = new TransactionJournal();
journalEntry.coa = coa;
journalEntry.type = journal.debit ? balanceType.DEBIT : balanceType.CREDIT;
journalEntry.amount = (journal.debit) ? journal.debit : journal.credit;
journalEntry.type = journal.debit
? balanceType.DEBIT
: balanceType.CREDIT;
journalEntry.amount = journal.debit ? journal.debit : journal.credit;
journalEntry.transaction = transaction;
return this.transactionJournalRepository.save(journalEntry);
}));
}),
);
await Promise.all(coaIds.map(coaId => {
let journalPerCoa = createJournalDto.journals.filter(journal => journal.coa_id == coaId);
await Promise.all(
coaIds.map((coaId) => {
const journalPerCoa = createJournalDto.journals.filter((journal) => {
return journal.coa_id == coaId;
});
let creditSum = journalPerCoa.map(it => it.credit).filter(it => it).reduce((a, b) => a.plus(b), new Decimal(0));
let debitSum = journalPerCoa.map(it => it.debit).filter(it => it).reduce((a, b) => a.plus(b), new Decimal(0));
const creditSum = journalPerCoa
.map((it) => {
return it.credit;
})
.filter((it) => {
return it;
})
.reduce((a, b) => {
return a.plus(b);
}, new Decimal(0));
const debitSum = journalPerCoa
.map((it) => {
return it.debit;
})
.filter((it) => {
return it;
})
.reduce((a, b) => {
return a.plus(b);
}, new Decimal(0));
let coa = coas.find(it => it.id.toLowerCase() === coaId.toLowerCase());
const coa = coas.find((it) => {
(it) => {
return it.id.toLowerCase() === coaId.toLowerCase();
};
});
let balance = new Decimal(coa.amount);
if (coa.balanceType === balanceType.DEBIT) {
balance = balance.plus(debitSum.minus(creditSum));
balance = balance.plus(debitSum.minus(creditSum));
} else if (coa.balanceType === balanceType.CREDIT) {
balance = balance.plus(creditSum.minus(debitSum));
balance = balance.plus(creditSum.minus(debitSum));
}
const diff = balance.minus(new Decimal(coa.amount));
return createJournalDto.transactionalEntityManager
.createQueryBuilder()
.update(COA)
.set({
amount: () => "amount + " + diff.toString()
})
.where("id = :id", { id: coa.id })
.execute();
}));
.createQueryBuilder()
.update(COA)
.set({
amount: () => {
return `amount + ${diff.toString()}`;
},
})
.where('id = :id', { id: coa.id })
.execute();
}),
);
return transaction;
}