due_at fix
This commit is contained in:
@ -1,4 +1,3 @@
|
||||
import typing_extensions
|
||||
from db import dbGetMany
|
||||
import datetime
|
||||
from loguru import logger
|
||||
@ -14,71 +13,87 @@ def perform(dbh, params):
|
||||
|
||||
|
||||
# get flat tenants by object and timespan with paid overhead and due overhead
|
||||
select t.id as tenant_id,
|
||||
t.firstname as tenant_firstname,
|
||||
t.lastname as tenant_lastname,
|
||||
f.id as flat_id,
|
||||
f.description as flat,
|
||||
p.id as house_id,
|
||||
p.description as house,
|
||||
ty.startdate as startdate,
|
||||
ty.enddate as enddate
|
||||
from tenant_t t,
|
||||
premise_t p,
|
||||
flat_t f,
|
||||
tenancy_t ty
|
||||
where ty.tenant = t.id and
|
||||
ty.flat = f.id and
|
||||
f.premise = p.id
|
||||
order by house_id, tenant_id;
|
||||
|
||||
|
||||
|
||||
# get overhead sums by object, category and timespan
|
||||
overheadSums = dbGetMany(
|
||||
tenants = dbGetMany(
|
||||
dbh,
|
||||
{
|
||||
"statement":
|
||||
"""
|
||||
select sum(ae.amount) as sum,
|
||||
aec.description as category,
|
||||
p.id as house_id,
|
||||
p.description as house
|
||||
from account_t a,
|
||||
premise_t p,
|
||||
account_entry_t ae,
|
||||
account_entry_category_t aec
|
||||
where p.account = a.id and
|
||||
ae.account = a.id and
|
||||
aec.overhead_relevant = 't' and
|
||||
ae.account_entry_category = aec.id and
|
||||
created_at between %(startDate)s and %(endDate)s and
|
||||
{
|
||||
"statement":
|
||||
"""
|
||||
select t.id as tenant_id,
|
||||
t.firstname as tenant_firstname,
|
||||
t.lastname as tenant_lastname,
|
||||
f.id as flat_id,
|
||||
f.description as flat,
|
||||
p.id as house_id,
|
||||
p.description as house,
|
||||
ty.startdate as startdate,
|
||||
ty.enddate as enddate
|
||||
from tenant_t t,
|
||||
premise_t p,
|
||||
flat_t f,
|
||||
tenancy_t ty
|
||||
where ty.tenant = t.id and
|
||||
ty.flat = f.id and
|
||||
ty.startdate >= %(startDate)s and
|
||||
(ty.enddate <= %(endDate)s or ty.enddate is null) and
|
||||
f.premise = p.id and
|
||||
p.id in %(premises)s
|
||||
group by house_id, house, category
|
||||
union
|
||||
select 0 as sum,
|
||||
aec.description as category,
|
||||
p.id as house_id,
|
||||
p.description as house
|
||||
from account_t a,
|
||||
premise_t p,
|
||||
account_entry_t ae,
|
||||
account_entry_category_t aec
|
||||
where p.account = a.id and
|
||||
ae.account = a.id and
|
||||
aec.overhead_relevant = 't' and
|
||||
aec.id not in (select distinct account_entry_category from account_entry_t) and
|
||||
created_at between %(startDate)s and %(endDate)s and
|
||||
p.id in %(premises)s
|
||||
group by house_id, house, category
|
||||
order by house_id, category
|
||||
""",
|
||||
order by house_id, tenant_id
|
||||
""",
|
||||
"params": {
|
||||
"startDate": startDate,
|
||||
"endDate": endDate,
|
||||
"premises": premises
|
||||
}
|
||||
}
|
||||
}
|
||||
)
|
||||
logger.info(f"{tenants=}")
|
||||
|
||||
|
||||
# get overhead sums by object, category and timespan
|
||||
overheadSums = dbGetMany(
|
||||
dbh,
|
||||
{
|
||||
"statement":
|
||||
"""
|
||||
select sum(ae.amount) as sum,
|
||||
aec.description as category,
|
||||
p.id as house_id,
|
||||
p.description as house
|
||||
from account_t a,
|
||||
premise_t p,
|
||||
account_entry_t ae,
|
||||
account_entry_category_t aec
|
||||
where p.account = a.id and
|
||||
ae.account = a.id and
|
||||
aec.overhead_relevant = 't' and
|
||||
ae.account_entry_category = aec.id and
|
||||
created_at between %(startDate)s and %(endDate)s and
|
||||
p.id in %(premises)s
|
||||
group by house_id, house, category
|
||||
union
|
||||
select 0 as sum,
|
||||
aec.description as category,
|
||||
p.id as house_id,
|
||||
p.description as house
|
||||
from account_t a,
|
||||
premise_t p,
|
||||
account_entry_t ae,
|
||||
account_entry_category_t aec
|
||||
where p.account = a.id and
|
||||
ae.account = a.id and
|
||||
aec.overhead_relevant = 't' and
|
||||
aec.id not in (select distinct account_entry_category from account_entry_t) and
|
||||
created_at between %(startDate)s and %(endDate)s and
|
||||
p.id in %(premises)s
|
||||
group by house_id, house, category
|
||||
order by house_id, category
|
||||
""",
|
||||
"params": {
|
||||
"startDate": startDate,
|
||||
"endDate": endDate,
|
||||
"premises": premises
|
||||
}
|
||||
}
|
||||
)
|
||||
logger.info(f"{overheadSums=}")
|
||||
|
||||
|
||||
38
cli/fixDueDate.py
Normal file
38
cli/fixDueDate.py
Normal file
@ -0,0 +1,38 @@
|
||||
from loguru import logger
|
||||
from db import dbGetMany, dbGetOne
|
||||
|
||||
def perform(dbh, params):
|
||||
accountEntries = dbGetMany(
|
||||
dbh,
|
||||
{
|
||||
"statement":
|
||||
"""
|
||||
select id, due_at from account_entry_t where due_at is not null
|
||||
""",
|
||||
"params": {}
|
||||
}
|
||||
)
|
||||
|
||||
for accountEntry in accountEntries:
|
||||
id = accountEntry['id']
|
||||
oldDueAt = accountEntry['due_at']
|
||||
newDueAt = oldDueAt.replace(day=1)
|
||||
logger.info(f"id: {id}, due_at: {oldDueAt} -> {newDueAt}")
|
||||
|
||||
fixedEntry = dbGetOne(
|
||||
dbh,
|
||||
{
|
||||
"statement":
|
||||
"""
|
||||
UPDATE account_entry_t
|
||||
SET due_at = %(dueAt)s
|
||||
WHERE id = %(id)s
|
||||
RETURNING *
|
||||
""",
|
||||
"params": {
|
||||
"id": id,
|
||||
"dueAt": newDueAt
|
||||
}
|
||||
}
|
||||
)
|
||||
logger.info("fixed")
|
||||
Reference in New Issue
Block a user