Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
9bf6f45
add sql query for loaders;location,office, partner, intervention
Nov 26, 2024
a9f92c1
bump up with temp version
Nov 26, 2024
58a7129
add queries for attachments, audit and spotcheck
Dec 3, 2024
1f595f9
update auditspotcheck, partner, office
Dec 4, 2024
da7aab2
add fmquestion, update actionpoint and intervention
Dec 4, 2024
6b9da87
document queries for engagement
Dec 5, 2024
a273a90
add audit_microassessment, audit_financial_finding
Dec 8, 2024
0944fed
add queries for audit_result and audit_special
Dec 9, 2024
d896d60
add queries for FAMIndicatorLoder
Dec 10, 2024
e82b72d
add queries for LocationsiteLoader
Dec 10, 2024
f52e268
document quersies for fund related and hact related loaders
Dec 11, 2024
56cfae5
add queries for InterventionActivity and InterventionCountryProgramme
Dec 12, 2024
ddef31d
document query for InterventionEPDLoader
Dec 16, 2024
cf90162
document queries for interventionmanagementbudget
Dec 18, 2024
6c5b5cf
add abd update queries for intervention related loaders
Dec 23, 2024
3264648
add and update some of partner related loaders' query documentation
Jan 2, 2025
62f3654
add interventionbudget query documentation
Jan 3, 2025
6c7130e
add documentation for report related loader queries
Jan 6, 2025
3a0d4cb
data references and respective target tables have been documented as …
Jan 8, 2025
21f7b31
add and update query documentation for various loaders
Jan 10, 2025
73a8f88
fix formatting
Jan 10, 2025
3012a96
add travel and trip queries, simplifications
Jan 13, 2025
cf6f1ca
create actionpoint loader spec as yml file
Jan 15, 2025
0c93124
add mappings for attachment and locationsite
Jan 16, 2025
52b8aa3
add audit loader mapping in yml
hbarisik Jan 17, 2025
696789d
add mapping for audit engagement
Jan 23, 2025
1eb1deb
add mapping for audit engagement in yml
Jan 23, 2025
6e32638
document for tpm activityt loader
Jan 27, 2025
04a21b9
rename file
Jan 28, 2025
061e3f7
add traveltrip etl mapping
Jan 29, 2025
89b02c5
add workspace mapping
Jan 30, 2025
edac10d
add new mapping and update exisiting ones
Jan 30, 2025
7232ebf
moved audit engagement mappings in to yml
Jan 31, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,36 @@
4.7.15.0
----
* DB Query for etools loaders have been extracted.
* Summary:
- Datamart base loader logic iterates through countries that are stored in source database
(etools) schema:

SELECT "users_country"."id",
"users_country"."schema_name",
"users_country"."name",
"users_country"."business_area_code",
"users_country"."initial_zoom",
"users_country"."latitude",
"users_country"."longitude",
"users_country"."country_short_code",
"users_country"."vision_sync_enabled",
"users_country"."vision_last_synced",
"users_country"."local_currency_id",
"users_country"."long_name",
"users_country"."iso3_code",
"users_country"."custom_dashboards"
FROM "users_country"
WHERE NOT ("users_country"."schema_name" IN ('public'))
ORDER BY "users_country"."name" ASC;

-


-




4.7.14
----
* Fix logic error extract_longitude function
Expand Down
2 changes: 1 addition & 1 deletion src/etools_datamart/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
NAME = "etools-datamart"
VERSION = __version__ = "4.7.14"
VERSION = __version__ = "4.7.15.0"
__author__ = ""
206 changes: 206 additions & 0 deletions src/etools_datamart/apps/mart/data/models/actionpoint.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,212 @@
RELATED_MODULE_NAMES = [c.__name__ for c in RELATED_MODULES]
RELATED_MODULE_CHOICES = zip(RELATED_MODULE_NAMES, RELATED_MODULE_NAMES)

"""
-- Set country schema
SET search_path = public, ##COUNTRY##;

-- Count for paging;
SELECT COUNT(*) AS "__count" FROM "action_points_actionpoint"

-- ActionPoint
SELECT '##COUNTRY##' AS __schema,
"action_points_actionpoint"."id",
"action_points_actionpoint"."created",
"action_points_actionpoint"."modified",
"action_points_actionpoint"."status",
"action_points_actionpoint"."description",
"action_points_actionpoint"."due_date",
"action_points_actionpoint"."date_of_completion",
"action_points_actionpoint"."assigned_by_id",
"action_points_actionpoint"."assigned_to_id",
"action_points_actionpoint"."section_id",
"action_points_actionpoint"."tpm_activity_id",
"action_points_actionpoint"."high_priority",
"action_points_actionpoint"."travel_activity_id",
"action_points_actionpoint"."category_id",
"action_points_actionpoint"."psea_assessment_id",
"action_points_actionpoint"."reference_number",
"action_points_actionpoint"."monitoring_activity_id",
"action_points_actionpoint"."engagement_id",
"action_points_actionpoint"."intervention_id",
"action_points_actionpoint"."location_id",
"action_points_actionpoint"."office_id",
"action_points_actionpoint"."partner_id",
"action_points_actionpoint"."author_id",
"action_points_actionpoint"."cp_output_id",

"assigned_by_auth_user"."password",
"assigned_by_auth_user"."last_login",
"assigned_by_auth_user"."is_superuser",
"assigned_by_auth_user"."username",
"assigned_by_auth_user"."first_name",
"assigned_by_auth_user"."last_name",
"assigned_by_auth_user"."email",
"assigned_by_auth_user"."is_staff",
"assigned_by_auth_user"."is_active",
"assigned_by_auth_user"."date_joined",
"assigned_by_auth_user"."middle_name",
"assigned_by_auth_user"."created",
"assigned_by_auth_user"."modified",
"assigned_by_auth_user"."preferences"
"assigned_to_auth_user"."password",
"assigned_to_auth_user"."last_login",
"assigned_to_auth_user"."is_superuser",
"assigned_to_auth_user"."username",
"assigned_to_auth_user"."first_name",
"assigned_to_auth_user"."last_name",
"assigned_to_auth_user"."email",
"assigned_to_auth_user"."is_staff",
"assigned_to_auth_user"."is_active",
"assigned_to_auth_user"."date_joined",
"assigned_to_auth_user"."middle_name",
"assigned_to_auth_user"."created",
"assigned_to_auth_user"."modified",
"assigned_to_auth_user"."preferences"

"author_auth_user"."password",
"author_auth_user"."last_login",
"author_auth_user"."is_superuser",
"author_auth_user"."username",
"author_auth_user"."first_name",
"author_auth_user"."last_name",
"author_auth_user"."email",
"author_auth_user"."is_staff",
"author_auth_user"."is_active",
"author_auth_user"."date_joined",
"author_auth_user"."middle_name",
"author_auth_user"."created",
"author_auth_user"."modified",
"author_auth_user"."preferences"

"reports_result"."name",
"reports_result"."code",
"reports_result"."result_type_id",
"reports_result"."sector_id",
"reports_result"."gic_code",
"reports_result"."gic_name",
"reports_result"."humanitarian_tag",
"reports_result"."level",
"reports_result"."lft",
"reports_result"."parent_id",
"reports_result"."rght",
"reports_result"."sic_code",
"reports_result"."sic_name",
"reports_result"."tree_id",
"reports_result"."vision_id",
"reports_result"."wbs",
"reports_result"."activity_focus_code",
"reports_result"."activity_focus_name",
"reports_result"."hidden",
"reports_result"."from_date",
"reports_result"."to_date",
"reports_result"."ram",
"reports_result"."country_programme_id",
"reports_result"."created",
"reports_result"."modified",
"reports_result"."humanitarian_marker_code",
"reports_result"."humanitarian_marker_name",
"reports_result"."programme_area_code",
"reports_result"."programme_area_name"

"partners_partnerorganization"."id",
"partners_partnerorganization"."description",
"partners_partnerorganization"."address",
"partners_partnerorganization"."email",
"partners_partnerorganization"."phone_number",
"partners_partnerorganization"."alternate_id",
"partners_partnerorganization"."alternate_name",
"partners_partnerorganization"."rating",
"partners_partnerorganization"."core_values_assessment_date",
"partners_partnerorganization"."vision_synced",
"partners_partnerorganization"."type_of_assessment",
"partners_partnerorganization"."last_assessment_date",
"partners_partnerorganization"."hidden",
"partners_partnerorganization"."deleted_flag",
"partners_partnerorganization"."total_ct_cp",
"partners_partnerorganization"."total_ct_cy",
"partners_partnerorganization"."blocked",
"partners_partnerorganization"."city",
"partners_partnerorganization"."country",
"partners_partnerorganization"."postal_code",
"partners_partnerorganization"."shared_with",
"partners_partnerorganization"."street_address",
"partners_partnerorganization"."hact_values",
"partners_partnerorganization"."created",
"partners_partnerorganization"."modified",
"partners_partnerorganization"."net_ct_cy",
"partners_partnerorganization"."reported_cy",
"partners_partnerorganization"."total_ct_ytd",
"partners_partnerorganization"."basis_for_risk_rating",
"partners_partnerorganization"."manually_blocked",
"partners_partnerorganization"."outstanding_dct_amount_6_to_9_months_usd",
"partners_partnerorganization"."outstanding_dct_amount_more_than_9_months_usd",
"partners_partnerorganization"."highest_risk_rating_name",
"partners_partnerorganization"."highest_risk_rating_type",
"partners_partnerorganization"."psea_assessment_date",
"partners_partnerorganization"."sea_risk_rating_name",
"partners_partnerorganization"."lead_office_id",
"partners_partnerorganization"."lead_section_id",
"partners_partnerorganization"."organization_id"

"organizations_organization"."created",
"organizations_organization"."modified",
"organizations_organization"."name",
"organizations_organization"."vendor_number",
"organizations_organization"."organization_type",
"organizations_organization"."cso_type",
"organizations_organization"."short_name",
"organizations_organization"."other",
"organizations_organization"."parent_id",

"t2f_travelactivity"."travel_type",
"t2f_travelactivity"."date",
"t2f_travelactivity"."partner_id",
"t2f_travelactivity"."partnership_id",
"t2f_travelactivity"."primary_traveler_id",
"t2f_travelactivity"."result_id"

FROM "action_points_actionpoint"
"assigned_by_auth_user"
"assigned_to_auth_user"
"assigned_to_auth_user"
"reports_result"
"partners_partnerorganization"
"organizations_organization"
"t2f_travelactivity"

ORDER BY "action_points_actionpoint"."id" ASC
LIMIT ##PAGE_SIZE## OFFSET ##PAGE_OFFSET##;

--
SELECT "django_content_type"."id",
"django_content_type"."app_label",
"django_content_type"."model"
FROM "django_content_type"
WHERE ("django_content_type"."app_label" = 'action_points'
AND "django_content_type"."model" = 'actionpoint')

--
SELECT '##COUNTRY##' AS __schema,
"django_comments"."id",
"django_comments"."object_pk",
"django_comments"."user_name",
"django_comments"."user_email",
"django_comments"."user_url",
"django_comments"."comment",
"django_comments"."submit_date",
"django_comments"."ip_address",
"django_comments"."is_public",
"django_comments"."is_removed",
"django_comments"."content_type_id",
"django_comments"."site_id",
"django_comments"."user_id"
FROM "django_comments"
WHERE ("django_comments"."content_type_id" = django_content_type"."id" )
AND "django_comments"."object_pk" = '2')

"""


class ActionPointLoader(EtoolsLoader):
def get_reference_number(self, record: ActionPointsActionpoint, values: dict, **kwargs):
Expand Down
Loading