@@ -86,7 +86,7 @@ def get_data_mongo(collection, today, query: dict = {}):
8686 )
8787
8888
89- def get_org_wise_data_mongo (collection , today , query : dict = {}):
89+ def get_hubwise_data_mongo (collection , today , query : dict = {}):
9090 week_date = today - timezone .timedelta (days = 7 )
9191 month_date = today - timezone .timedelta (days = 30 )
9292 last_day = today - timezone .timedelta (days = 1 )
@@ -141,31 +141,31 @@ def get_org_wise_data_mongo(collection, today, query: dict = {}):
141141 }
142142
143143
144- def merge_organization_data ( orgDataDictId , space_data , post_data ):
144+ def merge_hub_data ( organizationDictId , space_data , post_data ):
145145 merged_data = {}
146- for organization in orgDataDictId :
147- merge_org_data = []
146+ for organization in organizationDictId :
147+ merge_hub_data = []
148148 stats_keys = ["total" , "today" , "last_day" , "weekly" , "monthly" ]
149149 for stats in stats_keys :
150- merge_org_data .append (space_data [stats ].get (organization , 0 ))
151- merge_org_data .append (post_data [stats ].get (organization , 0 ))
152- merged_data [orgDataDictId [organization ]["name" ]] = merge_org_data
150+ merge_hub_data .append (space_data [stats ].get (organization , 0 ))
151+ merge_hub_data .append (post_data [stats ].get (organization , 0 ))
152+ merged_data [organizationDictId [organization ]["name" ]] = merge_hub_data
153153 return merged_data
154154
155155
156- def orgWiseData ( organizationList , today = None ):
156+ def hubWiseData ( hubData , today = None ):
157157 if today is None :
158158 today = timezone .now ().date ().today ()
159- orgDataDictId = {}
160- orgDataDictHandle = {}
161- for each in organizationList :
162- orgDataDictHandle [each ["domain_handle" ]] = each
163- orgDataDictId [each ["id" ]] = each
159+ hubDataDictId = {}
160+ hubDataDictHandle = {}
161+ for each in hubData :
162+ hubDataDictHandle [each ["domain_handle" ]] = each
163+ hubDataDictId [each ["id" ]] = each
164164 space_data = Space .objects .all ()
165165 post_data = ThreadPost .objects .all ()
166- space_data = get_organization_group_data (space_data , today , "space_organization_id" )
167- post_data = get_organization_group_data (post_data , today , "space__space_organization_id" )
168- merged_data = merge_organization_data ( orgDataDictId , space_data , post_data )
166+ space_data = get_hub_group_data (space_data , today , "space_organization_id" )
167+ post_data = get_hub_group_data (post_data , today , "space__space_organization_id" )
168+ merged_data = merge_hub_data ( hubDataDictId , space_data , post_data )
169169 return merged_data
170170
171171
@@ -210,7 +210,7 @@ def dailyActivityReport():
210210 body += "<br><br>"
211211 body += """<h3 style="text-align:center; margin-top:10px;">Last 30 Days Organization Wise Data</h3>"""
212212 organizationList = SpaceOrganization .objects .all ().values ("id" , "domain_handle" , "name" )
213- organizationData = orgWiseData (organizationList , today )
213+ organizationData = hubWiseData (organizationList , today )
214214 body += """
215215 <table width="100%" border="2" cellspacing="10" cellpadding="10" rules="ALL" style="border-collapse:collapse;color:#1f2240;background-color:#fff;padding:10px">
216216 <tr>
@@ -237,7 +237,7 @@ def dailyActivityReport():
237237 """
238238 organizationWisePilotData = {}
239239 for organization in organizationList :
240- pilot_data = get_org_wise_data_mongo (
240+ pilot_data = get_hubwise_data_mongo (
241241 "task_request_log" , today , {"org_id" : organization ["id" ]}
242242 )
243243 organizationWisePilotData [organization ["name" ]] = pilot_data
0 commit comments