Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit98fcc65

Browse files
committed
refactor: remove WakaTime range loop
1 parent65fa81f commit98fcc65

File tree

3 files changed

+55
-18
lines changed

3 files changed

+55
-18
lines changed

‎api/wakatime.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ export default async (req, res) => {
2828
langs_count,
2929
hide,
3030
api_domain,
31-
range,
3231
border_radius,
3332
border_color,
3433
}=req.query;
@@ -40,7 +39,7 @@ export default async (req, res) => {
4039
}
4140

4241
try{
43-
conststats=awaitfetchWakatimeStats({ username, api_domain, range});
42+
conststats=awaitfetchWakatimeStats({ username, api_domain});
4443

4544
letcacheSeconds=clampValue(
4645
parseInt(cache_seconds||CONSTANTS.FOUR_HOURS,10),

‎src/fetchers/wakatime-fetcher.js

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,33 @@ import { MissingParamError } from "../common/utils.js";
55
* WakaTime data fetcher.
66
*
77
*@param {{username: string, api_domain: string}} props Fetcher props.
8-
*@returns {Promise<WakaTimeData>} WakaTime data response.
8+
*@returns {Promise<wakaTimeStatsRangeData>} WakaTime data response.
99
*/
1010
constfetchWakatimeStats=async({ username, api_domain})=>{
1111
if(!username)thrownewMissingParamError(["username"]);
1212

13+
// Retrieve user range.
14+
const{data:userdata}=awaitaxios.get(
15+
`https://${
16+
api_domain ?api_domain.replace(/\/$/gi,"") :"wakatime.com"
17+
}/api/v1/users/${username}/stats`,
18+
);
19+
constrange=userdata.data.range;
20+
1321
// Loop through available ranges to get user data.
14-
for(constrangeof["all_time","last_year","last_7_days"]){
15-
try{
16-
const{ data}=awaitaxios.get(
17-
`https://${
18-
api_domain ?api_domain.replace(/\/$/gi,"") :"wakatime.com"
19-
}/api/v1/users/${username}/stats/${range}?is_including_today=true`,
20-
);
22+
try{
23+
const{ data}=awaitaxios.get(
24+
`https://${
25+
api_domain ?api_domain.replace(/\/$/gi,"") :"wakatime.com"
26+
}/api/v1/users/${username}/stats/${range}?is_including_today=true`,
27+
);
2128

22-
returndata.data;
23-
}catch(err){
24-
if(err.response.status===403&&range!=="last_year"){
25-
continue;
26-
}elseif(err.response.status<200||err.response.status>299){
27-
thrownewError(i18n.t("wakatimecard.nouser"));
28-
}
29-
throwerr;
29+
returndata.data;
30+
}catch(err){
31+
if(err.response.status<200||err.response.status>299){
32+
thrownewError(i18n.t("wakatimecard.nouser"));
3033
}
34+
throwerr;
3135
}
3236
};
3337

‎tests/fetchWakatime.test.js

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,37 @@ afterEach(() => {
88
mock.reset();
99
});
1010

11+
constwakaTimeUserData={
12+
data:{
13+
id:"aa437823-82d1-4b37-9b84-ab4ed89c8688",
14+
user_id:"c7e2e900-858b-400e-bc1c-016345cf59b6",
15+
range:"all_time",
16+
timeout:15,
17+
writes_only:false,
18+
holidays:134,
19+
status:"ok",
20+
is_up_to_date:true,
21+
days_minus_holidays:231,
22+
days_including_holidays:365,
23+
percent_calculated:100,
24+
human_readable_total:"691 hrs 5 mins",
25+
is_already_updating:false,
26+
is_stuck:false,
27+
total_seconds_including_other_language:2508467.924346,
28+
is_up_to_date_pending_future:false,
29+
total_seconds:2487938.453846,
30+
human_readable_daily_average:"2 hrs 59 mins",
31+
human_readable_total_including_other_language:"696 hrs 47 mins",
32+
daily_average_including_other_language:10859.0,
33+
daily_average:10770.0,
34+
human_readable_daily_average_including_other_language:"3 hrs",
35+
username:"rickstaa",
36+
is_including_today:false,
37+
human_readable_range:"last year",
38+
is_coding_activity_visible:true,
39+
is_other_usage_visible:false,
40+
},
41+
};
1142
constwakaTimeData={
1243
data:{
1344
categories:[
@@ -103,6 +134,9 @@ const wakaTimeData = {
103134
describe("Wakatime fetcher",()=>{
104135
it("should fetch correct wakatime data",async()=>{
105136
constusername="anuraghazra";
137+
mock
138+
.onGet(`https://wakatime.com/api/v1/users/${username}/stats`)
139+
.reply(200,wakaTimeUserData);
106140
mock
107141
.onGet(
108142
`https://wakatime.com/api/v1/users/${username}/stats/all_time?is_including_today=true`,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp