started on the emsil

app/models/__init__.py

@@ -15,8 +15,10 @@ from .members import Members
 from .products import Products
 from .members_products import MembersProducts
 from .members_actions import MembersActions
+from .members_pending import MembersPending
+
 
 __all__ = ['Members','Customer', 'Account', 'Products',
-           'MembersProducts', 'MembersActions', 'Loan', 'Transaction', 'Repayment',
+           'MembersProducts', 'MembersActions', 'MembersPending', 'Loan', 'Transaction', 'Repayment',
            'LoanCharge', 'Offer', 'Charge', 'RACCheck', 'LoanRepaymentSchedule',
            'TransactionOffer', 'RepaymentsData', 'Salary']

app/models/members.py

@@ -47,7 +47,8 @@ class Members(db.Model):
         member = cls.query.filter_by(username=str(username)).first()
 
         if not member:
-            raise ValueError(f"Username =  {username} not found")
+            raise None
+            #ValueError(f"Username =  {username} not found")
         return member
 
     @classmethod

app/models/members_pending.py

@@ -1,44 +1,56 @@
 from datetime import datetime, timezone
 from app.extensions import db
 from sqlalchemy.sql import func
-
+from sqlalchemy.exc import IntegrityError
 
 class MembersPending(db.Model):
     __tablename__ = 'members_pending'
 
     id = db.Column(db.Integer, primary_key=True, autoincrement=True)
     uid = db.Column(db.String(150), nullable=False)
-    username = db.Column(db.String(25), nullable=False)
-    password = db.Column(db.String(100), nullable=True)
-    loc = db.Column(db.String(20), nullable=True)
-    status = db.Column(db.Integer, default=1)
+    firstname = db.Column(db.String(35), nullable=False)
+    lastname = db.Column(db.String(35), nullable=True)
+    email = db.Column(db.String(35), nullable=False)
+    status = db.Column(db.Integer, default=0)
     added = db.Column(db.DateTime(timezone=False), server_default=func.now())
     updated = db.Column(db.DateTime(timezone=False), server_default=func.now(), onupdate=func.now())
-    email = db.Column(db.String(100), nullable=False)
-    account_name = db.Column(db.String(100), nullable=True)
-    firstname = db.Column(db.String(25), nullable=False)
-    lastname = db.Column(db.String(100), nullable=True)
+
+
 
     def to_dict(self):
         return {
             "id": self.id,
             "uid": self.uid,
-            "username": self.account_id,
-            "account_id": self.username,
-            "password": self.password,
-            "loc": self.loc,
+            "firstname": self.firstname,
+            "lastname": self.lastname,
+            "email": self.email,
             "status": self.status,
             "added": self.added.isoformat() if self.added else None,
-            "updated": self.updated.isoformat() if self.updated else None,
-            "email": self.email,
-            "account_name": self.account_name,
-            "firstname": self.firstname,
-            "lastname": self.lastname
+            "updated": self.updated.isoformat() if self.updated else None
         }
 
     def __repr__(self):
         return f'<Members {self.id} - {self.amount}>'
 
+    @classmethod
+    def add_members_pending(cls, firstname, lastname, email):
+
+        # Save the response
+        pending_data = cls(
+            firstname=firstname,
+            lastname=lastname,
+            email=email,
+            added=datetime.now(timezone.utc),
+            updated=datetime.now(timezone.utc)
+        )
+
+        try:
+            db.session.add(pending_data)
+        except IntegrityError as err:
+            raise ValueError(f"Database integrity error: {err}")
+        return pending_data
+
+
     @classmethod
     def get_member_by_username(cls, username):
         """
@@ -48,4 +60,31 @@ class MembersPending(db.Model):
 
         if not member:
             raise ValueError(f"Username =  {username} not found")
-        return member
+        return member
+
+    # {
+    #     "email": "ameye@chiefsoft.com",
+    #     "firstname": "Olusesan",
+    #     "lastname": "Ameye",
+    #     "isChecked": true
+    # }
+
+    '''
+    merms_panel=# \d members_pending
+                                        Table "public.members_pending"
+  Column   |            Type             | Collation | Nullable |                   Default
+-----------+-----------------------------+-----------+----------+---------------------------------------------
+ id        | integer                     |           | not null | nextval('members_pending_id_seq'::regclass)
+ uid       | uuid                        |           |          | uuid_generate_v4()
+ firstname | character varying(35)       |           | not null |
+ lastname  | character varying(35)       |           | not null |
+ email     | character varying(35)       |           | not null |
+ status    | integer                     |           |          | 0
+ added     | timestamp without time zone |           |          | now()
+ updated   | timestamp without time zone |           |          | now()
+Indexes:
+    "members_pending_id_key" UNIQUE CONSTRAINT, btree (id)
+
+
+merms_panel=#
+    '''