Skip to content

Commit 9b3cb79

Browse files
authored
Merge pull request #25 from nicolelim02/feat/questions
Add middleware to verify admin status for questions and set up tests
2 parents afa9755 + 57b92e0 commit 9b3cb79

File tree

23 files changed

+13572
-4885
lines changed

23 files changed

+13572
-4885
lines changed

.github/workflows/ci.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: ci
2+
3+
on:
4+
push:
5+
branches:
6+
- "*"
7+
pull_request:
8+
branches:
9+
- "*"
10+
11+
env:
12+
NODE_VERSION: 20
13+
14+
jobs:
15+
ci:
16+
runs-on: ubuntu-latest
17+
strategy:
18+
matrix:
19+
service: [frontend, backend/question-service, backend/user-service]
20+
steps:
21+
- name: Checkout code
22+
uses: actions/checkout@v4
23+
- name: Setting node version
24+
uses: actions/setup-node@v4
25+
with:
26+
node-version: ${{ env.NODE_VERSION }}
27+
- name: Install dependencies
28+
working-directory: ${{ matrix.service }}
29+
run: npm install
30+
- name: Linting
31+
working-directory: ${{ matrix.service }}
32+
run: npm run lint
33+
# - name: Tests
34+
# working-directory: ${{ matrix.service }}
35+
# run: npm test

.github/workflows/lint.yml

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

backend/question-service/.env.sample

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ FIREBASE_CLIENT_EMAIL=FIREBASE_CLIENT_EMAIL
66
FIREBASE_STORAGE_BUCKET=FIREBASE_STORAGE_BUCKET
77

88
ORIGINS=FRONTEND_ORIGINS
9+
10+
USER_SERVICE_URL=USER_SERVICE_URL

backend/question-service/app.ts

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import express, { NextFunction, Request, Response } from "express";
1+
import express, { Request, Response } from "express";
22
import dotenv from "dotenv";
33
import swaggerUi from "swagger-ui-express";
44
import yaml from "yaml";
@@ -19,29 +19,31 @@ const swaggerDocument = yaml.parse(file);
1919

2020
const app = express();
2121

22-
connectDB();
22+
if (process.env.NODE_ENV !== "test") {
23+
connectDB();
24+
}
2325

2426
app.use(cors({ origin: allowedOrigins, credentials: true }));
2527
app.options("*", cors({ origin: allowedOrigins, credentials: true }));
2628

2729
// To handle CORS Errors
28-
app.use((req: Request, res: Response, next: NextFunction) => {
29-
res.header("Access-Control-Allow-Origin", req.headers.origin); // "*" -> Allow all links to access
30-
31-
res.header(
32-
"Access-Control-Allow-Headers",
33-
"Origin, X-Requested-With, Content-Type, Accept, Authorization",
34-
);
35-
36-
// Browsers usually send this before PUT or POST Requests
37-
if (req.method === "OPTIONS") {
38-
res.header("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT, PATCH");
39-
return res.status(200).json({});
40-
}
41-
42-
// Continue Route Processing
43-
next();
44-
});
30+
// app.use((req: Request, res: Response, next: NextFunction) => {
31+
// res.header("Access-Control-Allow-Origin", req.headers.origin); // "*" -> Allow all links to access
32+
33+
// res.header(
34+
// "Access-Control-Allow-Headers",
35+
// "Origin, X-Requested-With, Content-Type, Accept, Authorization",
36+
// );
37+
38+
// // Browsers usually send this before PUT or POST Requests
39+
// if (req.method === "OPTIONS") {
40+
// res.header("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT, PATCH");
41+
// return res.status(200).json({});
42+
// }
43+
44+
// // Continue Route Processing
45+
// next();
46+
// });
4547

4648
app.use(express.json());
4749
app.use("/api/questions", questionRoutes);
Lines changed: 199 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,199 @@
1+
/**
2+
* For a detailed explanation regarding each configuration property, visit:
3+
* https://jestjs.io/docs/configuration
4+
*/
5+
6+
import type { Config } from "jest";
7+
8+
const config: Config = {
9+
// All imported modules in your tests should be mocked automatically
10+
// automock: false,
11+
12+
// Stop running tests after `n` failures
13+
// bail: 0,
14+
15+
// The directory where Jest should store its cached dependency information
16+
// cacheDirectory: "/private/var/folders/04/ng4c26hj1ksdsy_7x_21kvx80000gn/T/jest_dx",
17+
18+
// Automatically clear mock calls, instances, contexts and results before every test
19+
clearMocks: true,
20+
21+
// Indicates whether the coverage information should be collected while executing the test
22+
collectCoverage: true,
23+
24+
// An array of glob patterns indicating a set of files for which coverage information should be collected
25+
// collectCoverageFrom: undefined,
26+
27+
// The directory where Jest should output its coverage files
28+
coverageDirectory: "coverage",
29+
30+
// An array of regexp pattern strings used to skip coverage collection
31+
// coveragePathIgnorePatterns: [
32+
// "/node_modules/"
33+
// ],
34+
35+
// Indicates which provider should be used to instrument code for coverage
36+
coverageProvider: "v8",
37+
38+
// A list of reporter names that Jest uses when writing coverage reports
39+
// coverageReporters: [
40+
// "json",
41+
// "text",
42+
// "lcov",
43+
// "clover"
44+
// ],
45+
46+
// An object that configures minimum threshold enforcement for coverage results
47+
// coverageThreshold: undefined,
48+
49+
// A path to a custom dependency extractor
50+
// dependencyExtractor: undefined,
51+
52+
// Make calling deprecated APIs throw helpful error messages
53+
// errorOnDeprecated: false,
54+
55+
// The default configuration for fake timers
56+
// fakeTimers: {
57+
// "enableGlobally": false
58+
// },
59+
60+
// Force coverage collection from ignored files using an array of glob patterns
61+
// forceCoverageMatch: [],
62+
63+
// A path to a module which exports an async function that is triggered once before all test suites
64+
// globalSetup: undefined,
65+
66+
// A path to a module which exports an async function that is triggered once after all test suites
67+
// globalTeardown: undefined,
68+
69+
// A set of global variables that need to be available in all test environments
70+
// globals: {},
71+
72+
// The maximum amount of workers used to run your tests. Can be specified as % or a number. E.g. maxWorkers: 10% will use 10% of your CPU amount + 1 as the maximum worker number. maxWorkers: 2 will use a maximum of 2 workers.
73+
// maxWorkers: "50%",
74+
75+
// An array of directory names to be searched recursively up from the requiring module's location
76+
// moduleDirectories: [
77+
// "node_modules"
78+
// ],
79+
80+
// An array of file extensions your modules use
81+
// moduleFileExtensions: [
82+
// "js",
83+
// "mjs",
84+
// "cjs",
85+
// "jsx",
86+
// "ts",
87+
// "tsx",
88+
// "json",
89+
// "node"
90+
// ],
91+
92+
// A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module
93+
// moduleNameMapper: {},
94+
95+
// An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
96+
// modulePathIgnorePatterns: [],
97+
98+
// Activates notifications for test results
99+
// notify: false,
100+
101+
// An enum that specifies notification mode. Requires { notify: true }
102+
// notifyMode: "failure-change",
103+
104+
// A preset that is used as a base for Jest's configuration
105+
preset: "ts-jest",
106+
107+
// Run tests from one or more projects
108+
// projects: undefined,
109+
110+
// Use this configuration option to add custom reporters to Jest
111+
// reporters: undefined,
112+
113+
// Automatically reset mock state before every test
114+
// resetMocks: false,
115+
116+
// Reset the module registry before running each individual test
117+
// resetModules: false,
118+
119+
// A path to a custom resolver
120+
// resolver: undefined,
121+
122+
// Automatically restore mock state and implementation before every test
123+
// restoreMocks: false,
124+
125+
// The root directory that Jest should scan for tests and modules within
126+
// rootDir: undefined,
127+
128+
// A list of paths to directories that Jest should use to search for files in
129+
// roots: [
130+
// "<rootDir>"
131+
// ],
132+
133+
// Allows you to use a custom runner instead of Jest's default test runner
134+
// runner: "jest-runner",
135+
136+
// The paths to modules that run some code to configure or set up the testing environment before each test
137+
// setupFiles: [],
138+
139+
// A list of paths to modules that run some code to configure or set up the testing framework before each test
140+
setupFilesAfterEnv: ["./tests/setup.ts"],
141+
142+
// The number of seconds after which a test is considered as slow and reported as such in the results.
143+
// slowTestThreshold: 5,
144+
145+
// A list of paths to snapshot serializer modules Jest should use for snapshot testing
146+
// snapshotSerializers: [],
147+
148+
// The test environment that will be used for testing
149+
// testEnvironment: "jest-environment-node",
150+
151+
// Options that will be passed to the testEnvironment
152+
// testEnvironmentOptions: {},
153+
154+
// Adds a location field to test results
155+
// testLocationInResults: false,
156+
157+
// The glob patterns Jest uses to detect test files
158+
// testMatch: [
159+
// "**/__tests__/**/*.[jt]s?(x)",
160+
// "**/?(*.)+(spec|test).[tj]s?(x)"
161+
// ],
162+
163+
// An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
164+
// testPathIgnorePatterns: [
165+
// "/node_modules/"
166+
// ],
167+
168+
// The regexp pattern or array of patterns that Jest uses to detect test files
169+
// testRegex: [],
170+
171+
// This option allows the use of a custom results processor
172+
// testResultsProcessor: undefined,
173+
174+
// This option allows use of a custom test runner
175+
// testRunner: "jest-circus/runner",
176+
177+
// A map from regular expressions to paths to transformers
178+
// transform: undefined,
179+
180+
// An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
181+
// transformIgnorePatterns: [
182+
// "/node_modules/",
183+
// "\\.pnp\\.[^\\/]+$"
184+
// ],
185+
186+
// An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
187+
// unmockedModulePathPatterns: undefined,
188+
189+
// Indicates whether each individual test should be reported during the run
190+
// verbose: undefined,
191+
192+
// An array of regexp patterns that are matched against all source file paths before re-running tests in watch mode
193+
// watchPathIgnorePatterns: [],
194+
195+
// Whether to use watchman for file crawling
196+
// watchman: true,
197+
};
198+
199+
export default config;

0 commit comments

Comments
 (0)