From c2e29dd93fe0b1e47d4b7824f722e79b5c9856b9 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Sun, 16 Nov 2025 14:25:42 -0500 Subject: [PATCH] fix actions --- .env | 9 +++++++++ .env.live | 4 +++- .env.qa | 4 ++++ app/api/services/account.py | 32 ++++++++++++++++++++++++-------- app/models/members_actions.py | 20 ++++++++++++++++++++ app/models/provision_actions.py | 18 ++++++++++++++++++ 6 files changed, 78 insertions(+), 9 deletions(-) diff --git a/.env b/.env index 41fdbe9..e4041df 100644 --- a/.env +++ b/.env @@ -29,11 +29,20 @@ SIMBRELLA_APP_ID="app1" SIMBRELLA_API_KEY="testtest-api-key-12345" #JWT_SECRET_KEY=dce6bd64f7d7101de4f +# support@mermsemr.com +# F7f220a7f.may12002! MAIL_SERVER=smtp.gmail.com MAIL_PORT= 465 MAIL_USERNAME=message@chiefsoft.com MAIL_PASSWORD=may12002! +# MAIL_USERNAME=support@mermsemr.com +# MAIL_PASSWORD="aoqz xuqc rlrv ltzd" +# F7f220a7f.may12002! + +SEND_EMAIL_FROM=support@mermsemr.com +SEND_EMAIL_PASS=F7f220a7f.may12002! + JWT_SECRET_KEY=dce6bd64f7d7101de4fed7cfc185a12851611a79bd60bbfdcc5b414b85f1fdb75e0905691c2a77ce94a7351b261fab4e183e17731ed40089f68f7290a793119f285d8ec7902d248ce15e8b1d4996ebacf5e7bcb06a38ac7ce0736f17d5c2895a499661d27095ac20aa174f9af2fba9a849dd2e6fd0aad8aa7e1ecc030c11eb8dc8dcb71d32233de3530d04f85918b9582f8b02587a7350aa34232825d4831707c7c5775026f3fdd92c5df555e6ff8b785525922709830206bbd49c371fb6e16bcab01ffccaf904108bb9789c578bce6afbb33bc77960051e680b2428d1f026473e71ef0f9997b2a6dc496e1c40509a1d289e3ff8b384c2d49e1d7719f9f4aaa1 OPENAI_API_KEY = "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" diff --git a/.env.live b/.env.live index c432aa7..4582e83 100644 --- a/.env.live +++ b/.env.live @@ -35,7 +35,9 @@ MAIL_PORT= 465 MAIL_USERNAME=message@chiefsoft.com MAIL_PASSWORD=may12002! # MAIL_USERNAME=support@mermsemr.com -# MAIL_PASSWORD=F7f220a7f.may12002! +# MAIL_PASSWORD="aoqz xuqc rlrv ltzd" +# F7f220a7f.may12002! + JWT_SECRET_KEY=dce6bd64f7d7101de4fed7cfc185a12851611a79bd60bbfdcc5b414b85f1fdb75e0905691c2a77ce94a7351b261fab4e183e17731ed40089f68f7290a793119f285d8ec7902d248ce15e8b1d4996ebacf5e7bcb06a38ac7ce0736f17d5c2895a499661d27095ac20aa174f9af2fba9a849dd2e6fd0aad8aa7e1ecc030c11eb8dc8dcb71d32233de3530d04f85918b9582f8b02587a7350aa34232825d4831707c7c5775026f3fdd92c5df555e6ff8b785525922709830206bbd49c371fb6e16bcab01ffccaf904108bb9789c578bce6afbb33bc77960051e680b2428d1f026473e71ef0f9997b2a6dc496e1c40509a1d289e3ff8b384c2d49e1d7719f9f4aaa1 OPENAI_API_KEY = "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" diff --git a/.env.qa b/.env.qa index 23465f6..fe3107b 100644 --- a/.env.qa +++ b/.env.qa @@ -45,6 +45,10 @@ MAIL_SERVER=smtp.gmail.com MAIL_PORT= 465 MAIL_USERNAME=message@chiefsoft.com MAIL_PASSWORD=may12002! +# MAIL_USERNAME=support@mermsemr.com +# MAIL_PASSWORD="aoqz xuqc rlrv ltzd" +# F7f220a7f.may12002! + JWT_SECRET_KEY=dce6bd64f7d7101de4fed7cfc185a12851611a79bd60bbfdcc5b414b85f1fdb75e0905691c2a77ce94a7351b261fab4e183e17731ed40089f68f7290a793119f285d8ec7902d248ce15e8b1d4996ebacf5e7bcb06a38ac7ce0736f17d5c2895a499661d27095ac20aa174f9af2fba9a849dd2e6fd0aad8aa7e1ecc030c11eb8dc8dcb71d32233de3530d04f85918b9582f8b02587a7350aa34232825d4831707c7c5775026f3fdd92c5df555e6ff8b785525922709830206bbd49c371fb6e16bcab01ffccaf904108bb9789c578bce6afbb33bc77960051e680b2428d1f026473e71ef0f9997b2a6dc496e1c40509a1d289e3ff8b384c2d49e1d7719f9f4aaa1 OPENAI_API_KEY = "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" diff --git a/app/api/services/account.py b/app/api/services/account.py index 8e85593..a7c1308 100644 --- a/app/api/services/account.py +++ b/app/api/services/account.py @@ -7,7 +7,7 @@ from marshmallow import ValidationError from app.api.enums import TransactionType # from app.api.integrations import SimbrellaIntegration from app.extensions import db -from app.models import Members, MembersActions, MembersProfile, Payments, MembersProducts +from app.models import Members, MembersActions, MembersProfile, Payments, MembersProducts, ProvisionActions # from app.api.services.offer_analysis import OfferAnalysis from app.api.helpers.response_helper import ResponseHelper from werkzeug.security import generate_password_hash, check_password_hash @@ -295,15 +295,31 @@ class AccountService(BaseService): uid = str(validated_data.get('uid')) dList = [] - sample_range = random.randint(20, 60) - for x in range(sample_range): - timeMin = random.randint(1440, 2880) - calDate = datetime.datetime.utcnow() + datetime.timedelta(minutes=timeMin * random.randint(0, 20)) - new_l = {"uid": "425611f2-c692-4404-b93d-76ca7a5ce7" + str(x), - "title": "Calendar Random Item on " + str(x), "start": calDate, - "category": random.randint(1, 4)} + #LET get the ptovison actions + prov_actions = ProvisionActions.get_provision_action_calendar_member_id(member_id=1, limit=100) + + for prov_action in prov_actions: + new_l = {"uid": prov_action.uid, + "title": prov_action.action, "start": prov_action.added, + "category": 3} dList.append(new_l) + member_actions = MembersActions.get_recent_member_calendar_actions_member_id(member_id=1, limit=100) + for member_action in member_actions: + new_l = {"uid": member_action.uid, + "title": member_action.action_label, "start": member_action.added, + "category": 1} + dList.append(new_l) + + # sample_range = random.randint(20, 60) + # for x in range(sample_range): + # timeMin = random.randint(1440, 2880) + # calDate = datetime.datetime.utcnow() + datetime.timedelta(minutes=timeMin * random.randint(0, 20)) + # new_l = {"uid": "425611f2-c692-4404-b93d-76ca7a5ce7" + str(x), + # "title": "Calendar Random Item on " + str(x), "start": calDate, + # "category": random.randint(1, 4)} + # dList.append(new_l) + calendar_data = { "last_update": datetime.datetime.utcnow(), "category": [ diff --git a/app/models/members_actions.py b/app/models/members_actions.py index 10314cc..c6ec93d 100644 --- a/app/models/members_actions.py +++ b/app/models/members_actions.py @@ -43,7 +43,27 @@ class MembersActions(db.Model): raise ValueError(f"No Member Actions") return member_actions + @classmethod + def get_recent_member_calendar_actions_member_id(cls, member_id, limit): + # member_actions = cls.query.limit(4).all() + member_actions = cls.query.filter_by(member_id=member_id).order_by(cls.id.desc()).limit(limit).all() + if not member_actions: + raise ValueError(f"No Member Actions") + return member_actions + +# ''' +# merms_panel=# select * from members_actions limit 2; +# id | uid | member_id | member_uid | action_label | action_name | status_description | status | adde +# d | updated +# ----+--------------------------------------+-----------+--------------------------------------+------------------------+----------------------+--------------------+--------+--------------- +# -------------+---------------------------- +# 1 | 91f112f3-c8ad-4533-bfa7-117f8e8781b4 | 2 | f995061e-a36c-4648-a3fc-d18e3d93e353 | Systems Status Checks | system_status_checks | processing | 0 | 2025-07-20 18: +# 52:08.011359 | 2025-07-20 18:52:08.011359 +# 2 | 7fa90e2d-d4d2-40fd-bbad-c18be69f8967 | 1 | 2493007e-ab59-428a-8d34-ce66c8dea5ac | Systems Status Checks | system_status_checks | processing | 0 | 2025-07-20 18: +# 52:08.093698 | 2025-07-20 18:52:08.093698 +# (2 rows) +# ''' def to_dict(self): """ Convert the Loan object to a dictionary format for JSON serialization. diff --git a/app/models/provision_actions.py b/app/models/provision_actions.py index 0c15acb..85e1ffd 100644 --- a/app/models/provision_actions.py +++ b/app/models/provision_actions.py @@ -47,6 +47,24 @@ class ProvisionActions(db.Model): return provision_action + @classmethod + def get_provision_action_calendar_member_id(cls, member_id, limit): + provision_action = cls.query.all() + provision_action = cls.query.filter_by(member_id=member_id).limit(limit).all() + if not provision_action: + return None + return provision_action + +# ''' +# merms_panel=# select * from provision_actions limit 2; +# id | uid | member_id | product_uid | action | added +# ----+--------------------------------------+-----------+--------------------------------------+-------------------------------+---------------------------- +# 1 | 8b7db9fb-1404-4505-9858-7f418a6ae416 | 1 | df5bc060-18e0-4546-ae9a-89f7436f7cff | Allocating Provisioning Ports | 2025-07-12 21:21:02.036093 +# 2 | d0e0fe16-4e0f-4cdc-856e-d8cfeb6c673f | 1 | 58645ef9-e334-45e0-8ce1-8ec637a20c50 | Allocating Provisioning Ports | 2025-07-13 15:02:04.388589 +# (2 rows) +# +# ''' + def to_dict(self): """ Convert the Loan object to a dictionary format for JSON serialization.