Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename field in recurringTransactionAmount #77

Merged
merged 1 commit into from
Mar 10, 2023
Merged

Rename field in recurringTransactionAmount #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/database/sossoldi_database.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ class SossoldiDatabase {
`${RecurringTransactionAmountFields.from}` $textNotNull,
`${RecurringTransactionAmountFields.to}` $textNotNull,
`${RecurringTransactionAmountFields.amount}` $realNotNull,
`${RecurringTransactionAmountFields.idRecurringTransaction}` $integerNotNull,
`${RecurringTransactionAmountFields.idTransaction}` $integerNotNull,
`${RecurringTransactionAmountFields.createdAt}` $textNotNull,
`${RecurringTransactionAmountFields.updatedAt}` $textNotNull
)
Expand Down
22 changes: 11 additions & 11 deletions lib/model/recurring_transaction_amount.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class RecurringTransactionAmountFields extends BaseEntityFields {
static String from = 'from';
static String to = 'to';
static String amount = 'amount';
static String idRecurringTransaction = 'idRecurringTransaction'; // FK
static String idTransaction = 'idTransaction'; // FK
static String createdAt = BaseEntityFields.getCreatedAt;
static String updatedAt = BaseEntityFields.getUpdatedAt;

Expand All @@ -17,7 +17,7 @@ class RecurringTransactionAmountFields extends BaseEntityFields {
from,
to,
amount,
idRecurringTransaction,
idTransaction,
BaseEntityFields.createdAt,
BaseEntityFields.updatedAt
];
Expand All @@ -27,14 +27,14 @@ class RecurringTransactionAmount extends BaseEntity {
final DateTime from;
final DateTime to;
final num amount;
final int? idRecurringTransaction;
final int? idTransaction;

const RecurringTransactionAmount(
{int? id,
required this.from,
required this.to,
required this.amount,
required this.idRecurringTransaction,
required this.idTransaction,
DateTime? createdAt,
DateTime? updatedAt})
: super(id: id, createdAt: createdAt, updatedAt: updatedAt);
Expand All @@ -44,16 +44,16 @@ class RecurringTransactionAmount extends BaseEntity {
DateTime? from,
DateTime? to,
num? amount,
int? idRecurringTransaction,
int? idTransaction,
DateTime? createdAt,
DateTime? updatedAt}) =>
RecurringTransactionAmount(
id: id ?? this.id,
from: from ?? this.from,
to: to ?? this.to,
amount: amount ?? this.amount,
idRecurringTransaction:
idRecurringTransaction ?? this.idRecurringTransaction,
idTransaction:
idTransaction ?? this.idTransaction,
createdAt: createdAt ?? this.createdAt,
updatedAt: updatedAt ?? this.updatedAt);

Expand All @@ -65,8 +65,8 @@ class RecurringTransactionAmount extends BaseEntity {
to: DateTime.parse(
json[RecurringTransactionAmountFields.to] as String),
amount: json[RecurringTransactionAmountFields.amount] as num,
idRecurringTransaction:
json[RecurringTransactionAmountFields.idRecurringTransaction]
idTransaction:
json[RecurringTransactionAmountFields.idTransaction]
as int,
createdAt: DateTime.parse(json[BaseEntityFields.createdAt] as String),
updatedAt:
Expand All @@ -77,8 +77,8 @@ class RecurringTransactionAmount extends BaseEntity {
RecurringTransactionAmountFields.from: from.toIso8601String(),
RecurringTransactionAmountFields.to: to.toIso8601String(),
RecurringTransactionAmountFields.amount: amount,
RecurringTransactionAmountFields.idRecurringTransaction:
idRecurringTransaction,
RecurringTransactionAmountFields.idTransaction:
idTransaction,
BaseEntityFields.createdAt: createdAt?.toIso8601String(),
BaseEntityFields.updatedAt: updatedAt?.toIso8601String(),
};
Expand Down
16 changes: 8 additions & 8 deletions test/model/recurring_transaction_amount_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ void main() {
from: DateTime.utc(2022),
to: DateTime.utc(2023),
amount: 0,
idRecurringTransaction: 0,
idTransaction: 0,
createdAt: DateTime.utc(2022),
updatedAt: DateTime.utc(2022));

Expand All @@ -20,7 +20,7 @@ void main() {
assert(tCopy.from == t.from);
assert(tCopy.to == t.to);
assert(tCopy.amount == t.amount);
assert(tCopy.idRecurringTransaction == t.idRecurringTransaction);
assert(tCopy.idTransaction == t.idTransaction);
assert(tCopy.createdAt == t.createdAt);
assert(tCopy.updatedAt == t.updatedAt);
});
Expand All @@ -32,7 +32,7 @@ void main() {
DateTime.utc(2022).toIso8601String(),
RecurringTransactionAmountFields.to: DateTime.utc(2023).toIso8601String(),
RecurringTransactionAmountFields.amount: 0,
RecurringTransactionAmountFields.idRecurringTransaction: 0,
RecurringTransactionAmountFields.idTransaction: 0,
BaseEntityFields.createdAt: DateTime.utc(2022).toIso8601String(),
BaseEntityFields.updatedAt: DateTime.utc(2022).toIso8601String(),
};
Expand All @@ -45,8 +45,8 @@ void main() {
assert(t.to.toUtc().toIso8601String() ==
json[RecurringTransactionAmountFields.to]);
assert(t.amount == json[RecurringTransactionAmountFields.amount]);
assert(t.idRecurringTransaction ==
json[RecurringTransactionAmountFields.idRecurringTransaction]);
assert(t.idTransaction ==
json[RecurringTransactionAmountFields.idTransaction]);
assert(t.createdAt?.toUtc().toIso8601String() ==
json[BaseEntityFields.createdAt]);
assert(t.updatedAt?.toUtc().toIso8601String() ==
Expand All @@ -59,7 +59,7 @@ void main() {
from: DateTime.utc(2022),
to: DateTime.utc(2023),
amount: 0,
idRecurringTransaction: 0,
idTransaction: 0,
createdAt: DateTime.utc(2022),
updatedAt: DateTime.utc(2022));

Expand All @@ -71,8 +71,8 @@ void main() {
assert(t.to.toUtc().toIso8601String() ==
json[RecurringTransactionAmountFields.to]);
assert(t.amount == json[RecurringTransactionAmountFields.amount]);
assert(t.idRecurringTransaction ==
json[RecurringTransactionAmountFields.idRecurringTransaction]);
assert(t.idTransaction ==
json[RecurringTransactionAmountFields.idTransaction]);
assert(t.createdAt?.toUtc().toIso8601String() ==
json[BaseEntityFields.createdAt]);
assert(t.updatedAt?.toUtc().toIso8601String() ==
Expand Down