From d5bc9bb7cbeccda0c19e3a21cfbd22477500fe82 Mon Sep 17 00:00:00 2001 From: Harvey Kandola Date: Tue, 1 Aug 2017 15:35:13 +0100 Subject: [PATCH] page codebase moved to new API --- domain/page/endpoint.go | 1090 ++++++++++++++++++++++++++++++++ domain/page/mysql/store.go | 396 ++++++++++++ domain/section/endpoint.go | 168 +++++ domain/section/section_test.go | 2 +- domain/storer.go | 26 +- model/page/page.go | 19 + server/routing/routes.go | 42 +- 7 files changed, 1718 insertions(+), 25 deletions(-) create mode 100644 domain/page/endpoint.go create mode 100644 domain/section/endpoint.go diff --git a/domain/page/endpoint.go b/domain/page/endpoint.go new file mode 100644 index 00000000..6ada2917 --- /dev/null +++ b/domain/page/endpoint.go @@ -0,0 +1,1090 @@ +// Copyright 2016 Documize Inc. . All rights reserved. +// +// This software (Documize Community Edition) is licensed under +// GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html +// +// You can operate outside the AGPL restrictions by purchasing +// Documize Enterprise Edition and obtaining a commercial license +// by contacting . +// +// https://documize.com + +package page + +import ( + "database/sql" + "encoding/json" + "fmt" + "io/ioutil" + "net/http" + "strconv" + + "github.com/documize/community/core/env" + "github.com/documize/community/core/request" + "github.com/documize/community/core/response" + "github.com/documize/community/core/streamutil" + "github.com/documize/community/core/uniqueid" + "github.com/documize/community/domain" + "github.com/documize/community/domain/document" + "github.com/documize/community/domain/link" + "github.com/documize/community/domain/section/provider" + "github.com/documize/community/model/activity" + "github.com/documize/community/model/audit" + "github.com/documize/community/model/doc" + "github.com/documize/community/model/page" + htmldiff "github.com/documize/html-diff" +) + +// Handler contains the runtime information such as logging and database. +type Handler struct { + Runtime *env.Runtime + Store *domain.Store +} + +// Add inserts new section into document. +func (h *Handler) Add(w http.ResponseWriter, r *http.Request) { + method := "page.add" + ctx := domain.GetRequestContext(r) + + if !h.Runtime.Product.License.IsValid() { + response.WriteBadLicense(w) + return + } + + documentID := request.Param(r, "documentID") + if len(documentID) == 0 { + response.WriteMissingDataError(w, method, "documentID") + return + } + + if !document.CanChangeDocument(ctx, *h.Store, documentID) { + response.WriteForbiddenError(w) + return + } + + defer streamutil.Close(r.Body) + body, err := ioutil.ReadAll(r.Body) + if err != nil { + response.WriteBadRequestError(w, method, err.Error()) + return + } + + model := new(page.NewPage) + err = json.Unmarshal(body, &model) + if err != nil { + response.WriteBadRequestError(w, method, err.Error()) + return + } + + if model.Page.DocumentID != documentID { + response.WriteBadRequestError(w, method, "documentID mismatch") + return + } + + if model.Meta.DocumentID != documentID { + response.WriteBadRequestError(w, method, "documentID mismatch") + return + } + + pageID := uniqueid.Generate() + model.Page.RefID = pageID + model.Meta.PageID = pageID + model.Meta.OrgID = ctx.OrgID // required for Render call below + model.Meta.UserID = ctx.UserID // required for Render call below + model.Page.SetDefaults() + model.Meta.SetDefaults() + // page.Title = template.HTMLEscapeString(page.Title) + + doc, err := h.Store.Document.Get(ctx, documentID) + if err != nil { + h.Runtime.Log.Error(method, err) + response.WriteServerError(w, method, err) + return + } + + ctx.Transaction, err = h.Runtime.Db.Beginx() + if err != nil { + h.Runtime.Log.Error(method, err) + response.WriteServerError(w, method, err) + return + } + + output, ok := provider.Render(model.Page.ContentType, provider.NewContext(model.Meta.OrgID, model.Meta.UserID), model.Meta.Config, model.Meta.RawBody) + if !ok { + h.Runtime.Log.Info("provider.Render could not find: " + model.Page.ContentType) + } + + model.Page.Body = output + + err = h.Store.Page.Add(ctx, *model) + if err != nil { + ctx.Transaction.Rollback() + h.Runtime.Log.Error(method, err) + response.WriteServerError(w, method, err) + return + } + + if len(model.Page.BlockID) > 0 { + h.Store.Block.IncrementUsage(ctx, model.Page.BlockID) + } + + h.Store.Activity.RecordUserActivity(ctx, activity.UserActivity{ + LabelID: doc.LabelID, + SourceID: model.Page.DocumentID, + SourceType: activity.SourceTypeDocument, + ActivityType: activity.TypeCreated}) + + h.Store.Audit.Record(ctx, audit.EventTypeSectionAdd) + + ctx.Transaction.Commit() + + np, _ := h.Store.Page.Get(ctx, pageID) + + h.Store.Indexer.Add(ctx, np, pageID) + + response.WriteJSON(w, np) +} + +// GetPage gets specified page for document. +func (h *Handler) GetPage(w http.ResponseWriter, r *http.Request) { + method := "page.GetPage" + ctx := domain.GetRequestContext(r) + + documentID := request.Param(r, "documentID") + if len(documentID) == 0 { + response.WriteMissingDataError(w, method, "documentID") + return + } + + pageID := request.Param(r, "pageID") + if len(pageID) == 0 { + response.WriteMissingDataError(w, method, "pageID") + return + } + + if !document.CanViewDocument(ctx, *h.Store, documentID) { + response.WriteForbiddenError(w) + return + } + + page, err := h.Store.Page.Get(ctx, pageID) + if err == sql.ErrNoRows { + response.WriteNotFoundError(w, method, documentID) + return + } + if err != nil { + response.WriteServerError(w, method, err) + return + } + + if page.DocumentID != documentID { + response.WriteBadRequestError(w, method, "documentID mismatch") + return + } + + response.WriteJSON(w, page) +} + +// GetPages gets all pages for document. +func (h *Handler) GetPages(w http.ResponseWriter, r *http.Request) { + method := "page.GetPage" + ctx := domain.GetRequestContext(r) + + documentID := request.Param(r, "documentID") + if len(documentID) == 0 { + response.WriteMissingDataError(w, method, "documentID") + return + } + + if !document.CanViewDocument(ctx, *h.Store, documentID) { + response.WriteForbiddenError(w) + return + } + + var pages []page.Page + var err error + content := request.Query(r, "content") + + if len(content) > 0 { + pages, err = h.Store.Page.GetPagesWithoutContent(ctx, documentID) + } else { + pages, err = h.Store.Page.GetPages(ctx, documentID) + } + + if len(pages) == 0 { + pages = []page.Page{} + } + + if err != nil { + response.WriteServerError(w, method, err) + return + } + + response.WriteJSON(w, pages) +} + +// GetPagesBatch gets specified pages for document. +func (h *Handler) GetPagesBatch(w http.ResponseWriter, r *http.Request) { + method := "page.batch" + ctx := domain.GetRequestContext(r) + + documentID := request.Param(r, "documentID") + if len(documentID) == 0 { + response.WriteMissingDataError(w, method, "documentID") + return + } + + if !document.CanViewDocument(ctx, *h.Store, documentID) { + response.WriteForbiddenError(w) + return + } + + defer streamutil.Close(r.Body) + body, err := ioutil.ReadAll(r.Body) + if err != nil { + response.WriteBadRequestError(w, method, err.Error()) + return + } + + requestedPages := string(body) + + pages, err := h.Store.Page.GetPagesWhereIn(ctx, documentID, requestedPages) + if err == sql.ErrNoRows { + response.WriteNotFoundError(w, method, documentID) + return + } + if err != nil { + response.WriteServerError(w, method, err) + return + } + + response.WriteJSON(w, pages) +} + +// Delete deletes a page. +func (h *Handler) Delete(w http.ResponseWriter, r *http.Request) { + method := "page.delete" + ctx := domain.GetRequestContext(r) + + if !h.Runtime.Product.License.IsValid() { + response.WriteBadLicense(w) + return + } + + documentID := request.Param(r, "documentID") + if len(documentID) == 0 { + response.WriteMissingDataError(w, method, "documentID") + return + } + + pageID := request.Param(r, "pageID") + if len(pageID) == 0 { + response.WriteMissingDataError(w, method, "pageID") + return + } + + if !document.CanChangeDocument(ctx, *h.Store, documentID) { + response.WriteForbiddenError(w) + return + } + + doc, err := h.Store.Document.Get(ctx, documentID) + if err != nil { + response.WriteServerError(w, method, err) + return + } + + ctx.Transaction, err = h.Runtime.Db.Beginx() + if err != nil { + response.WriteServerError(w, method, err) + return + } + + page, err := h.Store.Page.Get(ctx, pageID) + if err != nil { + ctx.Transaction.Rollback() + response.WriteServerError(w, method, err) + return + } + + if len(page.BlockID) > 0 { + h.Store.Block.DecrementUsage(ctx, page.BlockID) + } + + _, err = h.Store.Page.Delete(ctx, documentID, pageID) + if err != nil { + ctx.Transaction.Rollback() + response.WriteServerError(w, method, err) + return + } + + h.Store.Activity.RecordUserActivity(ctx, activity.UserActivity{ + LabelID: doc.LabelID, + SourceID: documentID, + SourceType: activity.SourceTypeDocument, + ActivityType: activity.TypeDeleted}) + + h.Store.Audit.Record(ctx, audit.EventTypeSectionDelete) + + h.Store.Indexer.Delete(ctx, documentID, pageID) + + h.Store.Link.DeleteSourcePageLinks(ctx, pageID) + + h.Store.Link.MarkOrphanPageLink(ctx, pageID) + + h.Store.Page.DeletePageRevisions(ctx, pageID) + + ctx.Transaction.Commit() + + response.WriteEmpty(w) +} + +// DeletePages batch deletes pages. +func (h *Handler) DeletePages(w http.ResponseWriter, r *http.Request) { + method := "page.delete.pages" + ctx := domain.GetRequestContext(r) + + if !h.Runtime.Product.License.IsValid() { + response.WriteBadLicense(w) + return + } + + documentID := request.Param(r, "documentID") + if len(documentID) == 0 { + response.WriteMissingDataError(w, method, "documentID") + return + } + + if !document.CanChangeDocument(ctx, *h.Store, documentID) { + response.WriteForbiddenError(w) + return + } + + defer streamutil.Close(r.Body) + body, err := ioutil.ReadAll(r.Body) + if err != nil { + response.WriteBadRequestError(w, method, "Bad body") + return + } + + model := new([]page.PageLevelRequest) + err = json.Unmarshal(body, &model) + if err != nil { + response.WriteBadRequestError(w, method, "JSON marshal") + return + } + + doc, err := h.Store.Document.Get(ctx, documentID) + if err != nil { + response.WriteServerError(w, method, err) + return + } + + ctx.Transaction, err = h.Runtime.Db.Beginx() + if err != nil { + response.WriteServerError(w, method, err) + return + } + + for _, page := range *model { + pageData, err := h.Store.Page.Get(ctx, page.PageID) + if err != nil { + ctx.Transaction.Rollback() + response.WriteServerError(w, method, err) + return + } + + if len(pageData.BlockID) > 0 { + h.Store.Block.DecrementUsage(ctx, pageData.BlockID) + } + + _, err = h.Store.Page.Delete(ctx, documentID, page.PageID) + if err != nil { + ctx.Transaction.Rollback() + response.WriteServerError(w, method, err) + return + } + + h.Store.Indexer.Delete(ctx, documentID, page.PageID) + + h.Store.Link.DeleteSourcePageLinks(ctx, page.PageID) + + h.Store.Link.MarkOrphanPageLink(ctx, page.PageID) + + h.Store.Page.DeletePageRevisions(ctx, page.PageID) + } + + h.Store.Activity.RecordUserActivity(ctx, activity.UserActivity{ + LabelID: doc.LabelID, + SourceID: documentID, + SourceType: activity.SourceTypeDocument, + ActivityType: activity.TypeDeleted}) + + h.Store.Audit.Record(ctx, audit.EventTypeSectionDelete) + + ctx.Transaction.Commit() + + response.WriteEmpty(w) +} + +// Update will persist changed page and note the fact +// that this is a new revision. If the page is the first in a document +// then the corresponding document title will also be changed. +func (h *Handler) Update(w http.ResponseWriter, r *http.Request) { + method := "page.update" + ctx := domain.GetRequestContext(r) + + if !h.Runtime.Product.License.IsValid() { + response.WriteBadLicense(w) + return + } + + if !ctx.Editor { + response.WriteForbiddenError(w) + return + } + + documentID := request.Param(r, "documentID") + if len(documentID) == 0 { + response.WriteMissingDataError(w, method, "documentID") + return + } + + pageID := request.Param(r, "pageID") + if len(pageID) == 0 { + response.WriteMissingDataError(w, method, "pageID") + return + } + + defer streamutil.Close(r.Body) + body, err := ioutil.ReadAll(r.Body) + if err != nil { + response.WriteBadRequestError(w, method, "Bad request body") + return + } + + model := new(page.NewPage) + err = json.Unmarshal(body, &model) + if err != nil { + response.WriteBadRequestError(w, method, err.Error()) + return + } + + if model.Page.RefID != pageID || model.Page.DocumentID != documentID { + response.WriteBadRequestError(w, method, err.Error()) + return + } + + doc, err := h.Store.Document.Get(ctx, documentID) + if err != nil { + response.WriteServerError(w, method, err) + return + } + + ctx.Transaction, err = h.Runtime.Db.Beginx() + if err != nil { + response.WriteServerError(w, method, err) + return + } + + model.Page.SetDefaults() + model.Meta.SetDefaults() + + oldPageMeta, err := h.Store.Page.GetPageMeta(ctx, pageID) + if err != nil { + response.WriteBadRequestError(w, method, err.Error()) + return + } + + output, ok := provider.Render(model.Page.ContentType, provider.NewContext(model.Meta.OrgID, oldPageMeta.UserID), model.Meta.Config, model.Meta.RawBody) + if !ok { + h.Runtime.Log.Info("provider.Render could not find: " + model.Page.ContentType) + } + + model.Page.Body = output + refID := uniqueid.Generate() + skipRevision := false + skipRevision, err = strconv.ParseBool(request.Query(r, "r")) + + err = h.Store.Page.Update(ctx, model.Page, refID, ctx.UserID, skipRevision) + if err != nil { + response.WriteServerError(w, method, err) + ctx.Transaction.Rollback() + return + } + + err = h.Store.Page.UpdateMeta(ctx, model.Meta, true) // change the UserID to the current one + if err != nil { + response.WriteServerError(w, method, err) + ctx.Transaction.Rollback() + return + } + + h.Store.Activity.RecordUserActivity(ctx, activity.UserActivity{ + LabelID: doc.LabelID, + SourceID: model.Page.DocumentID, + SourceType: activity.SourceTypeDocument, + ActivityType: activity.TypeEdited}) + + h.Store.Audit.Record(ctx, audit.EventTypeSectionUpdate) + + // find any content links in the HTML + links := link.GetContentLinks(model.Page.Body) + + // get a copy of previously saved links + previousLinks, _ := h.Store.Link.GetPageLinks(ctx, model.Page.DocumentID, model.Page.RefID) + + // delete previous content links for this page + _, _ = h.Store.Link.DeleteSourcePageLinks(ctx, model.Page.RefID) + + // save latest content links for this page + for _, link := range links { + link.Orphan = false + link.OrgID = ctx.OrgID + link.UserID = ctx.UserID + link.SourceDocumentID = model.Page.DocumentID + link.SourcePageID = model.Page.RefID + + if link.LinkType == "document" { + link.TargetID = "" + } + + // We check if there was a previously saved version of this link. + // If we find one, we carry forward the orphan flag. + for _, p := range previousLinks { + if link.TargetID == p.TargetID && link.LinkType == p.LinkType { + link.Orphan = p.Orphan + break + } + } + + // save + err := h.Store.Link.Add(ctx, link) + if err != nil { + h.Runtime.Log.Error(fmt.Sprintf("Unable to insert content links for page %s", model.Page.RefID), err) + } + } + + ctx.Transaction.Commit() + + h.Store.Indexer.Update(ctx, model.Page) + + updatedPage, err := h.Store.Page.Get(ctx, pageID) + + response.WriteJSON(w, updatedPage) +} + +// ChangePageSequence will swap page sequence for a given number of pages. +func (h *Handler) ChangePageSequence(w http.ResponseWriter, r *http.Request) { + method := "page.sequence" + ctx := domain.GetRequestContext(r) + + if !h.Runtime.Product.License.IsValid() { + response.WriteBadLicense(w) + return + } + + documentID := request.Param(r, "documentID") + if len(documentID) == 0 { + response.WriteMissingDataError(w, method, "documentID") + return + } + + if !document.CanChangeDocument(ctx, *h.Store, documentID) { + response.WriteForbiddenError(w) + return + } + + defer streamutil.Close(r.Body) + body, err := ioutil.ReadAll(r.Body) + if err != nil { + response.WriteBadRequestError(w, method, err.Error()) + return + } + + model := new([]page.PageSequenceRequest) + err = json.Unmarshal(body, &model) + if err != nil { + response.WriteBadRequestError(w, method, err.Error()) + return + } + + ctx.Transaction, err = h.Runtime.Db.Beginx() + if err != nil { + response.WriteServerError(w, method, err) + return + } + + for _, p := range *model { + err = h.Store.Page.UpdateSequence(ctx, documentID, p.PageID, p.Sequence) + if err != nil { + ctx.Transaction.Rollback() + response.WriteServerError(w, method, err) + return + } + + h.Store.Indexer.UpdateSequence(ctx, documentID, p.PageID, p.Sequence) + } + + h.Store.Audit.Record(ctx, audit.EventTypeSectionResequence) + + ctx.Transaction.Commit() + + response.WriteEmpty(w) +} + +// ChangePageLevel handles page indent/outdent changes. +func (h *Handler) ChangePageLevel(w http.ResponseWriter, r *http.Request) { + method := "page.level" + ctx := domain.GetRequestContext(r) + + if !h.Runtime.Product.License.IsValid() { + response.WriteBadLicense(w) + return + } + + documentID := request.Param(r, "documentID") + if len(documentID) == 0 { + response.WriteMissingDataError(w, method, "documentID") + return + } + + if !document.CanChangeDocument(ctx, *h.Store, documentID) { + response.WriteForbiddenError(w) + return + } + + defer streamutil.Close(r.Body) + body, err := ioutil.ReadAll(r.Body) + if err != nil { + response.WriteBadRequestError(w, method, err.Error()) + return + } + + model := new([]page.PageLevelRequest) + err = json.Unmarshal(body, &model) + if err != nil { + response.WriteBadRequestError(w, method, err.Error()) + return + } + + ctx.Transaction, err = h.Runtime.Db.Beginx() + if err != nil { + response.WriteServerError(w, method, err) + return + } + + for _, p := range *model { + err = h.Store.Page.UpdateLevel(ctx, documentID, p.PageID, p.Level) + if err != nil { + ctx.Transaction.Rollback() + response.WriteServerError(w, method, err) + return + } + + h.Store.Indexer.UpdateLevel(ctx, documentID, p.PageID, p.Level) + } + + h.Store.Audit.Record(ctx, audit.EventTypeSectionResequence) + + ctx.Transaction.Commit() + + response.WriteEmpty(w) +} + +// GetMeta gets page meta data for specified document page. +func (h *Handler) GetMeta(w http.ResponseWriter, r *http.Request) { + method := "page.meta" + ctx := domain.GetRequestContext(r) + + documentID := request.Param(r, "documentID") + if len(documentID) == 0 { + response.WriteMissingDataError(w, method, "documentID") + return + } + + pageID := request.Param(r, "pageID") + if len(pageID) == 0 { + response.WriteMissingDataError(w, method, "pageID") + return + } + + if !document.CanViewDocument(ctx, *h.Store, documentID) { + response.WriteForbiddenError(w) + return + } + + meta, err := h.Store.Page.GetPageMeta(ctx, pageID) + if err == sql.ErrNoRows { + response.WriteNotFoundError(w, method, pageID) + return + } + if err != nil { + response.WriteServerError(w, method, err) + return + } + if meta.DocumentID != documentID { + response.WriteBadRequestError(w, method, "documentID mismatch") + return + } + + response.WriteJSON(w, meta) +} + +//************************************************** +// Copy Move Page +//************************************************** + +// GetMoveCopyTargets returns available documents for page copy/move axction. +func (h *Handler) GetMoveCopyTargets(w http.ResponseWriter, r *http.Request) { + method := "page.targets" + ctx := domain.GetRequestContext(r) + + var d []doc.Document + var err error + + d, err = h.Store.Document.DocumentList(ctx) + if len(d) == 0 { + d = []doc.Document{} + } + if err != nil { + response.WriteServerError(w, method, err) + return + } + + response.WriteJSON(w, d) +} + +// Copy copies page to either same or different document. +func (h *Handler) Copy(w http.ResponseWriter, r *http.Request) { + method := "page.targets" + ctx := domain.GetRequestContext(r) + + documentID := request.Param(r, "documentID") + if len(documentID) == 0 { + response.WriteMissingDataError(w, method, "documentID") + return + } + + pageID := request.Param(r, "pageID") + if len(pageID) == 0 { + response.WriteMissingDataError(w, method, "pageID") + return + } + + targetID := request.Param(r, "targetID") + if len(targetID) == 0 { + response.WriteMissingDataError(w, method, "targetID") + return + } + + // permission + if !document.CanViewDocument(ctx, *h.Store, documentID) { + response.WriteForbiddenError(w) + return + } + + // fetch data + doc, err := h.Store.Document.Get(ctx, documentID) + if err != nil { + response.WriteServerError(w, method, err) + return + } + + p, err := h.Store.Page.Get(ctx, pageID) + if err == sql.ErrNoRows { + response.WriteNotFoundError(w, method, documentID) + return + } + if err != nil { + response.WriteServerError(w, method, err) + return + } + + pageMeta, err := h.Store.Page.GetPageMeta(ctx, pageID) + if err == sql.ErrNoRows { + response.WriteNotFoundError(w, method, documentID) + return + } + if err != nil { + response.WriteServerError(w, method, err) + return + } + + newPageID := uniqueid.Generate() + p.RefID = newPageID + p.Level = 1 + p.Sequence = 0 + p.DocumentID = targetID + p.UserID = ctx.UserID + pageMeta.DocumentID = targetID + pageMeta.PageID = newPageID + pageMeta.UserID = ctx.UserID + + model := new(page.NewPage) + model.Meta = pageMeta + model.Page = p + + ctx.Transaction, err = h.Runtime.Db.Beginx() + if err != nil { + response.WriteServerError(w, method, err) + return + } + + err = h.Store.Page.Add(ctx, *model) + if err != nil { + ctx.Transaction.Rollback() + response.WriteServerError(w, method, err) + return + } + + if len(model.Page.BlockID) > 0 { + h.Store.Block.IncrementUsage(ctx, model.Page.BlockID) + } + + // Log action against target document + h.Store.Activity.RecordUserActivity(ctx, activity.UserActivity{ + LabelID: doc.LabelID, + SourceID: targetID, + SourceType: activity.SourceTypeDocument, + ActivityType: activity.TypeEdited}) + + h.Store.Audit.Record(ctx, audit.EventTypeSectionCopy) + + ctx.Transaction.Commit() + + np, _ := h.Store.Page.Get(ctx, pageID) + + response.WriteJSON(w, np) +} + +//************************************************** +// Revisions +//************************************************** + +// GetDocumentRevisions returns all changes for a document. +func (h *Handler) GetDocumentRevisions(w http.ResponseWriter, r *http.Request) { + method := "page.document.revisions" + ctx := domain.GetRequestContext(r) + + if !h.Runtime.Product.License.IsValid() { + response.WriteBadLicense(w) + return + } + + documentID := request.Param(r, "documentID") + if len(documentID) == 0 { + response.WriteMissingDataError(w, method, "documentID") + return + } + + if !document.CanViewDocument(ctx, *h.Store, documentID) { + response.WriteForbiddenError(w) + return + } + + revisions, _ := h.Store.Page.GetDocumentRevisions(ctx, documentID) + if len(revisions) == 0 { + revisions = []page.Revision{} + } + + h.Store.Audit.Record(ctx, audit.EventTypeDocumentRevisions) + + response.WriteJSON(w, revisions) +} + +// GetRevisions returns all changes for a given page. +func (h *Handler) GetRevisions(w http.ResponseWriter, r *http.Request) { + method := "page.revisions" + ctx := domain.GetRequestContext(r) + + if !h.Runtime.Product.License.IsValid() { + response.WriteBadLicense(w) + return + } + + documentID := request.Param(r, "documentID") + if len(documentID) == 0 { + response.WriteMissingDataError(w, method, "documentID") + return + } + + if !document.CanViewDocument(ctx, *h.Store, documentID) { + response.WriteForbiddenError(w) + return + } + + pageID := request.Param(r, "pageID") + if len(pageID) == 0 { + response.WriteMissingDataError(w, method, "pageID") + return + } + + revisions, _ := h.Store.Page.GetPageRevisions(ctx, pageID) + if len(revisions) == 0 { + revisions = []page.Revision{} + } + + response.WriteJSON(w, revisions) +} + +// GetDiff returns HTML diff between two revisions of a given page. +func (h *Handler) GetDiff(w http.ResponseWriter, r *http.Request) { + method := "page.diff" + ctx := domain.GetRequestContext(r) + + if !h.Runtime.Product.License.IsValid() { + response.WriteBadLicense(w) + return + } + + documentID := request.Param(r, "documentID") + if len(documentID) == 0 { + response.WriteMissingDataError(w, method, "documentID") + return + } + + pageID := request.Param(r, "pageID") + if len(pageID) == 0 { + response.WriteMissingDataError(w, method, "pageID") + return + } + + revisionID := request.Param(r, "revisionID") + if len(revisionID) == 0 { + response.WriteMissingDataError(w, method, "revisionID") + return + } + + if !document.CanViewDocument(ctx, *h.Store, documentID) { + response.WriteForbiddenError(w) + return + } + + p, err := h.Store.Page.Get(ctx, pageID) + if err == sql.ErrNoRows { + response.WriteNotFoundError(w, method, pageID) + return + } + if err != nil { + response.WriteServerError(w, method, err) + return + } + + revision, _ := h.Store.Page.GetPageRevision(ctx, revisionID) + + latestHTML := p.Body + previousHTML := revision.Body + var result []byte + + var cfg = &htmldiff.Config{ + Granularity: 5, + InsertedSpan: []htmldiff.Attribute{{Key: "style", Val: "background-color: palegreen;"}}, + DeletedSpan: []htmldiff.Attribute{{Key: "style", Val: "background-color: lightpink; text-decoration: line-through;"}}, + ReplacedSpan: []htmldiff.Attribute{{Key: "style", Val: "background-color: lightskyblue;"}}, + CleanTags: []string{"documize"}, + } + + res, err := cfg.HTMLdiff([]string{latestHTML, previousHTML}) + if err != nil { + response.WriteServerError(w, method, err) + return + } + + result = []byte(res[0]) + w.Write(result) +} + +// Rollback rolls back to a specific page revision. +func (h *Handler) Rollback(w http.ResponseWriter, r *http.Request) { + method := "page.rollback" + ctx := domain.GetRequestContext(r) + + documentID := request.Param(r, "documentID") + if len(documentID) == 0 { + response.WriteMissingDataError(w, method, "documentID") + return + } + + pageID := request.Param(r, "pageID") + if len(pageID) == 0 { + response.WriteMissingDataError(w, method, "pageID") + return + } + + revisionID := request.Param(r, "revisionID") + if len(revisionID) == 0 { + response.WriteMissingDataError(w, method, "revisionID") + return + } + + if !document.CanChangeDocument(ctx, *h.Store, documentID) { + response.WriteForbiddenError(w) + return + } + + var err error + ctx.Transaction, err = h.Runtime.Db.Beginx() + if err != nil { + response.WriteServerError(w, method, err) + return + } + + p, err := h.Store.Page.Get(ctx, pageID) + if err != nil { + response.WriteServerError(w, method, err) + return + } + + meta, err := h.Store.Page.GetPageMeta(ctx, pageID) + if err != nil { + response.WriteServerError(w, method, err) + return + } + + revision, err := h.Store.Page.GetPageRevision(ctx, revisionID) + if err != nil { + response.WriteServerError(w, method, err) + return + } + + doc, err := h.Store.Document.Get(ctx, documentID) + if err != nil { + response.WriteServerError(w, method, err) + return + } + + // roll back page + p.Body = revision.Body + refID := uniqueid.Generate() + + err = h.Store.Page.Update(ctx, p, refID, ctx.UserID, false) + if err != nil { + ctx.Transaction.Rollback() + response.WriteServerError(w, method, err) + return + } + + // roll back page meta + meta.Config = revision.Config + meta.RawBody = revision.RawBody + + err = h.Store.Page.UpdateMeta(ctx, meta, false) + if err != nil { + ctx.Transaction.Rollback() + response.WriteServerError(w, method, err) + return + } + + h.Store.Activity.RecordUserActivity(ctx, activity.UserActivity{ + LabelID: doc.LabelID, + SourceID: p.DocumentID, + SourceType: activity.SourceTypeDocument, + ActivityType: activity.TypeReverted}) + + h.Store.Audit.Record(ctx, audit.EventTypeSectionRollback) + + ctx.Transaction.Commit() + + response.WriteJSON(w, p) +} diff --git a/domain/page/mysql/store.go b/domain/page/mysql/store.go index d1e02d0f..55f4232f 100644 --- a/domain/page/mysql/store.go +++ b/domain/page/mysql/store.go @@ -13,10 +13,15 @@ package mysql import ( "fmt" + "strings" + "time" "github.com/documize/community/core/env" + "github.com/documize/community/core/streamutil" "github.com/documize/community/domain" + "github.com/documize/community/domain/store/mysql" "github.com/documize/community/model/page" + "github.com/jmoiron/sqlx" "github.com/pkg/errors" ) @@ -25,6 +30,147 @@ type Scope struct { Runtime *env.Runtime } +// Add inserts the given page into the page table, adds that page to the queue of pages to index and audits that the page has been added. +func (s Scope) Add(ctx domain.RequestContext, model page.NewPage) (err error) { + model.Page.OrgID = ctx.OrgID + model.Page.UserID = ctx.UserID + model.Page.Created = time.Now().UTC() + model.Page.Revised = time.Now().UTC() + + model.Meta.OrgID = ctx.OrgID + model.Meta.UserID = ctx.UserID + model.Meta.DocumentID = model.Page.DocumentID + model.Meta.Created = time.Now().UTC() + model.Meta.Revised = time.Now().UTC() + + if model.Page.Sequence == 0 { + // Get maximum page sequence number and increment (used to be AND pagetype='section') + row := s.Runtime.Db.QueryRow("SELECT max(sequence) FROM page WHERE orgid=? AND documentid=?", ctx.OrgID, model.Page.DocumentID) + var maxSeq float64 + err = row.Scan(&maxSeq) + + if err != nil { + maxSeq = 2048 + } + + model.Page.Sequence = maxSeq * 2 + } + + stmt, err := ctx.Transaction.Preparex("INSERT INTO page (refid, orgid, documentid, userid, contenttype, pagetype, level, title, body, revisions, sequence, blockid, created, revised) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)") + defer streamutil.Close(stmt) + + if err != nil { + err = errors.Wrap(err, "prepare page insert") + return + } + + _, err = stmt.Exec(model.Page.RefID, model.Page.OrgID, model.Page.DocumentID, model.Page.UserID, model.Page.ContentType, model.Page.PageType, model.Page.Level, model.Page.Title, model.Page.Body, model.Page.Revisions, model.Page.Sequence, model.Page.BlockID, model.Page.Created, model.Page.Revised) + if err != nil { + err = errors.Wrap(err, "execute page insert") + return + } + + stmt2, err := ctx.Transaction.Preparex("INSERT INTO pagemeta (pageid, orgid, userid, documentid, rawbody, config, externalsource, created, revised) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)") + defer streamutil.Close(stmt2) + + if err != nil { + err = errors.Wrap(err, "prepare page meta insert") + return + } + + _, err = stmt2.Exec(model.Meta.PageID, model.Meta.OrgID, model.Meta.UserID, model.Meta.DocumentID, model.Meta.RawBody, model.Meta.Config, model.Meta.ExternalSource, model.Meta.Created, model.Meta.Revised) + + if err != nil { + err = errors.Wrap(err, "execute page meta insert") + return + } + + return +} + +// Get returns the pageID page record from the page table. +func (s Scope) Get(ctx domain.RequestContext, pageID string) (p page.Page, err error) { + stmt, err := s.Runtime.Db.Preparex("SELECT a.id, a.refid, a.orgid, a.documentid, a.userid, a.contenttype, a.pagetype, a.level, a.sequence, a.title, a.body, a.revisions, a.blockid, a.created, a.revised FROM page a WHERE a.orgid=? AND a.refid=?") + defer streamutil.Close(stmt) + + if err != nil { + err = errors.Wrap(err, "prepare get page") + return + } + + err = stmt.Get(&p, ctx.OrgID, pageID) + if err != nil { + err = errors.Wrap(err, "execute get page") + return + } + + return +} + +// GetPages returns a slice containing all the page records for a given documentID, in presentation sequence. +func (s Scope) GetPages(ctx domain.RequestContext, documentID string) (p []page.Page, err error) { + err = s.Runtime.Db.Select(&p, "SELECT a.id, a.refid, a.orgid, a.documentid, a.userid, a.contenttype, a.pagetype, a.level, a.sequence, a.title, a.body, a.revisions, a.blockid, a.created, a.revised FROM page a WHERE a.orgid=? AND a.documentid=? ORDER BY a.sequence", ctx.OrgID, documentID) + + if err != nil { + err = errors.Wrap(err, "execute get pages") + return + } + + return +} + +// GetPagesWhereIn returns a slice, in presentation sequence, containing those page records for a given documentID +// where their refid is in the comma-separated list passed as inPages. +func (s Scope) GetPagesWhereIn(ctx domain.RequestContext, documentID, inPages string) (p []page.Page, err error) { + args := []interface{}{ctx.OrgID, documentID} + tempValues := strings.Split(inPages, ",") + + sql := "SELECT a.id, a.refid, a.orgid, a.documentid, a.userid, a.contenttype, a.pagetype, a.level, a.sequence, a.title, a.body, a.blockid, a.revisions, a.created, a.revised FROM page a WHERE a.orgid=? AND a.documentid=? AND a.refid IN (?" + strings.Repeat(",?", len(tempValues)-1) + ") ORDER BY sequence" + + inValues := make([]interface{}, len(tempValues)) + + for i, v := range tempValues { + inValues[i] = interface{}(v) + } + + args = append(args, inValues...) + + stmt, err := s.Runtime.Db.Preparex(sql) + defer streamutil.Close(stmt) + + if err != nil { + err = errors.Wrap(err, err.Error()) + return + } + + rows, err := stmt.Queryx(args...) + defer streamutil.Close(rows) + + if err != nil { + err = errors.Wrap(err, err.Error()) + return + } + + for rows.Next() { + page := page.Page{} + + err = rows.StructScan(&page) + if err != nil { + err = errors.Wrap(err, err.Error()) + return + } + + p = append(p, page) + } + + if err != nil { + err = errors.Wrap(err, err.Error()) + return + } + + return +} + // GetPagesWithoutContent returns a slice containing all the page records for a given documentID, in presentation sequence, // but without the body field (which holds the HTML content). func (s Scope) GetPagesWithoutContent(ctx domain.RequestContext, documentID string) (pages []page.Page, err error) { @@ -37,3 +183,253 @@ func (s Scope) GetPagesWithoutContent(ctx domain.RequestContext, documentID stri return } + +// Update saves changes to the database and handles recording of revisions. +// Not all updates result in a revision being recorded hence the parameter. +func (s Scope) Update(ctx domain.RequestContext, page page.Page, refID, userID string, skipRevision bool) (err error) { + page.Revised = time.Now().UTC() + + // Store revision history + if !skipRevision { + var stmt *sqlx.Stmt + stmt, err = ctx.Transaction.Preparex("INSERT INTO revision (refid, orgid, documentid, ownerid, pageid, userid, contenttype, pagetype, title, body, rawbody, config, created, revised) SELECT ? as refid, a.orgid, a.documentid, a.userid as ownerid, a.refid as pageid, ? as userid, a.contenttype, a.pagetype, a.title, a.body, b.rawbody, b.config, ? as created, ? as revised FROM page a, pagemeta b WHERE a.refid=? AND a.refid=b.pageid") + + defer streamutil.Close(stmt) + + if err != nil { + err = errors.Wrap(err, "prepare page revision insert") + return err + } + + _, err = stmt.Exec(refID, userID, time.Now().UTC(), time.Now().UTC(), page.RefID) + if err != nil { + err = errors.Wrap(err, "execute page revision insert") + return err + } + } + + // Update page + var stmt2 *sqlx.NamedStmt + stmt2, err = ctx.Transaction.PrepareNamed("UPDATE page SET documentid=:documentid, level=:level, title=:title, body=:body, revisions=:revisions, sequence=:sequence, revised=:revised WHERE orgid=:orgid AND refid=:refid") + defer streamutil.Close(stmt2) + + if err != nil { + err = errors.Wrap(err, "prepare page insert") + return + } + + _, err = stmt2.Exec(&page) + if err != nil { + err = errors.Wrap(err, "execute page insert") + return + } + + // Update revisions counter + if !skipRevision { + stmt3, err := ctx.Transaction.Preparex("UPDATE page SET revisions=revisions+1 WHERE orgid=? AND refid=?") + defer streamutil.Close(stmt3) + + if err != nil { + err = errors.Wrap(err, "prepare page revision counter") + return err + } + + _, err = stmt3.Exec(ctx.OrgID, page.RefID) + if err != nil { + err = errors.Wrap(err, "execute page revision counter") + return err + } + } + + return +} + +// UpdateMeta persists meta information associated with a document page. +func (s Scope) UpdateMeta(ctx domain.RequestContext, meta page.Meta, updateUserID bool) (err error) { + meta.Revised = time.Now().UTC() + + if updateUserID { + meta.UserID = ctx.UserID + } + + var stmt *sqlx.NamedStmt + stmt, err = ctx.Transaction.PrepareNamed("UPDATE pagemeta SET userid=:userid, documentid=:documentid, rawbody=:rawbody, config=:config, externalsource=:externalsource, revised=:revised WHERE orgid=:orgid AND pageid=:pageid") + defer streamutil.Close(stmt) + + if err != nil { + err = errors.Wrap(err, "prepare page meta update") + return + } + + _, err = stmt.Exec(&meta) + if err != nil { + err = errors.Wrap(err, "execute page meta update") + return + } + + return +} + +// UpdateSequence changes the presentation sequence of the pageID page in the document. +// It then propagates that change into the search table and audits that it has occurred. +func (s Scope) UpdateSequence(ctx domain.RequestContext, documentID, pageID string, sequence float64) (err error) { + stmt, err := ctx.Transaction.Preparex("UPDATE page SET sequence=? WHERE orgid=? AND refid=?") + defer streamutil.Close(stmt) + + if err != nil { + err = errors.Wrap(err, "prepare page sequence update") + return + } + + _, err = stmt.Exec(sequence, ctx.OrgID, pageID) + if err != nil { + err = errors.Wrap(err, "execute page sequence update") + return + } + + return +} + +// UpdateLevel changes the heading level of the pageID page in the document. +// It then propagates that change into the search table and audits that it has occurred. +func (s Scope) UpdateLevel(ctx domain.RequestContext, documentID, pageID string, level int) (err error) { + stmt, err := ctx.Transaction.Preparex("UPDATE page SET level=? WHERE orgid=? AND refid=?") + defer streamutil.Close(stmt) + + if err != nil { + err = errors.Wrap(err, "prepare page level update") + return + } + + _, err = stmt.Exec(level, ctx.OrgID, pageID) + if err != nil { + err = errors.Wrap(err, "execute page level update") + return + } + + return +} + +// Delete deletes the pageID page in the document. +// It then propagates that change into the search table, adds a delete the page revisions history, and audits that the page has been removed. +func (s Scope) Delete(ctx domain.RequestContext, documentID, pageID string) (rows int64, err error) { + b := mysql.BaseQuery{} + rows, err = b.DeleteConstrained(ctx.Transaction, "page", ctx.OrgID, pageID) + + if err == nil { + _, _ = b.DeleteWhere(ctx.Transaction, fmt.Sprintf("DELETE FROM pagemeta WHERE orgid='%s' AND pageid='%s'", ctx.OrgID, pageID)) + } + + return +} + +// GetPageMeta returns the meta information associated with the page. +func (s Scope) GetPageMeta(ctx domain.RequestContext, pageID string) (meta page.Meta, err error) { + stmt, err := s.Runtime.Db.Preparex("SELECT id, pageid, orgid, userid, documentid, rawbody, coalesce(config,JSON_UNQUOTE('{}')) as config, externalsource, created, revised FROM pagemeta WHERE orgid=? AND pageid=?") + defer streamutil.Close(stmt) + + if err != nil { + err = errors.Wrap(err, "prepare get page meta") + return + } + + err = stmt.Get(&meta, ctx.OrgID, pageID) + if err != nil { + err = errors.Wrap(err, "execute get page meta") + return + } + + return +} + +// GetDocumentPageMeta returns the meta information associated with a document. +func (s Scope) GetDocumentPageMeta(ctx domain.RequestContext, documentID string, externalSourceOnly bool) (meta []page.Meta, err error) { + filter := "" + if externalSourceOnly { + filter = " AND externalsource=1" + } + + err = s.Runtime.Db.Select(&meta, "SELECT id, pageid, orgid, userid, documentid, rawbody, coalesce(config,JSON_UNQUOTE('{}')) as config, externalsource, created, revised FROM pagemeta WHERE orgid=? AND documentid=?"+filter, ctx.OrgID, documentID) + + if err != nil { + err = errors.Wrap(err, "get document page meta") + return + } + + return +} + +/******************** +* Page Revisions +********************/ + +// GetPageRevision returns the revisionID page revision record. +func (s Scope) GetPageRevision(ctx domain.RequestContext, revisionID string) (revision page.Revision, err error) { + stmt, err := s.Runtime.Db.Preparex("SELECT id, refid, orgid, documentid, ownerid, pageid, userid, contenttype, pagetype, title, body, coalesce(rawbody, '') as rawbody, coalesce(config,JSON_UNQUOTE('{}')) as config, created, revised FROM revision WHERE orgid=? and refid=?") + defer streamutil.Close(stmt) + + if err != nil { + err = errors.Wrap(err, "prepare get page revisions") + return + } + + err = stmt.Get(&revision, ctx.OrgID, revisionID) + if err != nil { + err = errors.Wrap(err, "execute get page revisions") + return + } + + return +} + +// GetPageRevisions returns a slice of page revision records for a given pageID, in the order they were created. +// Then audits that the get-page-revisions action has occurred. +func (s Scope) GetPageRevisions(ctx domain.RequestContext, pageID string) (revisions []page.Revision, err error) { + err = s.Runtime.Db.Select(&revisions, "SELECT a.id, a.refid, a.orgid, a.documentid, a.ownerid, a.pageid, a.userid, a.contenttype, a.pagetype, a.title, /*a.body, a.rawbody, a.config,*/ a.created, a.revised, coalesce(b.email,'') as email, coalesce(b.firstname,'') as firstname, coalesce(b.lastname,'') as lastname, coalesce(b.initials,'') as initials FROM revision a LEFT JOIN user b ON a.userid=b.refid WHERE a.orgid=? AND a.pageid=? AND a.pagetype='section' ORDER BY a.id DESC", ctx.OrgID, pageID) + + if err != nil { + err = errors.Wrap(err, "get page revisions") + return + } + + return +} + +// GetDocumentRevisions returns a slice of page revision records for a given document, in the order they were created. +// Then audits that the get-page-revisions action has occurred. +func (s Scope) GetDocumentRevisions(ctx domain.RequestContext, documentID string) (revisions []page.Revision, err error) { + err = s.Runtime.Db.Select(&revisions, "SELECT a.id, a.refid, a.orgid, a.documentid, a.ownerid, a.pageid, a.userid, a.contenttype, a.pagetype, a.title, /*a.body, a.rawbody, a.config,*/ a.created, a.revised, coalesce(b.email,'') as email, coalesce(b.firstname,'') as firstname, coalesce(b.lastname,'') as lastname, coalesce(b.initials,'') as initials, coalesce(p.revisions, 0) as revisions FROM revision a LEFT JOIN user b ON a.userid=b.refid LEFT JOIN page p ON a.pageid=p.refid WHERE a.orgid=? AND a.documentid=? AND a.pagetype='section' ORDER BY a.id DESC", ctx.OrgID, documentID) + + if err != nil { + err = errors.Wrap(err, "get document revisions") + return + } + + if len(revisions) == 0 { + revisions = []page.Revision{} + } + + return +} + +// DeletePageRevisions deletes all of the page revision records for a given pageID. +func (s Scope) DeletePageRevisions(ctx domain.RequestContext, pageID string) (rows int64, err error) { + b := mysql.BaseQuery{} + rows, err =b.DeleteWhere(ctx.Transaction, fmt.Sprintf("DELETE FROM revision WHERE orgid='%s' AND pageid='%s'", ctx.OrgID, pageID)) + + return +} + +// GetNextPageSequence returns the next sequence numbner to use for a page in given document. +func (s Scope) GetNextPageSequence(ctx domain.RequestContext, documentID string) (maxSeq float64, err error) { + row := s.Runtime.Db.QueryRow("SELECT max(sequence) FROM page WHERE orgid=? AND documentid=?", ctx.OrgID, documentID) + + err = row.Scan(&maxSeq) + if err != nil { + maxSeq = 2048 + } + + maxSeq = maxSeq * 2 + + return +} \ No newline at end of file diff --git a/domain/section/endpoint.go b/domain/section/endpoint.go new file mode 100644 index 00000000..fb41d49f --- /dev/null +++ b/domain/section/endpoint.go @@ -0,0 +1,168 @@ +// Copyright 2016 Documize Inc. . All rights reserved. +// +// This software (Documize Community Edition) is licensed under +// GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html +// +// You can operate outside the AGPL restrictions by purchasing +// Documize Enterprise Edition and obtaining a commercial license +// by contacting . +// +// https://documize.com + +package section + +import ( + "database/sql" + "net/http" + + "github.com/documize/community/core/env" + "github.com/documize/community/core/request" + "github.com/documize/community/core/response" + "github.com/documize/community/core/uniqueid" + "github.com/documize/community/domain" + "github.com/documize/community/domain/document" + "github.com/documize/community/domain/section/provider" + "github.com/documize/community/model/page" +) + +// Handler contains the runtime information such as logging and database. +type Handler struct { + Runtime *env.Runtime + Store *domain.Store +} + +// GetSections returns available smart sections. +func (h *Handler) GetSections(w http.ResponseWriter, r *http.Request) { + s := provider.GetSectionMeta() + + response.WriteJSON(w, s) +} + +// RunSectionCommand passes UI request to section handler. +func (h *Handler) RunSectionCommand(w http.ResponseWriter, r *http.Request) { + method := "section.command" + ctx := domain.GetRequestContext(r) + + documentID := request.Query(r, "documentID") + if len(documentID) == 0 { + response.WriteMissingDataError(w, method, "documentID") + return + } + + sectionName := request.Query(r, "section") + if len(sectionName) == 0 { + response.WriteMissingDataError(w, method, "section") + return + } + + // Note that targetMethod query item can be empty -- + // it's up to the section handler to parse if required. + + // Permission checks + if !document.CanChangeDocument(ctx, *h.Store, documentID) { + response.WriteForbiddenError(w) + return + } + + if !ctx.Editor { + response.WriteForbiddenError(w) + return + } + + if !provider.Command(sectionName, provider.NewContext(ctx.OrgID, ctx.UserID), w, r) { + h.Runtime.Log.Info("Unable to run provider.Command() for: " + sectionName) + response.WriteNotFoundError(w, "RunSectionCommand", sectionName) + } +} + +// RefreshSections updates document sections where the data is externally sourced. +func (h *Handler) RefreshSections(w http.ResponseWriter, r *http.Request) { + method := "section.refresh" + ctx := domain.GetRequestContext(r) + + documentID := request.Query(r, "documentID") + if len(documentID) == 0 { + response.WriteMissingDataError(w, method, "documentID") + return + } + + if !document.CanViewDocument(ctx, *h.Store, documentID) { + response.WriteForbiddenError(w) + return + } + + // Return payload + var p []page.Page + + // Let's see what sections are reliant on external sources + meta, err := h.Store.Page.GetDocumentPageMeta(ctx, documentID, true) + if err != nil { + h.Runtime.Log.Error(method, err) + response.WriteServerError(w, method, err) + return + } + + ctx.Transaction, err = h.Runtime.Db.Beginx() + if err != nil { + h.Runtime.Log.Error(method, err) + response.WriteServerError(w, method, err) + return + } + + for _, pm := range meta { + // Grab the page because we need content type and + page, err2 := h.Store.Page.Get(ctx, pm.PageID) + if err2 == sql.ErrNoRows { + continue + } + if err2 != nil { + h.Runtime.Log.Error(method, err) + response.WriteServerError(w, method, err) + ctx.Transaction.Rollback() + return + } + + pcontext := provider.NewContext(pm.OrgID, pm.UserID) + + // Ask for data refresh + data, ok := provider.Refresh(page.ContentType, pcontext, pm.Config, pm.RawBody) + if !ok { + h.Runtime.Log.Info("provider.Refresh could not find: " + page.ContentType) + } + + // Render again + body, ok := provider.Render(page.ContentType, pcontext, pm.Config, data) + if !ok { + h.Runtime.Log.Info("provider.Render could not find: " + page.ContentType) + } + + // Compare to stored render + if body != page.Body { + // Persist latest data + page.Body = body + p = append(p, page) + + refID := uniqueid.Generate() + + err = h.Store.Page.Update(ctx, page, refID, ctx.UserID, false) + if err != nil { + h.Runtime.Log.Error(method, err) + response.WriteServerError(w, method, err) + ctx.Transaction.Rollback() + return + } + + err = h.Store.Page.UpdateMeta(ctx, pm, false) // do not change the UserID on this PageMeta + if err != nil { + h.Runtime.Log.Error(method, err) + response.WriteServerError(w, method, err) + ctx.Transaction.Rollback() + return + } + } + } + + ctx.Transaction.Commit() + + response.WriteJSON(w, p) +} diff --git a/domain/section/section_test.go b/domain/section/section_test.go index f048f906..9e491a3b 100644 --- a/domain/section/section_test.go +++ b/domain/section/section_test.go @@ -15,7 +15,7 @@ import ( "net/http" "testing" - "github.com/documize/community/core/section/provider" + "github.com/documize/community/domain/section/provider" ) type testsection provider.TypeMeta diff --git a/domain/storer.go b/domain/storer.go index 0c98b021..2ce0ff92 100644 --- a/domain/storer.go +++ b/domain/storer.go @@ -179,11 +179,6 @@ type ActivityStorer interface { GetDocumentActivity(ctx RequestContext, id string) (a []activity.DocumentActivity, err error) } -// PageStorer defines required methods for persisting document pages -type PageStorer interface { - GetPagesWithoutContent(ctx RequestContext, documentID string) (pages []page.Page, err error) -} - // SearchStorer defines required methods for persisting search queries type SearchStorer interface { Add(ctx RequestContext, page page.Page) (err error) @@ -219,3 +214,24 @@ type BlockStorer interface { Update(ctx RequestContext, b block.Block) (err error) Delete(ctx RequestContext, id string) (rows int64, err error) } + +// PageStorer defines required methods for persisting document pages +type PageStorer interface { + Add(ctx RequestContext, model page.NewPage) (err error) + Get(ctx RequestContext, pageID string) (p page.Page, err error) + GetPages(ctx RequestContext, documentID string) (p []page.Page, err error) + GetPagesWhereIn(ctx RequestContext, documentID, inPages string) (p []page.Page, err error) + GetPagesWithoutContent(ctx RequestContext, documentID string) (pages []page.Page, err error) + Update(ctx RequestContext, page page.Page, refID, userID string, skipRevision bool) (err error) + UpdateMeta(ctx RequestContext, meta page.Meta, updateUserID bool) (err error) + UpdateSequence(ctx RequestContext, documentID, pageID string, sequence float64) (err error) + UpdateLevel(ctx RequestContext, documentID, pageID string, level int) (err error) + Delete(ctx RequestContext, documentID, pageID string) (rows int64, err error) + GetPageMeta(ctx RequestContext, pageID string) (meta page.Meta, err error) + GetPageRevision(ctx RequestContext, revisionID string) (revision page.Revision, err error) + GetPageRevisions(ctx RequestContext, pageID string) (revisions []page.Revision, err error) + GetDocumentRevisions(ctx RequestContext, documentID string) (revisions []page.Revision, err error) + GetDocumentPageMeta(ctx RequestContext, documentID string, externalSourceOnly bool) (meta []page.Meta, err error) + DeletePageRevisions(ctx RequestContext, pageID string) (rows int64, err error) + GetNextPageSequence(ctx RequestContext, documentID string) (maxSeq float64, err error) +} diff --git a/model/page/page.go b/model/page/page.go index bdb95eb2..20f60ffd 100644 --- a/model/page/page.go +++ b/model/page/page.go @@ -95,3 +95,22 @@ type Revision struct { Initials string `json:"initials"` Revisions int `json:"revisions"` } + +// NewPage contains the page and associated meta. +type NewPage struct { + Page Page `json:"page"` + Meta Meta `json:"meta"` +} + + +// PageSequenceRequest details a page ID and its sequence within the document. +type PageSequenceRequest struct { + PageID string `json:"pageId"` + Sequence float64 `json:"sequence"` +} + +// PageLevelRequest details a page ID and level. +type PageLevelRequest struct { + PageID string `json:"pageId"` + Level int `json:"level"` +} \ No newline at end of file diff --git a/server/routing/routes.go b/server/routing/routes.go index 3b860932..bf190b10 100644 --- a/server/routing/routes.go +++ b/server/routing/routes.go @@ -24,8 +24,10 @@ import ( "github.com/documize/community/domain/link" "github.com/documize/community/domain/meta" "github.com/documize/community/domain/organization" + "github.com/documize/community/domain/page" "github.com/documize/community/domain/pin" "github.com/documize/community/domain/search" + "github.com/documize/community/domain/section" "github.com/documize/community/domain/setting" "github.com/documize/community/domain/space" "github.com/documize/community/domain/user" @@ -44,8 +46,10 @@ func RegisterEndpoints(rt *env.Runtime, s *domain.Store) { meta := meta.Handler{Runtime: rt, Store: s} user := user.Handler{Runtime: rt, Store: s} link := link.Handler{Runtime: rt, Store: s} + page := page.Handler{Runtime: rt, Store: s} space := space.Handler{Runtime: rt, Store: s} block := block.Handler{Runtime: rt, Store: s} + section := section.Handler{Runtime: rt, Store: s} setting := setting.Handler{Runtime: rt, Store: s} document := document.Handler{Runtime: rt, Store: s, Indexer: indexer} attachment := attachment.Handler{Runtime: rt, Store: s} @@ -81,25 +85,25 @@ func RegisterEndpoints(rt *env.Runtime, s *domain.Store) { Add(rt, RoutePrefixPrivate, "documents/{documentID}", []string{"DELETE", "OPTIONS"}, nil, document.Delete) Add(rt, RoutePrefixPrivate, "documents/{documentID}/activity", []string{"GET", "OPTIONS"}, nil, document.Activity) - Add(rt, RoutePrefixPrivate, "documents/{documentID}/pages/level", []string{"POST", "OPTIONS"}, nil, endpoint.ChangeDocumentPageLevel) - Add(rt, RoutePrefixPrivate, "documents/{documentID}/pages/sequence", []string{"POST", "OPTIONS"}, nil, endpoint.ChangeDocumentPageSequence) - Add(rt, RoutePrefixPrivate, "documents/{documentID}/pages/batch", []string{"POST", "OPTIONS"}, nil, endpoint.GetDocumentPagesBatch) - Add(rt, RoutePrefixPrivate, "documents/{documentID}/pages/{pageID}/revisions", []string{"GET", "OPTIONS"}, nil, endpoint.GetDocumentPageRevisions) - Add(rt, RoutePrefixPrivate, "documents/{documentID}/pages/{pageID}/revisions/{revisionID}", []string{"GET", "OPTIONS"}, nil, endpoint.GetDocumentPageDiff) - Add(rt, RoutePrefixPrivate, "documents/{documentID}/pages/{pageID}/revisions/{revisionID}", []string{"POST", "OPTIONS"}, nil, endpoint.RollbackDocumentPage) - Add(rt, RoutePrefixPrivate, "documents/{documentID}/revisions", []string{"GET", "OPTIONS"}, nil, endpoint.GetDocumentRevisions) + Add(rt, RoutePrefixPrivate, "documents/{documentID}/pages/level", []string{"POST", "OPTIONS"}, nil, page.ChangePageLevel) + Add(rt, RoutePrefixPrivate, "documents/{documentID}/pages/sequence", []string{"POST", "OPTIONS"}, nil, page.ChangePageSequence) + Add(rt, RoutePrefixPrivate, "documents/{documentID}/pages/batch", []string{"POST", "OPTIONS"}, nil, page.GetPagesBatch) + Add(rt, RoutePrefixPrivate, "documents/{documentID}/pages/{pageID}/revisions", []string{"GET", "OPTIONS"}, nil, page.GetRevisions) + Add(rt, RoutePrefixPrivate, "documents/{documentID}/pages/{pageID}/revisions/{revisionID}", []string{"GET", "OPTIONS"}, nil, page.GetDiff) + Add(rt, RoutePrefixPrivate, "documents/{documentID}/pages/{pageID}/revisions/{revisionID}", []string{"POST", "OPTIONS"}, nil, page.Rollback) + Add(rt, RoutePrefixPrivate, "documents/{documentID}/revisions", []string{"GET", "OPTIONS"}, nil, page.GetDocumentRevisions) - Add(rt, RoutePrefixPrivate, "documents/{documentID}/pages", []string{"GET", "OPTIONS"}, nil, endpoint.GetDocumentPages) - Add(rt, RoutePrefixPrivate, "documents/{documentID}/pages/{pageID}", []string{"PUT", "OPTIONS"}, nil, endpoint.UpdateDocumentPage) - Add(rt, RoutePrefixPrivate, "documents/{documentID}/pages/{pageID}", []string{"DELETE", "OPTIONS"}, nil, endpoint.DeleteDocumentPage) - Add(rt, RoutePrefixPrivate, "documents/{documentID}/pages", []string{"DELETE", "OPTIONS"}, nil, endpoint.DeleteDocumentPages) - Add(rt, RoutePrefixPrivate, "documents/{documentID}/pages/{pageID}", []string{"GET", "OPTIONS"}, nil, endpoint.GetDocumentPage) - Add(rt, RoutePrefixPrivate, "documents/{documentID}/pages", []string{"POST", "OPTIONS"}, nil, endpoint.AddDocumentPage) + Add(rt, RoutePrefixPrivate, "documents/{documentID}/pages", []string{"GET", "OPTIONS"}, nil, page.GetPages) + Add(rt, RoutePrefixPrivate, "documents/{documentID}/pages/{pageID}", []string{"PUT", "OPTIONS"}, nil, page.Update) + Add(rt, RoutePrefixPrivate, "documents/{documentID}/pages/{pageID}", []string{"DELETE", "OPTIONS"}, nil, page.Delete) + Add(rt, RoutePrefixPrivate, "documents/{documentID}/pages", []string{"DELETE", "OPTIONS"}, nil, page.DeletePages) + Add(rt, RoutePrefixPrivate, "documents/{documentID}/pages/{pageID}", []string{"GET", "OPTIONS"}, nil, page.GetPage) + Add(rt, RoutePrefixPrivate, "documents/{documentID}/pages", []string{"POST", "OPTIONS"}, nil, page.Add) Add(rt, RoutePrefixPrivate, "documents/{documentID}/attachments", []string{"GET", "OPTIONS"}, nil, attachment.Get) Add(rt, RoutePrefixPrivate, "documents/{documentID}/attachments/{attachmentID}", []string{"DELETE", "OPTIONS"}, nil, attachment.Delete) Add(rt, RoutePrefixPrivate, "documents/{documentID}/attachments", []string{"POST", "OPTIONS"}, nil, attachment.Add) - Add(rt, RoutePrefixPrivate, "documents/{documentID}/pages/{pageID}/meta", []string{"GET", "OPTIONS"}, nil, endpoint.GetDocumentPageMeta) - Add(rt, RoutePrefixPrivate, "documents/{documentID}/pages/{pageID}/copy/{targetID}", []string{"POST", "OPTIONS"}, nil, endpoint.CopyPage) + Add(rt, RoutePrefixPrivate, "documents/{documentID}/pages/{pageID}/meta", []string{"GET", "OPTIONS"}, nil, page.GetMeta) + Add(rt, RoutePrefixPrivate, "documents/{documentID}/pages/{pageID}/copy/{targetID}", []string{"POST", "OPTIONS"}, nil, page.Copy) Add(rt, RoutePrefixPrivate, "organizations/{orgID}", []string{"GET", "OPTIONS"}, nil, organization.Get) Add(rt, RoutePrefixPrivate, "organizations/{orgID}", []string{"PUT", "OPTIONS"}, nil, organization.Update) @@ -133,15 +137,15 @@ func RegisterEndpoints(rt *env.Runtime, s *domain.Store) { Add(rt, RoutePrefixPrivate, "templates/{templateID}/folder/{folderID}", []string{"POST", "OPTIONS"}, []string{"type", "stock"}, endpoint.StartDocumentFromStockTemplate) Add(rt, RoutePrefixPrivate, "templates/{templateID}/folder/{folderID}", []string{"POST", "OPTIONS"}, []string{"type", "saved"}, endpoint.StartDocumentFromSavedTemplate) - Add(rt, RoutePrefixPrivate, "sections", []string{"GET", "OPTIONS"}, nil, endpoint.GetSections) - Add(rt, RoutePrefixPrivate, "sections", []string{"POST", "OPTIONS"}, nil, endpoint.RunSectionCommand) - Add(rt, RoutePrefixPrivate, "sections/refresh", []string{"GET", "OPTIONS"}, nil, endpoint.RefreshSections) + Add(rt, RoutePrefixPrivate, "sections", []string{"GET", "OPTIONS"}, nil, section.GetSections) + Add(rt, RoutePrefixPrivate, "sections", []string{"POST", "OPTIONS"}, nil, section.RunSectionCommand) + Add(rt, RoutePrefixPrivate, "sections/refresh", []string{"GET", "OPTIONS"}, nil, section.RefreshSections) Add(rt, RoutePrefixPrivate, "sections/blocks/space/{folderID}", []string{"GET", "OPTIONS"}, nil, block.GetBySpace) Add(rt, RoutePrefixPrivate, "sections/blocks/{blockID}", []string{"GET", "OPTIONS"}, nil, block.Get) Add(rt, RoutePrefixPrivate, "sections/blocks/{blockID}", []string{"PUT", "OPTIONS"}, nil, block.Update) Add(rt, RoutePrefixPrivate, "sections/blocks/{blockID}", []string{"DELETE", "OPTIONS"}, nil, block.Delete) Add(rt, RoutePrefixPrivate, "sections/blocks", []string{"POST", "OPTIONS"}, nil, block.Add) - Add(rt, RoutePrefixPrivate, "sections/targets", []string{"GET", "OPTIONS"}, nil, endpoint.GetPageMoveCopyTargets) + Add(rt, RoutePrefixPrivate, "sections/targets", []string{"GET", "OPTIONS"}, nil, page.GetMoveCopyTargets) Add(rt, RoutePrefixPrivate, "links/{folderID}/{documentID}/{pageID}", []string{"GET", "OPTIONS"}, nil, link.GetLinkCandidates) Add(rt, RoutePrefixPrivate, "links", []string{"GET", "OPTIONS"}, nil, link.SearchLinkCandidates)