From c3b639390d1abfc3b13c0a5e4313b3161997de8f Mon Sep 17 00:00:00 2001
From: Lance Edgar <lance@wuttaproject.org>
Date: Fri, 24 Jan 2025 19:21:00 -0600
Subject: [PATCH] fix: add `Employee` model for lane_op

with abstract common base schema
---
 corepos/db/common/op.py       | 56 +++++++++++++++++++++++++++++++++++
 corepos/db/lane_op/model.py   | 11 ++++++-
 corepos/db/office_op/model.py | 31 ++++---------------
 3 files changed, 71 insertions(+), 27 deletions(-)
 create mode 100644 corepos/db/common/op.py

diff --git a/corepos/db/common/op.py b/corepos/db/common/op.py
new file mode 100644
index 0000000..7cf84fc
--- /dev/null
+++ b/corepos/db/common/op.py
@@ -0,0 +1,56 @@
+# -*- coding: utf-8; -*-
+################################################################################
+#
+#  pyCOREPOS -- Python Interface to CORE POS
+#  Copyright © 2018-2025 Lance Edgar
+#
+#  This file is part of pyCOREPOS.
+#
+#  pyCOREPOS is free software: you can redistribute it and/or modify it under
+#  the terms of the GNU General Public License as published by the Free
+#  Software Foundation, either version 3 of the License, or (at your option)
+#  any later version.
+#
+#  pyCOREPOS is distributed in the hope that it will be useful, but WITHOUT ANY
+#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+#  details.
+#
+#  You should have received a copy of the GNU General Public License along with
+#  pyCOREPOS.  If not, see <http://www.gnu.org/licenses/>.
+#
+################################################################################
+"""
+Common schema for operational data models
+"""
+
+import sqlalchemy as sa
+
+
+class EmployeeBase:
+    """
+    Base class for Employee models, shared by Office + Lane.
+    """
+    number = sa.Column('emp_no', sa.SmallInteger(), nullable=False,
+                       primary_key=True, autoincrement=False)
+
+    cashier_password = sa.Column('CashierPassword', sa.String(length=50), nullable=True)
+
+    admin_password = sa.Column('AdminPassword', sa.String(length=50), nullable=True)
+
+    first_name = sa.Column('FirstName', sa.String(length=255), nullable=True)
+
+    last_name = sa.Column('LastName', sa.String(length=255), nullable=True)
+
+    job_title = sa.Column('JobTitle', sa.String(length=255), nullable=True)
+
+    active = sa.Column('EmpActive', sa.Boolean(), nullable=True)
+
+    frontend_security = sa.Column('frontendsecurity', sa.SmallInteger(), nullable=True)
+
+    backend_security = sa.Column('backendsecurity', sa.SmallInteger(), nullable=True)
+
+    birth_date = sa.Column('birthdate', sa.DateTime(), nullable=True)
+
+    def __str__(self):
+        return ' '.join([self.first_name or '', self.last_name or '']).strip()
diff --git a/corepos/db/lane_op/model.py b/corepos/db/lane_op/model.py
index c7ed5b2..08da4f2 100644
--- a/corepos/db/lane_op/model.py
+++ b/corepos/db/lane_op/model.py
@@ -2,7 +2,7 @@
 ################################################################################
 #
 #  pyCOREPOS -- Python Interface to CORE POS
-#  Copyright © 2018-2023 Lance Edgar
+#  Copyright © 2018-2025 Lance Edgar
 #
 #  This file is part of pyCOREPOS.
 #
@@ -27,10 +27,19 @@ Data model for CORE POS "lane_op" DB
 import sqlalchemy as sa
 from sqlalchemy import orm
 
+from corepos.db.common import op as common
+
 
 Base = orm.declarative_base()
 
 
+class Employee(common.EmployeeBase, Base):
+    """
+    Data model for ``employees`` table.
+    """
+    __tablename__ = 'employees'
+
+
 class Department(Base):
     """
     Represents a department within the organization.
diff --git a/corepos/db/office_op/model.py b/corepos/db/office_op/model.py
index ff3f493..67f405a 100644
--- a/corepos/db/office_op/model.py
+++ b/corepos/db/office_op/model.py
@@ -2,7 +2,7 @@
 ################################################################################
 #
 #  pyCOREPOS -- Python Interface to CORE POS
-#  Copyright © 2018-2024 Lance Edgar
+#  Copyright © 2018-2025 Lance Edgar
 #
 #  This file is part of pyCOREPOS.
 #
@@ -31,6 +31,8 @@ import sqlalchemy as sa
 from sqlalchemy import orm
 from sqlalchemy.ext.associationproxy import association_proxy
 
+from corepos.db.common import op as common
+
 
 log = logging.getLogger(__name__)
 
@@ -991,35 +993,12 @@ class ProductPhysicalLocation(Base):
     location = sa.Column(sa.SmallInteger(), nullable=True, default=0)
 
 
-class Employee(Base):
+class Employee(common.EmployeeBase, Base):
     """
-    Represents an employee within the organization.
+    Data model for ``employees`` table.
     """
     __tablename__ = 'employees'
 
-    number = sa.Column('emp_no', sa.SmallInteger(), primary_key=True, autoincrement=False, nullable=False)
-
-    cashier_password = sa.Column('CashierPassword', sa.String(length=50), nullable=True)
-
-    admin_password = sa.Column('AdminPassword', sa.String(length=50), nullable=True)
-
-    first_name = sa.Column('FirstName', sa.String(length=255), nullable=True)
-
-    last_name = sa.Column('LastName', sa.String(length=255), nullable=True)
-
-    job_title = sa.Column('JobTitle', sa.String(length=255), nullable=True)
-
-    active = sa.Column('EmpActive', sa.Boolean(), nullable=True)
-
-    frontend_security = sa.Column('frontendsecurity', sa.SmallInteger(), nullable=True)
-
-    backend_security = sa.Column('backendsecurity', sa.SmallInteger(), nullable=True)
-
-    birth_date = sa.Column('birthdate', sa.DateTime(), nullable=True)
-
-    def __str__(self):
-        return ' '.join([self.first_name or '', self.last_name or '']).strip()
-
 
 class MemberType(Base):
     """