- added the possibility to delete 'inprogress' dataset again for the submitter - concat run commands insider Dockerfile for better docker image - npm updates - add own Exception classes HttpException.ts and InternalServerException.ts
This commit is contained in:
parent
b6b1c90ff8
commit
6fa22aad9b
18 changed files with 473 additions and 251 deletions
|
@ -14,7 +14,7 @@ export default class DatasetController {
|
|||
return datasets;
|
||||
}
|
||||
|
||||
public async findAll({ response }: HttpContextContract) {
|
||||
public async findAll({ response }: HttpContextContract) {
|
||||
try {
|
||||
const datasets = await Dataset.query()
|
||||
.where('server_state', 'published')
|
||||
|
|
|
@ -18,15 +18,7 @@ export default class HomeController {
|
|||
// .orderBy('server_date_published');
|
||||
|
||||
const datasets = await Database.from('documents as doc')
|
||||
.select([
|
||||
'publish_id',
|
||||
'server_date_published',
|
||||
Database.raw(`date_part('year', server_date_published) as pub_year`)
|
||||
],
|
||||
// Database
|
||||
// .raw('select "ip_address" from "user_logins" where "users.id" = "user_logins.user_id" limit 1')
|
||||
// .wrap('(', ')')
|
||||
)
|
||||
.select(['publish_id', 'server_date_published', Database.raw(`date_part('year', server_date_published) as pub_year`)])
|
||||
.where('server_state', serverState)
|
||||
.innerJoin('link_documents_persons as ba', 'doc.id', 'ba.document_id')
|
||||
.andWhereRaw(`date_part('year', server_date_published) = ?`, [from])
|
||||
|
|
Loading…
Add table
editor.link_modal.header
Reference in a new issue