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

Iris: Answer questions about lecture slides #8636

Merged
merged 131 commits into from
Jun 22, 2024
Merged
Changes from 1 commit
Commits
Show all changes
131 commits
Select commit Hold shift + click to select a range
afa41c5
Ingestion Pipeline with status callback
yassinsws May 15, 2024
662a429
erase pyris status update dto because not used and will not be used
yassinsws May 15, 2024
cbcc0b3
Merge changes and make a button for admins to enable ingestion
yassinsws May 19, 2024
269cbb8
Merge remote-tracking branch 'origin/develop' into feature/iris/Final…
yassinsws May 19, 2024
b70e198
Add a longer timerout for the Job webhook Job
yassinsws May 20, 2024
819a355
Erase console logs
yassinsws May 20, 2024
11c9c02
Implement PR review remarks by timor. And change Lecture ingestion en…
yassinsws May 27, 2024
5539de0
Add a new Iris Subsettings
yassinsws May 27, 2024
3ccd29f
Change pyris webhook service to optional
yassinsws May 27, 2024
2d83e14
Fix tests
yassinsws May 27, 2024
cab46bf
Fix tests
yassinsws May 27, 2024
a454bad
Update src/main/webapp/app/entities/iris/settings/iris-sub-settings.m…
yassinsws May 27, 2024
ba90c2f
Update src/main/webapp/i18n/de/iris.json
yassinsws May 27, 2024
58c2814
rollback file
yassinsws May 27, 2024
73cb821
Update src/main/java/de/tum/in/www1/artemis/domain/iris/settings/Iris…
yassinsws May 27, 2024
2357431
Typo
yassinsws May 27, 2024
24b416e
fix typo
yassinsws May 27, 2024
f67cfc1
Fix failing tests
yassinsws May 28, 2024
33805d0
Make server tests
yassinsws May 28, 2024
3499242
Make Ingestion server tests on PyrisLectureIngestionTest
yassinsws May 28, 2024
b39d193
Erase test from LectureUnitIntegrationTest because mover to PyrisLect…
yassinsws May 28, 2024
81908d8
Test should not be public
yassinsws May 28, 2024
4a9fa5d
Split process attachments to two units
yassinsws May 29, 2024
ab19f57
Fix tests
yassinsws May 29, 2024
727ec1d
Merge branch 'develop' into feature/iris/FinalIngestionBranch
bassner May 30, 2024
9e7f4bc
erase where discriminator equals null to make tests pass ?
yassinsws May 30, 2024
37ce242
Merge remote-tracking branch 'origin/feature/iris/FinalIngestionBranc…
yassinsws May 30, 2024
0120624
revert migration file
yassinsws May 30, 2024
446c756
Erase PyrisLectureIngestionTest.java to locate the error
yassinsws May 30, 2024
8c9966e
Fix Pyris tests
yassinsws May 30, 2024
c247ac7
Fix Migration
yassinsws May 30, 2024
df06b54
Max review: Refractoring
yassinsws Jun 1, 2024
f70fdab
Max review: Refractoring
yassinsws Jun 1, 2024
6c7279a
liquibase file update
yassinsws Jun 1, 2024
ff25fac
Refractoring the class to test
yassinsws Jun 1, 2024
8417aec
Merge remote-tracking branch 'origin/develop' into feature/iris/Final…
yassinsws Jun 1, 2024
5305f8f
update PyrisStageState
yassinsws Jun 1, 2024
4cbbc7a
Fix style error
yassinsws Jun 1, 2024
7a62922
Merge branch 'develop' into feature/iris/FinalIngestionBranch
MaximilianAnzinger Jun 3, 2024
3711009
Kaan Review, refractor
yassinsws Jun 3, 2024
f869219
Merge remote-tracking branch 'origin/feature/iris/FinalIngestionBranc…
yassinsws Jun 3, 2024
c1081cc
Merge branch 'develop' into feature/iris/FinalIngestionBranch
yassinsws Jun 3, 2024
23e353c
change NON_EMPTY TO NON_NULL
yassinsws Jun 3, 2024
ebcf922
Revert "change NON_EMPTY TO NON_NULL"
yassinsws Jun 3, 2024
8aee2ed
Merge branch 'develop' into feature/iris/FinalIngestionBranch
yassinsws Jun 3, 2024
e1381e1
change var to Explicit declaration
yassinsws Jun 3, 2024
eac031c
Merge branch 'develop' into feature/iris/FinalIngestionBranch
yassinsws Jun 3, 2024
9c2d08e
Merge remote-tracking branch 'origin/feature/iris/FinalIngestionBranc…
yassinsws Jun 3, 2024
adaf00e
Merge remote-tracking branch 'origin/feature/iris/FinalIngestionBranc…
yassinsws Jun 3, 2024
1d646d1
log error instead of throwing it.
yassinsws Jun 3, 2024
e8d37dd
Merge branch 'develop' into feature/iris/FinalIngestionBranch
yassinsws Jun 3, 2024
a2058af
log error instead of throwing it.
yassinsws Jun 4, 2024
41a6028
Refractor code + add new tests
yassinsws Jun 5, 2024
20ea20d
Merge branch 'develop' into feature/iris/FinalIngestionBranch
yassinsws Jun 5, 2024
4d6b5db
remove public from tests
yassinsws Jun 5, 2024
8926633
Merge remote-tracking branch 'origin/feature/iris/FinalIngestionBranc…
yassinsws Jun 5, 2024
87ef5ca
nullpointer exception edge case
yassinsws Jun 5, 2024
5593633
Merge remote-tracking branch 'origin/develop' into feature/iris/Final…
yassinsws Jun 5, 2024
9129e52
Solve merge conflicts
yassinsws Jun 5, 2024
8acb377
Merge branch 'develop' into feature/iris/FinalIngestionBranch
yassinsws Jun 5, 2024
abd7164
Fix server tsts
yassinsws Jun 6, 2024
cfa76b1
Merge branch 'develop' into feature/iris/FinalIngestionBranch
bassner Jun 7, 2024
48b86a1
merge and make files only get sent to pyris when the are in pdf format
yassinsws Jun 7, 2024
c356f73
Merge remote-tracking branch 'origin/feature/iris/FinalIngestionBranc…
yassinsws Jun 8, 2024
4890abb
do not need a discriminator migration
yassinsws Jun 8, 2024
3561567
Add try catch Block to Ingestion
yassinsws Jun 8, 2024
f954a46
Add lecture ingestion settings, only ingest if auto ingestion is enab…
yassinsws Jun 9, 2024
af73012
merge
yassinsws Jun 9, 2024
1b8d239
lint
yassinsws Jun 9, 2024
6850710
Add send lectures automatically to iris button
yassinsws Jun 10, 2024
2fe1e17
always try to erase the course from pyris
yassinsws Jun 10, 2024
a47a269
Merge branch 'develop' into feature/iris/FinalIngestionBranch
yassinsws Jun 10, 2024
ccbb64b
erase PyrisIngestionState for now
yassinsws Jun 10, 2024
1e513b0
Add 2 client test for send lecture button
yassinsws Jun 10, 2024
2013c97
Add client tests for iris-settings-update-component
yassinsws Jun 10, 2024
91388d9
Merge branch 'develop' into feature/iris/FinalIngestionBranch
yassinsws Jun 10, 2024
681c459
refractoring
yassinsws Jun 10, 2024
66d89f3
Merge remote-tracking branch 'origin/feature/iris/FinalIngestionBranc…
yassinsws Jun 10, 2024
484742a
fix failing test
yassinsws Jun 10, 2024
8b21932
better error message
yassinsws Jun 10, 2024
4287dcd
Add checks for pdf files in the test
yassinsws Jun 11, 2024
750761c
Add test for ingest all button
yassinsws Jun 11, 2024
12a6b07
Add test for executeLectureWebhook
yassinsws Jun 11, 2024
7e7be0c
Add test for lecture autoingestion
yassinsws Jun 11, 2024
4802603
Add test for lecture autoingestion
yassinsws Jun 11, 2024
1efd1d5
Merge branch 'develop' into feature/iris/FinalIngestionBranch
yassinsws Jun 11, 2024
2f7c70a
Refractor for tests
yassinsws Jun 11, 2024
1708f9a
Merge remote-tracking branch 'origin/feature/iris/FinalIngestionBranc…
yassinsws Jun 11, 2024
5997f37
Refractor for tests
yassinsws Jun 11, 2024
c3772f2
Add tests exceptions in ingestion job
yassinsws Jun 11, 2024
7d848d6
Erase Pyris state ingestion for now
yassinsws Jun 11, 2024
bc02ef9
Actualise change-set id
yassinsws Jun 12, 2024
1cc43fa
Reset database migration for now
yassinsws Jun 12, 2024
965aacc
refractor
yassinsws Jun 12, 2024
d4d6f82
refractor
yassinsws Jun 12, 2024
a8df13c
reset the liquibase file
yassinsws Jun 12, 2024
c122cb3
fix database migration for ts5?
yassinsws Jun 13, 2024
5c0eb06
fix database migration for ts5
yassinsws Jun 13, 2024
439e06c
reset database migration to the latest state
yassinsws Jun 13, 2024
fb353e0
add enable and diable send lectures to Iris when user is admin
yassinsws Jun 14, 2024
5cace0f
Add proper logging for the ingestion phases
yassinsws Jun 14, 2024
68a411f
Merge branch 'develop' into feature/iris/FinalIngestionBranch
yassinsws Jun 14, 2024
8a08433
Added Logging when lecture sent to Pyris.
yassinsws Jun 14, 2024
0f9d9dc
Merge branch 'develop' into feature/iris/FinalIngestionBranch
yassinsws Jun 14, 2024
05b636e
Handle Kaans' error, null pointer exception with getLecture ingestion
yassinsws Jun 14, 2024
2a9db64
Merge remote-tracking branch 'origin/feature/iris/FinalIngestionBranc…
yassinsws Jun 14, 2024
438b3c5
Implement kaans feedback, for the create lecture button to only appea…
yassinsws Jun 14, 2024
fcaea9c
refractor
yassinsws Jun 14, 2024
ee439da
add client tests
yassinsws Jun 14, 2024
8f4e7e8
Feature/iris/add button to ingest one lecture (#8796)
yassinsws Jun 15, 2024
cac1c77
Merge branch 'develop' into feature/iris/FinalIngestionBranch
yassinsws Jun 15, 2024
7bdabac
refractor
yassinsws Jun 15, 2024
a515280
Add client tests
yassinsws Jun 15, 2024
14b0c00
erase one client test
yassinsws Jun 15, 2024
411dff5
ADD CLIENT TEST FOR INGEST LECTURES IN PYRIS
yassinsws Jun 15, 2024
5e0a034
ADD CLIENT TEST FOR INGEST LECTURES IN PYRIS
yassinsws Jun 15, 2024
9d80cbb
Fix inconsitency in method send lectures to iris
yassinsws Jun 15, 2024
9197076
Fix test
yassinsws Jun 15, 2024
4bcc6f3
Add tests for client side
yassinsws Jun 15, 2024
ca3f0c9
Merge branch 'develop' into feature/iris/FinalIngestionBranch
yassinsws Jun 16, 2024
787a7a3
Apply suggestions from code review
yassinsws Jun 16, 2024
a34e46e
inject irisSettingsRepository as dependency and refractor code
yassinsws Jun 16, 2024
043fdb9
Update src/test/java/de/tum/in/www1/artemis/iris/PyrisLectureIngestio…
yassinsws Jun 16, 2024
1b4752a
inject irisSettingsRepository as dependency and refractor code
yassinsws Jun 16, 2024
f7ee13a
Merge remote-tracking branch 'origin/feature/iris/FinalIngestionBranc…
yassinsws Jun 16, 2024
6cc7b2f
merge
yassinsws Jun 16, 2024
31d5698
Merge branch 'develop' into feature/iris/FinalIngestionBranch
yassinsws Jun 17, 2024
80471ed
Merge branch 'develop' into feature/iris/FinalIngestionBranch
yassinsws Jun 18, 2024
98b275d
Merge branch 'develop' into feature/iris/FinalIngestionBranch
yassinsws Jun 19, 2024
e942dcd
Merge branch 'develop' into feature/iris/FinalIngestionBranch
bassner Jun 21, 2024
735e529
Merge branch 'develop' into feature/iris/FinalIngestionBranch
yassinsws Jun 21, 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
Prev Previous commit
Next Next commit
Merge branch 'develop' into feature/iris/FinalIngestionBranch
yassinsws authored Jun 3, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit c1081cc0535a5a00a53f76b26c0d1e3db4c2bf52

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.