diff --git a/frontend/bindings/app/internal/models/index.ts b/frontend/bindings/app/internal/models/index.js similarity index 91% rename from frontend/bindings/app/internal/models/index.ts rename to frontend/bindings/app/internal/models/index.js index c9d993a..580fb67 100644 --- a/frontend/bindings/app/internal/models/index.ts +++ b/frontend/bindings/app/internal/models/index.js @@ -1,3 +1,4 @@ +// @ts-check // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL // This file is automatically generated. DO NOT EDIT diff --git a/frontend/bindings/app/internal/models/models.ts b/frontend/bindings/app/internal/models/models.js similarity index 58% rename from frontend/bindings/app/internal/models/models.ts rename to frontend/bindings/app/internal/models/models.js index 97c7442..c48cc01 100644 --- a/frontend/bindings/app/internal/models/models.ts +++ b/frontend/bindings/app/internal/models/models.js @@ -1,3 +1,4 @@ +// @ts-check // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL // This file is automatically generated. DO NOT EDIT @@ -6,23 +7,37 @@ import {Create as $Create} from "@wailsio/runtime"; export class Author { - "Id": number; - "Name": string; - "Posts": Post[]; - "Comments": Comment[]; - - /** Creates a new Author instance. */ - constructor($$source: Partial = {}) { + /** + * Creates a new Author instance. + * @param {Partial} [$$source = {}] - The source object to create the Author. + */ + constructor($$source = {}) { if (!("Id" in $$source)) { + /** + * @member + * @type {number} + */ this["Id"] = 0; } if (!("Name" in $$source)) { + /** + * @member + * @type {string} + */ this["Name"] = ""; } if (!("Posts" in $$source)) { + /** + * @member + * @type {Post[]} + */ this["Posts"] = []; } if (!("Comments" in $$source)) { + /** + * @member + * @type {Comment[]} + */ this["Comments"] = []; } @@ -31,8 +46,10 @@ export class Author { /** * Creates a new Author instance from a string or object. + * @param {any} [$$source = {}] + * @returns {Author} */ - static createFrom($$source: any = {}): Author { + static createFrom($$source = {}) { const $$createField2_0 = $$createType1; const $$createField3_0 = $$createType3; let $$parsedSource = typeof $$source === 'string' ? JSON.parse($$source) : $$source; @@ -42,32 +59,49 @@ export class Author { if ("Comments" in $$parsedSource) { $$parsedSource["Comments"] = $$createField3_0($$parsedSource["Comments"]); } - return new Author($$parsedSource as Partial); + return new Author(/** @type {Partial} */($$parsedSource)); } } export class Comment { - "Id": number; - "Text": string; - "AuthorId": number; - "Author": Author; - "Posts": Post[]; - - /** Creates a new Comment instance. */ - constructor($$source: Partial = {}) { + /** + * Creates a new Comment instance. + * @param {Partial} [$$source = {}] - The source object to create the Comment. + */ + constructor($$source = {}) { if (!("Id" in $$source)) { + /** + * @member + * @type {number} + */ this["Id"] = 0; } if (!("Text" in $$source)) { + /** + * @member + * @type {string} + */ this["Text"] = ""; } if (!("AuthorId" in $$source)) { + /** + * @member + * @type {number} + */ this["AuthorId"] = 0; } if (!("Author" in $$source)) { + /** + * @member + * @type {Author} + */ this["Author"] = (new Author()); } if (!("Posts" in $$source)) { + /** + * @member + * @type {Post[]} + */ this["Posts"] = []; } @@ -76,8 +110,10 @@ export class Comment { /** * Creates a new Comment instance from a string or object. + * @param {any} [$$source = {}] + * @returns {Comment} */ - static createFrom($$source: any = {}): Comment { + static createFrom($$source = {}) { const $$createField3_0 = $$createType4; const $$createField4_0 = $$createType1; let $$parsedSource = typeof $$source === 'string' ? JSON.parse($$source) : $$source; @@ -87,48 +123,77 @@ export class Comment { if ("Posts" in $$parsedSource) { $$parsedSource["Posts"] = $$createField4_0($$parsedSource["Posts"]); } - return new Comment($$parsedSource as Partial); + return new Comment(/** @type {Partial} */($$parsedSource)); } } export class Post { - "Id": number; - "Text": string; - "Deadline": number; - "CreatedAt": number; - "AuthorId": number; - "Author": Author; - "PostTypeId": number; - "PostType": PostType; - "Comments": Comment[]; - - /** Creates a new Post instance. */ - constructor($$source: Partial = {}) { + /** + * Creates a new Post instance. + * @param {Partial} [$$source = {}] - The source object to create the Post. + */ + constructor($$source = {}) { if (!("Id" in $$source)) { + /** + * @member + * @type {number} + */ this["Id"] = 0; } if (!("Text" in $$source)) { + /** + * @member + * @type {string} + */ this["Text"] = ""; } if (!("Deadline" in $$source)) { + /** + * @member + * @type {number} + */ this["Deadline"] = 0; } if (!("CreatedAt" in $$source)) { + /** + * @member + * @type {number} + */ this["CreatedAt"] = 0; } if (!("AuthorId" in $$source)) { + /** + * @member + * @type {number} + */ this["AuthorId"] = 0; } if (!("Author" in $$source)) { + /** + * @member + * @type {Author} + */ this["Author"] = (new Author()); } if (!("PostTypeId" in $$source)) { + /** + * @member + * @type {number} + */ this["PostTypeId"] = 0; } if (!("PostType" in $$source)) { + /** + * @member + * @type {PostType} + */ this["PostType"] = (new PostType()); } if (!("Comments" in $$source)) { + /** + * @member + * @type {Comment[]} + */ this["Comments"] = []; } @@ -137,8 +202,10 @@ export class Post { /** * Creates a new Post instance from a string or object. + * @param {any} [$$source = {}] + * @returns {Post} */ - static createFrom($$source: any = {}): Post { + static createFrom($$source = {}) { const $$createField5_0 = $$createType4; const $$createField7_0 = $$createType5; const $$createField8_0 = $$createType3; @@ -152,20 +219,28 @@ export class Post { if ("Comments" in $$parsedSource) { $$parsedSource["Comments"] = $$createField8_0($$parsedSource["Comments"]); } - return new Post($$parsedSource as Partial); + return new Post(/** @type {Partial} */($$parsedSource)); } } export class PostType { - "Id": number; - "Name": string; - - /** Creates a new PostType instance. */ - constructor($$source: Partial = {}) { + /** + * Creates a new PostType instance. + * @param {Partial} [$$source = {}] - The source object to create the PostType. + */ + constructor($$source = {}) { if (!("Id" in $$source)) { + /** + * @member + * @type {number} + */ this["Id"] = 0; } if (!("Name" in $$source)) { + /** + * @member + * @type {string} + */ this["Name"] = ""; } @@ -174,10 +249,12 @@ export class PostType { /** * Creates a new PostType instance from a string or object. + * @param {any} [$$source = {}] + * @returns {PostType} */ - static createFrom($$source: any = {}): PostType { + static createFrom($$source = {}) { let $$parsedSource = typeof $$source === 'string' ? JSON.parse($$source) : $$source; - return new PostType($$parsedSource as Partial); + return new PostType(/** @type {Partial} */($$parsedSource)); } } diff --git a/frontend/bindings/app/internal/services/authorservice.js b/frontend/bindings/app/internal/services/authorservice.js new file mode 100644 index 0000000..8906222 --- /dev/null +++ b/frontend/bindings/app/internal/services/authorservice.js @@ -0,0 +1,101 @@ +// @ts-check +// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL +// This file is automatically generated. DO NOT EDIT + +// eslint-disable-next-line @typescript-eslint/ban-ts-comment +// @ts-ignore: Unused imports +import {Call as $Call, Create as $Create} from "@wailsio/runtime"; + +// eslint-disable-next-line @typescript-eslint/ban-ts-comment +// @ts-ignore: Unused imports +import * as models$0 from "../models/models.js"; + +// eslint-disable-next-line @typescript-eslint/ban-ts-comment +// @ts-ignore: Unused imports +import * as $models from "./models.js"; + +/** + * @returns {Promise & { cancel(): void }} + */ +export function Count() { + let $resultPromise = /** @type {any} */($Call.ByID(3969879864)); + return $resultPromise; +} + +/** + * @param {$models.Author} item + * @returns {Promise<$models.Author> & { cancel(): void }} + */ +export function Create(item) { + let $resultPromise = /** @type {any} */($Call.ByID(3684602449, item)); + let $typingPromise = /** @type {any} */($resultPromise.then(($result) => { + return $$createType0($result); + })); + $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise); + return $typingPromise; +} + +/** + * @param {number} id + * @returns {Promise & { cancel(): void }} + */ +export function Delete(id) { + let $resultPromise = /** @type {any} */($Call.ByID(2096845974, id)); + return $resultPromise; +} + +/** + * @returns {Promise<($models.Author | null)[]> & { cancel(): void }} + */ +export function GetAll() { + let $resultPromise = /** @type {any} */($Call.ByID(3248293926)); + let $typingPromise = /** @type {any} */($resultPromise.then(($result) => { + return $$createType2($result); + })); + $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise); + return $typingPromise; +} + +/** + * @param {number} id + * @returns {Promise<$models.Author | null> & { cancel(): void }} + */ +export function GetById(id) { + let $resultPromise = /** @type {any} */($Call.ByID(1703016211, id)); + let $typingPromise = /** @type {any} */($resultPromise.then(($result) => { + return $$createType1($result); + })); + $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise); + return $typingPromise; +} + +/** + * @param {{ [_: string]: string }} fieldsSortOrder + * @returns {Promise<($models.Author | null)[]> & { cancel(): void }} + */ +export function SortedByOrder(fieldsSortOrder) { + let $resultPromise = /** @type {any} */($Call.ByID(3046628691, fieldsSortOrder)); + let $typingPromise = /** @type {any} */($resultPromise.then(($result) => { + return $$createType2($result); + })); + $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise); + return $typingPromise; +} + +/** + * @param {$models.Author} item + * @returns {Promise<$models.Author> & { cancel(): void }} + */ +export function Update(item) { + let $resultPromise = /** @type {any} */($Call.ByID(2240704960, item)); + let $typingPromise = /** @type {any} */($resultPromise.then(($result) => { + return $$createType0($result); + })); + $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise); + return $typingPromise; +} + +// Private type creation functions +const $$createType0 = models$0.Author.createFrom; +const $$createType1 = $Create.Nullable($$createType0); +const $$createType2 = $Create.Array($$createType1); diff --git a/frontend/bindings/app/internal/services/authorservice.ts b/frontend/bindings/app/internal/services/authorservice.ts deleted file mode 100644 index 8d42285..0000000 --- a/frontend/bindings/app/internal/services/authorservice.ts +++ /dev/null @@ -1,74 +0,0 @@ -// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL -// This file is automatically generated. DO NOT EDIT - -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Unused imports -import {Call as $Call, Create as $Create} from "@wailsio/runtime"; - -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Unused imports -import * as models$0 from "../models/models.js"; - -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Unused imports -import * as $models from "./models.js"; - -export function Count(): Promise & { cancel(): void } { - let $resultPromise = $Call.ByID(3969879864) as any; - return $resultPromise; -} - -export function Create(item: $models.Author): Promise<$models.Author> & { cancel(): void } { - let $resultPromise = $Call.ByID(3684602449, item) as any; - let $typingPromise = $resultPromise.then(($result: any) => { - return $$createType0($result); - }) as any; - $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise); - return $typingPromise; -} - -export function Delete(id: number): Promise & { cancel(): void } { - let $resultPromise = $Call.ByID(2096845974, id) as any; - return $resultPromise; -} - -export function GetAll(): Promise<($models.Author | null)[]> & { cancel(): void } { - let $resultPromise = $Call.ByID(3248293926) as any; - let $typingPromise = $resultPromise.then(($result: any) => { - return $$createType2($result); - }) as any; - $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise); - return $typingPromise; -} - -export function GetById(id: number): Promise<$models.Author | null> & { cancel(): void } { - let $resultPromise = $Call.ByID(1703016211, id) as any; - let $typingPromise = $resultPromise.then(($result: any) => { - return $$createType1($result); - }) as any; - $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise); - return $typingPromise; -} - -export function SortedByOrder(fieldsSortOrder: { [_: string]: string }): Promise<($models.Author | null)[]> & { cancel(): void } { - let $resultPromise = $Call.ByID(3046628691, fieldsSortOrder) as any; - let $typingPromise = $resultPromise.then(($result: any) => { - return $$createType2($result); - }) as any; - $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise); - return $typingPromise; -} - -export function Update(item: $models.Author): Promise<$models.Author> & { cancel(): void } { - let $resultPromise = $Call.ByID(2240704960, item) as any; - let $typingPromise = $resultPromise.then(($result: any) => { - return $$createType0($result); - }) as any; - $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise); - return $typingPromise; -} - -// Private type creation functions -const $$createType0 = models$0.Author.createFrom; -const $$createType1 = $Create.Nullable($$createType0); -const $$createType2 = $Create.Array($$createType1); diff --git a/frontend/bindings/app/internal/services/commentservice.js b/frontend/bindings/app/internal/services/commentservice.js new file mode 100644 index 0000000..cf21686 --- /dev/null +++ b/frontend/bindings/app/internal/services/commentservice.js @@ -0,0 +1,101 @@ +// @ts-check +// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL +// This file is automatically generated. DO NOT EDIT + +// eslint-disable-next-line @typescript-eslint/ban-ts-comment +// @ts-ignore: Unused imports +import {Call as $Call, Create as $Create} from "@wailsio/runtime"; + +// eslint-disable-next-line @typescript-eslint/ban-ts-comment +// @ts-ignore: Unused imports +import * as models$0 from "../models/models.js"; + +// eslint-disable-next-line @typescript-eslint/ban-ts-comment +// @ts-ignore: Unused imports +import * as $models from "./models.js"; + +/** + * @returns {Promise & { cancel(): void }} + */ +export function Count() { + let $resultPromise = /** @type {any} */($Call.ByID(3225397984)); + return $resultPromise; +} + +/** + * @param {$models.Comment} item + * @returns {Promise<$models.Comment> & { cancel(): void }} + */ +export function Create(item) { + let $resultPromise = /** @type {any} */($Call.ByID(4239106089, item)); + let $typingPromise = /** @type {any} */($resultPromise.then(($result) => { + return $$createType0($result); + })); + $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise); + return $typingPromise; +} + +/** + * @param {number} id + * @returns {Promise & { cancel(): void }} + */ +export function Delete(id) { + let $resultPromise = /** @type {any} */($Call.ByID(2553503582, id)); + return $resultPromise; +} + +/** + * @returns {Promise<($models.Comment | null)[]> & { cancel(): void }} + */ +export function GetAll() { + let $resultPromise = /** @type {any} */($Call.ByID(1805763390)); + let $typingPromise = /** @type {any} */($resultPromise.then(($result) => { + return $$createType2($result); + })); + $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise); + return $typingPromise; +} + +/** + * @param {number} id + * @returns {Promise<$models.Comment | null> & { cancel(): void }} + */ +export function GetById(id) { + let $resultPromise = /** @type {any} */($Call.ByID(3217823099, id)); + let $typingPromise = /** @type {any} */($resultPromise.then(($result) => { + return $$createType1($result); + })); + $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise); + return $typingPromise; +} + +/** + * @param {{ [_: string]: string }} fieldsSortOrder + * @returns {Promise<($models.Comment | null)[]> & { cancel(): void }} + */ +export function SortedByOrder(fieldsSortOrder) { + let $resultPromise = /** @type {any} */($Call.ByID(4244533291, fieldsSortOrder)); + let $typingPromise = /** @type {any} */($resultPromise.then(($result) => { + return $$createType2($result); + })); + $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise); + return $typingPromise; +} + +/** + * @param {$models.Comment} item + * @returns {Promise<$models.Comment> & { cancel(): void }} + */ +export function Update(item) { + let $resultPromise = /** @type {any} */($Call.ByID(3080970936, item)); + let $typingPromise = /** @type {any} */($resultPromise.then(($result) => { + return $$createType0($result); + })); + $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise); + return $typingPromise; +} + +// Private type creation functions +const $$createType0 = models$0.Comment.createFrom; +const $$createType1 = $Create.Nullable($$createType0); +const $$createType2 = $Create.Array($$createType1); diff --git a/frontend/bindings/app/internal/services/commentservice.ts b/frontend/bindings/app/internal/services/commentservice.ts deleted file mode 100644 index baf2caa..0000000 --- a/frontend/bindings/app/internal/services/commentservice.ts +++ /dev/null @@ -1,74 +0,0 @@ -// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL -// This file is automatically generated. DO NOT EDIT - -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Unused imports -import {Call as $Call, Create as $Create} from "@wailsio/runtime"; - -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Unused imports -import * as models$0 from "../models/models.js"; - -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Unused imports -import * as $models from "./models.js"; - -export function Count(): Promise & { cancel(): void } { - let $resultPromise = $Call.ByID(3225397984) as any; - return $resultPromise; -} - -export function Create(item: $models.Comment): Promise<$models.Comment> & { cancel(): void } { - let $resultPromise = $Call.ByID(4239106089, item) as any; - let $typingPromise = $resultPromise.then(($result: any) => { - return $$createType0($result); - }) as any; - $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise); - return $typingPromise; -} - -export function Delete(id: number): Promise & { cancel(): void } { - let $resultPromise = $Call.ByID(2553503582, id) as any; - return $resultPromise; -} - -export function GetAll(): Promise<($models.Comment | null)[]> & { cancel(): void } { - let $resultPromise = $Call.ByID(1805763390) as any; - let $typingPromise = $resultPromise.then(($result: any) => { - return $$createType2($result); - }) as any; - $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise); - return $typingPromise; -} - -export function GetById(id: number): Promise<$models.Comment | null> & { cancel(): void } { - let $resultPromise = $Call.ByID(3217823099, id) as any; - let $typingPromise = $resultPromise.then(($result: any) => { - return $$createType1($result); - }) as any; - $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise); - return $typingPromise; -} - -export function SortedByOrder(fieldsSortOrder: { [_: string]: string }): Promise<($models.Comment | null)[]> & { cancel(): void } { - let $resultPromise = $Call.ByID(4244533291, fieldsSortOrder) as any; - let $typingPromise = $resultPromise.then(($result: any) => { - return $$createType2($result); - }) as any; - $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise); - return $typingPromise; -} - -export function Update(item: $models.Comment): Promise<$models.Comment> & { cancel(): void } { - let $resultPromise = $Call.ByID(3080970936, item) as any; - let $typingPromise = $resultPromise.then(($result: any) => { - return $$createType0($result); - }) as any; - $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise); - return $typingPromise; -} - -// Private type creation functions -const $$createType0 = models$0.Comment.createFrom; -const $$createType1 = $Create.Nullable($$createType0); -const $$createType2 = $Create.Array($$createType1); diff --git a/frontend/bindings/app/internal/services/index.ts b/frontend/bindings/app/internal/services/index.js similarity index 97% rename from frontend/bindings/app/internal/services/index.ts rename to frontend/bindings/app/internal/services/index.js index 50666ce..5e62e05 100644 --- a/frontend/bindings/app/internal/services/index.ts +++ b/frontend/bindings/app/internal/services/index.js @@ -1,3 +1,4 @@ +// @ts-check // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL // This file is automatically generated. DO NOT EDIT diff --git a/frontend/bindings/app/internal/services/models.ts b/frontend/bindings/app/internal/services/models.js similarity index 73% rename from frontend/bindings/app/internal/services/models.ts rename to frontend/bindings/app/internal/services/models.js index 41eba10..6792768 100644 --- a/frontend/bindings/app/internal/services/models.ts +++ b/frontend/bindings/app/internal/services/models.js @@ -1,3 +1,4 @@ +// @ts-check // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL // This file is automatically generated. DO NOT EDIT @@ -10,13 +11,25 @@ import {Create as $Create} from "@wailsio/runtime"; import * as models$0 from "../models/models.js"; export const Author = models$0.Author; -export type Author = models$0.Author; + +/** + * @typedef {models$0.Author} Author + */ export const Comment = models$0.Comment; -export type Comment = models$0.Comment; + +/** + * @typedef {models$0.Comment} Comment + */ export const Post = models$0.Post; -export type Post = models$0.Post; + +/** + * @typedef {models$0.Post} Post + */ export const PostType = models$0.PostType; -export type PostType = models$0.PostType; + +/** + * @typedef {models$0.PostType} PostType + */ diff --git a/frontend/bindings/app/internal/services/postservice.js b/frontend/bindings/app/internal/services/postservice.js new file mode 100644 index 0000000..2e483c7 --- /dev/null +++ b/frontend/bindings/app/internal/services/postservice.js @@ -0,0 +1,109 @@ +// @ts-check +// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL +// This file is automatically generated. DO NOT EDIT + +// eslint-disable-next-line @typescript-eslint/ban-ts-comment +// @ts-ignore: Unused imports +import {Call as $Call, Create as $Create} from "@wailsio/runtime"; + +// eslint-disable-next-line @typescript-eslint/ban-ts-comment +// @ts-ignore: Unused imports +import * as models$0 from "../models/models.js"; + +// eslint-disable-next-line @typescript-eslint/ban-ts-comment +// @ts-ignore: Unused imports +import * as $models from "./models.js"; + +/** + * @returns {Promise & { cancel(): void }} + */ +export function Count() { + let $resultPromise = /** @type {any} */($Call.ByID(3109924027)); + return $resultPromise; +} + +/** + * @param {$models.Post} item + * @returns {Promise<$models.Post> & { cancel(): void }} + */ +export function Create(item) { + let $resultPromise = /** @type {any} */($Call.ByID(1443399856, item)); + let $typingPromise = /** @type {any} */($resultPromise.then(($result) => { + return $$createType0($result); + })); + $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise); + return $typingPromise; +} + +/** + * @param {number} id + * @returns {Promise & { cancel(): void }} + */ +export function Delete(id) { + let $resultPromise = /** @type {any} */($Call.ByID(2924549135, id)); + return $resultPromise; +} + +/** + * @returns {Promise & { cancel(): void }} + */ +export function ExportToExcel() { + let $resultPromise = /** @type {any} */($Call.ByID(75322242)); + return $resultPromise; +} + +/** + * @returns {Promise<($models.Post | null)[]> & { cancel(): void }} + */ +export function GetAll() { + let $resultPromise = /** @type {any} */($Call.ByID(65691059)); + let $typingPromise = /** @type {any} */($resultPromise.then(($result) => { + return $$createType2($result); + })); + $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise); + return $typingPromise; +} + +/** + * @param {number} id + * @returns {Promise<$models.Post | null> & { cancel(): void }} + */ +export function GetById(id) { + let $resultPromise = /** @type {any} */($Call.ByID(4074736792, id)); + let $typingPromise = /** @type {any} */($resultPromise.then(($result) => { + return $$createType1($result); + })); + $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise); + return $typingPromise; +} + +/** + * @param {{ [_: string]: string }} fieldsSortOrder + * @returns {Promise<($models.Post | null)[]> & { cancel(): void }} + */ +export function SortedByOrder(fieldsSortOrder) { + let $resultPromise = /** @type {any} */($Call.ByID(471862744, fieldsSortOrder)); + let $typingPromise = /** @type {any} */($resultPromise.then(($result) => { + return $$createType2($result); + })); + $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise); + return $typingPromise; +} + +/** + * @param {$models.Post} item + * @returns {Promise<$models.Post> & { cancel(): void }} + */ +export function Update(item) { + let $resultPromise = /** @type {any} */($Call.ByID(137798821, item)); + let $typingPromise = /** @type {any} */($resultPromise.then(($result) => { + return $$createType0($result); + })); + $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise); + return $typingPromise; +} + +// Private type creation functions +const $$createType0 = models$0.Post.createFrom; +const $$createType1 = $Create.Nullable($$createType0); +const $$createType2 = $Create.Array($$createType1); diff --git a/frontend/bindings/app/internal/services/postservice.ts b/frontend/bindings/app/internal/services/postservice.ts deleted file mode 100644 index b079791..0000000 --- a/frontend/bindings/app/internal/services/postservice.ts +++ /dev/null @@ -1,79 +0,0 @@ -// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL -// This file is automatically generated. DO NOT EDIT - -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Unused imports -import {Call as $Call, Create as $Create} from "@wailsio/runtime"; - -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Unused imports -import * as models$0 from "../models/models.js"; - -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Unused imports -import * as $models from "./models.js"; - -export function Count(): Promise & { cancel(): void } { - let $resultPromise = $Call.ByID(3109924027) as any; - return $resultPromise; -} - -export function Create(item: $models.Post): Promise<$models.Post> & { cancel(): void } { - let $resultPromise = $Call.ByID(1443399856, item) as any; - let $typingPromise = $resultPromise.then(($result: any) => { - return $$createType0($result); - }) as any; - $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise); - return $typingPromise; -} - -export function Delete(id: number): Promise & { cancel(): void } { - let $resultPromise = $Call.ByID(2924549135, id) as any; - return $resultPromise; -} - -export function ExportToExcel(): Promise & { cancel(): void } { - let $resultPromise = $Call.ByID(75322242) as any; - return $resultPromise; -} - -export function GetAll(): Promise<($models.Post | null)[]> & { cancel(): void } { - let $resultPromise = $Call.ByID(65691059) as any; - let $typingPromise = $resultPromise.then(($result: any) => { - return $$createType2($result); - }) as any; - $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise); - return $typingPromise; -} - -export function GetById(id: number): Promise<$models.Post | null> & { cancel(): void } { - let $resultPromise = $Call.ByID(4074736792, id) as any; - let $typingPromise = $resultPromise.then(($result: any) => { - return $$createType1($result); - }) as any; - $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise); - return $typingPromise; -} - -export function SortedByOrder(fieldsSortOrder: { [_: string]: string }): Promise<($models.Post | null)[]> & { cancel(): void } { - let $resultPromise = $Call.ByID(471862744, fieldsSortOrder) as any; - let $typingPromise = $resultPromise.then(($result: any) => { - return $$createType2($result); - }) as any; - $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise); - return $typingPromise; -} - -export function Update(item: $models.Post): Promise<$models.Post> & { cancel(): void } { - let $resultPromise = $Call.ByID(137798821, item) as any; - let $typingPromise = $resultPromise.then(($result: any) => { - return $$createType0($result); - }) as any; - $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise); - return $typingPromise; -} - -// Private type creation functions -const $$createType0 = models$0.Post.createFrom; -const $$createType1 = $Create.Nullable($$createType0); -const $$createType2 = $Create.Array($$createType1); diff --git a/frontend/bindings/app/internal/services/posttypeservice.js b/frontend/bindings/app/internal/services/posttypeservice.js new file mode 100644 index 0000000..42dfdf1 --- /dev/null +++ b/frontend/bindings/app/internal/services/posttypeservice.js @@ -0,0 +1,101 @@ +// @ts-check +// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL +// This file is automatically generated. DO NOT EDIT + +// eslint-disable-next-line @typescript-eslint/ban-ts-comment +// @ts-ignore: Unused imports +import {Call as $Call, Create as $Create} from "@wailsio/runtime"; + +// eslint-disable-next-line @typescript-eslint/ban-ts-comment +// @ts-ignore: Unused imports +import * as models$0 from "../models/models.js"; + +// eslint-disable-next-line @typescript-eslint/ban-ts-comment +// @ts-ignore: Unused imports +import * as $models from "./models.js"; + +/** + * @returns {Promise & { cancel(): void }} + */ +export function Count() { + let $resultPromise = /** @type {any} */($Call.ByID(554487955)); + return $resultPromise; +} + +/** + * @param {$models.PostType} item + * @returns {Promise<$models.PostType> & { cancel(): void }} + */ +export function Create(item) { + let $resultPromise = /** @type {any} */($Call.ByID(1092898136, item)); + let $typingPromise = /** @type {any} */($resultPromise.then(($result) => { + return $$createType0($result); + })); + $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise); + return $typingPromise; +} + +/** + * @param {number} id + * @returns {Promise & { cancel(): void }} + */ +export function Delete(id) { + let $resultPromise = /** @type {any} */($Call.ByID(2114913543, id)); + return $resultPromise; +} + +/** + * @returns {Promise<($models.PostType | null)[]> & { cancel(): void }} + */ +export function GetAll() { + let $resultPromise = /** @type {any} */($Call.ByID(416231387)); + let $typingPromise = /** @type {any} */($resultPromise.then(($result) => { + return $$createType2($result); + })); + $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise); + return $typingPromise; +} + +/** + * @param {number} id + * @returns {Promise<$models.PostType | null> & { cancel(): void }} + */ +export function GetById(id) { + let $resultPromise = /** @type {any} */($Call.ByID(3237123344, id)); + let $typingPromise = /** @type {any} */($resultPromise.then(($result) => { + return $$createType1($result); + })); + $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise); + return $typingPromise; +} + +/** + * @param {{ [_: string]: string }} fieldsSortOrder + * @returns {Promise<($models.PostType | null)[]> & { cancel(): void }} + */ +export function SortedByOrder(fieldsSortOrder) { + let $resultPromise = /** @type {any} */($Call.ByID(1097313920, fieldsSortOrder)); + let $typingPromise = /** @type {any} */($resultPromise.then(($result) => { + return $$createType2($result); + })); + $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise); + return $typingPromise; +} + +/** + * @param {$models.PostType} item + * @returns {Promise<$models.PostType> & { cancel(): void }} + */ +export function Update(item) { + let $resultPromise = /** @type {any} */($Call.ByID(2773888269, item)); + let $typingPromise = /** @type {any} */($resultPromise.then(($result) => { + return $$createType0($result); + })); + $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise); + return $typingPromise; +} + +// Private type creation functions +const $$createType0 = models$0.PostType.createFrom; +const $$createType1 = $Create.Nullable($$createType0); +const $$createType2 = $Create.Array($$createType1); diff --git a/frontend/bindings/app/internal/services/posttypeservice.ts b/frontend/bindings/app/internal/services/posttypeservice.ts deleted file mode 100644 index d8a31b3..0000000 --- a/frontend/bindings/app/internal/services/posttypeservice.ts +++ /dev/null @@ -1,79 +0,0 @@ -// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL -// This file is automatically generated. DO NOT EDIT - -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Unused imports -import {Call as $Call, Create as $Create} from "@wailsio/runtime"; - -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Unused imports -import * as models$0 from "../models/models.js"; - -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Unused imports -import * as $models from "./models.js"; - -export function Count(): Promise & { cancel(): void } { - let $resultPromise = $Call.ByID(554487955) as any; - return $resultPromise; -} - -export function Create(item: $models.PostType): Promise<$models.PostType> & { cancel(): void } { - let $resultPromise = $Call.ByID(1092898136, item) as any; - let $typingPromise = $resultPromise.then(($result: any) => { - return $$createType0($result); - }) as any; - $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise); - return $typingPromise; -} - -export function Delete(id: number): Promise & { cancel(): void } { - let $resultPromise = $Call.ByID(2114913543, id) as any; - return $resultPromise; -} - -export function GetAll(): Promise<($models.PostType | null)[]> & { cancel(): void } { - let $resultPromise = $Call.ByID(416231387) as any; - let $typingPromise = $resultPromise.then(($result: any) => { - return $$createType2($result); - }) as any; - $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise); - return $typingPromise; -} - -export function GetById(id: number): Promise<$models.PostType | null> & { cancel(): void } { - let $resultPromise = $Call.ByID(3237123344, id) as any; - let $typingPromise = $resultPromise.then(($result: any) => { - return $$createType1($result); - }) as any; - $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise); - return $typingPromise; -} - -export function ImportFromExcel(): Promise & { cancel(): void } { - let $resultPromise = $Call.ByID(1671814244) as any; - return $resultPromise; -} - -export function SortedByOrder(fieldsSortOrder: { [_: string]: string }): Promise<($models.PostType | null)[]> & { cancel(): void } { - let $resultPromise = $Call.ByID(1097313920, fieldsSortOrder) as any; - let $typingPromise = $resultPromise.then(($result: any) => { - return $$createType2($result); - }) as any; - $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise); - return $typingPromise; -} - -export function Update(item: $models.PostType): Promise<$models.PostType> & { cancel(): void } { - let $resultPromise = $Call.ByID(2773888269, item) as any; - let $typingPromise = $resultPromise.then(($result: any) => { - return $$createType0($result); - }) as any; - $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise); - return $typingPromise; -} - -// Private type creation functions -const $$createType0 = models$0.PostType.createFrom; -const $$createType1 = $Create.Nullable($$createType0); -const $$createType2 = $Create.Array($$createType1); diff --git a/internal/extras/excel/export.go b/internal/addons/excel/export.go similarity index 100% rename from internal/extras/excel/export.go rename to internal/addons/excel/export.go diff --git a/internal/extras/excel/exporter.go b/internal/addons/excel/exporter.go similarity index 100% rename from internal/extras/excel/exporter.go rename to internal/addons/excel/exporter.go diff --git a/internal/extras/excel/import.go b/internal/addons/excel/import.go similarity index 100% rename from internal/extras/excel/import.go rename to internal/addons/excel/import.go diff --git a/internal/extras/excel/styles.go b/internal/addons/excel/styles.go similarity index 100% rename from internal/extras/excel/styles.go rename to internal/addons/excel/styles.go diff --git a/internal/extras/excel/tags.go b/internal/addons/excel/tags.go similarity index 100% rename from internal/extras/excel/tags.go rename to internal/addons/excel/tags.go diff --git a/internal/services/excel.go b/internal/services/excel.go new file mode 100644 index 0000000..579dfd6 --- /dev/null +++ b/internal/services/excel.go @@ -0,0 +1,56 @@ +package services + +import ( + "app/internal/addons/excel" + "app/internal/dialogs" + "github.com/wailsapp/wails/v3/pkg/application" + "strconv" +) + +type ExcelModule struct{} + +var ExcelService = application.NewService(&ExcelModule{}) + +func ImportAllEntities() error { + postTypeService := PostTypeService{} + filepath, err := dialogs.OpenFileDialog("Импорт данных") + if err != nil { + return err + } + err = excel.ImportFromSpreadsheet(filepath, excel.Importer{ + SheetName: "Тип поста", + Loader: func(rowIndex int, row []string) error { + id, err := strconv.Atoi(row[0]) + if err != nil { + return err + } + + _, err = postTypeService.Create(PostType{ + Id: uint(id), + Name: row[1], + }) + if err != nil { + return err + } + return nil + }, + }) + if err != nil { + return err + } + return nil +} + +func ExportAllEntities() error { + postService := PostService{} + exporter := excel.Exporter[Post]{ + SheetName: "Посты", + Entity: Post{}, + Provider: postService.GetAll, + } + err := excel.ExportEntitiesToSpreadsheet("report.xlsx", exporter) + if err != nil { + return err + } + return nil +} diff --git a/internal/services/post.go b/internal/services/post.go index b856bd6..525ae55 100644 --- a/internal/services/post.go +++ b/internal/services/post.go @@ -3,13 +3,9 @@ package services import ( "app/internal/dal" "app/internal/database" - "app/internal/dialogs" - "app/internal/extras/excel" "app/internal/models" "app/internal/utils" "errors" - "fmt" - "gorm.io/gen/field" "gorm.io/gorm" ) @@ -64,17 +60,7 @@ func (service *PostService) Count() (int64, error) { amount, err := dal.Post.Count() return amount, err } -func (service *PostService) ExportToExcel() { - exporter := excel.Exporter[Post]{ - SheetName: "Посты", - Entity: Post{}, - Provider: service.GetAll, - } - err := excel.ExportEntitiesToSpreadsheet("report.xlsx", exporter) - if err != nil { - dialogs.ErrorDialog("Ошибка экспорта", fmt.Sprintf("Ошибка при экспорте данных: %s", err)) - } -} + func (service *PostService) SortedByOrder(fieldsSortOrder map[string]string) ([]*Post, error) { return utils.SortByOrder(fieldsSortOrder, Post{}) } diff --git a/internal/services/posttype.go b/internal/services/posttype.go index 29196d1..5d1cf0b 100644 --- a/internal/services/posttype.go +++ b/internal/services/posttype.go @@ -3,14 +3,11 @@ package services import ( "app/internal/dal" "app/internal/database" - "app/internal/dialogs" - "app/internal/extras/excel" "app/internal/models" "app/internal/utils" "errors" "gorm.io/gen/field" "gorm.io/gorm" - "strconv" ) type PostTypeService struct { @@ -63,34 +60,6 @@ func (service *PostTypeService) Count() (int64, error) { return amount, err } -func (service *PostTypeService) ImportFromExcel() error { - filepath, err := dialogs.OpenFileDialog("Импорт данных") - if err != nil { - return err - } - err = excel.ImportFromSpreadsheet(filepath, excel.Importer{ - SheetName: "Тип поста", - Loader: func(rowIndex int, row []string) error { - id, err := strconv.Atoi(row[0]) - if err != nil { - return err - } - - _, err = service.Create(PostType{ - Id: uint(id), - Name: row[1], - }) - if err != nil { - return err - } - return nil - }, - }) - if err != nil { - return err - } - return nil -} func (service *PostTypeService) SortedByOrder(fieldsSortOrder map[string]string) ([]*PostType, error) { return utils.SortByOrder(fieldsSortOrder, PostType{}) } diff --git a/main.go b/main.go index cba527c..40dd703 100644 --- a/main.go +++ b/main.go @@ -13,7 +13,7 @@ var assets embed.FS func main() { app := application.New(application.Options{ Name: "nto_starterkit", - Description: "NTO toolkit template", + Description: "Toolkit template", Services: append([]application.Service{services.MigratorService}, services.ExportedServices...), Assets: application.AssetOptions{ Handler: application.AssetFileServerFS(assets),