Skip to content

Commit 778ede6

Browse files
jmgasperjmgasper
authored
Merge pull request #104 from topcoder-platform/develop
Fix for 90 day member payment report
2 parents 6be9b31 + 5cd50ec commit 778ede6

7 files changed

Lines changed: 244 additions & 39 deletions

File tree

‎LICENSE‎

Lines changed: 202 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,202 @@
1+
2+
Apache License
3+
Version 2.0, January 2004
4+
http://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS
178+
179+
APPENDIX: How to apply the Apache License to your work.
180+
181+
To apply the Apache License to your work, attach the following
182+
boilerplate notice, with the fields enclosed by brackets "[]"
183+
replaced with your own identifying information. (Don't include
184+
the brackets!) The text should be enclosed in the appropriate
185+
comment syntax for the file format. We also recommend that a
186+
file or class name and description of purpose be included on the
187+
same "printed page" as the copyright notice for easier
188+
identification within third-party archives.
189+
190+
Copyright [yyyy] [name of copyright owner]
191+
192+
Licensed under the Apache License, Version 2.0 (the "License");
193+
you may not use this file except in compliance with the License.
194+
You may obtain a copy of the License at
195+
196+
http://www.apache.org/licenses/LICENSE-2.0
197+
198+
Unless required by applicable law or agreed to in writing, software
199+
distributed under the License is distributed on an "AS IS" BASIS,
200+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201+
See the License for the specific language governing permissions and
202+
limitations under the License.

‎sql/reports/topcoder/90-day-members-paid.sql‎

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,27 @@
11
SELECT
2-
COUNT(DISTINCT payee.coder_id) AS "payee.count"
3-
FROM tcs_dw.payment AS payment
4-
INNER JOIN tcs_dw.user_payment AS user_payment
5-
ON payment.payment_id = user_payment.payment_id
6-
INNER JOIN tcs_dw.coder AS payee
7-
ON user_payment.user_id = payee.coder_id
8-
INNER JOIN topcoder_dw.calendar AS payment_create_date
9-
ON payment.created_calendar_id = payment_create_date.calendar_id
10-
LEFT JOIN tcs_dw.project AS challenge
11-
ON payment.challenge_blended_id = challenge.challenge_blended_id
12-
LEFT JOIN looker_pdt."LR$QHMWJ1761538148605_challenge_groups" AS challenge_groups
13-
ON challenge.challenge_blended_id = challenge_groups.challenge_blended_id
14-
LEFT JOIN tcs_dw.client_project_dim AS client_project_dim
15-
ON client_project_dim.client_project_id = challenge.client_project_id
16-
WHERE payment_create_date.date >= (DATE_TRUNC('day', CURRENT_TIMESTAMP) - INTERVAL '89 days')
17-
AND payment_create_date.date < (DATE_TRUNC('day', CURRENT_TIMESTAMP) + INTERVAL '1 day')
18-
AND (
19-
challenge_groups.group_name NOT ILIKE 'Wipro%'
20-
OR challenge_groups.group_name IS NULL
2+
COUNT(DISTINCT w.winner_id) AS "payee.count"
3+
FROM finance.payment AS p
4+
INNER JOIN finance.winnings AS w
5+
ON w.winning_id = p.winnings_id
6+
LEFT JOIN challenges."Challenge" AS c
7+
ON c.id = w.external_id
8+
LEFT JOIN projects.projects AS proj
9+
ON proj.id = c."projectId"::bigint
10+
WHERE (p.payment_status IS NULL OR p.payment_status != 'CANCELLED')
11+
AND p.created_at >= (DATE_TRUNC('day', CURRENT_TIMESTAMP) - INTERVAL '89 days')
12+
AND p.created_at < (DATE_TRUNC('day', CURRENT_TIMESTAMP) + INTERVAL '1 day')
13+
AND NOT EXISTS (
14+
SELECT 1
15+
FROM unnest(COALESCE(c.groups, ARRAY[]::text[])) AS group_ref(group_id)
16+
INNER JOIN groups."Group" AS g
17+
ON g.id = group_ref.group_id
18+
WHERE g.name ILIKE 'Wipro%'
2119
)
2220
AND (
2321
(
24-
client_project_dim.project_name NOT ILIKE 'Fun & Learning Challenges (Jaipur)'
25-
AND client_project_dim.project_name NOT ILIKE 'Fun & Learning - 2016 (Jaipur)'
26-
AND client_project_dim.project_name NOT ILIKE 'TopGear Trial'
22+
proj.name NOT ILIKE 'Fun & Learning Challenges (Jaipur)'
23+
AND proj.name NOT ILIKE 'Fun & Learning - 2016 (Jaipur)'
24+
AND proj.name NOT ILIKE 'TopGear Trial'
2725
)
28-
OR client_project_dim.project_name IS NULL
26+
OR proj.name IS NULL
2927
);

‎src/auth/permissions.util.spec.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,10 @@ describe("permissions.util", () => {
100100

101101
it("allows talent manager role for other SFDC report scopes", () => {
102102
expect(
103-
hasAccessToScopes(
104-
{ roles: ["Topcoder Talent Manager"] },
105-
[Scopes.SFDC.BA, Scopes.SFDC.ChallengesReport],
106-
),
103+
hasAccessToScopes({ roles: ["Topcoder Talent Manager"] }, [
104+
Scopes.SFDC.BA,
105+
Scopes.SFDC.ChallengesReport,
106+
]),
107107
).toBe(true);
108108
});
109109
});

‎src/reports/member/member-search.service.spec.ts‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,11 +159,12 @@ describe("MemberSearchService", () => {
159159
const enabledDataSql = mockDbService.query.mock.calls[0][0] as string;
160160
const enabledDataParams = mockDbService.query.mock.calls[0][1] as unknown[];
161161
const enabledCountSql = mockDbService.query.mock.calls[1][0] as string;
162-
const enabledCountParams = mockDbService.query.mock.calls[1][1] as unknown[];
162+
const enabledCountParams = mockDbService.query.mock
163+
.calls[1][1] as unknown[];
163164

164165
expect(enabledDataSql).toContain("profile_complete_filtered AS (");
165166
expect(enabledDataSql).toContain(
166-
"INNER JOIN profile_complete_filtered pcf ON pcf.user_id = m.\"userId\"",
167+
'INNER JOIN profile_complete_filtered pcf ON pcf.user_id = m."userId"',
167168
);
168169
expect(enabledCountSql).toContain("FROM profile_complete_filtered pcf");
169170
expect(enabledCountSql).not.toContain(
@@ -188,7 +189,7 @@ describe("MemberSearchService", () => {
188189

189190
expect(disabledDataSql).not.toContain("profile_complete_filtered AS (");
190191
expect(disabledDataSql).not.toContain(
191-
"INNER JOIN profile_complete_filtered pcf ON pcf.user_id = m.\"userId\"",
192+
'INNER JOIN profile_complete_filtered pcf ON pcf.user_id = m."userId"',
192193
);
193194
expect(disabledCountSql).toContain("FROM filtered_members fm");
194195
expect(disabledCountSql).not.toContain("profile_complete_filtered pcf");
@@ -225,7 +226,9 @@ describe("MemberSearchService", () => {
225226
expect(validationParams).toEqual([[skillA, skillB]]);
226227

227228
expect(dataSql).toContain("requested_skills AS");
228-
expect(dataSql).toContain("FILTER (WHERE usd.wins > 0 OR usd.submitted > 0)");
229+
expect(dataSql).toContain(
230+
"FILTER (WHERE usd.wins > 0 OR usd.submitted > 0)",
231+
);
229232
expect(dataSql).toContain("INNER JOIN user_match_data umd");
230233
expect(dataSql).toContain("THEN COUNT(DISTINCT CASE");
231234
expect(dataSql).toContain("ELSE COUNT(DISTINCT CASE");

‎src/reports/member/member-search.service.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,9 +237,10 @@ member_address AS (
237237
}
238238

239239
const whereClause = where.join(" AND ");
240-
const skillJoin = deduped.length > 0
241-
? `INNER JOIN user_match_data umd ON umd.user_id = m."userId"`
242-
: ``;
240+
const skillJoin =
241+
deduped.length > 0
242+
? `INNER JOIN user_match_data umd ON umd.user_id = m."userId"`
243+
: ``;
243244
ctes.push(`filtered_members AS (
244245
SELECT m."userId" AS user_id
245246
FROM members.member m

‎src/reports/sfdc/sfdc-reports.controller.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,9 @@ export class SfdcReportsController {
9999
description: "Billing account profile retrieved successfully",
100100
type: ResponseDto<BillingAccountProfileResponse>,
101101
})
102-
async getBillingAccountProfile(@Query() query: BillingAccountProfileQueryDto) {
102+
async getBillingAccountProfile(
103+
@Query() query: BillingAccountProfileQueryDto,
104+
) {
103105
return this.reportsService.getBillingAccountProfile(query);
104106
}
105107

‎src/reports/sfdc/sfdc-reports.service.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,9 @@ export class SfdcReportsService {
144144
): Promise<BillingAccountProfileResponse> {
145145
const billingAccountId = filters.billingAccountId.trim();
146146
const query = this.sql.load("reports/sfdc/billing-account-detail.sql");
147-
const rows = await this.db.query<BillingAccountProfileResponse["billingAccount"]>(
148-
query,
149-
[billingAccountId],
150-
);
147+
const rows = await this.db.query<
148+
BillingAccountProfileResponse["billingAccount"]
149+
>(query, [billingAccountId]);
151150

152151
return {
153152
billingAccount: rows[0] ?? null,

0 commit comments

Comments
 (0)