yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-27 07:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

ID in schema have type string

Browse Source
This commit is contained in:
gitstart 2022-08-31 10:37:08 +00:00
commit 6b94965574
5 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/upload/documentation/1.0.0/overrides/upload-File.json vendored
View File

@ -147,7 +147,7 @@
"deprecated": false,
"required": true,
"schema": {
"type": "string"
"type": "number"
}
}
],

2
packages/plugins/documentation/server/services/helpers/build-api-endpoint-path.js
View File

@ -46,7 +46,7 @@ const getPathParams = (routePath) => {
description: '',
deprecated: false,
required: true,
schema: { type: 'string' },
schema: { type: 'number' },
};
});
};

13
packages/plugins/documentation/server/services/helpers/build-component-schema.js
View File

@ -102,8 +102,8 @@ const getAllSchemasForContentType = ({ routeInfo, attributes, uniqueName }) => {
[`${pascalCase(uniqueName)}LocalizationResponse`]: {
type: 'object',
properties: {
id: { type: 'string' },
...cleanSchemaAttributes(attributes, { addComponentSchema }),
id: { type: 'number' },
...cleanSchemaAttributes(attributes),
},
},
};
@ -145,6 +145,11 @@ const getAllSchemasForContentType = ({ routeInfo, attributes, uniqueName }) => {
data: {
type: 'array',
items: {
type: 'object',
properties: {
id: { type: 'number' },
attributes: { type: 'object', properties: cleanSchemaAttributes(attributes) },
},
$ref: `#/components/schemas/${pascalCase(uniqueName)}ListResponseDataItem`,
},
},
@ -175,6 +180,10 @@ const getAllSchemasForContentType = ({ routeInfo, attributes, uniqueName }) => {
id: { type: 'string' },
attributes: {
type: 'object',
properties: {
id: { type: 'number' },
attributes: { type: 'object', properties: cleanSchemaAttributes(attributes) },
},
properties: cleanSchemaAttributes(attributes, {
addComponentSchema,
componentSchemaRefName: `#/components/schemas/${pascalCase(

21
packages/plugins/documentation/server/services/helpers/utils/clean-schema-attributes.js
View File

@ -115,6 +115,25 @@ const cleanSchemaAttributes = (
if (attribute.repeatable) {
attributesCopy[prop] = {
type: 'array',
items: {
type: 'object',
properties: {
...(isRequest ? {} : { id: { type: 'number' } }),
...cleanSchemaAttributes(componentAttributes, { typeMap, isRequest }),
},
},
};
} else {
attributesCopy[prop] = {
type: 'object',
properties: {
...(isRequest ? {} : { id: { type: 'number' } }),
...cleanSchemaAttributes(componentAttributes, {
typeMap,
isRequest,
}),
},
};
items: finalComponentSchema,
};
} else {
@ -128,7 +147,7 @@ const cleanSchemaAttributes = (
const rawComponentSchema = {
type: 'object',
properties: {
...(isRequest ? {} : { id: { type: 'string' } }),
...(isRequest ? {} : { id: { type: 'number' } }),
__component: { type: 'string' },
...cleanSchemaAttributes(componentAttributes, {
typeMap,

4
packages/plugins/documentation/server/services/helpers/utils/get-schema-data.js
View File

@ -15,7 +15,7 @@ module.exports = (isListOfEntities, attributes) => {
items: {
type: 'object',
properties: {
id: { type: 'string' },
id: { type: 'number' },
attributes: { type: 'object', properties: attributes },
},
},
@ -25,7 +25,7 @@ module.exports = (isListOfEntities, attributes) => {
return {
type: 'object',
properties: {
id: { type: 'string' },
id: { type: 'number' },
attributes: { type: 'object', properties: attributes },
},
};