Skip to content

Commit 0301070

Browse files
committed
linter
1 parent 89a0262 commit 0301070

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+423
-385
lines changed

backend/.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ module.exports = {
1818
rules: {
1919
"prettier/prettier": ["error", { endOfLine: "auto" }],
2020
"class-methods-use-this": 0,
21-
"import/prefer-default-export": "off"
21+
"import/prefer-default-export": "off",
2222
},
2323
ignorePatterns: ["build/*"],
2424
};

backend/graphql/index.ts

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { makeExecutableSchema, gql } from "apollo-server-express";
1+
import { makeExecutableSchema } from "apollo-server-express";
22
import { merge } from "lodash";
33
// import { applyMiddleware } from "graphql-middleware";
44

@@ -7,7 +7,6 @@ import {
77
resolvers as scalarResolvers,
88
} from "graphql-scalars";
99

10-
1110
import dataModels from "./types/models";
1211
import customTypes from "./types/enums";
1312
import resolverTypes from "./types/resolvers";
@@ -16,17 +15,8 @@ import participantResolvers from "./resolvers/participantResolver";
1615
import miscResolvers from "./resolvers/miscResolver";
1716

1817
const schema = makeExecutableSchema({
19-
typeDefs: [
20-
...scalarTypeDefs,
21-
dataModels,
22-
customTypes,
23-
resolverTypes,
24-
],
25-
resolvers: merge(
26-
scalarResolvers,
27-
participantResolvers,
28-
miscResolvers
29-
),
18+
typeDefs: [...scalarTypeDefs, dataModels, customTypes, resolverTypes],
19+
resolvers: merge(scalarResolvers, participantResolvers, miscResolvers),
3020
});
3121

3222
export default schema;

backend/graphql/resolvers/announcementResolver.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,4 +131,4 @@
131131
// },
132132
// };
133133

134-
// export default notificationResolvers;
134+
// export default notificationResolvers;

backend/graphql/resolvers/miscResolver.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ const miscService: IMiscService = new MiscService();
55
const miscResolvers = {
66
Query: {
77
getAvailableRooms: async (): Promise<number[]> => {
8-
return miscService.getAvailableRooms();
9-
}
10-
}
8+
return miscService.getAvailableRooms();
9+
},
10+
},
1111
};
1212

13-
export default miscResolvers;
13+
export default miscResolvers;

backend/graphql/resolvers/participantResolver.ts

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import { Participant } from "@prisma/client";
12
import ParticipantService from "../../services/implementation/participantImplementation";
23
import IParticipantService from "../../services/interface/participantInterface";
3-
import { Participant } from "@prisma/client";
44

55
const participantService: IParticipantService = new ParticipantService();
66
const participantResolvers = {
@@ -19,21 +19,25 @@ const participantResolvers = {
1919
createParticipant: async (
2020
_parent: undefined,
2121
{
22-
participantId,
22+
participantId,
2323
roomNumber,
2424
arrival,
25-
password
26-
} : {
25+
password,
26+
}: {
2727
participantId: string;
2828
roomNumber: number;
2929
arrival: string;
3030
password: string;
31-
}
31+
},
3232
): Promise<boolean> => {
33-
return participantService.createParticipant(participantId, roomNumber, arrival, password);
34-
35-
}
36-
}
33+
return participantService.createParticipant(
34+
participantId,
35+
roomNumber,
36+
arrival,
37+
password,
38+
);
39+
},
40+
},
3741
};
3842

3943
export default participantResolvers;

backend/graphql/types/models.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@ import { gql } from "apollo-server-express";
22

33
const dataModels = gql`
44
type Participant {
5-
participantId: String!
5+
participantId: String!
66
roomNumber: Int!
77
arrival: String!
8-
departure: String
8+
departure: String
99
password: String!
10-
credit: Int!
10+
credit: Int!
1111
}
1212
1313
type Announcement {
1414
announcementId: Int!
15-
from: StaffType!
16-
to: [Int!]!
15+
from: StaffType!
16+
to: [Int!]!
1717
createdAt: DateTime!
1818
message: String!
1919
}
@@ -22,7 +22,7 @@ const dataModels = gql`
2222
taskId: Int!
2323
roomNumber: Int
2424
type: TaskType!
25-
status: TaskStatus!
25+
status: TaskStatus!
2626
name: String!
2727
isRecurring: Boolean!
2828
start: DateTime!

backend/graphql/types/resolvers.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@ const resolverTypes = gql`
88
}
99
1010
type Mutation {
11-
createParticipant(participantId: String, roomNumber: Int, arrival: String, password: String): Boolean
11+
createParticipant(
12+
participantId: String
13+
roomNumber: Int
14+
arrival: String
15+
password: String
16+
): Boolean
1217
}
1318
`;
1419

backend/server.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import express from "express";
44

55
import { ApolloServer } from "apollo-server-express";
66
import schema from "./graphql";
7+
78
const CORS_ALLOW_LIST = [
89
"http://localhost:3000",
910
"https://uw-blueprint-starter-code.firebaseapp.com",

backend/services/implementation/announcementImplementation.ts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
import IAnnouncementService from "../interface/announcementInterface";
2-
3-
class AnnouncementService implements IAnnouncementService {
4-
5-
}
6-
7-
export default IAnnouncementService;
8-
91
// import prisma from "../../prisma";
102
// import INotificationService, {
113
// NotificationDTO,
@@ -546,4 +538,4 @@ export default IAnnouncementService;
546538
// // }
547539
// }
548540

549-
// export default NotificationService;
541+
// export default NotificationService;

backend/services/implementation/miscImplementation.ts

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,33 @@ import prisma from "../../prisma";
22
import IMiscService from "../interface/miscInterface";
33

44
class MiscService implements IMiscService {
5-
async getAvailableRooms(): Promise<number[]> {
6-
try {
7-
const today = new Date();
8-
const rooms = await prisma.participant.findMany({
9-
where: {
10-
OR: [
11-
{ departure: null },
12-
{ departure: { gte: today.toISOString() } },
13-
]
14-
},
15-
select: {
16-
roomNumber: true
17-
}
18-
});
19-
const occupiedRooms = new Set(rooms.map(room => room.roomNumber));
20-
const availableRooms: number[] = [];
21-
for (let room = 1; room <= 10; room++) {
22-
if (!occupiedRooms.has(room)) {
23-
availableRooms.push(room);
24-
}
25-
}
26-
return availableRooms;
27-
} catch (err) {
28-
console.log(err);
29-
throw err;
5+
async getAvailableRooms(): Promise<number[]> {
6+
try {
7+
const today = new Date();
8+
const rooms = await prisma.participant.findMany({
9+
where: {
10+
OR: [
11+
{ departure: null },
12+
{ departure: { gte: today.toISOString() } },
13+
],
14+
},
15+
select: {
16+
roomNumber: true,
17+
},
18+
});
19+
const occupiedRooms = new Set(rooms.map((room) => room.roomNumber));
20+
const availableRooms: number[] = [];
21+
for (let room = 1; room <= 10; room += 1) {
22+
if (!occupiedRooms.has(room)) {
23+
availableRooms.push(room);
3024
}
25+
}
26+
return availableRooms;
27+
} catch (err) {
28+
console.log(err);
29+
throw err;
3130
}
31+
}
3232
}
3333

3434
export default MiscService;

0 commit comments

Comments
 (0)