product URL

app/api/services/myproduct.py

@@ -57,7 +57,9 @@ class MyProductsService(BaseService):
                 subscription = MembersProducts.create_subscription(member_id ,product_id,status,internal_url)
 
                 response_data = {
-                    "subscription": subscription.uid,
+                    "subscription_uid": subscription.uid,
+                    "subscription_id": subscription.id,
+                    "internal_url": subscription.internal_url,
                     "member_id": member_id,
                     "uid": uid
                 }

app/api/services/products.py

@@ -1,5 +1,6 @@
 from flask import session, jsonify
 
+from app.api.services import MyProductsService
 # from app.api.routes.routes import myproduct_url
 # from app.api.services import MyProductsService
 # from app.models.loan import Loan
@@ -115,6 +116,17 @@ class ProductsService(BaseService):
             db.session.rollback()
             return ResponseHelper.internal_server_error()
 
+'''
+    uid = db.Column(db.String(150), nullable=False)
+    member_id = db.Column(db.Integer, nullable=False)
+    product_id = db.Column(db.String(25), nullable=False)
+    internal_url = db.Column(db.String(100), nullable=False)
+    external_url = db.Column(db.String(100), nullable=False)
+    dns_group = db.Column(db.String(20), nullable=False)
+    status = db.Column(db.Integer, nullable=True, default=0)
+    added = db.Column(db.DateTime(timezone=True), server_default=func.now())
+    updated = db.Column(db.DateTime(timezone=True), server_default=func.now(), onupdate=func.now())
+'''
 
     @staticmethod
     def product_url_request(data):
@@ -128,7 +140,8 @@ class ProductsService(BaseService):
                 member_data = Members.get_member_by_uid(uid)
                 member_id = member_data.id  # current_user["user"]["id"]
 
-                products = Products.get_user_product_list(member_id)
+                products =  MembersProducts.get_member_productlist_by_member_id(member_id)
+
                 product_data=[]
                 logger.info(f"Product Data ****** *****: {products}")
 
@@ -136,16 +149,13 @@ class ProductsService(BaseService):
                 for t in products:
                     product_data.append({
                             'id': t.id,
-                            'uid': t.uid,
+                            'subscription_uid': t.uid,
                             'product_id': t.product_id,
-                            'description': t.description,
-                            'name': t.name,
+                            'internal_url': t.internal_url,
+                            'external_url': t.external_url,
                             'status': t.status,
                             'added': t.added.isoformat() if t.added else None,
-                            'updated': t.updated.isoformat() if t.updated else None,
-                            'banner': t.banner,
-                            'prov_status': '',
-                            'status_text': 'Activate Now'
+                            'updated': t.updated.isoformat() if t.updated else None
                     })