Skip to content
Snippets Groups Projects
Commit 82d6956b authored by thijsheijden's avatar thijsheijden
Browse files

Squashed commit of the following:

commit 3c7e5d6ca3bd9eca99cb8455c0a3b83d5b82f3fd
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Tue Feb 1 09:49:32 2022 +0100

    uncommented cypher

commit e7ee7293bee3d7b55842524852a5be566c9c90b0
Merge: 2b75479 c5faca7
Author: Gaalen,K. van (Kieran) <k.vangaalen@students.uu.nl>
Date:   Mon Jan 31 14:15:04 2022 +0000

    Merge branch 'Updated-Readme' into 'develop'

    Updated readme

    See merge request GravenvanPolaris/query-conversion!18

commit c5faca711999365ead4c157177b43ffe54d36cd1
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Mon Jan 31 14:37:33 2022 +0100

    Added license

commit 75cf5dd70aa5170a338443b4d9789183a7f2689d
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Mon Jan 31 14:31:03 2022 +0100

    Updated Readme

commit 2b7547957e684f6220d322d58fcc58030859b0c4
Merge: 25ba2c0 e98daed
Author: Gaalen,K. van (Kieran) <k.vangaalen@students.uu.nl>
Date:   Mon Jan 31 13:27:57 2022 +0000

    Merge branch 'Better-Comments' into 'develop'

    Improved comments

    See merge request GravenvanPolaris/query-conversion!17

commit e98daed8543c4f913f248cd53e0fada83f0ecc02
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Fri Jan 28 12:51:22 2022 +0100

    Removed second pepe

commit f872aaf27ff56f0d048d30caca82fa518b72b25f
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Fri Jan 28 12:46:21 2022 +0100

    Improved comments and made them uniform. Also added explanation of commented out cypher code.

commit 25ba2c05874245751a5f2027b531bfdfb592ea5a
Merge: 10e2500 3a31595
Author: Gaalen,K. van (Kieran) <k.vangaalen@students.uu.nl>
Date:   Mon Jan 24 09:46:04 2022 +0000

    Merge branch 'SPARQL-chaining' into 'develop'

    Added metadata for sparql queries

    See merge request GravenvanPolaris/query-conversion!16

commit 3a315955418c8db45ba92635d0942689268e79b9
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Mon Jan 24 09:38:12 2022 +0100

    Fix metadata for interface

commit 6f7f4c9b8a4343dd6f799fff606c915d593e1d11
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Sat Jan 22 15:48:33 2022 +0100

    Added metadata to sparql

commit 10e2500a03ec79c8eaa7bee6f2fec576d3b54421
Merge: 5bc2e5e eb8e00c
Author: Gaalen,K. van (Kieran) <k.vangaalen@students.uu.nl>
Date:   Sat Jan 22 14:24:28 2022 +0000

    Merge branch 'SPARQL-chaining' into 'develop'

    SPARQL, comments, restructure, bugfixes and tests

    See merge request GravenvanPolaris/query-conversion!15

commit eb8e00cb5fac138988ebf41eb02e5a8c7abdf8ab
Author: Sander <krijt.sander@gmail.com>
Date:   Sat Jan 22 14:11:20 2022 +0100

    Created .gitignore to ingore coverage files and runs coverage and unit tests now for aql, sparql and entity

commit c59b951f93f75022e81a0431d0fef9613c7dd68e
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Fri Jan 21 16:17:55 2022 +0100

    Removed fmt.println

commit 249dec4418071876fcf3f77896406465514fc5e8
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Fri Jan 21 15:48:37 2022 +0100

    Updated readme, added tests, added comments

commit 07311f9e7a372c25e561c33702f3444f41f74de7
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Tue Jan 18 12:39:53 2022 +0100

    Started sparql group bys and fixed two bugs in the AQL group by implementation

commit 5bc2e5e415f73c848fd8153205be246c9773ad61
Merge: 82f8e62 57a11ca
Author: Krijt,T.S. (Sander) <t.s.krijt@students.uu.nl>
Date:   Tue Jan 18 10:51:36 2022 +0000

    Merge branch '960-copyright-disclaimer' into 'develop'

    Added copyright statement to files.

    See merge request GravenvanPolaris/query-conversion!13

commit 57a11ca28175181dbff362d3a9fef80725c00e7c
Author: Sander <krijt.sander@gmail.com>
Date:   Tue Jan 18 11:02:15 2022 +0100

    Added copyright statement to files.

commit 7b5b0bcf6a9ead6b1f0868021a0a6b681851df5d
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Thu Jan 13 11:22:47 2022 +0100

    Moved hierarchy to entity, added chaining for sparql

commit 5f4f4f469cc3dae4d488fbbb6a3ea3bd7d1b8f29
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Thu Jan 13 09:44:51 2022 +0100

    basic structure

commit 3e58f516de1e7db2abed66d42cbf40f2719f7e66
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Thu Jan 13 09:26:11 2022 +0100

    copy-paste base

commit 82f8e6268442f92c6185188c29c980275d653339
Merge: 56d25a0 bfc3bcf
Author: Gaalen,K. van (Kieran) <k.vangaalen@students.uu.nl>
Date:   Thu Dec 23 11:36:05 2021 +0000

    Merge branch 'Different-JSON-Format' into 'develop'

    Added validators and fixed group by nesting

    See merge request GravenvanPolaris/query-conversion!12

commit bfc3bcf295e4b90009861b163b9afd64ddb3db28
Merge: ac9e2c5 56d25a0
Author: Sander <krijt.sander@gmail.com>
Date:   Thu Dec 23 11:55:15 2021 +0100

    Merge branch 'develop' into Different-JSON-Format

commit ac9e2c5cfb658b1659ee41c354eec09d68130bef
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Wed Dec 22 21:20:06 2021 +0100

    Added validator for different nodes added to the same group or by on groupby and validator for incorrect modifiers on group by

commit 56d25a09f1b84b843c27b509675149e7fce6d90a
Merge: 40b8210 44c2fb8
Author: Gaalen,K. van (Kieran) <k.vangaalen@students.uu.nl>
Date:   Wed Dec 22 18:28:42 2021 +0000

    Merge branch '902-unit-testing-pipeline' into 'develop'

    902 unit testing pipeline

    See merge request GravenvanPolaris/query-conversion!11

commit 44c2fb8988c3404d933149f521b1be4f9f32e0dd
Author: Krijt,T.S. (Sander) <t.s.krijt@students.uu.nl>
Date:   Wed Dec 22 18:28:42 2021 +0000

    902 unit testing pipeline

commit ba313e3022c08eddf9cdf74c5541e6da9ddbbbb6
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Wed Dec 22 19:18:22 2021 +0100

    Fixed group by nesting not getting proper by type. Added test for this.

commit 40b8210aaddf5cfe4688fad0bcaca12a4815bc7a
Merge: 57592a3 6b8b43b
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Wed Dec 22 17:07:27 2021 +0100

    Merge branch 'develop' of git.science.uu.nl:GravenvanPolaris/query-conversion into develop

commit 57592a36f561a793dcecf3ef7f4c9eea47c46244
Merge: 7cba104 aab893f
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Wed Dec 22 17:06:18 2021 +0100

    Merge branch 'Different-JSON-Format' into develop

commit aab893f0e9dca74303c852cf94530771e18318d4
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Wed Dec 22 17:05:58 2021 +0100

    Updated comments

commit 6b8b43b32e7a6a2c7febc400b579209d14a5cc31
Merge: 7cba104 c577790
Author: Geurtjens,D. (Douwe Geurtjens) <d.geurtjens@students.uu.nl>
Date:   Tue Dec 21 17:01:26 2021 +0000

    Merge branch 'Different-JSON-Format' into 'develop'

    More tests and more coverage. Removed impossible to reach if statements

    See merge request GravenvanPolaris/query-conversion!9

commit c5777904bccbe4c92b41238a3fa4a58f00357292
Author: Gaalen,K. van (Kieran) <k.vangaalen@students.uu.nl>
Date:   Tue Dec 21 17:01:25 2021 +0000

    More tests and more coverage. Removed impossible to reach if statements

commit eb4b0df9d21fd2f88e5277af116cff2810a1054a
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Tue Dec 21 18:00:32 2021 +0100

    Replaced panic with errors

commit 7f18b22aba8ee2dd2537f81eba07c67cd03cb95d
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Tue Dec 21 16:35:00 2021 +0100

    More tests and more coverage. Removed impossible to reach if statements

commit 7cba10457746dd2b34ea7f193bb614843711a88b
Merge: 8f8e1a1 a0910ac
Author: Gaalen,K. van (Kieran) <k.vangaalen@students.uu.nl>
Date:   Tue Dec 21 12:28:16 2021 +0000

    Merge branch 'Different-JSON-Format' into 'develop'

    Fixed incorrect use of groupbymap in hierarchy and groupbyvalidator validating...

    See merge request GravenvanPolaris/query-conversion!7

commit a0910ac934a8a4c4b557c9b6dcb65535635b267c
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Tue Dec 21 12:10:13 2021 +0100

    Fixed incorrect use of groupbymap in hierarchy and groupbyvalidator validating relations instead of group bys

commit 8f8e1a1af7c6d030db53b12bcdbe83219cf31cb5
Merge: dd20364 742952f
Author: Gaalen,K. van (Kieran) <k.vangaalen@students.uu.nl>
Date:   Fri Dec 17 12:24:11 2021 +0000

    Merge branch 'Different-JSON-Format' into 'develop'

    Group by to develop

    See merge request GravenvanPolaris/query-conversion!6

commit 742952f8d2e11ee1544d86c49a389046b8eb5e0b
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Fri Dec 17 13:06:48 2021 +0100

    Validator now in interface (required some rework to the hierarchy structs)

commit ff24b11d06b757447001060e3a2bbacc8c0251e1
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Fri Dec 17 11:58:48 2021 +0100

    FixIndices to entity, seperateChain returns an error now, treeList json now has appropriate name, added float possibility for constraint, seperated test inputs and outputs into seperate files, removed unneeded files, added UU comment above every file.

commit 9cccac9a3dad5e39825787aa77b1221111b4bc15
Merge: 29a84a7 dd20364
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Thu Dec 16 16:23:40 2021 +0100

    Merge branch 'develop' into Different-JSON-Format

    Killed cypher, added tests and fixed merge conflicts

commit 29a84a77cd807439a519cf46d29d38be2804cc7f
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Tue Dec 14 15:59:28 2021 +0100

    Fixed and added tests for query conversion and hierarchy

commit 114da74c50d6cbc65d6592abaa2ee0fcbff28eef
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Thu Dec 9 14:57:33 2021 +0100

    Fixed existing convertquery tests

commit 667b9f898915510cff200e9f9c6a1ee52da7e4ce
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Thu Dec 9 11:54:15 2021 +0100

    Implemented group by, todo: qa

commit 7d6b6ed01ed423ebedab3f0f397c46cc30f382c6
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Tue Dec 7 16:20:43 2021 +0100

    Almost done implementing final group by, still todo: fix final return, fix final return if groupby, fix any bugs

commit 1cdda6cebffbde1f38a083ea1d304af0a1ecd29c
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Tue Dec 7 12:13:12 2021 +0100

    Removed unneeded comments

commit 14b9c2679f4df40a6ca7784370d5872f06543859
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Tue Dec 7 12:12:20 2021 +0100

    New hierarchy for new query struct. Also changed the testing json

commit 64d30c53b2c4a2af926ccb0f99e6e6ba948d9927
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Tue Nov 30 16:03:44 2021 +0100

    Test fixes

commit 41ad033be360c69735be11cdb73c4502a01577ea
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Tue Nov 30 12:14:24 2021 +0100

    id != index

commit 2b3c8de99af7d723bcdf5bac9f65a24284dd47ac
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Tue Nov 30 11:52:08 2021 +0100

    Fixed incorrect or in querystructvalidator

commit 2ef3360bb3f034627107dfbaeac74e225441f11c
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Tue Nov 30 11:26:43 2021 +0100

    Implemented nesting (QA Needed)

commit dd20364b2fa83c5241f489613b6a4704520cbbb9
Merge: bab97cb0 8e0b2530
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Mon Nov 29 13:25:15 2021 +0100

    Merge branch 'main' of https://git.science.uu.nl/graphpolaris/query-conversion into develop

    # Conflicts:
    #	cypher/convertQuery.go
    #	cypher/convertQuery_test.go
    #	cypher/createConstraints.go
    #	entity/queryStruct.go
    #	interface.go

commit bab97cb0
Merge: 67763da6 a4049969
Author: Geurtjens,D. (Douwe Geurtjens) <d.geurtjens@students.uu.nl>
Date:   Mon Nov 29 08:48:43 2021 +0000

    Merge branch 'Better-Error-Handling' into 'develop'

    Better error handling and beter seperation for clean code architecture

    See merge request GravenvanPolaris/query-conversion!1

commit a4049969
Author: Geurtjens,D. (Douwe Geurtjens) <d.geurtjens@students.uu.nl>
Date:   Mon Nov 29 08:48:43 2021 +0000

    Better error handling and beter seperation for clean code architecture

commit 67763da6
Merge: 81a9f816 fedf3d4e
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Tue Nov 23 14:28:40 2021 +0100

    Merge branch 'Frontend-Merge' into develop

commit fedf3d4e
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Tue Nov 23 14:28:10 2021 +0100

    math does not exists in golang

commit 763e8eb3
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Tue Nov 23 14:03:48 2021 +0100

    All tests fixed

commit 70e4c807
Merge: dcf60dc9 39586f96
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Tue Nov 23 13:55:53 2021 +0100

    Merge branch 'Frontend-Merge' of https://git.science.uu.nl/GravenvanPolaris/query-conversion into Frontend-Merge

commit dcf60dc9
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Tue Nov 23 13:55:45 2021 +0100

    Fixing tests

commit 39586f96
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Tue Nov 23 13:55:39 2021 +0100

    Half tests fixed

commit 60cbd81f
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Tue Nov 23 13:41:44 2021 +0100

    Fix id != index

commit 0b73904a
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Tue Nov 23 13:12:46 2021 +0100

    Validator fix

commit a2a1e007f9af29598929c1009b3bd610d1c95be3
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Thu Nov 18 14:53:09 2021 +0100

    Started query nesting

commit 81a9f816
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Wed Nov 17 14:59:18 2021 +0100

    No pipeline needed for this package

commit aaafb923
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Wed Nov 17 14:09:32 2021 +0100

    Created a validator for JSON format, improved unit-testing

commit 12e74013
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Tue Nov 16 12:09:22 2021 +0100

    Implemented modifiers

commit ae78d1f7
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Tue Nov 16 10:11:27 2021 +0100

    pipeline config

commit 1ecc63ab
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Mon Nov 15 13:56:45 2021 +0100

    Empty queries now generate a default response, many unit tests changed/rewritten. 77.2% coverage

commit 41712e3e
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Fri Nov 12 16:35:02 2021 +0100

    Slight JSON change, now has all member of a party added unconditionally.

commit de2a4004
Merge: 0e17ac0a 41cf4778
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Fri Nov 12 16:06:55 2021 +0100

    Merge branch 'Different-JSON-Format' of https://git.science.uu.nl/GravenvanPolaris/query-conversion into Different-JSON-Format

    # Conflicts:
    #	aql/convertQuery.go
    #	realtest.json

commit 0e17ac0a
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Fri Nov 12 16:04:30 2021 +0100

    Hierarchy unit test fixed

commit 41cf4778
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Fri Nov 12 16:01:59 2021 +0100

    indentation and query fixes

commit da8b880b
Merge: 3cd4555d ec3e24de
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Fri Nov 12 14:59:31 2021 +0100

    Merge branch 'Different-JSON-Format' of https://git.science.uu.nl/GravenvanPolaris/query-conversion into Different-JSON-Format

commit 3cd4555d
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Fri Nov 12 14:59:19 2021 +0100

    test with constraints (magic geert query)

commit ec3e24de
Merge: 06b04102 105f47c1
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Fri Nov 12 14:55:43 2021 +0100

    Merge branch 'Different-JSON-Format' of https://git.science.uu.nl/GravenvanPolaris/query-conversion into Different-JSON-Format

commit 06b04102
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Fri Nov 12 14:55:36 2021 +0100

    Replaced old convertQuery with new convertQuery, fixed parent -1 giving index out of range

commit 105f47c1
Merge: 7a8ca960 e3377d84
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Fri Nov 12 14:31:27 2021 +0100

    Merge branch 'Different-JSON-Format' of https://git.science.uu.nl/GravenvanPolaris/query-conversion into Different-JSON-Format

commit 7a8ca960
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Fri Nov 12 14:31:12 2021 +0100

    Functioning recursive hierarchy woopwooop

commit e3377d84
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Fri Nov 12 14:20:57 2021 +0100

    converQuery2 now works with hierarchy

commit 0d49f56e
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Fri Nov 12 14:16:19 2021 +0100

    testing hierarchy recursion

commit b2c6fe20
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Fri Nov 12 13:53:19 2021 +0100

    Fixed topnode, also rip groupby support

commit 6254c569
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Fri Nov 12 13:46:27 2021 +0100

    New convert query

commit 328d7aab
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Fri Nov 12 12:15:09 2021 +0100

    Dirty push for new hierarchy and query chaining

commit 638f7a9e
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Tue Nov 9 14:26:58 2021 +0100

    Quick push new new format

commit 700b62c2
Merge: 038e64a3 20c02ee8
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Tue Nov 9 12:40:05 2021 +0100

    Merge branch '676-Query-Nesting-Development' of https://git.science.uu.nl/GravenvanPolaris/query-conversion into 676-Query-Nesting-Development

commit 038e64a3
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Tue Nov 9 12:39:58 2021 +0100

    Started fixing tests for query conversion

commit 20c02ee8
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Tue Nov 9 12:14:51 2021 +0100

    Clean-code, comment fixes, constants to prevent typos

commit d90b0e95
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Tue Nov 9 11:17:57 2021 +0100

    Clean code fix

commit 6018de41
Merge: 2e02e93d c86d53d5
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Tue Nov 9 10:58:55 2021 +0100

    Merge branch '676-Query-Nesting-Development' of https://git.science.uu.nl/GravenvanPolaris/query-conversion into 676-Query-Nesting-Development

commit 2e02e93d
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Tue Nov 9 10:58:38 2021 +0100

    clean-code halfway, pulling for quick merge to avoid innumerable conflicts

commit c86d53d5
Merge: a97db900 e30c72c5
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Tue Nov 9 10:56:32 2021 +0100

    Merge branch '676-Query-Nesting-Development' of https://git.science.uu.nl/GravenvanPolaris/query-conversion into 676-Query-Nesting-Development

    # Conflicts:
    #	aql/hierarchy.go

commit a97db900
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Tue Nov 9 10:54:09 2021 +0100

    filter chaining

commit e30c72c5
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Tue Nov 9 10:35:38 2021 +0100

    A bunch of publics are now private

commit a695ef61
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Tue Nov 9 10:32:40 2021 +0100

    Hierarchy code duplication reduction

commit 7c6bee0f
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Mon Nov 8 13:27:33 2021 +0100

    Now no longer crashes on empty queries, important fix so query-service microservice can actually run unit-tests

commit c2afb852
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Mon Nov 8 12:25:51 2021 +0100

    Interface edit for Cypher workaround

commit a24241dc
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Mon Nov 8 09:40:40 2021 +0100

    Added ML params to querystruct.go for ML rewrite

commit 6d3fa73a
Merge: 2c65b8ec a3296a74
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Thu Nov 4 14:58:04 2021 +0100

    Merge branch '676-Query-Nesting-Development' of https://git.science.uu.nl/GravenvanPolaris/query-conversion into 676-Query-Nesting-Development

commit 2c65b8ec
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Thu Nov 4 14:57:31 2021 +0100

    Added json for demo

commit b863e734
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Thu Nov 4 14:57:09 2021 +0100

    Chaining and nesting done, some issues remain, these are documented in samenwerken met joris

commit a3296a74
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Thu Nov 4 13:01:25 2021 +0100

    quick fix

commit b97db7c1
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Thu Nov 4 13:00:10 2021 +0100

    new test query

commit 2423acdb
Merge: a282041e cfe2f0ce
Author: Joes <j.dejonge@students.uu.nl>
Date:   Thu Nov 4 12:49:16 2021 +0100

    Merge branch '676-Query-Nesting-Development' of https://git.science.uu.nl/GravenvanPolaris/query-conversion into 676-Query-Nesting-Development

commit a282041e
Author: Joes <j.dejonge@students.uu.nl>
Date:   Thu Nov 4 12:49:11 2021 +0100

    json test data changed

commit cfe2f0ce
Merge: 73c75936 ff0cac99
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Thu Nov 4 12:48:19 2021 +0100

    Merge branch '676-Query-Nesting-Development' of https://git.science.uu.nl/GravenvanPolaris/query-conversion into 676-Query-Nesting-Development

commit 73c75936
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Thu Nov 4 12:48:05 2021 +0100

    Query chaining done

commit ff0cac99
Author: Joes <j.dejonge@students.uu.nl>
Date:   Thu Nov 4 12:14:16 2021 +0100

    tests changed with new pdict typename of groupby

commit aa07c6d2
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Thu Nov 4 12:09:37 2021 +0100

    Rename of function pdict to groupBy, filter dictionary fix.

commit bee9d9aa
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Thu Nov 4 11:46:38 2021 +0100

    Fixed hierarchy.go

commit e85e222d
Merge: 7a4bd4e3 4a4887f1
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Thu Nov 4 11:40:11 2021 +0100

    Merge branch '676-Query-Nesting-Development' of https://git.science.uu.nl/GravenvanPolaris/query-conversion into 676-Query-Nesting-Development

commit 7a4bd4e3
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Thu Nov 4 11:38:00 2021 +0100

    improved test.json, finished (but not tested) new query conversion, removed old query conversion

commit 4a4887f1
Merge: b8412a9a 778454ba
Author: Joes <j.dejonge@students.uu.nl>
Date:   Thu Nov 4 11:34:48 2021 +0100

    Merge branch '676-Query-Nesting-Development' of https://git.science.uu.nl/GravenvanPolaris/query-conversion into 676-Query-Nesting-Development

commit b8412a9a
Author: Joes <j.dejonge@students.uu.nl>
Date:   Thu Nov 4 11:34:41 2021 +0100

    Some tests implemented

commit 778454ba
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Thu Nov 4 11:12:10 2021 +0100

    Unit tests now use new new json format

commit 228b5975
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Thu Nov 4 10:02:30 2021 +0100

    Actual querystruct changes and added tabs

commit 7de47fce
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Thu Nov 4 10:00:19 2021 +0100

    entities and filters done, some querystruct renaming

commit 789f52eb
Merge: 93123b55 af0f1faa
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Wed Nov 3 14:56:55 2021 +0100

    Merge branch '676-Query-Nesting-Development' of https://git.science.uu.nl/GravenvanPolaris/query-conversion into 676-Query-Nesting-Development

commit 93123b55
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Wed Nov 3 14:56:47 2021 +0100

    Started implementing new query conversion

commit af0f1faa
Author: Joes <j.dejonge@students.uu.nl>
Date:   Wed Nov 3 14:36:59 2021 +0100

    Created test hiearchy document with first test

commit 4112813a
Author: Joes <j.dejonge@students.uu.nl>
Date:   Wed Nov 3 13:28:27 2021 +0100

    Removed credits

commit 0d763185
Author: Joes <j.dejonge@students.uu.nl>
Date:   Wed Nov 3 13:27:50 2021 +0100

    belowappend changed with copy

commit 6129692e
Merge: 3ea1b8a6 b4e2d678
Author: Joes <j.dejonge@students.uu.nl>
Date:   Wed Nov 3 12:14:07 2021 +0100

    Merge branch '676-Query-Nesting-Development' of https://git.science.uu.nl/GravenvanPolaris/query-conversion into 676-Query-Nesting-Development

commit 3ea1b8a6
Author: Joes <j.dejonge@students.uu.nl>
Date:   Wed Nov 3 12:05:53 2021 +0100

    Added filters to hiearachy

commit b4e2d678
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Wed Nov 3 10:13:30 2021 +0100

    Implemented aboveappend and belowappend

commit 98cd78b5
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Tue Nov 2 15:55:06 2021 +0100

    QueryStruct updated, all code updated to match new struct. Unit tests all broken.

commit 055bd1da
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Tue Nov 2 12:28:49 2021 +0100

    FIX: unit tests are now working with new code

commit fa73ce7d
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Mon Nov 1 15:10:20 2021 +0100

    ADDED: Functions are now propely loaded into the hierarchy

commit ccd91cc1
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Fri Oct 29 14:40:14 2021 +0200

    ADDED: chained query hierarchy enforcment with pointer arrays

commit 807f4dea
Author: Kieran van Gaalen <kieran.van.gaalen@casema.nl>
Date:   Fri Oct 29 10:35:43 2021 +0200

    Split function query creation into multiple functions

commit 69587cfc
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Thu Oct 28 16:42:37 2021 +0200

    Functions have relationID for AQL syntactic purposes and loop reduction

commit e015a7b6
Author: Joes <j.dejonge@students.uu.nl>
Date:   Thu Oct 28 09:28:47 2021 +0200

    Changes on json

commit dd349f8b
Author: Joes <j.dejonge@students.uu.nl>
Date:   Wed Oct 27 15:09:03 2021 +0200

    Chagned strings so the query does give output

commit 9185af69
Author: Joes <j.dejonge@students.uu.nl>
Date:   Wed Oct 27 14:54:45 2021 +0200

    Finished multiple groupby functions and implemented test.json

commit 7fa32e57
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Tue Oct 26 15:59:19 2021 +0200

    ADDED: Query chaining LET bindings are now unique and re-usable, develop ready (?)

commit 18679055
Author: Douwe <d.geurtjens@students.uu.nl>
Date:   Tue Oct 26 11:49:15 2021 +0200

    ADDED: Joes's changes pushed to the proper repository
parent 645e6f35
No related branches found
No related tags found
Loading
Checking pipeline status
Showing
with 5297 additions and 2273 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment