@uniai-fe/uds-templates 0.5.14 → 0.5.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniai-fe/uds-templates",
-  "version": "0.5.14",
+  "version": "0.5.15",
   "description": "UNIAI Design System; UI Templates Package",
   "type": "module",
   "private": false,

package/src/weather/apis/korea/server.ts

@@ -12,7 +12,10 @@ import type {
   KMA_Res_WeatherNow,
 } from "../../types";
 import WEATHER_KOREA_RESPONSE from "../../data/response";
-import { getWeatherBaseMoments } from "../../utils/date-time";
+import {
+  getWeatherBaseMoments,
+  getWeatherDailyRangeBaseMoments,
+} from "../../utils/date-time";
 import { extractWeatherSummary } from "../../utils";
 import type { NextResponse } from "next/server";
 import { generateQueryUrl, nextAPILog } from "@uniai-fe/util-api";
@@ -63,6 +66,51 @@ const getWeatherParams = ({
   };
 };
 
+const getWeatherDailyRangeParams = ({
+  authKey,
+  searchParams,
+}: {
+  authKey: string;
+  searchParams: URLSearchParams;
+}): KMA_Req_Weather => {
+  const { base_date, base_time } = getWeatherDailyRangeBaseMoments();
+
+  return {
+    pageNo: "1",
+    numOfRows: "1000",
+    authKey,
+    dataType: "JSON",
+    nx: 0,
+    ny: 0,
+    ...Object.fromEntries(searchParams.entries()),
+    base_date,
+    base_time,
+  };
+};
+
+const hasTodayTemperatureRange = (
+  forecast: API_Res_WeatherKoreaForecast,
+): boolean =>
+  forecast.today.max_temperature !== null &&
+  forecast.today.min_temperature !== null;
+
+const fillTodayTemperatureRange = ({
+  forecast,
+  dailyRange,
+}: {
+  forecast: API_Res_WeatherKoreaForecast;
+  dailyRange: API_Res_WeatherKoreaForecast;
+}): API_Res_WeatherKoreaForecast => ({
+  ...forecast,
+  today: {
+    ...forecast.today,
+    max_temperature:
+      forecast.today.max_temperature ?? dailyRange.today.max_temperature,
+    min_temperature:
+      forecast.today.min_temperature ?? dailyRange.today.min_temperature,
+  },
+});
+
 /**
  * 기상청 API; 현재 날씨
  * @method GET
@@ -185,7 +233,38 @@ export const routeWeatherKoreaForecast = async ({
   try {
     const res: KMA_Res_WeatherForecast = await (await fetch(url)).json();
     resDefault.raw = res;
-    return extractWeatherSummary.forecast(resDefault, res);
+    const forecast = extractWeatherSummary.forecast(resDefault, res);
+
+    if (hasTodayTemperatureRange(forecast)) {
+      return forecast;
+    }
+
+    const dailyRangeQueryParams = Object.fromEntries(
+      Object.entries(getWeatherDailyRangeParams({ authKey, searchParams })).map(
+        ([key, value]) => [key, String(value)],
+      ),
+    );
+    const dailyRangeUrl = generateQueryUrl({
+      domain,
+      routeUrl,
+      queryUrl: QUERY_URL.forecast,
+      searchParams: new URLSearchParams(dailyRangeQueryParams),
+    });
+    const dailyRangeRes: KMA_Res_WeatherForecast = await (
+      await fetch(dailyRangeUrl)
+    ).json();
+    const dailyRange = extractWeatherSummary.forecast(
+      {
+        ...resDefault,
+        raw: dailyRangeRes,
+        today: { ...resDefault.today },
+        day_1: { ...resDefault.day_1 },
+        day_2: { ...resDefault.day_2 },
+      },
+      dailyRangeRes,
+    );
+
+    return fillTodayTemperatureRange({ forecast, dailyRange });
   } catch (error) {
     nextAPILog("GET", routeUrl, url, { error });
 

package/src/weather/apis/open-weather-map/server.ts

@@ -15,7 +15,7 @@ const API_BASE_CURRENT = "https://api.openweathermap.org/data/2.5/weather";
  * 글로벌 날씨 API; 예보 날씨 URL
  */
 const API_BASE_FORECAST =
-  "https://pro.openweathermap.org/data/2.5/weather/forecast/hourly";
+  "https://pro.openweathermap.org/data/2.5/forecast/hourly";
 
 const COMMON_OPTIONS = {
   units: "metric", // 섭씨 온도

package/src/weather/utils/date-time.ts

@@ -37,6 +37,29 @@ export const getWeatherBaseMoments = (
   return { base_date, base_time };
 };
 
+/**
+ * 날씨 도구; KMA 오늘 일최고/일최저 조회 기준시각
+ * @util
+ * @return {KMA_Req_BaseMoments} 오늘 TMN/TMX 보강용 발표일자/발표시각
+ * @desc
+ * - KMA 최신 단기예보는 과거 예보시각의 오늘 TMN/TMX를 포함하지 않을 수 있다.
+ * - 기본은 전날 23시 발표를 사용하고, 23시 이후에는 최근 24시간 범위 안의 당일 02시 발표를 사용한다.
+ */
+export const getWeatherDailyRangeBaseMoments = (): KMA_Req_BaseMoments => {
+  const now = new Date();
+  const base = new Date(now);
+  const base_hour = now.getHours() >= 23 ? 2 : 23;
+
+  if (base_hour === 23) {
+    base.setDate(base.getDate() - 1);
+  }
+
+  return {
+    base_date: dateFormat(base).replace(/-/g, ""),
+    base_time: `${base_hour.toString().padStart(2, "0")}00`,
+  };
+};
+
 /**
  * 날씨 도구; 현재 날씨/예보 시각
  * @util
@@ -49,17 +72,18 @@ export const getWeatherBaseMoments = (
  */
 export const getMoments = (): WeatherUtilDateTimeMoments => {
   const now = new Date();
-  const today = now.toISOString().slice(0, 10).replace(/-/g, "");
+  const today = dateFormat(now).replace(/-/g, "");
 
-  const tomorrow = new Date(now.getTime() + 86400000)
-    .toISOString()
-    .slice(0, 10)
-    .replace(/-/g, "");
+  const tomorrow = new Date(now.getTime() + 86400000);
+  const tomorrowKey = dateFormat(tomorrow).replace(/-/g, "");
 
-  const dayAfterTomorrow = new Date(now.getTime() + 2 * 86400000)
-    .toISOString()
-    .slice(0, 10)
-    .replace(/-/g, "");
+  const dayAfterTomorrow = new Date(now.getTime() + 2 * 86400000);
+  const dayAfterTomorrowKey = dateFormat(dayAfterTomorrow).replace(/-/g, "");
 
-  return { now, today, tomorrow, dayAfterTomorrow };
+  return {
+    now,
+    today,
+    tomorrow: tomorrowKey,
+    dayAfterTomorrow: dayAfterTomorrowKey,
+  };
 };

package/src/weather/utils/weather.ts

@@ -264,8 +264,30 @@ const getLocalDateKey = (date: Date): string => {
   return `${date.getFullYear()}-${month}-${day}`;
 };
 
-const getForecastItemDateKey = (item: OWM_Res_Weather_Forecast_Item): string =>
-  item.dt_txt?.slice(0, 10) || getLocalDateKey(new Date(item.dt * 1000));
+const getTimeZoneDateKey = (dateTimeSeconds: number, timezoneSeconds: number) =>
+  new Date((dateTimeSeconds + timezoneSeconds) * 1000)
+    .toISOString()
+    .slice(0, 10);
+
+const getOpenWeatherMapDateKey = (
+  forecast?: OWM_Res_Weather_Forecast,
+): string => {
+  const timezoneSeconds = forecast?.city?.timezone;
+
+  if (typeof timezoneSeconds === "number" && Number.isFinite(timezoneSeconds)) {
+    return getTimeZoneDateKey(Math.floor(Date.now() / 1000), timezoneSeconds);
+  }
+
+  return getLocalDateKey(new Date());
+};
+
+const getForecastItemDateKey = (
+  item: OWM_Res_Weather_Forecast_Item,
+  timezoneSeconds = 0,
+): string =>
+  Number.isFinite(item.dt)
+    ? getTimeZoneDateKey(item.dt, timezoneSeconds)
+    : item.dt_txt?.slice(0, 10) || getLocalDateKey(new Date(item.dt * 1000));
 
 const toOpenWeatherMapDayForecast = (
   items: OWM_Res_Weather_Forecast_Item[],
@@ -311,11 +333,12 @@ export const getOpenWeatherMapNextDays = (
 } => {
   if (!Array.isArray(forecast?.list)) return {};
 
-  const todayKey = getLocalDateKey(new Date());
+  const timezoneSeconds = forecast.city?.timezone ?? 0;
+  const todayKey = getOpenWeatherMapDateKey(forecast);
   const grouped = forecast.list.reduce<
     Record<string, OWM_Res_Weather_Forecast_Item[]>
   >((days, item) => {
-    const dateKey = getForecastItemDateKey(item);
+    const dateKey = getForecastItemDateKey(item, timezoneSeconds);
     if (dateKey === todayKey) return days;
 
     days[dateKey] = [...(days[dateKey] || []), item];
@@ -339,9 +362,10 @@ export const getOpenWeatherMapTodayForecast = (
 ): API_Res_WeatherKoreaNextDays | undefined => {
   if (!Array.isArray(forecast?.list)) return undefined;
 
-  const todayKey = getLocalDateKey(new Date());
+  const timezoneSeconds = forecast.city?.timezone ?? 0;
+  const todayKey = getOpenWeatherMapDateKey(forecast);
   const todayItems = forecast.list.filter(
-    item => getForecastItemDateKey(item) === todayKey,
+    item => getForecastItemDateKey(item, timezoneSeconds) === todayKey,
   );
 
   return toOpenWeatherMapDayForecast(todayItems);