Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/interview timeslots #25

Merged
merged 56 commits into from
May 30, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
5ffb921
add: relations between User, Availabilities
whiitex May 1, 2024
ce9dd19
fix: entity (recsess, user, timeslot, avail)
whiitex May 14, 2024
90ebd95
add: find available time slots functionality, tested
whiitex May 19, 2024
2718207
Merge branch 'dev' of https://github.com/MuNuChapterHKN/HKrecruitment…
whiitex May 19, 2024
59c3f48
fix: previous simplification for dev
whiitex May 19, 2024
74b0d00
format
whiitex May 19, 2024
019f24a
fix: minor
whiitex May 19, 2024
dc04c2f
fix: minor 2
whiitex May 19, 2024
71c66ed
fix: minor 3
whiitex May 19, 2024
2050e01
add: test 2e2
whiitex May 19, 2024
4602a26
format
whiitex May 19, 2024
d034c33
fix: sql errors
whiitex May 19, 2024
127c223
fix: sql error 2
whiitex May 19, 2024
cd72909
format
whiitex May 19, 2024
520a1f4
fix: minor
whiitex May 19, 2024
3a8c0d2
fix: 2
whiitex May 19, 2024
50533c5
fix: 3
whiitex May 19, 2024
682b5b8
fix 4
whiitex May 19, 2024
d7dd6c3
fix: 6
whiitex May 19, 2024
2154316
fix: 5
whiitex May 19, 2024
fc00fc5
fix: 7
whiitex May 19, 2024
5aa5400
fix: 8
whiitex May 19, 2024
23ffd9e
fix: 8
whiitex May 19, 2024
395a321
fix: 9
whiitex May 19, 2024
dd3f63a
format
whiitex May 19, 2024
0c92b3d
fix: 10
whiitex May 19, 2024
aab3bc9
fix: 11
whiitex May 19, 2024
b82b00d
debubg: tests
whiitex May 19, 2024
dff77a4
format
whiitex May 19, 2024
542e5dc
debubg: tests 2
whiitex May 19, 2024
527c65c
debug: test 3
whiitex May 19, 2024
da50afe
format
whiitex May 19, 2024
37729bb
debug: test 4
whiitex May 19, 2024
04656b0
debug: test 5
whiitex May 19, 2024
0596a93
debug: test 6
whiitex May 19, 2024
7351d02
debug: test 7
whiitex May 19, 2024
22522fc
debug: test 8
whiitex May 19, 2024
a4a43ad
debug: test 9
whiitex May 19, 2024
bbb997f
not def
whiitex May 19, 2024
1356a78
not def
whiitex May 19, 2024
4ed9b9d
not def!
whiitex May 19, 2024
7d6690c
fix: pull requested changes
whiitex May 22, 2024
90e0cb5
upd: sonar properties
whiitex May 22, 2024
58dc3f1
test: find available time slotsù
whiitex May 22, 2024
72e2679
fix: format
whiitex May 22, 2024
d8a4b8e
test: improvements
whiitex May 22, 2024
3c82ffa
fix: improve coverage
whiitex May 23, 2024
76bd43c
fix: improve coverage
whiitex May 24, 2024
0e82629
fix: improve coverage
whiitex May 24, 2024
defd47b
fix: improve coverage - format
whiitex May 24, 2024
dad4992
fix: minor
whiitex May 25, 2024
f2f4a4a
fix: formatting comments
whiitex May 25, 2024
87a2eb1
fix: formatting comments
whiitex May 25, 2024
6dd26b6
fix: formatting comments
whiitex May 25, 2024
1afe269
fix: formatting comments
whiitex May 25, 2024
c9c30fb
feat: check ability
whiitex May 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
Next Next commit
add: relations between User, Availabilities
  • Loading branch information
whiitex committed May 1, 2024
commit 5ffb921fa665a7c4fdbb0b8f3ab77aa330da1f35
3 changes: 3 additions & 0 deletions api/src/availability/availability.entity.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import {
Column,
Entity,
JoinColumn,
ManyToOne,
PrimaryGeneratedColumn,
Relation,
Expand All @@ -26,9 +27,11 @@ export class Availability implements AvailabilityInterface {

@DbAwareColumn(() => TimeSlot, { name: 'time_slot' })
@ManyToOne(() => TimeSlot, (timeSlot) => timeSlot.availabilities)
@JoinColumn({ name: 'time_slot' })
timeSlot: Relation<TimeSlot>;

@ManyToOne(() => User, (user) => user.availabilities)
@JoinColumn({ name: 'user_id' })
user: Relation<User>;

// @OneToOne(() => Interview)
Expand Down
8 changes: 7 additions & 1 deletion api/src/recruitment-session/recruitment-session.entity.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
import { Column, Entity, JoinColumn, OneToMany, PrimaryGeneratedColumn } from 'typeorm';
import {
RecruitmentSession as RecruitmentSessionInterface,
RecruitmentSessionState,
} from '@hkrecruitment/shared';
import { TimeSlot } from 'src/timeslots/timeslot.entity';

@Entity()
export class RecruitmentSession implements RecruitmentSessionInterface {
Expand All @@ -29,4 +30,9 @@ export class RecruitmentSession implements RecruitmentSessionInterface {

@Column('date', { name: 'last_modified' })
lastModified: Date;

@OneToMany(() => TimeSlot, (timeSlot) => timeSlot.recruitmentSession)
@JoinColumn({ name: 'time_slots' })
timeSlots: TimeSlot[];

}
8 changes: 8 additions & 0 deletions api/src/timeslots/timeslot.entity.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
import {
Column,
Entity,
JoinColumn,
ManyToOne,
OneToMany,
PrimaryGeneratedColumn,
Relation,
} from 'typeorm';
import { TimeSlot as TimeSlotInterface } from '@hkrecruitment/shared';
import { Availability } from 'src/availability/availability.entity';
import { RecruitmentSession } from 'src/recruitment-session/recruitment-session.entity';

@Entity()
export class TimeSlot implements TimeSlotInterface {
Expand All @@ -20,5 +23,10 @@ export class TimeSlot implements TimeSlotInterface {
end: Date;

@OneToMany(() => Availability, (availability) => availability.timeSlot)
@JoinColumn({ name: 'availabilities' })
availabilities: Relation<Availability[]>;

@ManyToOne(() => RecruitmentSession, (recruitmentSession) => recruitmentSession.timeSlots)
@JoinColumn({ name: 'recruitment_session' })
recruitmentSession: Relation<RecruitmentSession>;
}
4 changes: 3 additions & 1 deletion api/src/users/user.entity.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Column, Entity, OneToMany, PrimaryColumn, Relation } from 'typeorm';
import { Column, Entity, OneToMany, PrimaryColumn, Relation, JoinColumn } from 'typeorm';
import { Person, Role } from '@hkrecruitment/shared';
import { Availability } from 'src/availability/availability.entity';
import Joi from 'joi';

@Entity()
export class User implements Person {
Expand Down Expand Up @@ -29,6 +30,7 @@ export class User implements Person {
role: Role;

@OneToMany(() => Availability, (availability) => availability.user)
@JoinColumn({ name: 'availabilities' })
availabilities?: Relation<Availability[]>;

@Column()
Expand Down