534f179ee6
main was 16 days and 259 commits behind the line the product is actually built on, at contract 0.30.0 against 0.35.0, with no per-PC credential code at all. It was neither current nor curated - just stale. This brings it forward and, at the same time, makes it mean something: main is what a receiving site installs, and nothing else. WHAT IT CARRIES. Twelve plugins - backups, computers, endpoints, guides, knowledgebase, machines, network, notifications, printers, slides, tools, warranty - plus applications, which is manifest-less core and always ships. The only manifest dependency inside that set is endpoints on computers, and both are in it, so the closure is self-contained. WHAT IT DOES NOT. employees, geenforce, measuringtools, printedparts and usb stay on the site line. So do the Windows installer tree, the VM rehearsal helpers, the agent tooling config, one site's data loader, the internal audit and findings records, and the planner spreadsheet. 1,135 tracked files against 1,438. A REMOVAL THAT BREAKS THE APP IS NOT A REMOVAL, and two nearly shipped: deploy/site-profile-universal.json still named all seventeen plugins. It is the file docs/DEPLOY.md tells a site to provision from, so a fresh install would have failed at `flask plugin apply-profile` with PluginError - the first thing a receiving site does, broken by the branch meant to serve them. It now names the twelve that exist, and its comment says the two must agree. agent/ was never refreshed. Whoever populated this branch copied shopdb/, plugins/, frontend/ and tests/ from the site line and left the agent tree at its September state: 22 C# and PowerShell sources missing, including AgentCredentials, EnrollmentService, AgentHttpFactory and the fleet-alert client, plus one file the site line had deleted still present. The old tree is internally consistent, so it compiles, and nothing in CI builds it - every gate was green over a server that speaks enrollment and per-PC credentials to a bundled agent source that cannot. Resynced whole. DECISIONS THIS ENCODES, rather than defers: - The plugin-authoring lab builds printedparts, whose manifest depends on employees, so it could not stay. The lab remains on the site line and main ships no build-along tutorial. That is a real loss for an adopting developer and is recorded here rather than discovered later. - Recognition, Training and Recertification notifications are no longer seeded. Each splits one notification into a card per employee and renders a photo, which needs a plugin this branch does not bundle. Seeding them would offer an author a type that cannot resolve anybody. A site that installs employees gets them from that plugin's own seed. - Windows/IIS is documented as the legacy path throughout, and the README leads with Docker, because that is what a receiving site gets. The API description is regenerated for THIS branch - 347 paths and 483 operations, down from 415 and 573 - so the published contract describes what is here rather than what the site line serves. docs/CONFIG.md lost the two measuring-tool label keys the code no longer declares, which two lanes had decided opposite ways. Suite: 3124 passed, 6 skipped. Naming and style gates pass. The docs gates run rather than skip, and every index line count is derived from the file it names.
110 lines
4.3 KiB
Python
110 lines
4.3 KiB
Python
"""Tests for the shopfloor TV feed (/api/notifications/shopfloor).
|
|
|
|
Since the notification-type display rework, per-employee fan-out is driven by
|
|
the type's splitperemployee column (seeded true for Recognition/Training):
|
|
a note naming several comma-joined SSOs yields one card per employee; types
|
|
without the flag stay a single card.
|
|
"""
|
|
|
|
import pytest
|
|
|
|
from plugins.notifications.models import Notification, NotificationType
|
|
|
|
|
|
def _make_type(db, typename, typecolor, splitperemployee=False):
|
|
t = NotificationType(typename=typename, typecolor=typecolor,
|
|
splitperemployee=splitperemployee, isactive=True)
|
|
db.session.add(t)
|
|
db.session.commit()
|
|
return t
|
|
|
|
|
|
def _make_shopfloor_note(db, ntype, employeesso, employeename):
|
|
n = Notification(
|
|
notificationtypeid=ntype.notificationtypeid,
|
|
notification='msg',
|
|
businessunitid=None,
|
|
isactive=True,
|
|
isshopfloor=True,
|
|
employeesso=employeesso,
|
|
employeename=employeename,
|
|
)
|
|
db.session.add(n)
|
|
db.session.commit()
|
|
return n
|
|
|
|
|
|
@pytest.mark.parametrize('typecolor', ['recognition', 'training'])
|
|
def test_multi_employee_split_into_one_card_each(client, db, typecolor):
|
|
"""A split-flagged note with two SSOs yields two current cards."""
|
|
ntype = _make_type(db, typecolor.capitalize(), typecolor, splitperemployee=True)
|
|
_make_shopfloor_note(db, ntype, '111,222', 'Alice, Bob')
|
|
|
|
resp = client.get('/api/notifications/shopfloor')
|
|
assert resp.status_code == 200
|
|
current = resp.get_json()['data']['current']
|
|
assert len(current) == 2
|
|
assert {c['employeesso'] for c in current} == {'111', '222'}
|
|
assert {c['employeename'] for c in current} == {'Alice', 'Bob'}
|
|
|
|
|
|
def test_non_split_type_stays_single_card(client, db):
|
|
"""A type without splitperemployee is not fanned out, even with many SSOs."""
|
|
ntype = _make_type(db, 'Awareness', 'info')
|
|
_make_shopfloor_note(db, ntype, '111,222', 'Alice, Bob')
|
|
|
|
resp = client.get('/api/notifications/shopfloor')
|
|
assert resp.status_code == 200
|
|
current = resp.get_json()['data']['current']
|
|
assert len(current) == 1
|
|
assert current[0]['employeesso'] == '111,222'
|
|
|
|
|
|
def test_single_employee_recognition_stays_single_card(client, db):
|
|
"""One SSO produces one card (no spurious split on a lone employee)."""
|
|
ntype = _make_type(db, 'Recognition', 'recognition', splitperemployee=True)
|
|
_make_shopfloor_note(db, ntype, '111', 'Alice')
|
|
|
|
resp = client.get('/api/notifications/shopfloor')
|
|
assert resp.status_code == 200
|
|
current = resp.get_json()['data']['current']
|
|
assert len(current) == 1
|
|
assert current[0]['employeesso'] == '111'
|
|
|
|
|
|
def test_shopfloor_names_resolve_live_when_not_stored(client, app, db, monkeypatch):
|
|
"""A notification imported without employeename shows the directory name,
|
|
not the bare SSO.
|
|
|
|
The directory is the site's external HR database, which no test environment
|
|
has, so the core resolver is stubbed. What is under test is that the feed
|
|
ASKS - a card that fell back to the SSO whenever employeename was empty was
|
|
the regression, and it is invisible if the feed never calls out at all.
|
|
"""
|
|
from plugins.notifications.models import Notification, NotificationType
|
|
import shopdb.api as contract
|
|
|
|
# Patched on shopdb.api, not on shopdb.core.api.employees: the contract
|
|
# surface is where a plugin imports it from, and patching the defining
|
|
# module would leave the name the plugin actually binds untouched.
|
|
monkeypatch.setattr(
|
|
contract, 'resolve_employee_display_name',
|
|
lambda sso: 'Recert Person' if str(sso) == '502000777' else None)
|
|
|
|
with app.app_context():
|
|
ntype = NotificationType(typename='Recertification',
|
|
typecolor='recertification',
|
|
splitperemployee=True)
|
|
db.session.add(ntype)
|
|
db.session.flush()
|
|
db.session.add(Notification(
|
|
notificationtypeid=ntype.notificationtypeid,
|
|
notification='Recert due', isshopfloor=True,
|
|
employeesso='502000777', employeename=None))
|
|
db.session.commit()
|
|
|
|
feed = client.get('/api/notifications/shopfloor').get_json()['data']
|
|
cards = feed['current'] + feed['upcoming']
|
|
card = next(c for c in cards if c['notification'] == 'Recert due')
|
|
assert card['employeename'] == 'Recert Person'
|