Merge branch 'worktree-agent-ac3c9345edd29a1c6'
# Conflicts: # app/cli.py # app/jobs/sources.py # app/static/app.css # app/static/companies.js # app/web/api.py # tests/test_web.py
This commit is contained in:
commit
c6246af994
21 files changed
+1017
-155
No files matched your search
+15
-8
@@ -265,7 +265,9 @@ class CompanyOut(BaseModel):
|
||||
still open. `ats` is the host its careers site runs on whether or not the
|
||||
app reads it, and `ats_slug` its name there, so a followed company with
|
||||
no `board` and an `ats` is one the app cannot read yet; `careers_url` is
|
||||
where a person can."""
|
||||
where a person can. `failing_since` and `failing_reason` say since when
|
||||
the board has failed on every fetch and why it last did, both empty
|
||||
while it answers."""
|
||||
|
||||
key: str
|
||||
name: str
|
||||
@@ -278,20 +280,22 @@ class CompanyOut(BaseModel):
|
||||
ats_slug: str = ""
|
||||
careers_url: str = ""
|
||||
country: str = ""
|
||||
failing_since: str = ""
|
||||
failing_reason: str = ""
|
||||
|
||||
|
||||
def _company_boards(store: Store) -> dict[str, tuple[int, str, bool]]:
|
||||
"""`company_key -> (subscription id, ats host, on)`, read off each
|
||||
def _company_boards(store: Store) -> dict[str, tuple[int, str, bool, str]]:
|
||||
"""`company_key -> (subscription id, ats host, on, target)`, read off each
|
||||
company's own subscription. Same join as `Store.company_boards`, with the
|
||||
id and switch state a company row needs to draw its own on/off control
|
||||
rather than fetching `/api/sources` as well. A detached board (`show`
|
||||
0) is no board."""
|
||||
boards: dict[str, tuple[int, str, bool]] = {}
|
||||
boards: dict[str, tuple[int, str, bool, str]] = {}
|
||||
for sub in store.subscriptions(source="ats"):
|
||||
if not sub.show:
|
||||
continue
|
||||
boards.setdefault(company_key(sub.company), (sub.id, sub.board,
|
||||
bool(sub.subscribed and sub.fetch)))
|
||||
boards.setdefault(company_key(sub.company), (
|
||||
sub.id, sub.board, bool(sub.subscribed and sub.fetch), sub.target))
|
||||
return boards
|
||||
|
||||
|
||||
@@ -301,14 +305,17 @@ def list_companies(store: StoreDep, agent: int | None = None) -> list[CompanyOut
|
||||
absent) has it; 0 throughout when there is no agent."""
|
||||
boards = _company_boards(store)
|
||||
counts = store.open_role_counts()
|
||||
failing = jobs.pull.failing_boards(store)
|
||||
out = []
|
||||
for c in store.companies(_agent_id(store, agent)):
|
||||
sub_id, host, on = boards.get(c.key, (None, "", None))
|
||||
sub_id, host, on, target = boards.get(c.key, (None, "", None, ""))
|
||||
since, reason = failing.get(target, ("", ""))
|
||||
out.append(CompanyOut(key=c.key, name=c.name, board=host,
|
||||
subscription_id=sub_id, on=on, affinity=c.affinity,
|
||||
open_roles=counts.get(c.key, 0), ats=c.ats,
|
||||
ats_slug=c.ats_slug, careers_url=c.careers_url,
|
||||
country=c.country))
|
||||
country=c.country,
|
||||
failing_since=since, failing_reason=reason))
|
||||
return out
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user