minor changes + console logs for sending to debug the stage2 instance

This commit is contained in:
Ulf Gebhardt 2022-01-24 16:53:45 +01:00
parent bf7a0f14ce
commit 1110a6fdef
Signed by: ulfgebhardt
GPG Key ID: DA6B843E748679C9
3 changed files with 25 additions and 3 deletions

View File

@ -425,8 +425,12 @@ async function addUserTransaction(
queryRunner: QueryRunner,
): Promise<dbUserTransaction> {
let newBalance = centAmount
// eslint-disable-next-line no-console
console.log('newBalance', newBalance)
const userTransactionRepository = getCustomRepository(UserTransactionRepository)
const lastUserTransaction = await userTransactionRepository.findLastForUser(user.id)
// eslint-disable-next-line no-console
console.log('lastUserTransaction', lastUserTransaction)
if (lastUserTransaction) {
newBalance += Number(
await calculateDecay(
@ -437,6 +441,8 @@ async function addUserTransaction(
throw new Error('error by calculating decay')
}),
)
// eslint-disable-next-line no-console
console.log('newBalance', newBalance)
}
if (newBalance <= 0) {
@ -576,6 +582,8 @@ export class TransactionResolver {
.catch((error) => {
throw new Error('error loading saved transaction: ' + error)
})
// eslint-disable-next-line no-console
console.log('transaction', transaction)
// Insert Transaction: sender - amount
const senderUserTransactionBalance = await addUserTransaction(
@ -584,6 +592,8 @@ export class TransactionResolver {
-centAmount,
queryRunner,
)
// eslint-disable-next-line no-console
console.log('senderUserTransactionBalance', senderUserTransactionBalance)
// Insert Transaction: recipient + amount
const recipiantUserTransactionBalance = await addUserTransaction(
recipiantUser,
@ -591,6 +601,8 @@ export class TransactionResolver {
centAmount,
queryRunner,
)
// eslint-disable-next-line no-console
console.log('recipiantUserTransactionBalance', recipiantUserTransactionBalance)
// Update Balance: sender - amount
const senderStateBalance = await updateStateBalance(
@ -599,6 +611,8 @@ export class TransactionResolver {
transaction.received,
queryRunner,
)
// eslint-disable-next-line no-console
console.log('senderStateBalance', senderStateBalance)
// Update Balance: recipiant + amount
const recipiantStateBalance = await updateStateBalance(
recipiantUser,
@ -606,8 +620,16 @@ export class TransactionResolver {
transaction.received,
queryRunner,
)
// eslint-disable-next-line no-console
console.log('recipiantStateBalance', recipiantStateBalance)
if (senderStateBalance.amount !== senderUserTransactionBalance.balance) {
// eslint-disable-next-line no-console
console.log(
'db data corrupted, sender',
senderStateBalance.amount,
senderUserTransactionBalance.balance,
)
throw new Error('db data corrupted, sender')
}
if (recipiantStateBalance.amount !== recipiantUserTransactionBalance.balance) {

View File

@ -22,7 +22,7 @@ fi
pm2 stop gradido-backend
# Backup data
mysqldump --databases --single-transaction --quick --lock-tables=false > ${SCRIPT_DIR}/backup/mariadb-backup-$(date +%d-%m-%Y_%H-%M-%S).sql -u ${DB_USER} -p${DB_PASSWORD} ${DB_DATABASE}
mysqldump --databases --single-transaction --quick --hex-blob --lock-tables=false > ${SCRIPT_DIR}/backup/mariadb-backup-$(date +%d-%m-%Y_%H-%M-%S).sql -u ${DB_USER} -p${DB_PASSWORD} ${DB_DATABASE}
# Start Services
pm2 start gradido-backend

View File

@ -6,8 +6,8 @@ SCRIPT_DIR=$(dirname $SCRIPT_PATH)
PROJECT_ROOT=$SCRIPT_DIR/../..
set +o allexport
BACKUP_FILE_LOGIN=$1 #gradido_login_22-01-21.sql
BACKUP_FILE_COMMUNITY=$2 #gradido_node_22-01-21.sql
BACKUP_FILE_LOGIN=$1 #gradido_login_22-01-24.sql
BACKUP_FILE_COMMUNITY=$2 #gradido_node_22-01-24.sql
# Load backend .env for DB_USERNAME, DB_PASSWORD & DB_DATABASE
# NOTE: all config values will be in process.env when starting