Skip to content

Commit 00874d6

Browse files
committed
dead code removed. redis utils added and types added
1 parent c66d2aa commit 00874d6

File tree

8 files changed

+39
-107
lines changed

8 files changed

+39
-107
lines changed

server/controllers/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
* the request goes here.
77
*/
88

9-
import * as productCtrl from './product';
9+
import * as metarCtrl from './metar';
1010

1111

1212
export {
13-
productCtrl,
13+
metarCtrl,
1414
};

server/controllers/metar.ts

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
2+
import chalk from 'chalk';
3+
import { promisify } from 'util';
4+
import request, { Request, Response } from 'request';
5+
6+
7+
import { IMetarModel, } from 'Models';
8+
9+
import * as utils from '../utils/utils';
10+
import * as redis_utils from '../utils/redis-utils';
11+
12+
13+
export const getMetar = (station_code: string, no_cache: number): Promise<IMetarModel> => {
14+
// nocahce => 1 // fetch new data and refresh cache
15+
16+
// scode => station_code
17+
// api => https://tgftp.nws.noaa.gov/data/observations/metar/stations/${scode}.TXT
18+
19+
return Promise.reject();
20+
};

server/controllers/product.ts

Lines changed: 0 additions & 56 deletions
This file was deleted.

server/models/Product.ts

Lines changed: 0 additions & 28 deletions
This file was deleted.

server/models/index.ts

Lines changed: 0 additions & 14 deletions
This file was deleted.

server/routes/metar.ts

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import { Router, NextFunction, Response, Request, } from 'express';
44
import { JWTRequest, CustomError } from 'Interfaces';
55

6-
import { productCtrl, } from '../controllers';
7-
import { IProductModel, } from 'Models';
6+
import { metarCtrl, } from '../controllers';
7+
import { IMetarModel, } from 'Models';
88

99

1010
const router = Router();
@@ -19,10 +19,17 @@ router.get('/ping', (req: Request, res: Response, next: NextFunction) => {
1919
router.get('/info', (req: Request, res: Response, next: NextFunction) => {
2020
const { scode, nocache, } = req.query;
2121

22-
// nocahce => 1 // fetch new data and refresh cache
23-
24-
// scode => station_code
25-
// api => https://tgftp.nws.noaa.gov/data/observations/metar/stations/${scode}.TXT
22+
metarCtrl.getMetar(scode, nocache)
23+
.then((metar: IMetarModel) => {
24+
res.status(200).json({
25+
data: {
26+
type: 'metar',
27+
id: 'metar',
28+
attributes: metar,
29+
}
30+
});
31+
})
32+
.catch((err: CustomError) => next(err));
2633
});
2734

2835
export default router;

server/types/Models.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22

3-
export interface IProductModel {
3+
export interface IMetarModel {
44
urlh: string;
55
statu: number;
66
brand: string;

server/utils/redis-utils.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
2+
import { redisClient } from '../config';
3+

0 commit comments

Comments
 (0)