Merge pull request #33 from codam-coding-college/rework

New intra synchronisation design.
Synchronises with API filters.
Updated website interface.
Added login screen.

Now uses SQLite (with prisma) instead of JSON databases.

Author: n-mattos

.gitignore

@@ -4,7 +4,8 @@
 /node_modules/
 /token*.json
 /env/.env
-/database*/
+database/*.db
 /test.ts
 /sessions/
 *.swp
+/prisma/*.db

.prettierrc

@@ -1,5 +1,5 @@
 {
-	"semi": false,
+	"semi": true,
 	"singleQuote": true,
 	"bracketSameLine": true,
 	"printWidth": 180,

Dockerfile

@@ -1,17 +1,37 @@
 FROM node:18-alpine
 
-WORKDIR /app
+# Install build dependencies and fix distutils in one layer
+RUN apk add --no-cache python3 make g++ py3-setuptools py3-pip && \
+    ln -sf /usr/lib/python3.12/site-packages/setuptools/_distutils /usr/lib/python3.12/distutils || echo "distutils workaround attempted"
 
-HEALTHCHECK --interval=5s --timeout=10s --start-period=5s --retries=1 CMD wget -q -O - http://localhost:8080/robots.txt
-EXPOSE 8080
+WORKDIR /app
+RUN mkdir -p /app/database
 
-ENV NODE_ENV=production
+# Copy package files first for better caching
 COPY package.json package-lock.json ./
-RUN npm ci --omit=dev
+
+# Install all dependencies and build in fewer layers
+RUN npm ci --ignore-scripts && \
+    npm install --save-dev @types/oauth @types/passport-oauth2 @types/connect-sqlite3 && \
+    npm rebuild
+
+# Copy source files
 COPY . .
-RUN npm run build
 
-RUN rm -rf src
-COPY views ./build/views
+# Build application and clean up in one layer
+RUN npx prisma generate && \
+    npx prisma migrate deploy && \
+    npx prisma db push && \
+    npm run build && \
+    npm prune --omit=dev && \
+    rm -rf src
+
+# Move views to built location
+RUN mv views build/
+
+# Runtime configuration
+ENV NODE_ENV=production
+EXPOSE 8080
+HEALTHCHECK --interval=5s --timeout=10s --start-period=5s --retries=1 CMD wget -q -O - http://localhost:8080/robots.txt
 
 ENTRYPOINT [ "npm", "start" ]

README.md

@@ -9,10 +9,6 @@ This website is meant to help students to find peers that are working on the sam
 
 Also see `./src/env.ts` for more configuration
 
-## Changing listed projects
-- The projects shown on the front page are listed in `./env/projectIDs.json`. Should the curriculum change, you can edit that file. Remember to restart the server and wait for the server to pull all the data from the intra api.
-- A list of all the projects and their corresponding ID in the 42 network (as of march 2022) can be found in `./env/allProjectIDs.json`
-
 ## Updating the secrets / API tokens
 ```shell
 cd find-peers
@@ -25,26 +21,13 @@ docker compose up -d
 docker logs --tail 10000 -f find-peers
 ```
 
-## Monitoring
-At the (unauthenticated) route `/status/pull` you can see a summary of the pull status of every campus
-It contains the key `hoursAgo` for every campus, which is the amount of hours since the last successful pull (syncing the 42 DB of the users' completed projects) of that campus
-This value should not be higher than 2 * the pull timeout (currently 24 hours)
-
 ## Configuration files
 | File path                                    | Description                                                                           | Managed by server |
 |----------------------------------------------|---------------------------------------------------------------------------------------|-------------------|
-| `./env/projectIDs.json`                      | List of all the projects and their corresponding ID to be displayed on the front page | no                |
-| `./env/allProjectIDs.json`                   | List of all projects in the 42 network (as of march 2022)                             | no                |
 | `./env/.env-example`                         | Example file for api tokens, rename to `.env` to activate                             | no                |
-| `./env/campusIDs.json`                       | List of all campuses and their corresponding ID that are fetched from the 42 API      | no                |
-| `./database/`                                | All database files, mount this when running in a docker container                     | yes               |
-| `./database/sessions/`                       | All session files currently active                                                    | yes               |
-| `./database/users.json`                      | Userdata associated with session                                                      | yes               |
-| `./database/<campus_name>/lastpull.txt`      | Unix timestamp when the project users of that campus were last successfully updated   | yes               |
-| `./database/<campus_name>/projectUsers.json` | Status of users for each project                                                      | yes               |
 
 ## Running
-The 'database' of this project is a folder called 'database' at the root of the project.
+The database of this project is in a folder called 'database' at the root of the project.
 
 ### Docker and Docker-compose
 This is in production
@@ -61,5 +44,9 @@ docker logs --tail 10000 -f find-peers
 - Install Nodejs >= 18.x
 - Install dependencies\
 `npm install`
+- Generate prisma client
+`npx prisma generate`
+- Push schema directly
+`npx prisma db`
 - Start development server\
 `npm run dev`

docker-compose.yaml

@@ -25,8 +25,8 @@ services:
     environment:
       - PORT=8080
     ports:
-      - 80:8080
-      # - 8080:8080
+      - 8080:8080
+      # - 80:8080
 
   watchtower:
     container_name: watchtower

env/.env-example

@@ -21,9 +21,3 @@ USERAUTH_CALLBACK_URL=https://example.com/auth/42/callback
 
 SYNC_UID=
 SYNC_SECRET=
-
-# Rate limiter, you can find this number on in the line "Your application has a secondly rate limit set at " on the application page
-SYNC_MAX_REQUESTS_PER_SECOND=
-
-# DataDog API key, used for logging metrics
-DD_API_KEY=