hans-sequelize-api
Advanced tools
+54
-12
@@ -85,3 +85,8 @@ "use strict"; | ||
| attributes: fields || defaultFields, | ||
| include: self._getRelationsInclude({ relations, relationFields: relationFields || defaultRelationFields, relationFilters, relationSort }), | ||
| include: self._getRelationsInclude({ | ||
| relations, | ||
| relationFields: relationFields || defaultRelationFields, | ||
| relationFilters, | ||
| relationSort | ||
| }), | ||
| limit: pageSizeLocal, | ||
@@ -113,3 +118,8 @@ offset: (pageLocal - 1) * pageSizeLocal | ||
| attributes: fields || defaultFields, | ||
| include: self._getRelationsInclude({ relations, relationFields: relationFields || defaultRelationFields, relationFilters, relationSort }) | ||
| include: self._getRelationsInclude({ | ||
| relations, | ||
| relationFields: relationFields || defaultRelationFields, | ||
| relationFilters, | ||
| relationSort | ||
| }) | ||
| }); | ||
@@ -133,6 +143,4 @@ if (!entity) | ||
| const data = req.body; | ||
| const entity = yield self._postgreModels[modelName].create(data, { fields }); | ||
| const entity = yield self._postgreModels[modelName].create(data); | ||
| let newEntity; | ||
| // console.log(await self._postgreModels[modelName].findAll({attributes: ['id', 'skill_id', 'user_id']})) | ||
| console.log('entity: ', entity); | ||
| //@ts-ignore | ||
@@ -144,7 +152,24 @@ if (entity.dataValues.id) { | ||
| attributes: fields || defaultFields, | ||
| include: self._getRelationsInclude({ relations, relationFields: relationFields || defaultRelationFields, relationFilters, relationSort }) | ||
| include: self._getRelationsInclude({ | ||
| relations, | ||
| relationFields: relationFields || defaultRelationFields, | ||
| relationFilters, | ||
| relationSort | ||
| }) | ||
| }); | ||
| } | ||
| //@ts-ignore | ||
| (0, hans_http_handlers_1.status201)(res, entity.dataValues.id ? newEntity : entity.dataValues); | ||
| else { | ||
| newEntity = yield self._postgreModels[modelName].findOne({ | ||
| where: data, | ||
| attributes: fields || defaultFields, | ||
| include: self._getRelationsInclude({ | ||
| relations, | ||
| relationFields: relationFields || defaultRelationFields, | ||
| relationFilters, | ||
| relationSort | ||
| }) | ||
| }); | ||
| console.log(newEntity); | ||
| } | ||
| (0, hans_http_handlers_1.status201)(res, newEntity); | ||
| } | ||
@@ -171,3 +196,3 @@ catch (e) { | ||
| let newEntity; | ||
| if (updatedEntity === null || updatedEntity === void 0 ? void 0 : updatedEntity.getDataValue('id')) { | ||
| if (updatedEntity.getDataValue('id')) { | ||
| newEntity = yield self._postgreModels[modelName].findOne({ | ||
@@ -185,4 +210,16 @@ //@ts-ignore | ||
| } | ||
| //@ts-ignore | ||
| (0, hans_http_handlers_1.status200)(res, (updatedEntity === null || updatedEntity === void 0 ? void 0 : updatedEntity.getDataValue('id')) ? newEntity : updatedEntity); | ||
| else { | ||
| newEntity = yield self._postgreModels[modelName].findOne({ | ||
| where: data, | ||
| attributes: fields || defaultFields, | ||
| include: self._getRelationsInclude({ | ||
| relations, | ||
| relationFields: relationFields || defaultRelationFields, | ||
| relationFilters, | ||
| relationSort | ||
| }) | ||
| }); | ||
| console.log(newEntity); | ||
| } | ||
| (0, hans_http_handlers_1.status200)(res, newEntity); | ||
| } | ||
@@ -206,3 +243,8 @@ catch (e) { | ||
| attributes: fields || defaultFields, | ||
| include: self._getRelationsInclude({ relations, relationFields: relationFields || defaultRelationFields, relationFilters, relationSort }) | ||
| include: self._getRelationsInclude({ | ||
| relations, | ||
| relationFields: relationFields || defaultRelationFields, | ||
| relationFilters, | ||
| relationSort | ||
| }) | ||
| }); | ||
@@ -209,0 +251,0 @@ if (!entity) |
+1
-1
| { | ||
| "name": "hans-sequelize-api", | ||
| "version": "1.0.20", | ||
| "version": "1.0.21", | ||
| "description": "rest-api form sequelize-express stack", | ||
@@ -5,0 +5,0 @@ "main": "lib/index.js", |
+52
-12
@@ -103,3 +103,8 @@ import {IRouter, Request, Response, Router} from 'express' | ||
| attributes: fields || defaultFields, | ||
| include: self._getRelationsInclude({relations, relationFields: relationFields || defaultRelationFields, relationFilters, relationSort}), | ||
| include: self._getRelationsInclude({ | ||
| relations, | ||
| relationFields: relationFields || defaultRelationFields, | ||
| relationFilters, | ||
| relationSort | ||
| }), | ||
| limit: pageSizeLocal, | ||
@@ -137,3 +142,8 @@ offset: (pageLocal - 1) * pageSizeLocal | ||
| attributes: fields || defaultFields, | ||
| include: self._getRelationsInclude({relations, relationFields: relationFields || defaultRelationFields, relationFilters, relationSort}) | ||
| include: self._getRelationsInclude({ | ||
| relations, | ||
| relationFields: relationFields || defaultRelationFields, | ||
| relationFilters, | ||
| relationSort | ||
| }) | ||
| }) | ||
@@ -162,6 +172,4 @@ if (!entity) return error404(res) | ||
| const data = req.body | ||
| const entity = await self._postgreModels[modelName].create(data, {fields}) | ||
| const entity = await self._postgreModels[modelName].create(data) | ||
| let newEntity | ||
| // console.log(await self._postgreModels[modelName].findAll({attributes: ['id', 'skill_id', 'user_id']})) | ||
| console.log('entity: ', entity) | ||
| //@ts-ignore | ||
@@ -173,7 +181,23 @@ if (entity.dataValues.id) { | ||
| attributes: fields || defaultFields, | ||
| include: self._getRelationsInclude({relations, relationFields: relationFields || defaultRelationFields, relationFilters, relationSort}) | ||
| include: self._getRelationsInclude({ | ||
| relations, | ||
| relationFields: relationFields || defaultRelationFields, | ||
| relationFilters, | ||
| relationSort | ||
| }) | ||
| }) | ||
| } else { | ||
| newEntity = await self._postgreModels[modelName].findOne({ | ||
| where: data, | ||
| attributes: fields || defaultFields, | ||
| include: self._getRelationsInclude({ | ||
| relations, | ||
| relationFields: relationFields || defaultRelationFields, | ||
| relationFilters, | ||
| relationSort | ||
| }) | ||
| }) | ||
| console.log(newEntity) | ||
| } | ||
| //@ts-ignore | ||
| status201(res, entity.dataValues.id ? newEntity : entity.dataValues) | ||
| status201(res, newEntity!) | ||
| } catch (e: any) { | ||
@@ -205,3 +229,3 @@ error500('api post entity', res, e, __filename) | ||
| let newEntity | ||
| if (updatedEntity?.getDataValue('id')) { | ||
| if (updatedEntity.getDataValue('id')) { | ||
| newEntity = await self._postgreModels[modelName].findOne({ | ||
@@ -218,5 +242,16 @@ //@ts-ignore | ||
| }) | ||
| } else { | ||
| newEntity = await self._postgreModels[modelName].findOne({ | ||
| where: data, | ||
| attributes: fields || defaultFields, | ||
| include: self._getRelationsInclude({ | ||
| relations, | ||
| relationFields: relationFields || defaultRelationFields, | ||
| relationFilters, | ||
| relationSort | ||
| }) | ||
| }) | ||
| console.log(newEntity) | ||
| } | ||
| //@ts-ignore | ||
| status200(res, updatedEntity?.getDataValue('id') ? newEntity : updatedEntity) | ||
| status200(res, newEntity) | ||
| } catch (e: any) { | ||
@@ -246,3 +281,8 @@ error500('api put entity', res, e, __filename) | ||
| attributes: fields || defaultFields, | ||
| include: self._getRelationsInclude({relations, relationFields: relationFields || defaultRelationFields, relationFilters, relationSort}) | ||
| include: self._getRelationsInclude({ | ||
| relations, | ||
| relationFields: relationFields || defaultRelationFields, | ||
| relationFilters, | ||
| relationSort | ||
| }) | ||
| }) | ||
@@ -249,0 +289,0 @@ if (!entity) return error404(res) |
51318
5.45%931
9.66%