Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
14a0544
Tweaked CICD, removed husky, removed fly deployment
dogezen Oct 21, 2024
c5812af
Merge remote-tracking branch 'upstream/main'
dogezen Oct 24, 2024
39a987c
setting up Jasmine testing. First step in ensuring the pipeline will …
VictorsCodingCorner Oct 28, 2024
3d2add5
First untested version of an implementation for comments on posts.
OliverLundhAndersson Oct 28, 2024
5388277
updated prisma to work in accordance to the api spec
Badde00 Oct 29, 2024
b63509c
Removal of ";" i multiple files
OliverLundhAndersson Oct 29, 2024
9c33731
Removal of "," i multiple files and adjustments to match prettier
OliverLundhAndersson Oct 29, 2024
8498242
Added migration for comments
OliverLundhAndersson Oct 29, 2024
a84f821
Updated prisma model for Cohort. Added list of Cohorts to User model
Oct 29, 2024
a2c6485
Updated API spec to relfect cohort model changes
Oct 29, 2024
92c29f9
Added Cohort to User model in Api spec
Oct 29, 2024
22c9d38
Almost finished, the one thing remaining is to get the correct profil…
LudwigJL Oct 29, 2024
0e52e97
Updated openapi.yml to include API endpoints for comments
OliverLundhAndersson Oct 29, 2024
de15321
Updated seed.js to include dummy data for comments.
OliverLundhAndersson Oct 29, 2024
8d98a00
Merge pull request #8 from boolean-uk/comments
OliverLundhAndersson Oct 29, 2024
9a64f4f
Merge branch 'main' of github.com:boolean-uk/team-dev-server-ex-2410-…
Oct 29, 2024
eda3d0d
Merge branch 'main' of github.com:boolean-uk/team-dev-server-ex-2410-…
Badde00 Oct 29, 2024
4ed88fa
tried to fix merge comments
Badde00 Oct 29, 2024
f824d97
Merge branch 'main' of github.com:boolean-uk/team-dev-server-ex-2410-…
sebgro98 Oct 29, 2024
faf5506
updated actions/checkout to v4
sebgro98 Oct 29, 2024
e5db18e
Merge pull request #18 from boolean-uk/comments-api-spec
sebgro98 Oct 29, 2024
2c1246b
Merge branch 'main' of github.com:boolean-uk/team-dev-server-ex-2410-…
Oct 29, 2024
0b9f850
start of implementation
FelixMathiasson Oct 29, 2024
9021791
Merge pull request #16 from boolean-uk/32-update-prisma-to-represent-…
sebgro98 Oct 29, 2024
3f99720
mege conflicts
sebgro98 Oct 29, 2024
07ce118
Merge pull request #11 from boolean-uk/Setting-up-Automated-testing-B…
sebgro98 Oct 29, 2024
1e3f900
Merge pull request #14 from boolean-uk/9-backend-design-cohort-update…
Badde00 Oct 29, 2024
d75a691
added update function
FelixMathiasson Oct 29, 2024
2defdf5
fixed faulty url
FelixMathiasson Oct 29, 2024
8a216c9
Added function to getAll and create a cohort
Oct 29, 2024
a9e78ae
finally it works, just how user got dealt the data
FelixMathiasson Oct 29, 2024
41c5d03
updated the seed.js and added a new migration for updating the cohort…
sebgro98 Oct 29, 2024
63ba8b4
Solved the Profile issue with include, I believe everything should be…
LudwigJL Oct 29, 2024
e825966
post domain ready for review
LudwigJL Oct 30, 2024
f13d951
updated the schema with @default tags on post and cohort
sebgro98 Oct 30, 2024
f1e3973
fixed white lines
sebgro98 Oct 30, 2024
381c377
Updated the route and description i openapi.yml for GET comments
OliverLundhAndersson Oct 30, 2024
1df6944
Merge branch 'main' locally, have resolved all merge conflicts
LudwigJL Oct 30, 2024
9a6e30b
Merge pull request #23 from boolean-uk/22-fix-seedjs-and-add-migrate-…
sebgro98 Oct 30, 2024
d6dac91
Merge pull request #26 from boolean-uk/24-update-prisma-schema-so-tha…
sebgro98 Oct 30, 2024
a44f49f
Merge branch 'main' of github.com:boolean-uk/team-dev-server-ex-2410-…
Oct 30, 2024
8e1dd29
Added CRUD in domain cohort object
Oct 30, 2024
759144f
Add CRUD routes for cohorts
Oct 30, 2024
501e6ed
Added controller for cohort
Oct 30, 2024
8e9c1db
Lint fix based on Github action result
Oct 30, 2024
77f8161
Merge branch 'main' of github.com:boolean-uk/team-dev-server-ex-2410-…
sebgro98 Oct 30, 2024
31aa0a5
fixed id issue
FelixMathiasson Oct 30, 2024
8f61e50
Merge pull request #19 from boolean-uk/comments-dummy-data
sebgro98 Oct 30, 2024
ea8885b
Merge branch 'main' of github.com:boolean-uk/team-dev-server-ex-2410-…
sebgro98 Oct 30, 2024
6567bdb
Merge pull request #27 from boolean-uk/API-spec-comment-bugfix
sebgro98 Oct 30, 2024
cbc1c5c
Merge conflict solved
LudwigJL Oct 30, 2024
7805dcf
Merge branch 'main' of github.com:boolean-uk/team-dev-server-ex-2410-…
Oct 30, 2024
29f9708
Changed status code from 201 to 200 when returning from getById
Oct 30, 2024
88bb02b
Updating what is being return in the user object when adding user to …
Oct 30, 2024
6b7bfd3
Removed migrations.sql
LudwigJL Oct 30, 2024
f55fba3
Updated API spec
Oct 30, 2024
5498387
API spec was bugging. Should be fixed
Oct 30, 2024
eb78310
Updated API spec to include new cohort endpoints
Oct 30, 2024
83a6148
added user test and coverage form the coverage branch
VictorsCodingCorner Oct 30, 2024
a151f30
Merge pull request #31 from boolean-uk/4-create-the-objects-user-post
sebgro98 Oct 30, 2024
d4b83cd
User.spec tests implemented. Test coverage disabeld
VictorsCodingCorner Oct 30, 2024
9a4efb2
Merge pull request #32 from boolean-uk/10-user-automated-test
Badde00 Oct 30, 2024
bc05b14
Merge pull request #30 from boolean-uk/21-backend-design-cohort-imple…
Badde00 Oct 30, 2024
f8456e3
fixed permissions in PUT update user
FelixMathiasson Oct 30, 2024
6ecb8e0
Merge branch 'main' of https://github.com/boolean-uk/team-dev-server-…
FelixMathiasson Oct 30, 2024
e375120
solved the bug with failing constantly
FelixMathiasson Oct 30, 2024
d6aa38f
removed log output
FelixMathiasson Oct 30, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .dockerignore

This file was deleted.

5 changes: 0 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
name: CI
on: [push, pull_request]
env:
DATABASE_URL: ${{ secrets.DATABASE_URL }}
JWT_TOKEN: ${{ secrets.JWT_TOKEN }}
JWT_EXPIRY: ${{ secrets.JWT_EXPIRY }}
jobs:
test:
runs-on: ubuntu-latest
Expand All @@ -14,4 +10,3 @@ jobs:
node-version: 'lts/*'
- run: npm ci
- run: npx eslint src
- run: npx prisma migrate reset --force --skip-seed
21 changes: 0 additions & 21 deletions .github/workflows/deploy.yml

This file was deleted.

39 changes: 39 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Run Jasmine Tests

on:
push:
branches: [ main ]
pull_request:
branches: [ main ]

jobs:
test:
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Set up Node.js
uses: actions/setup-node@v3
with:
node-version: '20'

- name: Install dependencies
run: npm install

- name: Install Jasmine
run: npm install jasmine --save-dev

- name: Initialize Jasmine
run: npx jasmine init

- name: Run tests with coverage
run: npm run test:coverage

- name: Upload coverage report
if: success()
uses: actions/upload-artifact@v3
with:
name: coverage-report
path: coverage
4 changes: 0 additions & 4 deletions .husky/pre-commit

This file was deleted.

36 changes: 0 additions & 36 deletions Dockerfile

This file was deleted.

Loading